15 files changed, 81 insertions, 50 deletions

diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index a366c4c7f196..57ea64032379 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -1,15 +1,19 @@
 # New ports collection makefile for:	Canna
 # Version required:	3.2p1
 # Date created:		3 November 1995
-# Whom:			Nobuhiro Yasutomi
+# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.2 1995/03/24 11:09:21 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:46:20 jkh Exp $
 #
 
 DISTNAME=	Canna32p1
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/
+PKGNAME=	Canna-3.2.1
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/ \
+		ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 PATCH_STRIP=	-p1
 ALL_TARGET=	canna
 
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index e99ba1998715..8d844754e3b0 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -3,15 +3,18 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1995/03/27 13:24:11 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
 #
 
 DISTNAME=	Wnn4.2
-MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+PKGNAME=	Wnn-4.2
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+
 MAINTAINER=	asami@FreeBSD.ORG
-IS_INTERACTIVE=	yes
+
 WRKSRC=		${WRKDIR}/Xsi
+IS_INTERACTIVE=	yes
 
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index e99ba1998715..8d844754e3b0 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -3,15 +3,18 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1995/03/27 13:24:11 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
 #
 
 DISTNAME=	Wnn4.2
-MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+PKGNAME=	Wnn-4.2
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+
 MAINTAINER=	asami@FreeBSD.ORG
-IS_INTERACTIVE=	yes
+
 WRKSRC=		${WRKDIR}/Xsi
+IS_INTERACTIVE=	yes
 
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index e99ba1998715..8d844754e3b0 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -3,15 +3,18 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1995/03/27 13:24:11 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
 #
 
 DISTNAME=	Wnn4.2
-MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+PKGNAME=	Wnn-4.2
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+
 MAINTAINER=	asami@FreeBSD.ORG
-IS_INTERACTIVE=	yes
+
 WRKSRC=		${WRKDIR}/Xsi
+IS_INTERACTIVE=	yes
 
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile
index e99ba1998715..8d844754e3b0 100644
--- a/japanese/Wnn6/Makefile
+++ b/japanese/Wnn6/Makefile
@@ -3,15 +3,18 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1995/03/27 13:24:11 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
 #
 
 DISTNAME=	Wnn4.2
-MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+PKGNAME=	Wnn-4.2
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+
 MAINTAINER=	asami@FreeBSD.ORG
-IS_INTERACTIVE=	yes
+
 WRKSRC=		${WRKDIR}/Xsi
+IS_INTERACTIVE=	yes
 
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index e99ba1998715..8d844754e3b0 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -3,15 +3,18 @@
 # Date created:		22 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.7 1995/03/27 13:24:11 asami Exp $
+# $Id: Makefile,v 1.8 1995/04/01 12:46:22 jkh Exp $
 #
 
 DISTNAME=	Wnn4.2
-MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+PKGNAME=	Wnn-4.2
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://utsun.s.u-tokyo.ac.jp/fj/
+
 MAINTAINER=	asami@FreeBSD.ORG
-IS_INTERACTIVE=	yes
+
 WRKSRC=		${WRKDIR}/Xsi
+IS_INTERACTIVE=	yes
 
 # These are necesary because this package uses a different Makefile for
 #  building and installing etc.
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index a366c4c7f196..57ea64032379 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -1,15 +1,19 @@
 # New ports collection makefile for:	Canna
 # Version required:	3.2p1
 # Date created:		3 November 1995
-# Whom:			Nobuhiro Yasutomi
+# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.2 1995/03/24 11:09:21 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:46:20 jkh Exp $
 #
 
 DISTNAME=	Canna32p1
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/
+PKGNAME=	Canna-3.2.1
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/ \
+		ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 PATCH_STRIP=	-p1
 ALL_TARGET=	canna
 
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index a366c4c7f196..57ea64032379 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,15 +1,19 @@
 # New ports collection makefile for:	Canna
 # Version required:	3.2p1
 # Date created:		3 November 1995
-# Whom:			Nobuhiro Yasutomi
+# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.2 1995/03/24 11:09:21 asami Exp $
+# $Id: Makefile,v 1.3 1995/04/01 12:46:20 jkh Exp $
 #
 
 DISTNAME=	Canna32p1
-MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/
+PKGNAME=	Canna-3.2.1
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/Canna32/ \
+		ftp://ftp.cdrom.com/pub/japanese/titech/Canna32/
+
 MAINTAINER=	asami@FreeBSD.ORG
+
 PATCH_STRIP=	-p1
 ALL_TARGET=	canna
 
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index b024970f51d9..86a0e8fdc17e 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	gawk+mb
 # Version required:	2.15.4+mb1.03
 # Date created:		5 April 1995
-# Whom:			Nobuhiro Yasutomi
+# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id:$
+# $Id: Makefile,v 1.1.1.1 1995/04/05 08:53:43 asami Exp $
 #
 
 DISTNAME=	gawk-2.15.4
diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile
index 70079943c55a..fcb7e051128a 100644
--- a/japanese/grep/Makefile
+++ b/japanese/grep/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	grep+mb
 # Version required:	2.0+mb1.04
 # Date created:		2 April 1995
-# Whom:			Nobuhiro Yasutomi
+# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.2 1995/03/27 13:50:07 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1995/04/04 09:38:27 asami Exp $
 #
 
 DISTNAME=	grep-2.0
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index 7e853bf84ade..4f3488805470 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -3,13 +3,15 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.6 1995/03/24 11:09:28 asami Exp $
+# $Id: Makefile,v 1.7 1995/04/01 12:46:24 jkh Exp $
 #
 
 DISTNAME=	kterm-6.1.0
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
 CATEGORIES+=	japanese x11
+MASTER_SITES=	ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
+
 MAINTAINER=	asami@FreeBSD.ORG
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index 7e853bf84ade..4f3488805470 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -3,13 +3,15 @@
 # Date created:		18 November 1994
 # Whom:			asami
 #
-# $Id: Makefile,v 1.6 1995/03/24 11:09:28 asami Exp $
+# $Id: Makefile,v 1.7 1995/04/01 12:46:24 jkh Exp $
 #
 
 DISTNAME=	kterm-6.1.0
-USE_IMAKE=	yes
-MASTER_SITES=	ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
 CATEGORIES+=	japanese x11
+MASTER_SITES=	ftp://freefall.cdrom.com/pub/FreeBSD/LOCAL_PORTS/
+
 MAINTAINER=	asami@FreeBSD.ORG
 
+USE_IMAKE=	yes
+
 .include <bsd.port.mk>
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 95b2d2948b8e..786300bb9da7 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,24 +1,22 @@
 # New ports collection makefile for:	jless
 # Version required:	237
 # Date created:		7 March 1995
-# Whom:			Nobuhiro Yasutomi
+# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.3 1995/03/28 06:20:54 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:46:26 jkh Exp $
 #
-DISTNAME=	jless-237
-DISTFILES=	less-237.tar.gz
-MASTER_SITES=	ftp://ftp.aist-nara.ac.jp/pub/misc/less/
+
+DISTNAME=	less-237
+PKGNAME=	jp-less-237
 CATEGORIES+=	japanese
-MAINTAINER=	asami@FreeBSD.ORG
-HAS_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/less-237
+MASTER_SITES=	ftp://ftp.aist-nara.ac.jp/pub/misc/less/
+
 PATCH_SITES=	ftp://ftp.aist-nara.ac.jp/pub/misc/less/
 PATCHFILES=	less-237-iso2022-patch2.gz less-237-iso2022-patch2.p1.gz
 PATCH_DIST_STRIP=	-p1
-PREBUILD_COOKIE=	${.CURDIR}/work/.prebuild_done
 
-${PREBUILD_COOKIE}:
-	find ${WRKSRC} -name \*.orig -exec /bin/rm -f \{} \;
-	@${TOUCH} ${TOUCH_FLAGS} ${PREBUILD_COOKIE}
+MAINTAINER=	asami@FreeBSD.ORG
+
+HAS_CONFIGURE=	yes
 
 .include <bsd.port.mk>
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index 5ed175ee284a..3ca8c42dc808 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -3,12 +3,14 @@
 # Date created:		5 February 1995
 # Whom:			asami
 #
-# $Id: Makefile,v 1.3 1995/03/24 11:09:43 asami Exp $
+# $Id: Makefile,v 1.4 1995/04/01 12:46:31 jkh Exp $
 #
 
 DISTNAME=	nkf-1.5pl1
-MASTER_SITES=	ftp://www.hitachi-sk.co.jp/pub/Japanese/filter/
+PKGNAME=	nkf-1.5.1
 CATEGORIES+=	japanese
+MASTER_SITES=	ftp://www.hitachi-sk.co.jp/pub/Japanese/filter/
+
 MAINTAINER=	asami@FreeBSD.ORG
 
 pre-patch: ${PATCH_COOKIE}
diff --git a/japanese/sed/Makefile b/japanese/sed/Makefile
index dcba204069f4..ba22999e8eed 100644
--- a/japanese/sed/Makefile
+++ b/japanese/sed/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for:	sed+mb
 # Version required:	1.18+mb1.03
 # Date created:		2 April 1995
-# Whom:			Nobuhiro Yasutomi
+# Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
-# $Id: Makefile,v 1.2 1995/03/27 13:50:07 asami Exp $
+# $Id: Makefile,v 1.1.1.1 1995/04/04 09:37:51 asami Exp $
 #
 
 DISTNAME=	sed-1.18