Misc. cleanup. They've been in my tree for a while, I forgot to commit them.

9 files changed, 48 insertions, 66 deletions

diff --git a/chinese/nvi-big5/Makefile b/chinese/nvi-big5/Makefile
index df4ec00bdc2..11078596331 100644
--- a/chinese/nvi-big5/Makefile
+++ b/chinese/nvi-big5/Makefile
@@ -3,24 +3,20 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:44 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
+FILESDIR=	${.CURDIR}/../../editors/nvi/files
+PATCHDIR=	${.CURDIR}/../../editors/nvi/patches
+PKGDIR=		${.CURDIR}/../../editors/nvi/pkg
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
 .include <${.CURDIR}/../../editors/nvi/Makefile>
-# bsd.port.mk has been included in the above statement, so we don't need to
-# include it again.
 
 PKGNAME=	cn-nvi-big5-1.79-970306
 CATEGORIES=	chinese editors
 
 MAINTAINER=	itojun@itojun.org
 
-#LIB_DEPENDS+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
-
-FILESDIR=	${PORTSDIR}/editors/nvi/files
-PATCHDIR=	${PORTSDIR}/editors/nvi/patches
-PKGDIR=		${PORTSDIR}/editors/nvi/pkg
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 CONFIGURE_ARGS=	--enable-multibyte=big5 --program-prefix=n
diff --git a/chinese/nvi-euc-cn/Makefile b/chinese/nvi-euc-cn/Makefile
index f59e57e2760..b65c8dc2cb3 100644
--- a/chinese/nvi-euc-cn/Makefile
+++ b/chinese/nvi-euc-cn/Makefile
@@ -3,24 +3,20 @@
 # 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/06 11:48:00 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
+FILESDIR=	${.CURDIR}/../../editors/nvi/files
+PATCHDIR=	${.CURDIR}/../../editors/nvi/patches
+PKGDIR=		${.CURDIR}/../../editors/nvi/pkg
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
 .include <${.CURDIR}/../../editors/nvi/Makefile>
-# bsd.port.mk has been included in the above statement, so we don't need to
-# include it again.
 
 PKGNAME=	cn-nvi-euccn-1.79-970306
 CATEGORIES=	chinese editors
 
 MAINTAINER=	itojun@itojun.org
 
-#LIB_DEPENDS+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
-
-FILESDIR=	${PORTSDIR}/editors/nvi/files
-PATCHDIR=	${PORTSDIR}/editors/nvi/patches
-PKGDIR=		${PORTSDIR}/editors/nvi/pkg
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 CONFIGURE_ARGS=	--enable-multibyte=euc-cn --program-prefix=n
diff --git a/editors/nvi-m17n/Makefile b/editors/nvi-m17n/Makefile
index 01f4c2eec87..8dd23813736 100644
--- a/editors/nvi-m17n/Makefile
+++ b/editors/nvi-m17n/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:44 asami Exp $
 #
 
 DISTNAME=	nvi-1.79
@@ -11,6 +11,7 @@ PKGNAME=	nvi-m17n-1.79-970306
 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
 PATCH_SITES=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
@@ -20,6 +21,7 @@ MAINTAINER=	itojun@itojun.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	yes
+# can't say PATCH_DIST_STRIP=-p1 because contains files outside ${WRKSRC}
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p0
 CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"/usr/local/etc/vi.exrc\"'
 CONFIGURE_ARGS=	--enable-multibyte --program-prefix=n
diff --git a/editors/nvi-perl/Makefile b/editors/nvi-perl/Makefile
index 01f4c2eec87..8dd23813736 100644
--- a/editors/nvi-perl/Makefile
+++ b/editors/nvi-perl/Makefile
@@ -3,7 +3,7 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:44 asami Exp $
 #
 
 DISTNAME=	nvi-1.79
@@ -11,6 +11,7 @@ PKGNAME=	nvi-m17n-1.79-970306
 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
 PATCH_SITES=	ftp://ftp.foretune.co.jp/pub/tools/nvi-m17n/
 
@@ -20,6 +21,7 @@ MAINTAINER=	itojun@itojun.org
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/build
 GNU_CONFIGURE=	yes
+# can't say PATCH_DIST_STRIP=-p1 because contains files outside ${WRKSRC}
 PATCH_DIST_ARGS=-d ${WRKSRC}/.. --forward --quiet -E -p0
 CONFIGURE_ENV=	OPTFLAG='-D_PATH_SYSEXRC=\"/usr/local/etc/vi.exrc\"'
 CONFIGURE_ARGS=	--enable-multibyte --program-prefix=n
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index 6f1754632f9..5376f882c49 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -3,13 +3,16 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:45 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
+FILESDIR=	${.CURDIR}/../../editors/nvi/files
+PATCHDIR=	${.CURDIR}/../../editors/nvi/patches
+PKGDIR=		${.CURDIR}/../../editors/nvi/pkg
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
 .include <${.CURDIR}/../../editors/nvi/Makefile>
-# bsd.port.mk has been included in the above statement, so we don't need to
-# include it again.
 
 PKGNAME=	jp-nvi-eucjp-1.79-970306
 CATEGORIES=	japanese editors
@@ -18,9 +21,4 @@ MAINTAINER=	itojun@itojun.org
 
 LIB_DEPENDS+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
 
-FILESDIR=	${PORTSDIR}/editors/nvi/files
-PATCHDIR=	${PORTSDIR}/editors/nvi/patches
-PKGDIR=		${PORTSDIR}/editors/nvi/pkg
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 CONFIGURE_ARGS=	--enable-multibyte=euc-jp --program-prefix=n --enable-canna
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index 1a3885d9e03..7824c1eabb9 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -3,13 +3,16 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:45 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
+FILESDIR=	${.CURDIR}/../../editors/nvi/files
+PATCHDIR=	${.CURDIR}/../../editors/nvi/patches
+PKGDIR=		${.CURDIR}/../../editors/nvi/pkg
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
 .include <${.CURDIR}/../../editors/nvi/Makefile>
-# bsd.port.mk has been included in the above statement, so we don't need to
-# include it again.
 
 PKGNAME=	jp-nvi-iso2022jp-1.79-970306
 CATEGORIES=	japanese editors
@@ -18,9 +21,4 @@ MAINTAINER=	itojun@itojun.org
 
 LIB_DEPENDS+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
 
-FILESDIR=	${PORTSDIR}/editors/nvi/files
-PATCHDIR=	${PORTSDIR}/editors/nvi/patches
-PKGDIR=		${PORTSDIR}/editors/nvi/pkg
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 CONFIGURE_ARGS=	--enable-multibyte=iso-2022-jp --program-prefix=n --enable-canna
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index bd157ee7156..4cd8221eaed 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -3,13 +3,16 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:45 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
+FILESDIR=	${.CURDIR}/../../editors/nvi/files
+PATCHDIR=	${.CURDIR}/../../editors/nvi/patches
+PKGDIR=		${.CURDIR}/../../editors/nvi/pkg
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
 .include <${.CURDIR}/../../editors/nvi/Makefile>
-# bsd.port.mk has been included in the above statement, so we don't need to
-# include it again.
 
 PKGNAME=	jp-nvi-sjis-1.79-970306
 CATEGORIES=	japanese editors
@@ -18,9 +21,4 @@ MAINTAINER=	itojun@itojun.org
 
 LIB_DEPENDS+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
 
-FILESDIR=	${PORTSDIR}/editors/nvi/files
-PATCHDIR=	${PORTSDIR}/editors/nvi/patches
-PKGDIR=		${PORTSDIR}/editors/nvi/pkg
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 CONFIGURE_ARGS=	--enable-multibyte=sjis --program-prefix=n --enable-canna
diff --git a/korean/nvi-euc-kr/Makefile b/korean/nvi-euc-kr/Makefile
index b4a8c21a112..9cee59d3f63 100644
--- a/korean/nvi-euc-kr/Makefile
+++ b/korean/nvi-euc-kr/Makefile
@@ -3,24 +3,20 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:46 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
+FILESDIR=	${.CURDIR}/../../editors/nvi/files
+PATCHDIR=	${.CURDIR}/../../editors/nvi/patches
+PKGDIR=		${.CURDIR}/../../editors/nvi/pkg
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
 .include <${.CURDIR}/../../editors/nvi/Makefile>
-# bsd.port.mk has been included in the above statement, so we don't need to
-# include it again.
 
 PKGNAME=	kr-nvi-euckr-1.79-970306
 CATEGORIES=	korean editors
 
 MAINTAINER=	itojun@itojun.org
 
-#LIB_DEPENDS+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
-
-FILESDIR=	${PORTSDIR}/editors/nvi/files
-PATCHDIR=	${PORTSDIR}/editors/nvi/patches
-PKGDIR=		${PORTSDIR}/editors/nvi/pkg
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 CONFIGURE_ARGS=	--enable-multibyte=euc-kr --program-prefix=n
diff --git a/korean/nvi-iso-2022-kr/Makefile b/korean/nvi-iso-2022-kr/Makefile
index 5d23d832822..e3791b373d8 100644
--- a/korean/nvi-iso-2022-kr/Makefile
+++ b/korean/nvi-iso-2022-kr/Makefile
@@ -3,24 +3,20 @@
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1997/03/06 08:38:46 asami Exp $
 #
 
 # can't use PORTSDIR here, since we haven't included bsd.port.mk
+FILESDIR=	${.CURDIR}/../../editors/nvi/files
+PATCHDIR=	${.CURDIR}/../../editors/nvi/patches
+PKGDIR=		${.CURDIR}/../../editors/nvi/pkg
+COMMENT=	${.CURDIR}/pkg/COMMENT
+
 .include <${.CURDIR}/../../editors/nvi/Makefile>
-# bsd.port.mk has been included in the above statement, so we don't need to
-# include it again.
 
 PKGNAME=	kr-nvi-iso2022kr-1.79-970306
 CATEGORIES=	korean editors
 
 MAINTAINER=	itojun@itojun.org
 
-#LIB_DEPENDS+=	canna\\.1\\.:${PORTSDIR}/japanese/Canna
-
-FILESDIR=	${PORTSDIR}/editors/nvi/files
-PATCHDIR=	${PORTSDIR}/editors/nvi/patches
-PKGDIR=		${PORTSDIR}/editors/nvi/pkg
-COMMENT=	${.CURDIR}/pkg/COMMENT
-
 CONFIGURE_ARGS=	--enable-multibyte=iso-2022-kr --program-prefix=n