regen in diff -u format.

2 files changed, 77 insertions, 111 deletions

diff --git a/editors/nvi-m17n/patches/patch-aa b/editors/nvi-m17n/patches/patch-aa
index e7fdeafcb0f..83f309c7815 100644
--- a/editors/nvi-m17n/patches/patch-aa
+++ b/editors/nvi-m17n/patches/patch-aa
@@ -1,107 +1,73 @@
-$NetBSD: patch-aa,v 1.3 2005/12/01 18:29:58 wiz Exp $
-*** build/Makefile.in.orig	Thu Mar  6 13:19:46 1997
---- build/Makefile.in	Thu Mar  6 13:23:40 1997
-***************
-*** 87,95 ****
-  	cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
-! 	cd $(bindir) && $(ln) \
-  		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
-! 	cd $(bindir) && $(ln) \
-  		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f regular qregular
-  	$(cp) regular $(bindir)/regular
---- 87,95 ----
-  	cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
-! 	cd $(bindir) && $(ln) -s \
-  		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
-! 	cd $(bindir) && $(ln) -s \
-  		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f regular qregular
-  	$(cp) regular $(bindir)/regular
-***************
-*** 97,115 ****
-  	cd $(bindir) && $(chmod) $(emode) regular qregular
-  	[ -d $(mandir) ] || \
-  	    ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
-! 	[ -d $(mandir)/cat1 ] || \
-! 	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
-  	@echo "Installing man pages: $(mandir) ..."
-! 	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
-! 	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
-! 	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
-! 	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
-! 	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
-! 	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
-! 	cd $(mandir)/cat1 && $(ln) \
-! 	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
-! 	cd $(mandir)/cat1 && $(ln) \
-! 	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
-  	[ -d $(mandir)/man1 ] || \
-  	    ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
-  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
---- 97,115 ----
-  	cd $(bindir) && $(chmod) $(emode) regular qregular
-  	[ -d $(mandir) ] || \
-  	    ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
-! #	[ -d $(mandir)/cat1 ] || \
-! #	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
-  	@echo "Installing man pages: $(mandir) ..."
-! #	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
-! #	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
-! #	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
-! #	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
-! #	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
-! #	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
-! #	cd $(mandir)/cat1 && $(ln) -s \
-! #	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
-! #	cd $(mandir)/cat1 && $(ln) -s \
-! #	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
-  	[ -d $(mandir)/man1 ] || \
-  	    ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
-  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
-***************
-*** 118,126 ****
-  	cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
-! 	cd $(mandir)/man1 && $(ln) \
-  	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
-! 	cd $(mandir)/man1 && $(ln) \
-  	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
-  
-  cat=	dutch english french german ru_SU.KOI8-R spanish swedish
---- 118,126 ----
-  	cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
-! 	cd $(mandir)/man1 && $(ln) -s \
-  	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
-! 	cd $(mandir)/man1 && $(ln) -s \
-  	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
-  
-  cat=	dutch english french german ru_SU.KOI8-R spanish swedish
-***************
-*** 163,171 ****
-  	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f regular qregular
-! 	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
-! 	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
-! 	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
---- 163,171 ----
-  	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
-  	cd $(bindir) && $(rm) -f regular qregular
-! #	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
-! #	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
-! #	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
-  	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+$NetBSD: patch-aa,v 1.4 2005/12/01 18:33:48 wiz Exp $
+
+--- build/Makefile.in.orig	2005-12-01 19:32:57.000000000 +0100
++++ build/Makefile.in
+@@ -88,9 +88,9 @@ install: all install_common
+ 	cd $(bindir) && $(chmod) $(emode) `echo vi | sed '$(transform)'`
+ 	cd $(bindir) && $(rm) -f `echo ex | sed '$(transform)'`
+ 	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+-	cd $(bindir) && $(ln) \
++	cd $(bindir) && $(ln) -s \
+ 		`echo vi | sed '$(transform)'` `echo ex | sed '$(transform)'`
+-	cd $(bindir) && $(ln) \
++	cd $(bindir) && $(ln) -s \
+ 		`echo vi | sed '$(transform)'` `echo view | sed '$(transform)'`
+ 	cd $(bindir) && $(rm) -f regular qregular
+ 	$(cp) regular $(bindir)/regular
+@@ -98,19 +98,19 @@ install: all install_common
+ 	cd $(bindir) && $(chmod) $(emode) regular qregular
+ 	[ -d $(mandir) ] || \
+ 	    ($(mkdir) $(mandir) && $(chmod) $(dmode) $(mandir))
+-	[ -d $(mandir)/cat1 ] || \
+-	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
++#	[ -d $(mandir)/cat1 ] || \
++#	    ($(mkdir) $(mandir)/cat1 && $(chmod) $(dmode) $(mandir)/cat1)
+ 	@echo "Installing man pages: $(mandir) ..."
+-	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+-	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
+-	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(ln) \
+-	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(ln) \
+-	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
++#	$(cp) $(srcdir)/docs/USD.doc/vi.man/vi.0 \
++#	    $(mandir)/cat1/`echo vi.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(chmod) $(fmode) `echo vi.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(ln) -s \
++#	    `echo vi.0 | sed '$(transform)'` `echo ex.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(ln) -s \
++#	    `echo vi.0 | sed '$(transform)'` `echo view.0 | sed '$(transform)'`
+ 	[ -d $(mandir)/man1 ] || \
+ 	    ($(mkdir) $(mandir)/man1 && $(chmod) $(dmode) $(mandir)/man1)
+ 	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+@@ -119,9 +119,9 @@ install: all install_common
+ 	cd $(mandir)/man1 && $(chmod) $(fmode) `echo vi.1 | sed '$(transform)'`
+ 	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+ 	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
+-	cd $(mandir)/man1 && $(ln) \
++	cd $(mandir)/man1 && $(ln) -s \
+ 	    `echo vi.1 | sed '$(transform)'` `echo ex.1 | sed '$(transform)'`
+-	cd $(mandir)/man1 && $(ln) \
++	cd $(mandir)/man1 && $(ln) -s \
+ 	    `echo vi.1 | sed '$(transform)'` `echo view.1 | sed '$(transform)'`
+ 
+ cat=	dutch english french german ru_SU.KOI8-R spanish swedish
+@@ -164,9 +164,9 @@ uninstall:
+ 	cd $(bindir) && $(rm) -f `echo vi | sed '$(transform)'`
+ 	cd $(bindir) && $(rm) -f `echo view | sed '$(transform)'`
+ 	cd $(bindir) && $(rm) -f regular qregular
+-	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
+-	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(rm) -f `echo ex.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(rm) -f `echo vi.0 | sed '$(transform)'`
++#	cd $(mandir)/cat1 && $(rm) -f `echo view.0 | sed '$(transform)'`
+ 	cd $(mandir)/man1 && $(rm) -f `echo ex.1 | sed '$(transform)'`
+ 	cd $(mandir)/man1 && $(rm) -f `echo vi.1 | sed '$(transform)'`
+ 	cd $(mandir)/man1 && $(rm) -f `echo view.1 | sed '$(transform)'`
diff --git a/editors/nvi-m17n/patches/patch-ab b/editors/nvi-m17n/patches/patch-ab
index 2b2c0813dea..828b9cba262 100644
--- a/editors/nvi-m17n/patches/patch-ab
+++ b/editors/nvi-m17n/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2005/12/01 18:29:58 wiz Exp $
---- build/configure.bad	Fri Jun 26 02:22:51 1998
-+++ build/configure	Fri Jun 26 02:23:39 1998
-@@ -1686,10 +1686,8 @@
+$NetBSD: patch-ab,v 1.5 2005/12/01 18:33:48 wiz Exp $
+--- build/configure.orig	2005-12-01 19:32:57.000000000 +0100
++++ build/configure
+@@ -1805,10 +1805,8 @@ if test "$vi_cv_canna" = "yes"; then
  		case "$host_os" in
  		bsdi2.1)
  			vi_cannapath="/usr/contrib/canna";;