From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marek Benc Subject: Re: [PATCH] Add nvi Date: Tue, 02 Sep 2014 15:25:46 +0200 Message-ID: <5405C55A.6050301@gmail.com> References: <54047591.9080902@gmail.com> <8761h6sac7.fsf@gnu.org> <540594E3.10008@gmail.com> <874mwqnr2q.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080202090007080909040005" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:59600) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XOo6r-0005uM-UV for guix-devel@gnu.org; Tue, 02 Sep 2014 09:27:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XOo6l-0004Cy-Vh for guix-devel@gnu.org; Tue, 02 Sep 2014 09:26:57 -0400 In-Reply-To: <874mwqnr2q.fsf@gnu.org> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: =?UTF-8?B?THVkb3ZpYyBDb3VydMOocw==?= Cc: Guix-devel This is a multi-part message in MIME format. --------------080202090007080909040005 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 09/02/2014 02:29 PM, Ludovic Courtès wrote: > Marek Benc skribis: > >> On 09/02/2014 10:19 AM, Ludovic Courtès wrote: > [...] > >>> Shouldn’t it be >>> https://sites.google.com/a/bostic.com/keithbostic/files/... ? (This is >>> the URL given on the home page.) >> Actually, no. The actual home page, according to Debain, is >> http://www.kotnet.org/~skimo/nvi/ ; However, that site is dead. I've >> looked at what other distributions report and they say >> https://sites.google.com/a/bostic.com/keithbostic/vi is currently the >> home of nvi. Unfortunately, they don't provide the latest version of >> the editor (there's even a bug in the build system of that version), >> so I had to look somewhere else to get the newest one, which I found >> at Slackbuilds and some other places, like the Debian source >> repository. > In that case please leave the sites.google.com home page, with a comment > above the source URL stating that sites.google.com is stale etc. > >> I think I'll remove the website from the definition, as it'll cause >> confusion (It confused even me). >>>> + (license bsd-3))) >>> This is actually bsd-4 (see its ‘LICENSE’ file: it has the four clauses, >>> as shown at .) >> Really? I see there only 3 clauses, here's a listing of the LICENSE file: > I was looking at nvi-1.79/LICENSE and nvi-1.79/regex/COPYRIGHT, which > both contain the 4-clause text. It’s surprising that the newer version > no longer has the fourth clause. > > Which version do Trisquel or Debian ship? What does their ‘copyright’ > file says? Debian Stable ships with 1.81.6, with some additional patches (which I might eventually add in, we'llsee). The license there is BSD-3 as well, I'll enclose the copyright file as an attachment. >> Okay, now that that's out of the way, here's the updated patch: >> >> 2014-09-02 Marek Benc > For the subject line, use “gnu: Add nvi.” > >> * gnu/packages/nvi.scm: Add the nvi editor. >> * gnu/packages/patches/nvi-assume-preserve-path.patch: Assume nvi can >> store backups in /var/tmp. > In both cases, “New file.” is enough (try ‘git log’ to see examples.) > > The files also need to be added to gnu-system.am. Ah, there it is. I was actually searching for this file, thinking it would be Makefile.am in some subdirectory, but I couldn't find it. > > Could you send the patch (with the added comments) as an attachment, > because the mail client apparently mangled it? Okay, It's as an attachment. Here's the changelog entries: 2014-09-02 Marek Benc * gnu/packages/nvi.scm: New file. * gnu/packages/patches/nvi-assume-preserve-path.patch: New file. * gnu-system.am: Added the preceding 2 files. > > Thanks, > Ludo’. --------------080202090007080909040005 Content-Type: text/plain; charset=UTF-8; name="copyright" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="copyright" Rm9ybWF0LVNwZWNpZmljYXRpb246IGh0dHA6Ly93aWtpLmRlYmlhbi5vcmcvUHJvcG9zYWxz L0NvcHlyaWdodEZvcm1hdApVcHN0cmVhbS1OYW1lOiBudmkKVXBzdHJlYW0tTWFpbnRhaW5l cjogU3ZlbiBWZXJkb29sYWVnZSA8c2tpbW8tdmlAa290bmV0Lm9yZz4KVXBzdHJlYW0tU291 cmNlOiBodHRwOi8vd3d3LmtvdG5ldC5vcmcvfnNraW1vL252aS9kZXZlbC8KCkZpbGVzOiAq CkNvcHlyaWdodDogQ29weXJpZ2h0IChjKSAxOTkxLCAxOTkyLCAxOTkzLCAxOTk0LCBUaGUg UmVnZW50cyBvZiB0aGUgVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlhLiAgQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KICBDb3B5cmlnaHQgKGMpIDE5OTEsIDE5OTIsIDE5OTMsIDE5OTQsIDE5OTUs IDE5OTYsIDE5OTcsIDE5OTgsIDE5OTksIDIwMDAsIEtlaXRoIEJvc3RpYy4gIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCiAgQ29weXJpZ2h0IChjKSAxOTkzLCBBbGFuIFJpY2hhcmRzb24uICBB bGwgcmlnaHRzIHJlc2VydmVkLgogIENvcHlyaWdodCAoYykgMTk5NCwgMTk5NiwgUm9iIE1h eW9mZi4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgQ29weXJpZ2h0IChjKSAxOTk1LCBHZW9y Z2UgVi4gTmV2aWxsZS1OZWlsLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICBDb3B5cmlnaHQg KGMpIDE5OTYsIFJvYiBaaW1tZXJtYW5uLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICBDb3B5 cmlnaHQgKGMpIDE5OTYsIDE5OTksIDIwMDAsIFN2ZW4gVmVyZG9vbGFlZ2UuICBBbGwgcmln aHRzIHJlc2VydmVkLgogIENvcHlyaWdodCAoQykgMTk5NiwgMTk5NywgMTk5OCwgMTk5OSwg MjAwMCwgMjAwMSwgMjAwMywgMjAwNCwgMjAwNSwgMjAwNiwgMjAwNywgRnJlZSBTb2Z0d2Fy ZSBGb3VuZGF0aW9uLCBJbmMuCkxpY2Vuc2U6IEJTRC0zCiAgVGhlIGZvbGxvd2luZyBhcmUg dGhlIGNvcHlyaWdodHMgYW5kIHJlZGlzdHJpYnV0aW9uIGNvbmRpdGlvbnMgdGhhdCBhcHBs eQogIHRvIHRoaXMgY29weSBvZiB0aGUgVmkgc29mdHdhcmUuCiAgCiAgLyoKICAgKiBDb3B5 cmlnaHQgKGMpIDE5OTEsIDE5OTIsIDE5OTMsIDE5OTQKICAgKiAgICAgIFRoZSBSZWdlbnRz IG9mIHRoZSBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEuICBBbGwgcmlnaHRzIHJlc2VydmVk LgogICAqICBDb3B5cmlnaHQgKGMpIDE5OTEsIDE5OTIsIDE5OTMsIDE5OTQsIDE5OTUsIDE5 OTYsIDE5OTcsIDE5OTgsIDE5OTksIDIwMDAKICAgKglLZWl0aCBCb3N0aWMuICBBbGwgcmln aHRzIHJlc2VydmVkLgogICAqICBDb3B5cmlnaHQgKGMpIDE5OTksIDIwMDAKICAgKglTdmVu IFZlcmRvb2xhZWdlLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICAgKgogICAqIFJlZGlzdHJp YnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0 aG91dAogICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRo ZSBmb2xsb3dpbmcgY29uZGl0aW9ucwogICAqIGFyZSBtZXQ6CiAgICogMS4gUmVkaXN0cmli dXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQK ICAgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIuCiAgICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3Jt IG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKICAgKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4g dGhlCiAgICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3Zp ZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KICAgKiAzLiBOZWl0aGVyIHRoZSBuYW1lIG9m IHRoZSBVbml2ZXJzaXR5IG5vciB0aGUgbmFtZXMgb2YgaXRzIGNvbnRyaWJ1dG9ycwogICAq ICAgIG1heSBiZSB1c2VkIHRvIGVuZG9yc2Ugb3IgcHJvbW90ZSBwcm9kdWN0cyBkZXJpdmVk IGZyb20gdGhpcyBzb2Z0d2FyZQogICAqICAgIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3Jp dHRlbiBwZXJtaXNzaW9uLgogICAqCiAgICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBUSEUgUkVHRU5UUyBBTkQgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQKICAgKiBBTlkg RVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1J VEVEIFRPLCBUSEUKICAgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZ IEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRQogICAqIEFSRSBESVNDTEFJ TUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgVEhFIFJFR0VOVFMgT1IgQ09OVFJJQlVUT1JTIEJF IExJQUJMRQogICAqIEZPUiBBTlkgRElSRUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BF Q0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMCiAgICogREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09P RFMKICAgKiBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9S IEJVU0lORVNTIElOVEVSUlVQVElPTikKICAgKiBIT1dFVkVSIENBVVNFRCBBTkQgT04gQU5Z IFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVAogICAq IExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNF KSBBUklTSU5HIElOIEFOWSBXQVkKICAgKiBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GCiAgICogU1VDSCBE QU1BR0UuCiAgICovCiAgCiAgKFRoZSBmaWxlcyBpbiB0aGUgY2xpYi8gc3ViZGlyZWN0b3J5 IGJlYXIgYSBCU0QtNCBsaWNlbnNlIGhlYWRlciwgeWV0IHRoZQogIG9ubHkgY29weXJpZ2h0 IGhvbGRlciBvZiB0aG9zZSBmaWxlcyBpcyB0aGUgVW5pdmVyc2l0eSBvZiBDYWxpZm9ybmlh LAogIEJlcmtlbGV5LCB3aGljaCByZW1vdmVkIHRoZSBhZC1jbGF1c2UgaW4gMTk5NyByZXRy b2FjdGl2ZWx5IChpLmUuIGl0CiAgcmVsaWNlbnNlZCBhbGwgQlNELTQgY29kZSB1bmRlciBp dHMgY29weXJpZ2h0IHRvIEJTRC0zKS4gVGh1cyB0aG9zZSBmaWxlcwogIGFyZSBlZmZlY3Rp dmVseSBkaXN0cmlidXRlZCB1bmRlciB0aGUgQlNELTMgbGljZW5zZSBhcyB3ZWxsLikKCkZp bGVzOiByZWdleC8qCkNvcHlyaWdodDogQ29weXJpZ2h0IChjKSAxOTkyLCAxOTkzLCAxOTk0 LCBIZW5yeSBTcGVuY2VyLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KICBDb3B5cmlnaHQgKGMp IDE5OTQsIFRoZSBSZWdlbnRzIG9mIHRoZSBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEuICBB bGwgcmlnaHRzIHJlc2VydmVkLgpMaWNlbnNlOiBvdGhlciwgQlNELTMKICBPcmlnaW5hbCBs aWNlbnNlIHRlcm1zIGJ5IEhlbnJ5IFNwZW5jZXI6CgogIFRoaXMgc29mdHdhcmUgaXMgbm90 IHN1YmplY3QgdG8gYW55IGxpY2Vuc2Ugb2YgdGhlIEFtZXJpY2FuIFRlbGVwaG9uZQogIGFu ZCBUZWxlZ3JhcGggQ29tcGFueSBvciBvZiB0aGUgUmVnZW50cyBvZiB0aGUgVW5pdmVyc2l0 eSBvZiBDYWxpZm9ybmlhLgoKICBQZXJtaXNzaW9uIGlzIGdyYW50ZWQgdG8gYW55b25lIHRv IHVzZSB0aGlzIHNvZnR3YXJlIGZvciBhbnkgcHVycG9zZSBvbgogIGFueSBjb21wdXRlciBz eXN0ZW0sIGFuZCB0byBhbHRlciBpdCBhbmQgcmVkaXN0cmlidXRlIGl0LCBzdWJqZWN0CiAg dG8gdGhlIGZvbGxvd2luZyByZXN0cmljdGlvbnM6CgogIDEuIFRoZSBhdXRob3IgaXMgbm90 IHJlc3BvbnNpYmxlIGZvciB0aGUgY29uc2VxdWVuY2VzIG9mIHVzZSBvZiB0aGlzCiAgICAg c29mdHdhcmUsIG5vIG1hdHRlciBob3cgYXdmdWwsIGV2ZW4gaWYgdGhleSBhcmlzZSBmcm9t IGZsYXdzIGluIGl0LgoKICAyLiBUaGUgb3JpZ2luIG9mIHRoaXMgc29mdHdhcmUgbXVzdCBu b3QgYmUgbWlzcmVwcmVzZW50ZWQsIGVpdGhlciBieQogICAgIGV4cGxpY2l0IGNsYWltIG9y IGJ5IG9taXNzaW9uLiAgU2luY2UgZmV3IHVzZXJzIGV2ZXIgcmVhZCBzb3VyY2VzLAogICAg IGNyZWRpdHMgbXVzdCBhcHBlYXIgaW4gdGhlIGRvY3VtZW50YXRpb24uCgogIDMuIEFsdGVy ZWQgdmVyc2lvbnMgbXVzdCBiZSBwbGFpbmx5IG1hcmtlZCBhcyBzdWNoLCBhbmQgbXVzdCBu b3QgYmUKICAgICBtaXNyZXByZXNlbnRlZCBhcyBiZWluZyB0aGUgb3JpZ2luYWwgc29mdHdh cmUuICBTaW5jZSBmZXcgdXNlcnMKICAgICBldmVyIHJlYWQgc291cmNlcywgY3JlZGl0cyBt dXN0IGFwcGVhciBpbiB0aGUgZG9jdW1lbnRhdGlvbi4KCiAgNC4gVGhpcyBub3RpY2UgbWF5 IG5vdCBiZSByZW1vdmVkIG9yIGFsdGVyZWQuCgogIFN1YnNlcXVlbnQgbW9kaWZpY2F0aW9u cyBtYWRlIGJ5IFVDQiBhcmUgY292ZXJlZCBieSBCU0QtMzoKCiAgPS09LT0tPS09LT0tPS09 LT0tPS09LT0tPS09LT0tPS09LT0tPS09LT0tPS09LT0tPS09LT0tPS09LT0tPS09LT0tPS09 LT0tPQogIC8qLQogICAqIENvcHlyaWdodCAoYykgMTk5NAogICAqCVRoZSBSZWdlbnRzIG9m IHRoZSBVbml2ZXJzaXR5IG9mIENhbGlmb3JuaWEuICBBbGwgcmlnaHRzIHJlc2VydmVkLgog ICAqCiAgICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CiAgICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCiAgICogYXJlIG1ldDoK ICAgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhl IGFib3ZlIGNvcHlyaWdodAogICAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlv bnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KICAgKiAyLiBSZWRpc3RyaWJ1dGlv bnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAog ICAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lciBpbiB0aGUKICAgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhl ciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgogICAqIDMuIEFs bCBhZHZlcnRpc2luZyBtYXRlcmlhbHMgbWVudGlvbmluZyBmZWF0dXJlcyBvciB1c2Ugb2Yg dGhpcyBzb2Z0d2FyZQogICAqICAgIG11c3QgZGlzcGxheSB0aGUgZm9sbG93aW5nIGFja25v d2xlZGdlbWVudDoKICAgKglUaGlzIHByb2R1Y3QgaW5jbHVkZXMgc29mdHdhcmUgZGV2ZWxv cGVkIGJ5IHRoZSBVbml2ZXJzaXR5IG9mCiAgICoJQ2FsaWZvcm5pYSwgQmVya2VsZXkgYW5k IGl0cyBjb250cmlidXRvcnMuCiAgICogNC4gTmVpdGhlciB0aGUgbmFtZSBvZiB0aGUgVW5p dmVyc2l0eSBub3IgdGhlIG5hbWVzIG9mIGl0cyBjb250cmlidXRvcnMKICAgKiAgICBtYXkg YmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVjdHMgZGVyaXZlZCBmcm9tIHRo aXMgc29mdHdhcmUKICAgKiAgICB3aXRob3V0IHNwZWNpZmljIHByaW9yIHdyaXR0ZW4gcGVy bWlzc2lvbi4KICAgKgogICAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIFJF R0VOVFMgQU5EIENPTlRSSUJVVE9SUyBgYEFTIElTJycgQU5ECiAgICogQU5ZIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywg VEhFCiAgICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UKICAgKiBBUkUgRElTQ0xBSU1FRC4gIElO IE5PIEVWRU5UIFNIQUxMIFRIRSBSRUdFTlRTIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUK ICAgKiBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVY RU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTAogICAqIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTCiAgICog T1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVT UyBJTlRFUlJVUFRJT04pCiAgICogSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkg T0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QKICAgKiBMSUFCSUxJ VFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lO RyBJTiBBTlkgV0FZCiAgICogT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBTT0ZUV0FSRSwgRVZF TiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRgogICAqIFNVQ0ggREFNQUdFLgog ICAqCiAgICoJQCgjKUNPUFlSSUdIVAk4LjEgKEJlcmtlbGV5KSAzLzE2Lzk0CiAgICovCgpG aWxlczogZGViaWFuLyoKQ29weXJpZ2h0OiBDb3B5cmlnaHQgKGMpIDE5OTYsIDE5OTcsIDE5 OTgsIDE5OTksIDIwMDAsIDIwMDEsIDIwMDIsIDIwMDMsIDIwMDQsIDIwMDUsIDIwMDYsIFN0 ZXZlIEdyZWVubGFuZC4KICBDb3B5cmlnaHQgKGMpIDIwMDgsIDIwMDksIEphbiBDaHJpc3Rv cGggTm9yZGhvbHouCkxpY2Vuc2U6IEdBUAogIENvcHlpbmcgYW5kIGRpc3RyaWJ1dGlvbiBv ZiB0aGlzIGZpbGUsIHdpdGggb3Igd2l0aG91dCBtb2RpZmljYXRpb24sCiAgYXJlIHBlcm1p dHRlZCBpbiBhbnkgbWVkaXVtIHdpdGhvdXQgcm95YWx0eSBwcm92aWRlZCB0aGUgY29weXJp Z2h0CiAgbm90aWNlIGFuZCB0aGlzIG5vdGljZSBhcmUgcHJlc2VydmVkLgo= --------------080202090007080909040005 Content-Type: text/x-diff; name="nvi.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="nvi.patch" >From ffe65745b5cfe8a5a03cd56f3fa7069f2c4b83b3 Mon Sep 17 00:00:00 2001 From: Marek Benc Date: Tue, 2 Sep 2014 15:18:20 +0200 Subject: [PATCH] gnu: Add nvi. --- gnu-system.am | 2 + gnu/packages/nvi.scm | 68 ++++++++++++++++++++ .../patches/nvi-assume-preserve-path.patch | 30 +++++++++ 3 files changed, 100 insertions(+) create mode 100644 gnu/packages/nvi.scm create mode 100644 gnu/packages/patches/nvi-assume-preserve-path.patch diff --git a/gnu-system.am b/gnu-system.am index e439f51..a3f04ec 100644 --- a/gnu-system.am +++ b/gnu-system.am @@ -180,6 +180,7 @@ GNU_SYSTEM_MODULES = \ gnu/packages/nettle.scm \ gnu/packages/node.scm \ gnu/packages/noweb.scm \ + gnu/packages/nvi.scm \ gnu/packages/ocaml.scm \ gnu/packages/ocrad.scm \ gnu/packages/onc-rpc.scm \ @@ -351,6 +352,7 @@ dist_patch_DATA = \ gnu/packages/patches/mit-krb5-init-fix.patch \ gnu/packages/patches/mpc123-initialize-ao.patch \ gnu/packages/patches/module-init-tools-moduledir.patch \ + gnu/packages/patches/nvi-assume-preserve-path.patch \ gnu/packages/patches/orpheus-cast-errors-and-includes.patch \ gnu/packages/patches/patchelf-page-size.patch \ gnu/packages/patches/patchutils-xfail-gendiff-tests.patch \ diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm new file mode 100644 index 0000000..c756737 --- /dev/null +++ b/gnu/packages/nvi.scm @@ -0,0 +1,68 @@ +;;; GNU Guix --- Functional package management for GNU +;;; Copyright © 2014 Marek Benc +;;; +;;; This file is part of GNU Guix. +;;; +;;; GNU Guix is free software; you can redistribute it and/or modify it +;;; under the terms of the GNU General Public License as published by +;;; the Free Software Foundation; either version 3 of the License, or (at +;;; your option) any later version. +;;; +;;; GNU Guix is distributed in the hope that it will be useful, but +;;; WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with GNU Guix. If not, see . + +(define-module (gnu packages nvi) + #:use-module (gnu packages) + #:use-module (gnu packages bdb) + #:use-module (gnu packages ncurses) + #:use-module (guix packages) + #:use-module (guix download) + #:use-module (guix build-system gnu) + #:use-module (guix licenses)) + +(define-public nvi + (package + (name "nvi") + (version "1.81.6") + (source + (origin + (method url-fetch) + (uri ;; sites.google.coma/bostic.com/keithbostic/vi is stale. + (string-append "http://harrier.slackbuilds.org/misc/nvi-" version + ".tar.bz2")) + (sha256 + (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l")) + (patches (list (search-patch "nvi-assume-preserve-path.patch"))) + (snippet + ;; Create a wrapper for the configure script, make it executable. + '(let ((conf-wrap (open-output-file "configure"))) + (display "#!/bin/sh" conf-wrap) + (newline conf-wrap) + (display + "../nvi-1.81.6/dist/configure --srcdir=../nvi-1.81.6/dist $@" + conf-wrap) + (newline conf-wrap) + (close-output-port conf-wrap) + (chmod "configure" #o0755))))) + + (build-system gnu-build-system) + (arguments + `(#:out-of-source? #t)) + (inputs + `(("bdb" ,bdb) + ("ncurses" ,ncurses))) + (synopsis "The Berkeley Vi Editor") + (description + "Vi is the original screen based text editor for Unix systems. It is +considered the standard text editor, and is available on almost all Unix +systems. Nvi is intended as a \"bug-for-bug compatible\" clone of the original +BSD vi editor. As such, it doesn't have a lot of snazzy features as do some +of the other vi clones such as elvis and vim. However, if all you want is vi, +this is the one to get.") + (home-page "https://sites.google.com/a/bostic.com/keithbostic/vi") + (license bsd-3))) diff --git a/gnu/packages/patches/nvi-assume-preserve-path.patch b/gnu/packages/patches/nvi-assume-preserve-path.patch new file mode 100644 index 0000000..3a406ec --- /dev/null +++ b/gnu/packages/patches/nvi-assume-preserve-path.patch @@ -0,0 +1,30 @@ +Make configure assume nvi can store backups in /var/tmp + +--- a/dist/configure 2014-09-01 14:46:01.075778095 +0200 ++++ b/dist/configure 2014-09-01 14:52:08.411790122 +0200 +@@ -21319,23 +21319,8 @@ + if test "${vi_cv_path_preserve+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- dirlist="/var/preserve /var/tmp /usr/tmp" +- vi_cv_path_preserve=no +- for i in $dirlist; do +- if test -d $i/vi.recover; then +- vi_cv_path_preserve=$i/vi.recover +- break; +- fi +- done +- if test "$vi_cv_path_preserve" = no; then +- for i in $dirlist; do +- if test -d $i -a -w $i; then +- vi_cv_path_preserve=$i/vi.recover +- break; +- fi +- done +- +- fi ++# Assume /var/tmp ++ vi_cv_path_preserve=/var/tmp/vi.recover + fi + + if test "$vi_cv_path_preserve" = no; then -- 1.7.10.4 --------------080202090007080909040005--