From e10daf9d8d468e47a5fbbdcaa133f6b8ce04687a Mon Sep 17 00:00:00 2001
From: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
Date: Tue, 19 Nov 2019 16:16:27 -0500
Subject: system/nvi: upgrade to 1.81.6

---
 system/nvi/build-fix.patch | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'system/nvi/build-fix.patch')

diff --git a/system/nvi/build-fix.patch b/system/nvi/build-fix.patch
index 3839b7461..82f2784e6 100644
--- a/system/nvi/build-fix.patch
+++ b/system/nvi/build-fix.patch
@@ -1,19 +1,25 @@
---- nvi-1.79/build/Makefile.in.old	1996-10-23 13:43:38.000000000 +0000
-+++ nvi-1.79/build/Makefile.in	2018-08-08 00:47:23.110000000 +0000
-@@ -137,16 +137,6 @@
- 	    $(chmod) $(dmode) $(datadir)/vi/catalog
- 	(cd $(srcdir)/catalog && $(cp) $(cat) $(datadir)/vi/catalog && \
- 	    cd $(datadir)/vi/catalog && $(chmod) $(fmode) *)
+diff -Nurd nvi-1.81.6/dist/Makefile.in nvi-1.81.6.new/dist/Makefile.in
+--- nvi-1.81.6/dist/Makefile.in	2007-11-18 11:43:51.000000000 -0500
++++ nvi-1.81.6.new/dist/Makefile.in	2019-11-19 16:10:14.382325969 -0500
+@@ -1757,21 +1757,6 @@
+ 	@(cd $(visrcdir)/catalog && \
+ 	    $(cp) $(cat) $(DESTDIR)$(datadir)/vi/catalog && \
+ 	    cd $(DESTDIR)$(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)
+-	@$(mkdir) $(DESTDIR)$(datadir)/vi/perl && \
+-	    $(chmod) $(dmode) $(DESTDIR)$(datadir)/vi/perl
+-	@[ ! -f VI.pm ] || \
+-	    ($(cp) VI.pm $(DESTDIR)$(datadir)/vi/perl && \
+-	    (cd $(DESTDIR)$(datadir)/vi/perl && $(chmod) $(fmode) VI.pm))
+-	@(cd $(visrcdir)/perl_scripts && \
+-	    $(cp) *.pl $(DESTDIR)$(datadir)/vi/perl && \
+-	    cd $(DESTDIR)$(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 && \
--	    cd $(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl)
+-	@$(mkdir) $(DESTDIR)$(datadir)/vi/tcl && \
+-	    $(chmod) $(dmode) $(DESTDIR)$(datadir)/vi/tcl
+-	@(cd $(visrcdir)/tcl_scripts && \
+-	    $(cp) *.tcl $(DESTDIR)$(datadir)/vi/tcl && \
+-	    cd $(DESTDIR)$(datadir)/vi/tcl && $(chmod) $(fmode) *.tcl)
  	@echo "Installing recover script: $(datadir)/vi/recover ..."
- 	($(cp) recover $(datadir)/vi/recover && \
- 	    $(chmod) $(emode) $(datadir)/vi/recover)
+ 	@($(cp) recover $(DESTDIR)$(datadir)/vi/recover && \
+ 	    $(chmod) $(emode) $(DESTDIR)$(datadir)/vi/recover)
-- 
cgit v1.2.3-70-g09d2