[pkgsrc/trunk]: pkgsrc/editors/nvi-m17n regen in diff -u format.

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8e8ef4640532
branches:  trunk
changeset: 503883:8e8ef4640532
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Dec 01 18:33:48 2005 +0000

description:
regen in diff -u format.

diffstat:

 editors/nvi-m17n/distinfo         |    6 +-
 editors/nvi-m17n/patches/patch-aa |  180 +++++++++++++++----------------------
 editors/nvi-m17n/patches/patch-ab |    8 +-
 3 files changed, 80 insertions(+), 114 deletions(-)

diffs (217 lines):

diff -r ad726584bd2a -r 8e8ef4640532 editors/nvi-m17n/distinfo
--- a/editors/nvi-m17n/distinfo Thu Dec 01 18:29:58 2005 +0000
+++ b/editors/nvi-m17n/distinfo Thu Dec 01 18:33:48 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/12/01 18:29:58 wiz Exp $
+$NetBSD: distinfo,v 1.9 2005/12/01 18:33:48 wiz Exp $
 
 SHA1 (nvi-1.79.tar.gz) = 65b49768783372609278ecedd63caa8c1547aa2a
 RMD160 (nvi-1.79.tar.gz) = 1c39d480e0d30a87fc061c3219354b50011a8621
@@ -6,6 +6,6 @@
 SHA1 (nvi-1.79.m17n-20040401.diff.gz) = 10fa772dad4368727a7ddc740d85cdfda3062414
 RMD160 (nvi-1.79.m17n-20040401.diff.gz) = 1b1790448d38a4f92f3b2df5f6aa566f1d8efff0
 Size (nvi-1.79.m17n-19991117.diff.gz) = 166609 bytes
-SHA1 (patch-aa) = aea78d88e44cfcbaa2327861d945098e3db1ce1a
-SHA1 (patch-ab) = 07d0cb5d617e5c2c5781f93daf3a1e8cbe22cf14
+SHA1 (patch-aa) = 4f9f677af314c1bba142d9c249d9d0b294c63fb0
+SHA1 (patch-ab) = 5559561254fce98b99e9d3d529d86e868f1abd03
 SHA1 (patch-global) = 8a825c8c68872cdfb38c280616d8cbe444bda4b0
diff -r ad726584bd2a -r 8e8ef4640532 editors/nvi-m17n/patches/patch-aa
--- a/editors/nvi-m17n/patches/patch-aa Thu Dec 01 18:29:58 2005 +0000
+++ b/editors/nvi-m17n/patches/patch-aa Thu Dec 01 18:33:48 2005 +0000
@@ -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 -r ad726584bd2a -r 8e8ef4640532 editors/nvi-m17n/patches/patch-ab
--- a/editors/nvi-m17n/patches/patch-ab Thu Dec 01 18:29:58 2005 +0000
+++ b/editors/nvi-m17n/patches/patch-ab Thu Dec 01 18:33:48 2005 +0000
@@ -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";;