Update to April 3rd version of patch. Closes PR ports/3204.

Submitted by:	Jun-ichiro ITOH <itojun@csl.sony.co.jp>

13 files changed, 34 insertions, 30 deletions

diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile
index 110785963311..a1fe9bd49cd7 100644
--- a/chinese/nvi-big5/Makefile
+++ b/chinese/nvi-big5/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:44 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:55:32 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 .include <${.CURDIR}/../../editors/nvi/Makefile>
 
-PKGNAME=	cn-nvi-big5-1.79-970306
+PKGNAME=	cn-nvi-big5-1.79-970403
 CATEGORIES=	chinese editors
 
 MAINTAINER=	itojun@itojun.org
diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile
index b65c8dc2cb37..9593c6f343dd 100644
--- a/chinese/nvi-euc-cn/Makefile
+++ b/chinese/nvi-euc-cn/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.2 1997/03/06 11:48:00 asami Exp $
+# $Id: Makefile,v 1.3 1997/03/15 11:55:56 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 .include <${.CURDIR}/../../editors/nvi/Makefile>
 
-PKGNAME=	cn-nvi-euccn-1.79-970306
+PKGNAME=	cn-nvi-euccn-1.79-970403
 CATEGORIES=	chinese editors
 
 MAINTAINER=	itojun@itojun.org
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 8dd238137364..cd9217a723fb 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -3,16 +3,16 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:44 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:55:58 asami Exp $
 #
 
 DISTNAME=	nvi-1.79
-PKGNAME=	nvi-m17n-1.79-970306
+PKGNAME=	nvi-m17n-1.79-970403
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/4bsd/\
 		ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
-PATCHFILES=	nvi-1.79.m17n-970306.diff.gz
+PATCHFILES=	nvi-1.79.m17n-970403-1000.diff.gz
 PATCH_SITES=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
 MAINTAINER=	itojun@itojun.org
diff --git a/editors/nvi-m17n/distinfo b/editors/nvi-m17n/distinfo
index 5494a345e4d1..c713f86d321b 100644
--- a/editors/nvi-m17n/distinfo
+++ b/editors/nvi-m17n/distinfo
@@ -1,2 +1,2 @@
 MD5 (nvi-1.79.tar.gz) = 765e2153f5fc4f21793f2edc2647305a
-MD5 (nvi-1.79.m17n-970306.diff.gz) = a8db6119e61ad136c0d44b1792bb644c
+MD5 (nvi-1.79.m17n-970403-1000.diff.gz) = cb4071af6824d03c335300c8be6cc105
diff --git a/editors/nvi-m17n/pkg-descr b/editors/nvi-m17n/pkg-descr
index da3026c825dd..4490d57e549c 100644
--- a/editors/nvi-m17n/pkg-descr
+++ b/editors/nvi-m17n/pkg-descr
@@ -7,9 +7,11 @@ Berkeley.
 
 Multilingual patch enables you to use the following multilingual
 encoding methods, such as:
-	none euc-jp-old euc-jp euc-cn euc-kr latin1 latin2 iso-2022-cn
-	iso-2022-jp iso-2022-kr iso-2022-7-1 iso-2022-7-2 iso-2022-8-2
-	sjis big5 hz
+	none iso-8859-[1234789] latin1 latin2
+	euc-jp-old euc-jp euc-cn euc-kr
+	iso-2022-cn iso-2022-jp iso-2022-kr
+	iso-2022-7-1 iso-2022-7-2 iso-2022-8-2
+	sjis big5 hz euc-tw
 Multilingual support has been set up to use some of the above (guess from
 the name of the ports/packages) as default value.
 You can change encoding style on the fly, or by setting up ~/.exrc.
@@ -21,4 +23,4 @@ Default encoding is set by /usr/local/etc/vi.exrc.
 
 original distribution site:
 	ftp://ftp.cs.berkeley.edu/ucb/4bsd/nvi-1.79.tar.gz
-	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/nvi-1.79.m17n-970306.diff.gz
+	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/nvi-1.79.m17n-970403-1000.diff.gz
diff --git a/editors/nvi-perl/Makefile b/editors/nvi-perl/Makefile
index 8dd238137364..cd9217a723fb 100644
--- a/editors/nvi-perl/Makefile
+++ b/editors/nvi-perl/Makefile
@@ -3,16 +3,16 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:44 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:55:58 asami Exp $
 #
 
 DISTNAME=	nvi-1.79
-PKGNAME=	nvi-m17n-1.79-970306
+PKGNAME=	nvi-m17n-1.79-970403
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.cs.berkeley.edu/ucb/4bsd/\
 		ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
-PATCHFILES=	nvi-1.79.m17n-970306.diff.gz
+PATCHFILES=	nvi-1.79.m17n-970403-1000.diff.gz
 PATCH_SITES=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
 MAINTAINER=	itojun@itojun.org
diff --git a/editors/nvi-perl/distinfo b/editors/nvi-perl/distinfo
index 5494a345e4d1..c713f86d321b 100644
--- a/editors/nvi-perl/distinfo
+++ b/editors/nvi-perl/distinfo
@@ -1,2 +1,2 @@
 MD5 (nvi-1.79.tar.gz) = 765e2153f5fc4f21793f2edc2647305a
-MD5 (nvi-1.79.m17n-970306.diff.gz) = a8db6119e61ad136c0d44b1792bb644c
+MD5 (nvi-1.79.m17n-970403-1000.diff.gz) = cb4071af6824d03c335300c8be6cc105
diff --git a/editors/nvi-perl/pkg-descr b/editors/nvi-perl/pkg-descr
index da3026c825dd..4490d57e549c 100644
--- a/editors/nvi-perl/pkg-descr
+++ b/editors/nvi-perl/pkg-descr
@@ -7,9 +7,11 @@ Berkeley.
 
 Multilingual patch enables you to use the following multilingual
 encoding methods, such as:
-	none euc-jp-old euc-jp euc-cn euc-kr latin1 latin2 iso-2022-cn
-	iso-2022-jp iso-2022-kr iso-2022-7-1 iso-2022-7-2 iso-2022-8-2
-	sjis big5 hz
+	none iso-8859-[1234789] latin1 latin2
+	euc-jp-old euc-jp euc-cn euc-kr
+	iso-2022-cn iso-2022-jp iso-2022-kr
+	iso-2022-7-1 iso-2022-7-2 iso-2022-8-2
+	sjis big5 hz euc-tw
 Multilingual support has been set up to use some of the above (guess from
 the name of the ports/packages) as default value.
 You can change encoding style on the fly, or by setting up ~/.exrc.
@@ -21,4 +23,4 @@ Default encoding is set by /usr/local/etc/vi.exrc.
 
 original distribution site:
 	ftp://ftp.cs.berkeley.edu/ucb/4bsd/nvi-1.79.tar.gz
-	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/nvi-1.79.m17n-970306.diff.gz
+	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/nvi-1.79.m17n-970403-1000.diff.gz
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index 5376f882c492..4a2985e82222 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:45 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:56:01 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 .include <${.CURDIR}/../../editors/nvi/Makefile>
 
-PKGNAME=	jp-nvi-eucjp-1.79-970306
+PKGNAME=	jp-nvi-eucjp-1.79-970403
 CATEGORIES=	japanese editors
 
 MAINTAINER=	itojun@itojun.org
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index 7824c1eabb9d..5e5c687497b5 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:45 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:56:03 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 .include <${.CURDIR}/../../editors/nvi/Makefile>
 
-PKGNAME=	jp-nvi-iso2022jp-1.79-970306
+PKGNAME=	jp-nvi-iso2022jp-1.79-970403
 CATEGORIES=	japanese editors
 
 MAINTAINER=	itojun@itojun.org
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index 4cd8221eaedb..1e523528c5a4 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:45 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:56:05 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 .include <${.CURDIR}/../../editors/nvi/Makefile>
 
-PKGNAME=	jp-nvi-sjis-1.79-970306
+PKGNAME=	jp-nvi-sjis-1.79-970403
 CATEGORIES=	japanese editors
 
 MAINTAINER=	itojun@itojun.org
diff --git a/korean/nvi-euc-kr/Makefile b/korean/nvi-euc-kr/Makefile
index 9cee59d3f63e..5fa2849c9568 100644
--- a/korean/nvi-euc-kr/Makefile
+++ b/korean/nvi-euc-kr/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:46 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:56:07 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 .include <${.CURDIR}/../../editors/nvi/Makefile>
 
-PKGNAME=	kr-nvi-euckr-1.79-970306
+PKGNAME=	kr-nvi-euckr-1.79-970403
 CATEGORIES=	korean editors
 
 MAINTAINER=	itojun@itojun.org
diff --git a/korean/nvi-iso-2022-kr/Makefile b/korean/nvi-iso-2022-kr/Makefile
index e3791b373d8a..9b56599c91c7 100644
--- a/korean/nvi-iso-2022-kr/Makefile
+++ b/korean/nvi-iso-2022-kr/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:46 asami Exp $
+# $Id: Makefile,v 1.2 1997/03/15 11:56:09 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
@@ -14,7 +14,7 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 .include <${.CURDIR}/../../editors/nvi/Makefile>
 
-PKGNAME=	kr-nvi-iso2022kr-1.79-970306
+PKGNAME=	kr-nvi-iso2022kr-1.79-970403
 CATEGORIES=	korean editors
 
 MAINTAINER=	itojun@itojun.org