Made the move to profile.d and upgraded to the latest nvi.

git-svn-id: http://svn.telesphoreo.org/trunk@84 514c082c-b64e-11dc-b46d-3d985efe055d

5 files changed, 7 insertions, 22 deletions

diff --git a/data/nvi/make.sh b/data/nvi/make.sh
index 5b013df51..237d6f052 100644
--- a/data/nvi/make.sh
+++ b/data/nvi/make.sh
@@ -1,7 +1,7 @@
 pkg:extract
-cd nvi-1.79
-pkg:patch
-cd build
-ac_cv_lib_termcap=no vi_cv_sys5_pty=no pkg:configure --disable-curses
-make CC=arm-apple-darwin-gcc
-make install prefix="${PKG_DEST}/usr" strip="$(which arm-apple-darwin-strip)"
+cd */build.unix
+PKG_CONF=../dist/configure pkg:configure vi_cv_sprintf_count=yes vi_cv_sys5_pty=no
+make
+pkg:install
+pkg: mkdir -p /etc/profile.d
+pkg: cp -a %/nvi.sh /etc/profile.d
diff --git a/data/nvi/nvi-1.79.tar.gz b/data/nvi/nvi-1.79.tar.gz
deleted file mode 100644
index ccb6ac979..000000000
--- a/data/nvi/nvi-1.79.tar.gz
+++ /dev/null
diff --git a/data/nvi/nvi-1.81.6.tar.gz b/data/nvi/nvi-1.81.6.tar.gz
new file mode 100644
index 000000000..06ceaa1e1
--- /dev/null
+++ b/data/nvi/nvi-1.81.6.tar.gz
diff --git a/data/nvi/nvi.sh b/data/nvi/nvi.sh
new file mode 100755
index 000000000..3842cff5c
--- /dev/null
+++ b/data/nvi/nvi.sh
@@ -0,0 +1 @@
+export EDITOR=vi
diff --git a/data/nvi/subshell.diff b/data/nvi/subshell.diff
deleted file mode 100644
index 71322ab43..000000000
--- a/data/nvi/subshell.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru nvi-1.79/build/Makefile.in nvi-1.79+iPhone/build/Makefile.in
---- nvi-1.79/build/Makefile.in	1996-10-23 13:43:38.000000000 +0000
-+++ nvi-1.79+iPhone/build/Makefile.in	2008-01-01 05:24:54.000000000 +0000
-@@ -137,12 +137,6 @@
- 	    $(chmod) $(dmode) $(datadir)/vi/catalog
- 	(cd $(srcdir)/catalog && $(cp) $(cat) $(datadir)/vi/catalog && \
- 	    cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
--	@echo "Installing Perl scripts: $(datadir)/vi/perl ..."
--	$(mkdir) $(datadir)/vi/perl && $(chmod) $(dmode) $(datadir)/vi/perl
--	[ -f VI.pm ] && $(cp) VI.pm $(datadir)/vi/perl && \
--	    cd $(datadir)/vi/perl && $(chmod) $(fmode) VI.pm)
--	(cd $(srcdir)/perl_scripts && $(cp) *.pl $(datadir)/vi/perl && \
--	    cd $(datadir)/vi/perl && $(chmod) $(fmode) *.pl)
- 	@echo "Installing Tcl scripts: $(datadir)/vi/tcl ..."
- 	$(mkdir) $(datadir)/vi/tcl && $(chmod) $(dmode) $(datadir)/vi/tcl
- 	(cd $(srcdir)/tcl_scripts && $(cp) *.tcl $(datadir)/vi/tcl && \