[PATCH] Add nvi

[Marek Benc]

Disregard my previous email, I figured it out.

Here is my favorite text editor. This is my first package, so I'm sorry 
if I messed up somewhere.
The formatting is probably bad, but every package seemed to be formatted 
slightly differently, so I don't know.

--- a/gnu/packages/nvi.scm    2014-09-01 15:22:45.219850258 +0200
+++ b/gnu/packages/nvi.scm    2014-09-01 15:01:29.791808501 +0200
@@ -0,0 +1,70 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2014 Marek Benc <address@hidden>
+;;;
+;;; 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 <http://www.gnu.org/licenses/>.
+
+(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
+          (string-append "http://harrier.slackbuilds.org/misc/nvi-"; version
+                         ".tar.bz2"))
+        (sha256
+          (base32 "0nbbs1inyrqds0ywn3ln5slv54v5zraq7lszkg8nsavv4kivhh9l"))
+        (patches (list
+                   ;; Assume the preserve path is /var/tmp
+                   (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)))

--- a/gnu/packages/patches/nvi-assume-preserve-path.patch 2014-09-01 
15:22:45.219850258 +0200
+++ b/gnu/packages/patches/nvi-assume-preserve-path.patch 2014-09-01 
15:03:50.395813104 +0200
@@ -0,0 +1,28 @@
+--- 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