Update with the new PORT{NAME,VERSION}/PKGNAME{PRE,SUF}FIX variables.

Now try to use those variables everywhere around DIST* and PATCH* definitions as far as possible, for ease of the future updates and the neatness. Okay, 60% of `japanese' ports have been done. :)
author: Akinori MUSHA <knu@FreeBSD.org> 2000-04-11 14:15:53 +0000
committer: Akinori MUSHA <knu@FreeBSD.org> 2000-04-11 14:15:53 +0000
commit: edcf8b3594b5df6440713253552b675fb0234474 (patch)
tree: cb86ff29b6c34e6d077c56ce53ca461f9623f343
parent: 7b4b0c4f33915abb1f15e37f30ce951ba7aa94e6 (diff)
download: ports-edcf8b3594b5df6440713253552b675fb0234474.tar.gz
ports-edcf8b3594b5df6440713253552b675fb0234474.zip
213 files changed, 667 insertions, 700 deletions
diff --git a/databases/namazu2/Makefile b/databases/namazu2/Makefile
index 483d129006d4..42813787a338 100644
--- a/databases/namazu2/Makefile
+++ b/databases/namazu2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ja-namazu2
+PORTNAME=	namazu2
 PORTVERSION=	2.0.3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.namazu.org/stable/
diff --git a/japanese/Canna/Makefile b/japanese/Canna/Makefile
index 0ce1a8c6603a..8a250830864b 100644
--- a/japanese/Canna/Makefile
+++ b/japanese/Canna/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	Canna
-# Version required:	3.2p2
 # Date created:		3 November 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
@@ -7,10 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	Canna32p2
-PKGNAME=	ja-Canna-3.2.2
+PORTNAME=	Canna
+PORTVERSION=	3.2.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./p/}
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/FreeWnn-lib/Makefile b/japanese/FreeWnn-lib/Makefile
index 71b056112a60..b7de6dd00e68 100644
--- a/japanese/FreeWnn-lib/Makefile
+++ b/japanese/FreeWnn-lib/Makefile
@@ -1,36 +1,39 @@
 # New ports collection makefile for:	Wnn for Japanese
-# Version required:	4.2
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Wnn4.2
-PKGNAME?=	ja-Wnn-4.2
+PORTNAME=	Wnn
+PORTVERSION=	4.2
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
 		ftp://ftp.wg.omron.co.jp/pub/Wnn/dic/pubdic+/ \
 		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/Wnn/
-DISTFILES=	Wnn4.2.tar.gz ${WNN_EXTRA_PATCH}
+DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${WNN_EXTRA_PATCH}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	taoka@FreeBSD.org
 
 USE_XLIB=	yes
-EXTRACT_ONLY=	Wnn4.2.tar.gz
 PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
 FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
 PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 
-WNN_EXTRA_PATCH= Wnn4.2.patch-981201.tar.gz
+WNN_EXTRA_PATCH= ${DISTNAME}.patch-981201.tar.gz
 MAKE_ENV+=	 PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}'
 
 .if defined(BATCH)
 BATCH=	yes	# make sure it's not empty
 .endif
 
-.if (${PKGNAME} == ja-Wnn-4.2)
+.include <bsd.port.pre.mk>
+
+.if ${PKGNAMEPREFIX} == ja-
 DISTFILES+=	pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-Wnn
 DOC_FROM=	${WRKSRC}/Wnn
@@ -41,7 +44,7 @@ SHARED_LIB=	libwnn4
 .else
 BuildWnn=	NO
 .endif
-.if (${PKGNAME} == zh-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == zh-
 PORT_DOCDIR=	${PREFIX}/share/doc/zh-Wnn
 DOC_FROM=	${WRKSRC}/cWnn
 BuildCWnn=	YES
@@ -49,7 +52,7 @@ SHARED_LIB=	libcwnn4
 .else
 BuildCWnn=	NO
 .endif
-.if (${PKGNAME} == ko-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ko-
 # kWnn has no manual.
 BuildKWnn=	YES
 SHARED_LIB=	libkwnn4
@@ -71,7 +74,7 @@ post-extract:
 		${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \
 		-C ${WRKSRC}
 	${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 .endif
 
@@ -79,7 +82,7 @@ pre-patch:
 	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98
 
 #### pubdic+
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 post-patch:
 	cd ${PUBDICPDIR}; \
 	${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \
@@ -112,7 +115,7 @@ do-configure:
 
 pre-build:
 #### pubdic+
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \
 	cd ${WRKSRC}/Pubdic; \
 	for file in ${WDICS}; do \
@@ -130,7 +133,7 @@ pre-build:
 #	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
 #### gerodic
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 post-build:
 	cd ${WRKSRC}/Contrib/dic/gerodic; \
 	${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u
@@ -142,7 +145,7 @@ pre-install:
 
 post-install:
 #### gerodic
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	cd ${WRKSRC}/Contrib/dic/gerodic; \
 	make all install
 .endif
@@ -167,4 +170,4 @@ post-install:
 	fi
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/FreeWnn-server/Makefile b/japanese/FreeWnn-server/Makefile
index 71b056112a60..b7de6dd00e68 100644
--- a/japanese/FreeWnn-server/Makefile
+++ b/japanese/FreeWnn-server/Makefile
@@ -1,36 +1,39 @@
 # New ports collection makefile for:	Wnn for Japanese
-# Version required:	4.2
 # Date created:		20 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Wnn4.2
-PKGNAME?=	ja-Wnn-4.2
+PORTNAME=	Wnn
+PORTVERSION=	4.2
 CATEGORIES?=	japanese
 MASTER_SITES=	ftp://ftp.u-tokyo.ac.jp/pub/Japanese/Wnn/ \
 		ftp://ftp.wg.omron.co.jp/pub/Wnn/dic/pubdic+/ \
 		http://www.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/Wnn/
-DISTFILES=	Wnn4.2.tar.gz ${WNN_EXTRA_PATCH}
+DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${WNN_EXTRA_PATCH}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	taoka@FreeBSD.org
 
 USE_XLIB=	yes
-EXTRACT_ONLY=	Wnn4.2.tar.gz
 PATCHDIR=	${.CURDIR}/../../japanese/Wnn/patches
 FILESDIR=	${.CURDIR}/../../japanese/Wnn/files
 PKGDIR=		${.CURDIR}/../../japanese/Wnn/pkg
 WRKSRC=		${WRKDIR}/Xsi
 
-WNN_EXTRA_PATCH= Wnn4.2.patch-981201.tar.gz
+WNN_EXTRA_PATCH= ${DISTNAME}.patch-981201.tar.gz
 MAKE_ENV+=	 PATH=/usr/bin:$${PATH} PORT_IMAKE_DEFINES='${WNN_DEF}'
 
 .if defined(BATCH)
 BATCH=	yes	# make sure it's not empty
 .endif
 
-.if (${PKGNAME} == ja-Wnn-4.2)
+.include <bsd.port.pre.mk>
+
+.if ${PKGNAMEPREFIX} == ja-
 DISTFILES+=	pubdic+.tar.gz pubdic+-fix01.gz pubdic+.diff pubdic+.special.diff
 PORT_DOCDIR=	${PREFIX}/share/doc/ja-Wnn
 DOC_FROM=	${WRKSRC}/Wnn
@@ -41,7 +44,7 @@ SHARED_LIB=	libwnn4
 .else
 BuildWnn=	NO
 .endif
-.if (${PKGNAME} == zh-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == zh-
 PORT_DOCDIR=	${PREFIX}/share/doc/zh-Wnn
 DOC_FROM=	${WRKSRC}/cWnn
 BuildCWnn=	YES
@@ -49,7 +52,7 @@ SHARED_LIB=	libcwnn4
 .else
 BuildCWnn=	NO
 .endif
-.if (${PKGNAME} == ko-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ko-
 # kWnn has no manual.
 BuildKWnn=	YES
 SHARED_LIB=	libkwnn4
@@ -71,7 +74,7 @@ post-extract:
 		${_DISTDIR}${WNN_EXTRA_PATCH} ${EXTRACT_AFTER_ARGS} \
 		-C ${WRKSRC}
 	${LN} -sf Project.tmpl ${WRKSRC}/config/X11.tmpl
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}pubdic+.tar.gz ${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
 .endif
 
@@ -79,7 +82,7 @@ pre-patch:
 	cd ${WRKSRC}; ${PATCH} ${PATCH_DIST_ARGS} < ${WRKSRC}/Wnn-patch-01Dec98
 
 #### pubdic+
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 post-patch:
 	cd ${PUBDICPDIR}; \
 	${GZCAT} ${_DISTDIR}pubdic+-fix01.gz | ${PATCH} --quiet; \
@@ -112,7 +115,7 @@ do-configure:
 
 pre-build:
 #### pubdic+
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	cd ${PUBDICPDIR}; ${XMKMF}; ${MAKE} wnn; \
 	cd ${WRKSRC}/Pubdic; \
 	for file in ${WDICS}; do \
@@ -130,7 +133,7 @@ pre-build:
 #	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} Makefile.inst World)
 
 #### gerodic
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 post-build:
 	cd ${WRKSRC}/Contrib/dic/gerodic; \
 	${ATOD} -h ${WRKSRC}/Pubdic/hinsi.data g-jinmei.dic < g-jinmei.u
@@ -142,7 +145,7 @@ pre-install:
 
 post-install:
 #### gerodic
-.if (${PKGNAME} == ja-Wnn-4.2)
+.if ${PKGNAMEPREFIX} == ja-
 	cd ${WRKSRC}/Contrib/dic/gerodic; \
 	make all install
 .endif
@@ -167,4 +170,4 @@ post-install:
 	fi
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/VTPSfont/Makefile b/japanese/VTPSfont/Makefile
index e3a3f93707cc..079f4fdda650 100644
--- a/japanese/VTPSfont/Makefile
+++ b/japanese/VTPSfont/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	VTPSfont
-# Version required:	1.3
 # Date created:		99/06/15
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	VTPSfont-1.3
-PKGNAME=	ja-VTPSfont-1.3
+PORTNAME=	VTPSfont
+PORTVERSION=	1.3
 CATEGORIES=	japanese print
 MASTER_SITES=	http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/
-EXTRACT_SUFX=	''
+EXTRACT_SUFX=	# none
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/Wnn6-lib/Makefile b/japanese/Wnn6-lib/Makefile
index a6dfb07e8bc4..d8d094dcdf60 100644
--- a/japanese/Wnn6-lib/Makefile
+++ b/japanese/Wnn6-lib/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	head files and libraries of Wnn6
-# Version required:	99.10.28
 # Date created:		11 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Wnn6-SDK-sources
-PKGNAME=	ja-Wnn6-lib-98.10.28
+PORTNAME=	Wnn6-lib
+PORTVERSION=	98.10.28
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
+DISTNAME=	Wnn6-SDK-sources
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/Wnn6/Makefile b/japanese/Wnn6/Makefile
index 7513616e399c..f8f72c024bdb 100644
--- a/japanese/Wnn6/Makefile
+++ b/japanese/Wnn6/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	Wnn6
-# Version required:	97.6.6
 # Date created:		15 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	OMRONWnn6
-PKGNAME=	ja-Wnn6-97.6.6
+PORTNAME=	Wnn6
+PORTVERSION=	97.6.6
 CATEGORIES=	japanese
+DISTNAME=	OMRONWnn6
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	taoka@FreeBSD.org
diff --git a/japanese/Wnn7-lib/Makefile b/japanese/Wnn7-lib/Makefile
index a6dfb07e8bc4..d8d094dcdf60 100644
--- a/japanese/Wnn7-lib/Makefile
+++ b/japanese/Wnn7-lib/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	head files and libraries of Wnn6
-# Version required:	99.10.28
 # Date created:		11 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Wnn6-SDK-sources
-PKGNAME=	ja-Wnn6-lib-98.10.28
+PORTNAME=	Wnn6-lib
+PORTVERSION=	98.10.28
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/Wnn6/sdk_source/
+DISTNAME=	Wnn6-SDK-sources
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/a2ps/Makefile b/japanese/a2ps/Makefile
index 399fcb25313d..1274ef6074cf 100644
--- a/japanese/a2ps/Makefile
+++ b/japanese/a2ps/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	a2ps-j
-# Version required:	1.44
 # Date created:		16 Nov 1996
 # Whom:			SAITO Itsuro <saito@miv.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	a2ps.pl-1.44
-PKGNAME=	ja-a2ps-1.44
+PORTNAME=	a2ps
+PORTVERSION=	1.44
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
 		ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
-EXTRACT_SUFX=	# None
+DISTFILES=	${PORTNAME}.pl-${PORTVERSION}
 
 MAINTAINER=	saito@miv.t.u-tokyo.ac.jp
 
diff --git a/japanese/ack/Makefile b/japanese/ack/Makefile
index 9ed234f275bf..96d204f0b1db 100644
--- a/japanese/ack/Makefile
+++ b/japanese/ack/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for: ack
-# Version required:	1.39
 # Date created:		21 Jul 1998
 # Whom:			Masanori Kiriake <seiken@nbs.co.jp>
 #
 # $FreeBSD$
 
-DISTNAME=	ack139
-PKGNAME=	ja-ack-1.39
+PORTNAME=	ack
+PORTVERSION=	1.39
 CATEGORIES=	japanese converters
 MASTER_SITES=	ftp://ftp.tohoku.ac.jp/pub/unix/ack/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	seiken@ARGV.AC
 
diff --git a/japanese/acroread-jpnfont/Makefile b/japanese/acroread-jpnfont/Makefile
index f4d261d4c99d..b7fe00193813 100644
--- a/japanese/acroread-jpnfont/Makefile
+++ b/japanese/acroread-jpnfont/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	acroread-jpnfont
-# Version required:	1999.7.20
 # Date created:		99/06/16
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/acroread5-jpnfont/Makefile b/japanese/acroread5-jpnfont/Makefile
index f4d261d4c99d..b7fe00193813 100644
--- a/japanese/acroread5-jpnfont/Makefile
+++ b/japanese/acroread5-jpnfont/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	acroread-jpnfont
-# Version required:	1999.7.20
 # Date created:		99/06/16
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/addttfont/Makefile b/japanese/addttfont/Makefile
index 5fd0d3389354..8d352b8a2e11 100644
--- a/japanese/addttfont/Makefile
+++ b/japanese/addttfont/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	addttfont
-# Version required:	1.7
 # Date created:		99/06/15
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	addttfont-1.7
-PKGNAME=	ja-addttfont-1.7
+PORTNAME=	addttfont
+PORTVERSION=	1.7
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/
-EXTRACT_SUFX=	''
+EXTRACT_SUFX=	# none
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/alias-fonts/Makefile b/japanese/alias-fonts/Makefile
index 5e93a2651388..a6b02790166a 100644
--- a/japanese/alias-fonts/Makefile
+++ b/japanese/alias-fonts/Makefile
@@ -1,12 +1,12 @@
 # Ports collection makefile for: Japanese Font Setup for Netscape browsers
-# Version required:	1.0
 # Date created:		22 Jun 1998
 # Whom:                 sada
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-netscape-fonts-1.0
+PORTNAME=	netscape-fonts
+PORTVERSION=	1.0
 CATEGORIES=	japanese www x11-fonts
 DISTFILES=	# empty
 
diff --git a/japanese/binder/Makefile b/japanese/binder/Makefile
index 0818e35598e6..9e06e37dda9f 100644
--- a/japanese/binder/Makefile
+++ b/japanese/binder/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	Muggy for ja-TkStep
-# Version required:	1.2
 # Date created:		25 March 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
diff --git a/japanese/bookview/Makefile b/japanese/bookview/Makefile
index 886a27cfd2fd..0af688e641f7 100644
--- a/japanese/bookview/Makefile
+++ b/japanese/bookview/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	bookview
-# Version required:		2.4.6
 # Date created:			2 Oct 1997
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	bookview-2.4.6
-PKGNAME=	ja-bookview-2.4.6
+PORTNAME=	bookview
+PORTVERSION=	2.4.6
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/bookview/
 
diff --git a/japanese/canna-lib/Makefile b/japanese/canna-lib/Makefile
index 0ce1a8c6603a..8a250830864b 100644
--- a/japanese/canna-lib/Makefile
+++ b/japanese/canna-lib/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	Canna
-# Version required:	3.2p2
 # Date created:		3 November 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
@@ -7,10 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	Canna32p2
-PKGNAME=	ja-Canna-3.2.2
+PORTNAME=	Canna
+PORTVERSION=	3.2.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./p/}
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/canna-server/Makefile b/japanese/canna-server/Makefile
index 0ce1a8c6603a..8a250830864b 100644
--- a/japanese/canna-server/Makefile
+++ b/japanese/canna-server/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	Canna
-# Version required:	3.2p2
 # Date created:		3 November 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #			NIIMI Satoshi <sa2c@and.or.jp>
@@ -7,10 +6,11 @@
 # $FreeBSD$
 #
 
-DISTNAME=	Canna32p2
-PKGNAME=	ja-Canna-3.2.2
+PORTNAME=	Canna
+PORTVERSION=	3.2.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna32/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//:S/./p/}
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/canuum/Makefile b/japanese/canuum/Makefile
index 278f93d977f3..fbbffd18c301 100644
--- a/japanese/canuum/Makefile
+++ b/japanese/canuum/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for: canuum
-# Version required:	1.0
 # Date created:		20 Jan 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	canuum-1.0
-PKGNAME=	ja-canuum-1.0
+PORTNAME=	canuum
+PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/Canna/Canna22/ \
 		ftp://ftp.nec.co.jp/pub/Canna/Canna32/
-DISTFILES=	Uum4.109.tar.gz  Canna32p2.tar.gz
+DISTFILES=	Uum4.109.tar.gz \
+		Canna32p2.tar.gz
 EXTRACT_ONLY=	Uum4.109.tar.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile
index 4dfdf7822b84..1fc0d3769ec5 100644
--- a/japanese/cdrom2/Makefile
+++ b/japanese/cdrom2/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	cdrom2
-# Version required:		1996/06/16
 # Date created:			03 Feb 1997
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	euc
-PKGNAME=	ja-cdrom2-1996.06.16
+PORTNAME=	cdrom2
+PORTVERSION=	1996.06.16
 CATEGORIES=	japanese misc
 MASTER_SITES=	ftp://ftp.nerimadors.or.jp/pub/src/cdrom2/
+DISTNAME=	euc
 
 MAINTAINER=	max@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/cdrom2
-DIST_SUBDIR=	cdrom2
+WRKSRC=		${WRKDIR}/${PORTNAME}
+DIST_SUBDIR=	${PORTNAME}
 DOCS=		errata.doc gaiji.txt index.doc install.doc kekka.txt \
 		kojien3.doc menu.doc readers.doc readme.doc readme.org \
 		ruigo.doc x_option.doc
diff --git a/japanese/chasen/Makefile b/japanese/chasen/Makefile
index 307b7baa0c7f..49f9c2e05fed 100644
--- a/japanese/chasen/Makefile
+++ b/japanese/chasen/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	chasen
-# Version required:	2.02 + 2.1
 # Date created:		21 October 1998
 # Whom:			kuriyama
 #
@@ -7,11 +6,12 @@
 # $FreeBSD$
 #
 
-DISTNAME=	chasen-sys2.02-ipadic2.1
-PKGNAME=	ja-chasen-2.02
+PORTNAME=	chasen
+PORTVERSION=	2.02
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.aist-nara.ac.jp/pub/lab/nlp/tools/chasen/ \
 		http://cactus.aist-nara.ac.jp/~akira-k/cha/arc/
+DISTNAME=	${PORTNAME}-sys${PORTVERSION}-ipadic2.1
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
diff --git a/japanese/chimera/Makefile b/japanese/chimera/Makefile
index 148f6fc0f669..4461b78b6b9a 100644
--- a/japanese/chimera/Makefile
+++ b/japanese/chimera/Makefile
@@ -1,23 +1,26 @@
 # New ports collection makefile for:	chimera + kanji patch
-# Version required:	1.70p1
 # Date created:		26 December 1994
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	chimera-1.70p0
-PKGNAME=	ja-chimera-1.70p1
+PORTNAME=	chimera
+PORTVERSION=	1.70p1
 CATEGORIES=	japanese www
 MASTER_SITES=	ftp://ftp.cs.unlv.edu/pub/chimera/
+DISTNAME=	${PORTNAME}-${PREV_VERSION}
 
 PATCH_SITES=	http://hasse.mathematik.tu-muenchen.de/%7Enikl/chimera-1.65p/ \
 		ftp://netbsd.tohoku.ac.jp/network/www/chimera/
-PATCHFILES=	chimera-1.70p0-1.70p1.gz diff-1.70p1-jp-01
+PATCHFILES=	${PORTNAME}-${PREV_VERSION}-${PORTVERSION}.gz \
+		diff-${PORTVERSION}-jp-01
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
+PREV_VERSION=	${PORTVERSION:S/p1/p0/}
+
 FETCH_BEFORE_ARGS=	-b
 USE_IMAKE=	yes
 MAN1=		chimera.1
diff --git a/japanese/csrd/Makefile b/japanese/csrd/Makefile
index bdc6fbe3ed28..95f560336820 100644
--- a/japanese/csrd/Makefile
+++ b/japanese/csrd/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: csrd
-# Version required:	1.0
 # Date created:		99/08/18
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	csrd-1.0
-PKGNAME=	ja-csrd-1.0
+PORTNAME=	csrd
+PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	http://openlab.ring.gr.jp/edict/csrd/
 
diff --git a/japanese/dbskkd-cdb/Makefile b/japanese/dbskkd-cdb/Makefile
index 4d91ea20dc51..20e25cc892d8 100644
--- a/japanese/dbskkd-cdb/Makefile
+++ b/japanese/dbskkd-cdb/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	dbskkd-cdb
-# Version required:	1.01
 # Date created:		17 Jun 1999
 # Whom:			Makoto Matsushita <matusita@jp.FreeBSD.ORG>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dbskkd-cdb-1.01
-PKGNAME=	ja-dbskkd-cdb-1.01
+PORTNAME=	dbskkd-cdb
+PORTVERSION=	1.01
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.k2r.org/kenji/software/
 
diff --git a/japanese/deepforest/Makefile b/japanese/deepforest/Makefile
index 2f6b34fd3a40..fe161b687030 100644
--- a/japanese/deepforest/Makefile
+++ b/japanese/deepforest/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	JDE's DeepForest for ja-TkStep
-# Version required:	1.0
 # Date created:		25 March 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
diff --git a/japanese/diclookup-emacs20/Makefile b/japanese/diclookup-emacs20/Makefile
index 88ae9e59e6b6..d57cc4b1ecf9 100644
--- a/japanese/diclookup-emacs20/Makefile
+++ b/japanese/diclookup-emacs20/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:	diclookup-mule
-# Version required:	2.3.1beta2
 # Date created:		31 Jan 1998
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	diclookup-mule-2.3.3
-PKGNAME=	ja-diclookup-mule-2.3.3
+PORTNAME=	diclookup-mule
+PORTVERSION=	2.3.3
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tools/diclookup-mule/
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diclookup-mule-2.3.3-wave-patch.gz
+PATCHFILES=	diclookup-mule-${PORTVERSION}-wave-patch.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
diff --git a/japanese/diclookup-mule/Makefile b/japanese/diclookup-mule/Makefile
index 88ae9e59e6b6..d57cc4b1ecf9 100644
--- a/japanese/diclookup-mule/Makefile
+++ b/japanese/diclookup-mule/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:	diclookup-mule
-# Version required:	2.3.1beta2
 # Date created:		31 Jan 1998
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	diclookup-mule-2.3.3
-PKGNAME=	ja-diclookup-mule-2.3.3
+PORTNAME=	diclookup-mule
+PORTVERSION=	2.3.3
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tools/diclookup-mule/
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	diclookup-mule-2.3.3-wave-patch.gz
+PATCHFILES=	diclookup-mule-${PORTVERSION}-wave-patch.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
diff --git a/japanese/dserver/Makefile b/japanese/dserver/Makefile
index 6e0ba2aea5ef..7b36054f86a5 100644
--- a/japanese/dserver/Makefile
+++ b/japanese/dserver/Makefile
@@ -1,26 +1,29 @@
 # New ports collection makefile for:	dserver
-# Version required:	2.2betapl2
 # Date created:		3 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dserver2.2betapl2
-PKGNAME=	ja-dserver-2.2.2
+PORTNAME=	dserver
+PORTVERSION=	2.2.2
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.pu-toyama.ac.jp/pub/misc/ \
 		ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/ \
 		ftp://ftp.sra.co.jp/pub/net/ndtp/misc/
-DISTFILES=	dserver2.2betapl2.tar.gz dserver2.2betapl2.addtable.tar.gz \
-		kenjiro-ndtpd.diff kenjiro-dictlist.diff
+DISTNAME=	${PORTNAME}2.2betapl2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}.addtable.${EXTRACT_SUFX} \
+		kenjiro-ndtpd.diff \
+		kenjiro-dictlist.diff
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}.addtable.${EXTRACT_SUFX}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
 RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
 
-EXTRACT_ONLY=	dserver2.2betapl2.tar.gz dserver2.2betapl2.addtable.tar.gz
-WRKSRC=		${WRKDIR}/dserver
+WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
 
 pre-patch:
diff --git a/japanese/dvi2dvi/Makefile b/japanese/dvi2dvi/Makefile
index c26c28bb011a..b9f3690a8e59 100644
--- a/japanese/dvi2dvi/Makefile
+++ b/japanese/dvi2dvi/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    dvi2dvi
-# Version required:     1.1
 # Date created:         25 Dec 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dvi2dvi-1.1
-PKGNAME=	ja-dvi2dvi-1.1
+PORTNAME=	dvi2dvi
+PORTVERSION=	1.1
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/ \
 		ftp://ftp.math.s.chiba-u.ac.jp/tex/tex/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} web2c-7.2a${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		web2c-7.2a.tar.gz
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
diff --git a/japanese/dvi2ps/Makefile b/japanese/dvi2ps/Makefile
index 57dcad605fc8..178988328285 100644
--- a/japanese/dvi2ps/Makefile
+++ b/japanese/dvi2ps/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: jp-dvi2ps
-# Version required:	2.0
 # Date created:		15 Sep 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dvi2ps-2.0j
-PKGNAME=	ja-dvi2ps-2.0
+PORTNAME=	dvi2ps
+PORTVERSION=	2.0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.math.s.chiba-u.ac.jp/tex/
+DISTNAME=	${PORTNAME}-${PORTVERSION}j
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
diff --git a/japanese/dvi2tty/Makefile b/japanese/dvi2tty/Makefile
index 9ff9ef8df6be..a4916a2dfa95 100644
--- a/japanese/dvi2tty/Makefile
+++ b/japanese/dvi2tty/Makefile
@@ -1,18 +1,19 @@
 # New ports collection makefile for:	dvi2tty
-# Version required:		5.0
 # Date created:			30 Mar. 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dvi2tty5.0
-PKGNAME=	ja-dvi2tty-ascii-5.0
+PORTNAME=	dvi2tty-ascii
+PORTVERSION=	5.0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
+DISTNAME=	dvi2tty${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.web.ad.jp/pub/TeX/akiu/dviwares/dvi2tty/
-PATCHFILES=	dvi2tty-ascii-jtex-patch dvi2tty.c-patch
+PATCHFILES=	${PORTNAME}-jtex-patch \
+		dvi2tty.c-patch
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/dvipsk-vflib/Makefile b/japanese/dvipsk-vflib/Makefile
index 5e00a7106a1a..7bd3df296b2e 100644
--- a/japanese/dvipsk-vflib/Makefile
+++ b/japanese/dvipsk-vflib/Makefile
@@ -1,21 +1,22 @@
 # New ports collection makefile for:    dvipsk + jpatch + vflib-patch
-# Version required:     5.78a + p1.4d + 1.1alpha
 # Date created:         25 Aug 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dvipsk-5.78a
-PKGNAME=	ja-dvipsk-vflib-5.78a
+PORTNAME=	dvipsk
+PORTVERSION=	5.78a
+PKGNAMESUFFIX=	-vflib
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/ \
 		ftp://ftp.center.osaka-u.ac.jp/CTAN/dviware/dvipsk/ \
 		ftp://ftp.riken.go.jp/pub/CTAN/dviware/dvipsk/ \
 		ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/dviware/dvipsk/ \
 		http://math.shinshu-u.ac.jp/~nakayama/howto/tex/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4d.tar.gz \
-		dvipsk-vflib-1.1alpha.patch.tgz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		dvipsk-jpatch-p1.4d.tar.gz \
+		${PORTNAME}${PKGNAMESUFFIX}-1.1alpha.patch.tgz
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
diff --git a/japanese/dvipsk/Makefile b/japanese/dvipsk/Makefile
index 0c4a354e63fa..99a390d35b22 100644
--- a/japanese/dvipsk/Makefile
+++ b/japanese/dvipsk/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:    dvipsk + jpatch
-# Version required:     5.78a + p1.4d
 # Date created:         25 Aug 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dvipsk-5.78a
-PKGNAME=	ja-dvipsk-5.78a
+PORTNAME=	dvipsk
+PORTVERSION=	5.78a
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/dvips/ \
 		ftp://ftp.center.osaka-u.ac.jp/CTAN/dviware/dvipsk/ \
 		ftp://ftp.riken.go.jp/pub/CTAN/dviware/dvipsk/ \
 		ftp://ftp.u-aizu.ac.jp/pub/tex/CTAN/dviware/dvipsk/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} dvipsk-jpatch-p1.4d.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-jpatch-p1.4d.tar.gz
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
diff --git a/japanese/e2ps/Makefile b/japanese/e2ps/Makefile
index be55aefd2396..77b285259dba 100644
--- a/japanese/e2ps/Makefile
+++ b/japanese/e2ps/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	e2ps
-# Version required:	4.0
 # Date created:		27 Nov 1998
 # Whom:			Daisuke Kawahara <kawahara@pine.kuee.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	e2ps-4.0
-PKGNAME=	ja-e2ps-4.0
+PORTNAME=	e2ps
+PORTVERSION=	4.0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://pine.kuee.kyoto-u.ac.jp/pub/e2ps/
 
diff --git a/japanese/easypr/Makefile b/japanese/easypr/Makefile
index 5672462479bd..b97d9aa2ea0b 100644
--- a/japanese/easypr/Makefile
+++ b/japanese/easypr/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	easypr
-# Version required:	0.25
 # Date created:		99/10/19
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	print-0.25
-PKGNAME=	ja-easypr-0.25
+PORTNAME=	easypr
+PORTVERSION=	0.25
 CATEGORIES=	japanese print
 MASTER_SITES=	http://www.linet.gr.jp/~mituiwa/
+DISTNAME=	print-${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/eb/Makefile b/japanese/eb/Makefile
index 3fb9f2b7eade..8345605c4736 100644
--- a/japanese/eb/Makefile
+++ b/japanese/eb/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	eb
-# Version required:		2.3.7
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eb-2.3.7
-PKGNAME=	ja-eb-2.3.7
+PORTNAME=	eb
+PORTVERSION=	2.3.7
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
-DISTFILES=	${EBFILES} ${APPENDIXFILES}
+DISTFILES=	${EBFILES} \
+		${APPENDIXFILES}
+EXTRACT_ONLY=	${EBFILES}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	eb-2.3.7+.diff
+PATCHFILES=	${DISTNAME}+.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
-EBFILES=	${DISTNAME}.tar.gz
+EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/chujiten-2.3.tar.gz \
 		appendix/chujiten2-2.0.tar.gz \
@@ -44,8 +45,6 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/readers2-2.0.tar.gz
 LISTFILES=	LIST LIST-ja
 
-EXTRACT_ONLY=	${EBFILES}
-
 DIST_SUBDIR=	eb
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-zlib
diff --git a/japanese/eb2/Makefile b/japanese/eb2/Makefile
index 3fb9f2b7eade..8345605c4736 100644
--- a/japanese/eb2/Makefile
+++ b/japanese/eb2/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	eb
-# Version required:		2.3.7
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eb-2.3.7
-PKGNAME=	ja-eb-2.3.7
+PORTNAME=	eb
+PORTVERSION=	2.3.7
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
-DISTFILES=	${EBFILES} ${APPENDIXFILES}
+DISTFILES=	${EBFILES} \
+		${APPENDIXFILES}
+EXTRACT_ONLY=	${EBFILES}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	eb-2.3.7+.diff
+PATCHFILES=	${DISTNAME}+.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
-EBFILES=	${DISTNAME}.tar.gz
+EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/chujiten-2.3.tar.gz \
 		appendix/chujiten2-2.0.tar.gz \
@@ -44,8 +45,6 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/readers2-2.0.tar.gz
 LISTFILES=	LIST LIST-ja
 
-EXTRACT_ONLY=	${EBFILES}
-
 DIST_SUBDIR=	eb
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-zlib
diff --git a/japanese/eb3/Makefile b/japanese/eb3/Makefile
index 3fb9f2b7eade..8345605c4736 100644
--- a/japanese/eb3/Makefile
+++ b/japanese/eb3/Makefile
@@ -1,23 +1,24 @@
 # New ports collection makefile for:	eb
-# Version required:		2.3.7
 # Date created:			20 Jan 1999
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eb-2.3.7
-PKGNAME=	ja-eb-2.3.7
+PORTNAME=	eb
+PORTVERSION=	2.3.7
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/eb/
-DISTFILES=	${EBFILES} ${APPENDIXFILES}
+DISTFILES=	${EBFILES} \
+		${APPENDIXFILES}
+EXTRACT_ONLY=	${EBFILES}
 
 PATCH_SITES=	${MASTER_SITES}
-PATCHFILES=	eb-2.3.7+.diff
+PATCHFILES=	${DISTNAME}+.diff
 
 MAINTAINER=	takamune@avrl.mei.co.jp
 
-EBFILES=	${DISTNAME}.tar.gz
+EBFILES=	${DISTNAME}${EXTRACT_SUFX}
 APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/chujiten-2.3.tar.gz \
 		appendix/chujiten2-2.0.tar.gz \
@@ -44,8 +45,6 @@ APPENDIXFILES=	appendix/cencro-1.0.tar.gz \
 		appendix/readers2-2.0.tar.gz
 LISTFILES=	LIST LIST-ja
 
-EXTRACT_ONLY=	${EBFILES}
-
 DIST_SUBDIR=	eb
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--with-zlib
diff --git a/japanese/eblook/Makefile b/japanese/eblook/Makefile
index af3ee5950465..18dc20cfb846 100644
--- a/japanese/eblook/Makefile
+++ b/japanese/eblook/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	eblook
-# Version required:	1.3
 # Date created:		20 August 1999
 # Whom:			Shigeyuki Fukushima <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	eblook-1.3
-PKGNAME=	ja-eblook-1.3
+PORTNAME=	eblook
+PORTVERSION=	1.3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://openlab.ring.gr.jp/lookup/DIST/eblook/
 
diff --git a/japanese/ebnetd/Makefile b/japanese/ebnetd/Makefile
index 576a03498616..5763b283e75b 100644
--- a/japanese/ebnetd/Makefile
+++ b/japanese/ebnetd/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	ndtpd
-# Version required:		2.3.7
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ndtpd-2.3.7
-PKGNAME=	ja-ndtpd-2.3.7
+PORTNAME=	ndtpd
+PORTVERSION=	2.3.7
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
 
diff --git a/japanese/ebw3/Makefile b/japanese/ebw3/Makefile
index 768ca965cf48..7cac1430fe62 100644
--- a/japanese/ebw3/Makefile
+++ b/japanese/ebw3/Makefile
@@ -1,18 +1,20 @@
 # New ports collection makefile for:    ebw3
-# Version required:     0.2-b4
 # Date created:         23 Jun 1997
 # Whom:                 Hironori Ikura <hikura@kaisei.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ebw3-0.2-b4
-PKGNAME=	ja-ebw3-0.2b4
+PORTNAME=	ebw3
+PORTVERSION=	${VERSION:S/-//}
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.imasy.or.jp/pub/unix/net/www/ebw3/
+DISTNAME=	${PORTNAME}-${VERSION}
 
 MAINTAINER=	hikura@kaisei.org
 
+VERSION=	0.2-b4
+
 STARTUP_SCRIPT=	$(PREFIX)/etc/rc.d/ebw3d.sh.sample
 
 post-install:
diff --git a/japanese/edict-fpw/Makefile b/japanese/edict-fpw/Makefile
index 504beebbf17c..85abaf011cfd 100644
--- a/japanese/edict-fpw/Makefile
+++ b/japanese/edict-fpw/Makefile
@@ -1,28 +1,30 @@
 # New ports collection makefile for:	EDICT - JIS X 4081 format version
-# Version required:	1.1
 # Date created:        	00/01/14
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	edict-fpw1.1-src
-PKGNAME=	ja-edict-fpw-1.1
+PORTNAME=	edict-fpw
+PORTVERSION=	1.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/freepwing/fpwbooks/edict/ \
 		ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
 		ftp://ftp.cdrom.com/pub/japanese/monash/ \
 		ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/
-DISTFILES=	edict-fpw1.1-src.tar.gz edict.gz edict.doc
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		edict.gz \
+		edict.doc
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=    	taoka@FreeBSD.org
 
 BUILD_DEPENDS=	fpwmake:${PORTSDIR}/japanese/freepwing \
 		catdump:${PORTSDIR}/japanese/epwutil
 
-WRKSRC=		${WRKDIR}/edict-fpw1.1
-EXTRACT_ONLY=	edict-fpw1.1-src.tar.gz
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
 post-extract:
 	${MKDIR} ${WRKSRC}/source
diff --git a/japanese/edict-fpw/distinfo b/japanese/edict-fpw/distinfo
index 7cc0c5bf9055..05093e5ba65a 100644
--- a/japanese/edict-fpw/distinfo
+++ b/japanese/edict-fpw/distinfo
@@ -1,3 +1,3 @@
 MD5 (edict-fpw1.1-src.tar.gz) = a5c71416967bce713c58e1362eca1ed3
-MD5 (edict.gz) = 3297eeaaa57d946fe23d68b0d2fd8449
-MD5 (edict.doc) = f00fd2c2aaf116f3fcc241eb264377eb
+MD5 (edict.gz) = 4b27b7136dfb2b79f17305ba4b9be4b0
+MD5 (edict.doc) = 85619ddceced99326ca28ac458ec8e40
diff --git a/japanese/edict-sdic/Makefile b/japanese/edict-sdic/Makefile
index 370da1496f97..5d7d73d1a83a 100644
--- a/japanese/edict-sdic/Makefile
+++ b/japanese/edict-sdic/Makefile
@@ -1,25 +1,26 @@
 # New ports collection makefile for:	EDICT - SDICT format version
-# Version required:	19981007
 # Date created:        	00/01/14
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	edict-19981007
-PKGNAME=	ja-edict-sdic-19981007
+PORTNAME=	edict-sdic
+PORTVERSION=	19981007
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://pine.kuee.kyoto-u.ac.jp/pub/tsuchiya/sdic/ \
 		ftp://ftp.cc.monash.edu.au/pub/nihongo/ \
 		ftp://ftp.cdrom.com/pub/japanese/monash/ \
 		ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
 		ftp://ftp.u-aizu.ac.jp/pub/SciEng/nihongo/ftp.cc.monash.edu.au/
-DISTFILES=	sdic-2.1.2.tar.gz edict.gz edict.doc
+DISTNAME=	sdic-2.1.2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		edict.gz \
+		edict.doc
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=    	taoka@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/sdic-2.1.2
-EXTRACT_ONLY=	sdic-2.1.2.tar.gz
 ALL_TARGET=	jedict.sdic eedict.sdic
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=mule \
diff --git a/japanese/edict-sdic/distinfo b/japanese/edict-sdic/distinfo
index 4b2e2c61077a..5009fcc65aa3 100644
--- a/japanese/edict-sdic/distinfo
+++ b/japanese/edict-sdic/distinfo
@@ -1,3 +1,3 @@
 MD5 (sdic-2.1.2.tar.gz) = 7b8aca26fbebb069fea59481a12b5c72
-MD5 (edict.gz) = 3297eeaaa57d946fe23d68b0d2fd8449
-MD5 (edict.doc) = f00fd2c2aaf116f3fcc241eb264377eb
+MD5 (edict.gz) = 4b27b7136dfb2b79f17305ba4b9be4b0
+MD5 (edict.doc) = 85619ddceced99326ca28ac458ec8e40
diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile
index 7b8506659d6c..bd64a139ccb4 100644
--- a/japanese/edict-utf-8/Makefile
+++ b/japanese/edict-utf-8/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	edict
-# Version required:	19981007
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
 # $FreeBSD$
 #
 
-DISTNAME=	edict-19990714
-PKGNAME=	ja-edict-19990714
+PORTNAME=	edict
+PORTVERSION=	19990714
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/japanese/monash/ \
 		ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile
index 7b8506659d6c..bd64a139ccb4 100644
--- a/japanese/edict/Makefile
+++ b/japanese/edict/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	edict
-# Version required:	19981007
 # Date created:		18 August 1997
 # Whom:			Jonathan Hanna
 #
 # $FreeBSD$
 #
 
-DISTNAME=	edict-19990714
-PKGNAME=	ja-edict-19990714
+PORTNAME=	edict
+PORTVERSION=	19990714
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.cdrom.com/pub/japanese/monash/ \
 		ftp://ftp.sedl.org/pub/mirrors/nihongo/ \
diff --git a/japanese/ee/Makefile b/japanese/ee/Makefile
index 11331f1b800a..c67d54661f2d 100644
--- a/japanese/ee/Makefile
+++ b/japanese/ee/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for: ee
-# Version required:	1.0
 # Date created:		20 Jan 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jee-1.0
-PKGNAME=	ja-jee-1.0
+PORTNAME=	jee
+PORTVERSION=	1.0
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.mogami-wire.co.jp/pub/beta/ \
 		ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
-DISTFILES=	jee.tar.gz \
-		libncurses-3.0.tar.gz \
-		ee-3.0.tar.gz
+DISTFILES=	${PORTNAME}.tar.gz \
+		ee-3.0.tar.gz \
+		libncurses-3.0.tar.gz
+EXTRACT_ONLY=	ee-3.0.tar.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
@@ -23,14 +23,11 @@ MANLANG=	ja
 MAN1=		jee.1
 WRKSRC=		${WRKDIR}/ee
 
-do-extract:
-	@${MKDIR} ${WRKSRC}
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/jee.tar.gz \
-		${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/ee-3.0.tar.gz \
-		${EXTRACT_AFTER_ARGS} -C ${WRKDIR}
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/libncurses-3.0.tar.gz \
+post-extract:
+.for f in ${PORTNAME}.tar.gz libncurses-3.0.tar.gz
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${f} \
 		${EXTRACT_AFTER_ARGS} -C ${WRKSRC}
+.endfor
 	${MV} ${WRKSRC}/libncurses ${WRKSRC}/curses
 
 post-patch:
diff --git a/japanese/elisa10x8/Makefile b/japanese/elisa10x8/Makefile
index 3a23ba9eafa6..1409e1ae88a5 100644
--- a/japanese/elisa10x8/Makefile
+++ b/japanese/elisa10x8/Makefile
@@ -1,25 +1,25 @@
 # New ports collection makefile for:	elisafont
-# Version required:	1.0
 # Date created:		26 Sep 1997
 # Whom: Dai ISHIJIMA & ELISA Font Project <ishijima@tri.pref.osaka.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-elisa8-1.0
-PKGNAME=	ja-elisa10x8-1.0
+PORTNAME=	elisa10x8
+PORTVERSION=	1.0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	ftp://ftp.tut.ac.jp/X11/Fonts/ \
 		ftp://ftp.iij.ad.jp/pub/X/X11R6.3/%SUBDIR%/ \
 		ftp://ftp.eu.net/X11/R6.3/%SUBDIR%/
 MASTER_SITE_SUBDIR=	xc/fonts/bdf/misc
-DISTFILES=	elisau10.tgz clR5x8.bdf
+DISTFILES=	elisau10.tgz \
+		clR5x8.bdf
+EXTRACT_ONLY=	elisau10.tgz
 
 MAINTAINER=	ishijima@tri.pref.osaka.jp
 
 USE_X_PREFIX=	yes
 NO_WRKSUBDIR=	yes
-EXTRACT_ONLY=	elisau10.tgz
 
 FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	DISTDIR=${DISTDIR} FONTSDIR=${FONTSDIR}
diff --git a/japanese/elisa8x8/Makefile b/japanese/elisa8x8/Makefile
index e0426b57a241..5b1cafe270e0 100644
--- a/japanese/elisa8x8/Makefile
+++ b/japanese/elisa8x8/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	elisa8x8
-# Version required:	1.0
 # Date created:		17 Aug. 1998
 # Whom: Toshihiko SHIMOKAWA <toshi@tea.forus.or.jp> & ELISA Font Project
 #
 # $FreeBSD$
 #
 
-DISTNAME=	elisat10
-PKGNAME=	ja-elisa8x8-1.0
+PORTNAME=	elisa8x8
+PORTVERSION=	1.0
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.tea.forus.or.jp/toshi/exhibition/
+DISTNAME=	elisat10
 
 MAINTAINER=	toshi@tea.forus.or.jp
 
diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile
index 0bf3c1e03b98..441623de2a20 100644
--- a/japanese/elvis/Makefile
+++ b/japanese/elvis/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:    elvis + japanese patch
-# Version required:     1.8 pl 4 + j 1.1
 # Date created:         5 October 1995
 # Whom:                 Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       elvis-1.8
-PKGNAME=        ja-elvis-1.8.4
+PORTNAME=	elvis
+PORTVERSION=	1.8.4
 CATEGORIES=    japanese editors
 MASTER_SITES=   ftp://ftp.cs.pdx.edu/pub/elvis/
 EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}-1.8
 
 PATCH_SITES=    ftp://ftp.foretune.co.jp/pub/tools/jelvis/
-PATCHFILES=     jelvis1.8p4-j1.1.tar.Z
+PATCHFILES=     j${PORTNAME}1.8p4-j1.1.tar.Z
 
 MAINTAINER=     sanpei@yy.cs.keio.ac.jp
 
diff --git a/japanese/emacs-manual/Makefile b/japanese/emacs-manual/Makefile
index 90f5335ce4fb..7791dc4e8768 100644
--- a/japanese/emacs-manual/Makefile
+++ b/japanese/emacs-manual/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:    ja-emacs-manual
-# Version required:     13
 # Date created:         14 April 1999
 # Whom:                 OKAZAKI Tetsurou
 #
 # $FreeBSD$
 #
 
-DISTNAME=	emacs-20.5-man-jp
-PKGNAME=	ja-emacs-manual-13.2000.01.13
+PORTNAME=	emacs-manual
+PORTVERSION=	13.2000.01.13
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/GNU/emacs-20.x/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	emacs
+DISTNAME=	emacs-20.5-man-jp
 DISTFILES=	${DISTNAME}.tgz ${EMACS_ARC}
 
 MAINTAINER=	okazaki@be.to
diff --git a/japanese/emacs20-dl-canna/Makefile b/japanese/emacs20-dl-canna/Makefile
index 97de0f08d192..b1f8b580327f 100644
--- a/japanese/emacs20-dl-canna/Makefile
+++ b/japanese/emacs20-dl-canna/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	emacs20-dl-canna
-# Version required:	1.4
 # Date created:		10 October 1998
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
-DISTNAME=	emacs-canna-${DLCANNA_VER}
-PKGNAME=	ja-emacs20-dl-canna-${DLCANNA_VER}
+PORTNAME=	emacs20-dl-canna
+PORTVERSION=	1.4
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.m17n.org/pub/mule/dynamic-loading/emacs-canna/ \
 		${MASTER_SITE_PORTS_JP} 
+DISTNAME=	emacs-canna-${PORTVERSION}
 
 MAINTAINER=	shige@FreeBSD.org
 
diff --git a/japanese/emacs20-dl-wnn6/Makefile b/japanese/emacs20-dl-wnn6/Makefile
index 229e80439e02..e6396f994b77 100644
--- a/japanese/emacs20-dl-wnn6/Makefile
+++ b/japanese/emacs20-dl-wnn6/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	emacs20-dl-wnn6
-# Version required:	0.3.6
 # Date created:		10 October 1998
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
-DISTNAME=	dl-wnn-0.3.6
-PKGNAME=	ja-emacs20-dl-wnn6-0.3.6
+PORTNAME=	emacs20-dl-wnn6
+PORTVERSION=	0.3.6
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://tokuda-www.cs.titech.ac.jp/~katsuya/emacs/
+DISTNAME=	dl-wnn-${PORTVERSION}
 
 MAINTAINER=	shige@FreeBSD.org
 
diff --git a/japanese/epwutil/Makefile b/japanese/epwutil/Makefile
index a8b209477b3f..7e34c70741ce 100644
--- a/japanese/epwutil/Makefile
+++ b/japanese/epwutil/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	epwutil
-# Version required:	1.0
 # Date created:		22 January 1999
 # Whom:			Kazutoki TAKAMUNE <takamune@avrl.mei.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	epwutil-1.0
-PKGNAME=	ja-epwutil-1.0
+PORTNAME=	epwutil
+PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.nerimadors.or.jp/pub/epwutil/
 
diff --git a/japanese/escpf/Makefile b/japanese/escpf/Makefile
index e554c0f4e568..2b2a0275756a 100644
--- a/japanese/escpf/Makefile
+++ b/japanese/escpf/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: escpf
-# Version required:	0.4
 # Date created:		15 June 1996
 # Whom:			Mita Yoshio <mita@iis.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	escpf-0.4
-PKGNAME=	ja-escpf-0.4
+PORTNAME=	escpf
+PORTVERSION=	0.4
 CATEGORIES=	japanese print
 MASTER_SITES=	http://www.flatout.org/~wing/Linux/Escpf/
 
diff --git a/japanese/esecanna-module-vje25/Makefile b/japanese/esecanna-module-vje25/Makefile
index d7788e5e4498..0d64611f3295 100644
--- a/japanese/esecanna-module-vje25/Makefile
+++ b/japanese/esecanna-module-vje25/Makefile
@@ -1,16 +1,16 @@
 # New ports collection Makefile for: esecanna module for VJE-Delta 2.5
-# Version required:	0.14.3
 # Date created:		24 February 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	esecanna-module-vje25_0.14.3
-PKGNAME=	ja-esecanna-module-vje25-0.14.3
+PORTNAME=	esecanna-module-vje25
+PORTVERSION=	0.14.3
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
 		http://people.FreeBSD.org/~knu/ports/distfiles/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	knu@idaemons.org
 
diff --git a/japanese/esecanna-module-vje30/Makefile b/japanese/esecanna-module-vje30/Makefile
index bcb5441c6531..057e07ac6e62 100644
--- a/japanese/esecanna-module-vje30/Makefile
+++ b/japanese/esecanna-module-vje30/Makefile
@@ -1,16 +1,16 @@
 # New ports collection Makefile for: esecanna module for VJE-Delta 3.0
-# Version required:	0.14.3
 # Date created:		24 February 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	esecanna-module-vje30_0.14.3
-PKGNAME=	ja-esecanna-module-vje30-0.14.3
+PORTNAME=	esecanna-module-vje30
+PORTVERSION=	0.14.3
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
 		http://people.FreeBSD.org/~knu/ports/distfiles/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	knu@idaemons.org
 
diff --git a/japanese/esecanna-module-wnn6/Makefile b/japanese/esecanna-module-wnn6/Makefile
index 9e300d012eea..0338d9998964 100644
--- a/japanese/esecanna-module-wnn6/Makefile
+++ b/japanese/esecanna-module-wnn6/Makefile
@@ -1,16 +1,16 @@
 # New ports collection Makefile for: esecanna module for Wnn6
-# Version required:	0.14.2
 # Date created:		26 February 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	esecanna-module-wnn6_0.14.2
-PKGNAME=	ja-esecanna-module-wnn6-0.14.2
+PORTNAME=	esecanna-module-wnn6
+PORTVERSION=	0.14.2
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
 		http://people.FreeBSD.org/~knu/ports/distfiles/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	knu@idaemons.org
 
diff --git a/japanese/esecanna/Makefile b/japanese/esecanna/Makefile
index d185006b37d4..6cb9123f91e6 100644
--- a/japanese/esecanna/Makefile
+++ b/japanese/esecanna/Makefile
@@ -1,16 +1,16 @@
 # New ports collection Makefile for: esecanna
-# Version required:	0.99.1
 # Date created:		24 February 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	esecanna_0.99.1
-PKGNAME=	ja-esecanna-0.99.1
+PORTNAME=	esecanna
+PORTVERSION=	0.99.1
 CATEGORIES=	japanese
 MASTER_SITES=	http://esecanna.netfort.gr.jp/ \
 		http://people.FreeBSD.org/~knu/ports/distfiles/
+DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	knu@idaemons.org
 
diff --git a/japanese/eterm/Makefile b/japanese/eterm/Makefile
index 51b0d73f353f..72c4dafbdc5b 100644
--- a/japanese/eterm/Makefile
+++ b/japanese/eterm/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	eterm
-# Version required:    0.9
 # Date created:        11th December 1998
 # Whom:                MANTANI Nobutaka <nobutaka@nobutaka.com>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Eterm-0.9
-PKGNAME=	ja-eterm-0.9
+PORTNAME=	eterm
+PORTVERSION=	0.9
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.enlightenment.org/pub/enlightenment/Eterm/ \
 		ftp://ftp.dti.ad.jp/pub/X/enlightenment/Eterm/ \
 		ftp://ftp.kddlabs.co.jp/.10/X11/window_manager/enlightenment/Eterm/ \
 		ftp://ftp.sogang.ac.kr/.c/tools/X11/Enlightenment/Eterm/
+DISTNAME=	Eterm-${PORTVERSION}
 
 MAINTAINER=	nobutaka@nobutaka.com
 
diff --git a/japanese/ewipe/Makefile b/japanese/ewipe/Makefile
index 29e09ef91255..e41d12d3952c 100644
--- a/japanese/ewipe/Makefile
+++ b/japanese/ewipe/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	ewipe
-# Version required:	1.1.0
 # Date created:		17 October 1997
 # Whom:			itojun@itojun.org
 #
@@ -10,7 +9,6 @@ MASTERDIR=	${.CURDIR}/../../misc/ewipe
 PATCHDIR=	${.CURDIR}/patches
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-PKGNAME=	ja-ewipe-1.1.0
 KANJI=		yes
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/exmh2/Makefile b/japanese/exmh2/Makefile
index e0a310ac90b6..85298521d617 100644
--- a/japanese/exmh2/Makefile
+++ b/japanese/exmh2/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	exmh (Japanese)
-# Version required:	2.0.2
 # Date created:		15 Mar 1999
 # Whom:		Takeshi WATANABE <watanabe@komadori.planet.sci.kobe-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-${DISTNAME}
 CATEGORIES=	japanese mail tk80
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index 5aab8146fa63..76bb31289b38 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	expect
-# Version required:	5.26
 # Date created:		17 Oct 1997
 # Whom:			taguchi
 #
 # $FreeBSD$
 #
 
-DISTNAME=	expect-5.30
-PKGNAME=	ja-expect-5.30
+PORTNAME=	expect
+PORTVERSION=	5.30
 CATEGORIES=	japanese lang tk80
 MASTER_SITES=	ftp://ftp.nist.gov/mel/div826/subject/expect/old/
 
@@ -15,7 +14,6 @@ MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 LIB_DEPENDS=	tk80jp.1:${PORTSDIR}/japanese/tk80
 
-WRKSRC=		${WRKDIR}/expect-5.30
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
 CONFIGURE_ARGS=	--enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
diff --git a/japanese/freepwing/Makefile b/japanese/freepwing/Makefile
index 60ddc638cb86..f40fea5cd127 100644
--- a/japanese/freepwing/Makefile
+++ b/japanese/freepwing/Makefile
@@ -1,21 +1,23 @@
 # New ports collection makefile for: FreePWING
-# Version required:	1.2beta2
 # Date created:		00/01/24
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	freepwing-1.2beta2
-PKGNAME=	ja-freepwing-1.2.b2
+PORTNAME=	freepwing
+PORTVERSION=	${VERSION:S/beta/.b/}
 CATEGORIES=	japanese textproc
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/misc/freepwing/freepwing/ \
 		ftp://ftp.sra.co.jp/pub/misc/freepwing/freepwing/beta/
+DISTNAME=	${PORTNAME}-${VERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
 RUN_DEPENDS=	gmake:${PORTSDIR}/devel/gmake
 
+VERSION=	1.2beta2
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/doc
 USE_GMAKE=	yes
diff --git a/japanese/gawk/Makefile b/japanese/gawk/Makefile
index b67a0680c420..cc7eb618f0f4 100644
--- a/japanese/gawk/Makefile
+++ b/japanese/gawk/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	gawk+mb
-# Version required:	3.0.4+mb1.12
 # Date created:		5 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gawk-3.0.4
-PKGNAME=	ja-gawk-3.0.4
+PORTNAME=	gawk
+PORTVERSION=	3.0.4
 CATEGORIES=	japanese lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	gawk
diff --git a/japanese/gd/Makefile b/japanese/gd/Makefile
index 5302b79b4cfb..d3cbb78ccee1 100644
--- a/japanese/gd/Makefile
+++ b/japanese/gd/Makefile
@@ -1,19 +1,18 @@
 # New ports collection makefile for: gd
-# Version required:			1.6.3
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       gd-1.6.3
-PKGNAME=	ja-gd-1.6.3
+PORTNAME=	gd
+PORTVERSION=	1.6.3
 CATEGORIES=	japanese graphics
 MASTER_SITES=   http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/
 
-PATCH_SITES=    ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gd/1.6.3/
-PATCHFILES=     gd-1.6.3.ttf-kanji.patch.990731
+PATCH_SITES=    ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gd/${PORTVERSION}/
+PATCHFILES=     ${DISTNAME}.ttf-kanji.patch.990731
 
 MAINTAINER=	ichiro@ichiro.org
 
diff --git a/japanese/gd1/Makefile b/japanese/gd1/Makefile
index 5302b79b4cfb..d3cbb78ccee1 100644
--- a/japanese/gd1/Makefile
+++ b/japanese/gd1/Makefile
@@ -1,19 +1,18 @@
 # New ports collection makefile for: gd
-# Version required:			1.6.3
 # Date created:				19 Aug 1998
 # Whom:					ichiro@ichiro.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=       gd-1.6.3
-PKGNAME=	ja-gd-1.6.3
+PORTNAME=	gd
+PORTVERSION=	1.6.3
 CATEGORIES=	japanese graphics
 MASTER_SITES=   http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/
 
-PATCH_SITES=    ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gd/1.6.3/
-PATCHFILES=     gd-1.6.3.ttf-kanji.patch.990731
+PATCH_SITES=    ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gd/${PORTVERSION}/
+PATCHFILES=     ${DISTNAME}.ttf-kanji.patch.990731
 
 MAINTAINER=	ichiro@ichiro.org
 
diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index ce92b5f9bc07..80a93a71b89b 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for:	gicq
-# Version required:		0.33
 # Date Created:			31 Oct 1998
 # Whom:				Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gicq-0.33
-PKGNAME=	ja-gicq-0.33
+PORTNAME=	gicq
+PORTVERSION=	0.33
 CATEGORIES=	japanese net
 MASTER_SITES=	http://people.FreeBSD.org/~flathill/distfiles/ \
 		ftp://ftp.korsoft.com/pub/gicq/
 
 PATCH_SITES=	http://people.FreeBSD.org/~flathill/distfiles/ \
 		http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
-PATCHFILES=	gicq-0.33ja.patch
+PATCHFILES=	${DISTNAME}ja.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	flathill@FreeBSD.org
diff --git a/japanese/gn-gnspool/Makefile b/japanese/gn-gnspool/Makefile
index 6d89d6639b84..02d4855d0ca6 100644
--- a/japanese/gn-gnspool/Makefile
+++ b/japanese/gn-gnspool/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for: 	gn(Gon's Newsreader with gnspool)
-# Version required:			1.40
 # Date created:				14 Feb. 1997
 # Whom:					Kiroh HARADA <kiroh@kh.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gn-1.40
-PKGNAME=	ja-gn-gnspool-1.40
+PORTNAME=	gn-gnspool
+PORTVERSION=	1.40
 CATEGORIES=	japanese news
 MASTER_SITES=	ftp://ftp.omronsoft.co.jp/pub/misc/gn/
+DISTNAME=	gn-${PORTVERSION}
 
 MAINTAINER=	seiken@ARGV.AC
 
-# The program ``configur'' sometimes issue questions and
+# The program ``configure'' sometimes issue questions and
 # batch-mode build would fail.
 IS_INTERACTIVE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
diff --git a/japanese/gn-mnews/Makefile b/japanese/gn-mnews/Makefile
index 4b3c8e1163f5..6eeff97ce364 100644
--- a/japanese/gn-mnews/Makefile
+++ b/japanese/gn-mnews/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	gn-mnews
-# Version required:		1.20
 # Date created:			7 Feb 1997
 # Whom:				Kiroh HARADA <kiroh@jp.freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mnews120
-PKGNAME=	ja-gn-mnews-1.20
+PORTNAME=	gn-mnews
+PORTVERSION=	1.20
 CATEGORIES=	japanese news
 MASTER_SITES=	ftp://ftp.mei.co.jp/free/Network/news/readers/
+DISTNAME=	mnews${PORTVERSION:S/.//}
 
 MAINTAINER=	seiken@ARGV.AC
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	gninews:${PORTSDIR}/japanese/gn-gnspool \
 NO_PACKAGE=	"Redistribution of binary built from modified source is prohibited"
 BROKEN=		"Couldn't fetch now"
 
-WRKSRC=		${WRKDIR}/mnews-1.20/build
+WRKSRC=		${WRKDIR}/mnews-${PORTVERSION}/build
 
 do-configure:
 	@for f in Makefile site_dep.h ; do \
diff --git a/japanese/gp/Makefile b/japanese/gp/Makefile
index d96fab8320f0..7bf94d15b280 100644
--- a/japanese/gp/Makefile
+++ b/japanese/gp/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for: GP + Japanese treatment
-# Version required:	2.5p2
 # Date created:		15 April 1997
 # Whom:			Kiriyama Kazuhiko<kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-gp-2.5p2
 CATEGORIES=	japanese print
 
 LANGUAGE=	Japanese
diff --git a/japanese/grep/Makefile b/japanese/grep/Makefile
index 2f877dc356d3..80489d616936 100644
--- a/japanese/grep/Makefile
+++ b/japanese/grep/Makefile
@@ -1,19 +1,18 @@
 # New ports collection makefile for:	grep+mb
-# Version required:	2.0+mb1.04
 # Date created:		2 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	grep-2.0
-PKGNAME=	ja-grep-2.0
+PORTNAME=	grep
+PORTVERSION=	2.0
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	grep
 
 PATCH_SITES=	ftp://ftp.hipecs.hokudai.ac.jp/pub/GNU/jp/
-PATCHFILES=	grep-2.0-mb1.04.diff.gz
+PATCHFILES=	${DISTNAME}-mb1.04.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/groff/Makefile b/japanese/groff/Makefile
index 03c760ad312d..d3e1de3c7b7e 100644
--- a/japanese/groff/Makefile
+++ b/japanese/groff/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	ja-groff
-# Version required:	1.11.1+0.99.1
 # Date created:		14 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	groff-1.11.1
-PKGNAME=	ja-groff-0.99.1.1
+PORTNAME=	groff
+PORTVERSION=	0.99.1.1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
+DISTNAME=	${PORTNAME}-1.11.1
 
 PATCH_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.tg.rim.or.jp/~inagaki/
-PATCHFILES=	jgroff-0.99.1.diff.gz jgroff-0.99.1-0.99.1.1.diff.gz
+PATCHFILES=	j${PORTNAME}-${PORTVERSION:R}.diff.gz \
+		j${PORTNAME}-${PORTVERSION:R}-${PORTVERSION}.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	okazaki@be.to
diff --git a/japanese/gtkicq/Makefile b/japanese/gtkicq/Makefile
index bea7629486c9..19eb0766c4a7 100644
--- a/japanese/gtkicq/Makefile
+++ b/japanese/gtkicq/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for: ja-gtkicq
-# Version required: 0.60
 # Date created: 8 MAY 1999
 # Whom: Shuichi Tanaka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	gtkicq-0.60
-PKGNAME=	ja-gtkicq-0.60
+PORTNAME=	gtkicq
+PORTVERSION=	0.60
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://gtkicq.pn.org/pub/gtkicq/
 
 PATCH_SITES=	http://keemun.soraneko.com/gtkicq/archives/
-PATCHFILES=	gtkicq-0.60-ja.diff.gz
+PATCHFILES=	${DISTNAME}-ja.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	stanaka@bb.mbn.or.jp
@@ -23,11 +22,11 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libjcode.a:${PORTSDIR}/japanese/libjcode \
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
-USE_X_PREFIX=       yes
-USE_GMAKE=      yes
-GNU_CONFIGURE=  yes
+USE_X_PREFIX=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome
-CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		GTK_CONFIG="${GTK_CONFIG}" \
 		LIBS="-L${LOCALBASE}/lib"
 
diff --git a/japanese/gxditview/Makefile b/japanese/gxditview/Makefile
index cd2bb44b7471..f3a9ff2ab027 100644
--- a/japanese/gxditview/Makefile
+++ b/japanese/gxditview/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	gxditview (part of ja-groff)
-# Version required:	1.11.1+0.99.1.1
 # Date created:		14 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	groff-1.11.1
-PKGNAME=	ja-gxditview-0.99.1.1
+PORTNAME=	gxditview
+PORTVERSION=	0.99.1.1
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	groff
+DISTNAME=	groff-1.11.1
 
 PATCH_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.tg.rim.or.jp/~inagaki/
-PATCHFILES=	jgroff-0.99.1.diff.gz jgroff-0.99.1-0.99.1.1.diff.gz
+PATCHFILES=	jgroff-${PORTVERSION:R}.diff.gz \
+		jgroff-${PORTVERSION:R}-${PORTVERSION}.diff.gz
 PATCH_DIST_ARGS=	-d ${WRKSRC}/.. --forward --quiet -E -p1
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/japanese/hex/Makefile b/japanese/hex/Makefile
index b11ac1689769..5ce2c32794ab 100644
--- a/japanese/hex/Makefile
+++ b/japanese/hex/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	hex
-# Version required:	2.04
 # Date created:		Nov 5, 1996
 # Whom:			IMAMURA Tomoaki (yu@pastel.club.or.jp)
 #
 # $FreeBSD$
 #
 
-DISTNAME=	hex204
-PKGNAME=	ja-hex-2.04
+PORTNAME=	hex
+PORTVERSION=	2.04
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.yl.is.s.u-tokyo.ac.jp/~nayuta/S/hex/
 EXTRACT_SUFX=	.tgz
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	yu@pastel.club.or.jp
 
diff --git a/japanese/hns/Makefile b/japanese/hns/Makefile
index a9907dda60e0..7b961d89f778 100644
--- a/japanese/hns/Makefile
+++ b/japanese/hns/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:    hns
-# Version required:             2.00-pl3
 # Date created:                 10 Jun 1999
 # Whom:                         Hyper NIKKI System Project <hnsmaster@h14m.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	hns-2.00-pl3
-PKGNAME=	ja-hns-2.00.3
+PORTNAME=	hns
+PORTVERSION=	2.00.3
 CATEGORIES=	japanese www perl5
 MASTER_SITES=	http://www.h14m.org/dist/
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-pl${PORTVERSION:E}
 
 MAINTAINER=	hnsmaster@h14m.org
 
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-WRKSRC=		${WRKDIR}/hns-2.00
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
 do-install:
 	${MKDIR} ${PREFIX}/share/hns
diff --git a/japanese/ircII/Makefile b/japanese/ircII/Makefile
index ec53f8293567..bf7dede475a8 100644
--- a/japanese/ircII/Makefile
+++ b/japanese/ircII/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	IrcII Client
-# Version required:	2.8.2
 # Date created:		02 May 1996
 # Whom:			Masafumi
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ircii-2.8.2
-PKGNAME=	ja-ircii-2.8.2
+PORTNAME=	ircii
+PORTVERSION=	2.8.2
 CATEGORIES=	japanese irc
 MASTER_SITES=	ftp://cs-ftp.bu.edu/irc/clients/ \
 		ftp://ftp.kyoto.wide.ad.jp/IRC/ircII/
-DISTFILES=	ircii-2.8.2.tar.gz ircii-2.8help.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME:R}help.tar.gz
 
 PATCH_SITES=	ftp://ftp.kyoto.wide.ad.jp/IRC/ircII/
-PATCHFILES=	ircii-2.8.2-jp.patch.gz
+PATCHFILES=	${DISTNAME}-jp.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	max@FreeBSD.org
diff --git a/japanese/iv/Makefile b/japanese/iv/Makefile
index e04aa0db258b..9b8d0f766c57 100644
--- a/japanese/iv/Makefile
+++ b/japanese/iv/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	iv
-# Version required:	3.1
 # Date created:		23.Feb.1996
 # Whom:			sanpei@yy.cs.keio.ac.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	iv-3.1
-PKGNAME=	ja-iv-3.1
+PORTNAME=	iv
+PORTVERSION=	3.1
 CATEGORIES=	japanese graphics
 MASTER_SITES=	ftp://interviews.stanford.edu/pub/ \
 		${MASTER_SITE_PORTS_JP}
-DISTFILES=	3.1.tar.Z iv3_1j_gamma.tar.gz
+DISTFILES=	${PORTVERSION}.tar.Z \
+		${PORTNAME}${PORTVERSION:S/./_/g}j_gamma.tar.gz
 
 PATCH_SITES=	${MASTER_SITE_PORTS_JP}
-PATCHFILES=	iv-3.1j-gamma-fixcmpfont.patch
+PATCHFILES=	${DISTNAME}j-gamma-fixcmpfont.patch
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	sanpei@sanpei.org
diff --git a/japanese/japaneseAFM/Makefile b/japanese/japaneseAFM/Makefile
index aba5eef44f18..07659b2dc256 100644
--- a/japanese/japaneseAFM/Makefile
+++ b/japanese/japaneseAFM/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: japanese AFM files
-# Version required:	1.0
 # Date created:		11 September 1997
 # Whom:			KIRIYAMA Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	japaneseAFM
-PKGNAME=	ja-japaneseAFM-1.0
+PORTNAME=	japaneseAFM
+PORTVERSION=	1.0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	kiri@kiri.toba-cmt.ac.jp
 
diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile
index 8704ad76a9c0..c640e5affd91 100644
--- a/japanese/jcode.pl/Makefile
+++ b/japanese/jcode.pl/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	jcode.pl
-# Version required:	2.10
 # Date created:		20 February 1998
 # Whom:			sada
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jcode.pl-2.10
-PKGNAME=	ja-jcode.pl-2.10
+PORTNAME=	jcode.pl
+PORTVERSION=	2.10
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.iij.ad.jp/pub/IIJ/dist/utashiro/perl/ \
 		ftp://ftp.sra.co.jp/pub/lang/perl/sra-scripts/
-EXTRACT_SUFX=
+EXTRACT_SUFX=	# none
 
 MAINTAINER=	sada@e-mail.ne.jp
 
diff --git a/japanese/jed/Makefile b/japanese/jed/Makefile
index eda3aafdf08b..7cbd4bae266a 100644
--- a/japanese/jed/Makefile
+++ b/japanese/jed/Makefile
@@ -1,24 +1,27 @@
 # New ports collection makefile for:	Jed text editor w/ Japanese support
-# Version required:	0.99.8.j067
 # Date created:		2 Feb 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jed-B0.99-8__J067
-PKGNAME=	ja-jed-0.99.8.j067
+PORTNAME=	jed
+PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://people.FreeBSD.org/~knu/ports/distfiles/ \
 		http://kondara.sdri.co.jp/~kikutani/slang/
+DISTNAME=	${PORTNAME}-B${VERSION:R}-${VERSION:E}__J${JP_VERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		jed-extralibs-0.99.8${EXTRACT_SUFX}
+		${PORTNAME}-extralibs-${VERSION}.tar.gz
 
 MAINTAINER=	knu@idaemons.org
 
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang \
 		${LIBDEP_CANNA}
 
+VERSION=	0.99.8
+JP_VERSION=	067
+
 DIST_SUBDIR=	jed
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	JED_ROOT="${JED_ROOT}" X_EXTRA_LIBS="-lxpg4 -lcurses"
diff --git a/japanese/jgv/Makefile b/japanese/jgv/Makefile
index f0adc879e6cf..132089b91fce 100644
--- a/japanese/jgv/Makefile
+++ b/japanese/jgv/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	JDE's JGV for ja-TkStep
-# Version required:	0.2
 # Date created:		25 March 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
diff --git a/japanese/jhd/Makefile b/japanese/jhd/Makefile
index df58761607be..c258676a1f00 100644
--- a/japanese/jhd/Makefile
+++ b/japanese/jhd/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: jhd
-# Version required:	2.3
 # Date created:		Feb 5, 1998
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jhd-2.3
-PKGNAME=	ja-jhd-2.3
+PORTNAME=	jhd
+PORTVERSION=	2.3
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.iamas.ac.jp/pub1/UNIX/File/
 
diff --git a/japanese/jls/Makefile b/japanese/jls/Makefile
index 5280acb5acc2..8d97edfc629c 100644
--- a/japanese/jls/Makefile
+++ b/japanese/jls/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	jls
-# Version required:	0.x
 # Date created:		4 January 1999
 # Whom:			shige
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jls-0.1
-PKGNAME=	ja-ls-0.1
+PORTNAME=	ls
+PORTVERSION=	0.1
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://people.FreeBSD.org/~shige/ports/
+DISTNAME=	j${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	shige@FreeBSD.org
 
diff --git a/japanese/jpilot/Makefile b/japanese/jpilot/Makefile
index 30292b294077..02fe066c05a9 100644
--- a/japanese/jpilot/Makefile
+++ b/japanese/jpilot/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:   jpilot (japanized)
-# Version required:    0.98
 # Date created:        Tue Aug 31 23:23:00 JST 1999
 # Whom:                sumikawa
 #
@@ -9,7 +8,6 @@
 MASTERDIR=	${.CURDIR}/../../palm/jpilot
 COMMENT=	${.CURDIR}/pkg/COMMENT
 
-PKGNAME=	ja-jpilot-0.98
 CATEGORIES=	japanese
 
 MAINTAINER=	sumikawa@FreeBSD.org
diff --git a/japanese/jtex209-ascii/Makefile b/japanese/jtex209-ascii/Makefile
index e4f507ad5ecd..b5332e8cc96e 100644
--- a/japanese/jtex209-ascii/Makefile
+++ b/japanese/jtex209-ascii/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for: ja-jlatex209
-# Version required:	a1.7-n1.52
 # Date created:		4 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-jlatex209-a17
 BATCH_TEX=	ASCII
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of jtex-*
diff --git a/japanese/jtex209-both/Makefile b/japanese/jtex209-both/Makefile
index 69e455d33069..fea656ac8152 100644
--- a/japanese/jtex209-both/Makefile
+++ b/japanese/jtex209-both/Makefile
@@ -1,35 +1,53 @@
 # New ports collection makefile for: ja-jlatex209
-# Version required:	a1.7-n1.52
 # Date created:		4 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME?=	ja-jlatex209-a17-n152
+PORTNAME=	jlatex209
+PORTVERSION=	${_PORTVERSION}
+PKGNAMESUFFIX=	${_PKGNAMESUFFIX}
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.iis.u-tokyo.ac.jp/TeX/NTT-JTeX/:old/ \
 		ftp://ftp.iis.u-tokyo.ac.jp/TeX/fonts/pk/ \
 		ftp://ftp.waseda.ac.jp/pub/tex/ascii-OLD/
-DISTFILES=	jtex-1.52.tar.gz tfm-files.tar.Z jtex1.7.tar.gz pTeX-JIS-patch
+DISTFILES=	jtex-${NTT_VERSION}.tar.gz \
+		tfm-files.tar.Z \
+		jtex${ASCII_VERSION}.tar.gz \
+		pTeX-JIS-patch
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
+ASCII_VERSION=	1.7
+NTT_VERSION=	1.52
+
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of jtex-*
 USE_GMAKE=	yes
 NO_WRKSUBDIR=	yes
-EXTRACT_ONLY=	jtex-1.52.tar.gz
+EXTRACT_ONLY=	jtex-${NTT_VERSION}.tar.gz
 USE_BISON=	yes
 
 # Which latex to be made at BATCH mode.  BOTH, ASCII, NTT are available.
 BATCH_TEX?=	BOTH
 
+.if ${BATCH_TEX} == BOTH
+_PORTVERSION=	${ASCII_VERSION}+${NTT_VERSION}
+_PKGNAMESUFFIX=	-ascii+ntt
+.elseif ${BATCH_TEX} == ASCII
+_PORTVERSION=	${ASCII_VERSION}
+_PKGNAMESUFFIX=	-ascii
+.elseif ${BATCH_TEX} == NTT
+_PORTVERSION=	${NTT_VERSION}
+_PKGNAMESUFFIX=	-ntt
+.endif
+
 post-extract:
 	@(\
 	  cd ${WRKSRC} ; \
-	  ${MKDIR} jtex1.7 ; \
+	  ${MKDIR} jtex${ASCII_VERSION} ; \
 	  cd jtex1.7 ; \
-	  tar xzf ${DISTDIR}/jtex1.7.tar.gz ; \
+	  tar xzf ${DISTDIR}/jtex${ASCII_VERSION}.tar.gz ; \
 	  cd ptex/ptex ; \
 	  ${CP} -R ../../jtex/web2cdir . ; \
 	  ${CP} -R ../../jtex/jtangle . \
diff --git a/japanese/jtex209-ntt/Makefile b/japanese/jtex209-ntt/Makefile
index 34cfe252a3db..adf2569a0d64 100644
--- a/japanese/jtex209-ntt/Makefile
+++ b/japanese/jtex209-ntt/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for: ja-jlatex209
-# Version required:	a1.7-n1.52
 # Date created:		4 Nov 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-jlatex209-n152
 BATCH_TEX=	NTT
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of jtex-*
diff --git a/japanese/jvim-canna+freewnn/Makefile b/japanese/jvim-canna+freewnn/Makefile
index be6625f03d94..a14466836ae6 100644
--- a/japanese/jvim-canna+freewnn/Makefile
+++ b/japanese/jvim-canna+freewnn/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	jvim for Canna and Wnn4
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna+wnn4-2.0r
+PKGNAMESUFFIX=	-canna+wnn4
 CANNA=		yes
 WNN4=		yes
 
diff --git a/japanese/jvim-canna+wnn6/Makefile b/japanese/jvim-canna+wnn6/Makefile
index 698e12f7b53a..165c7e5e4912 100644
--- a/japanese/jvim-canna+wnn6/Makefile
+++ b/japanese/jvim-canna+wnn6/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	jvim for Canna and Wnn6
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna+wnn6-2.0r
+PKGNAMESUFFIX=	-canna+wnn6
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/jvim-canna+wnn7/Makefile b/japanese/jvim-canna+wnn7/Makefile
index 698e12f7b53a..165c7e5e4912 100644
--- a/japanese/jvim-canna+wnn7/Makefile
+++ b/japanese/jvim-canna+wnn7/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	jvim for Canna and Wnn6
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna+wnn6-2.0r
+PKGNAMESUFFIX=	-canna+wnn6
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/jvim-canna/Makefile b/japanese/jvim-canna/Makefile
index 6946e8f80911..1fb81f682902 100644
--- a/japanese/jvim-canna/Makefile
+++ b/japanese/jvim-canna/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	jvim for Canna
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-canna-2.0r
+PKGNAMESUFFIX=	-canna
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim-freewnn/Makefile b/japanese/jvim-freewnn/Makefile
index e3cb96922098..87b53d1db7cb 100644
--- a/japanese/jvim-freewnn/Makefile
+++ b/japanese/jvim-freewnn/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	jvim for Wnn4
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-wnn4-2.0r
+PKGNAMESUFFIX=	-wnn4
 WNN4=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim-wnn6/Makefile b/japanese/jvim-wnn6/Makefile
index 5e7aaf369c49..b61c433057be 100644
--- a/japanese/jvim-wnn6/Makefile
+++ b/japanese/jvim-wnn6/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	jvim for Wnn6
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-wnn6-2.0r
+PKGNAMESUFFIX=	-wnn6
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim-wnn7/Makefile b/japanese/jvim-wnn7/Makefile
index 5e7aaf369c49..b61c433057be 100644
--- a/japanese/jvim-wnn7/Makefile
+++ b/japanese/jvim-wnn7/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	jvim for Wnn6
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-jvim-wnn6-2.0r
+PKGNAMESUFFIX=	-wnn6
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../jvim
diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile
index 4d421589fb08..2339d2b91987 100644
--- a/japanese/jvim/Makefile
+++ b/japanese/jvim/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	jvim
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jvim2.0r+onew2.2.10
-PKGNAME?=	ja-jvim-2.0r
+PORTNAME=	jvim
+PORTVERSION=	2.0r
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 		ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/
+DISTNAME=	${PORTNAME}${PORTVERSION}+onew2.2.10
 
 MAINTAINER=	taoka@FreeBSD.org
 
@@ -19,7 +19,7 @@ FILESDIR=	${.CURDIR}/../jvim/files
 PLIST=		${.CURDIR}/../jvim/pkg/PLIST
 MANLANG=	ja
 MAN1=		jcat.1 jfold.1 jgrep.1 jvim.1
-WRKSRC=		${WRKDIR}/jvim2.0r
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
 # Specifying a velue INPUT_METHOD, and seting values BUILD_DEPENDS,
 # LIB_DEPENDS, etc.
diff --git a/japanese/jvim3-canna+freewnn/Makefile b/japanese/jvim3-canna+freewnn/Makefile
index 07b68d5d32b1..0fa642baf8ab 100644
--- a/japanese/jvim3-canna+freewnn/Makefile
+++ b/japanese/jvim3-canna+freewnn/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Canna and Wnn4
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3-canna+wnn6/Makefile b/japanese/jvim3-canna+wnn6/Makefile
index 9bb67fdc3ac6..41ee6eaad019 100644
--- a/japanese/jvim3-canna+wnn6/Makefile
+++ b/japanese/jvim3-canna+wnn6/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Canna and Wnn6
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3-canna+wnn7/Makefile b/japanese/jvim3-canna+wnn7/Makefile
index 9bb67fdc3ac6..41ee6eaad019 100644
--- a/japanese/jvim3-canna+wnn7/Makefile
+++ b/japanese/jvim3-canna+wnn7/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Canna and Wnn6
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3-canna/Makefile b/japanese/jvim3-canna/Makefile
index 279026f59361..9f3ec47dc983 100644
--- a/japanese/jvim3-canna/Makefile
+++ b/japanese/jvim3-canna/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Canna
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3-direct_canna/Makefile b/japanese/jvim3-direct_canna/Makefile
index 4a89081ac437..4d1a73ef6beb 100644
--- a/japanese/jvim3-direct_canna/Makefile
+++ b/japanese/jvim3-direct_canna/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Canna without ONEW library
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3-freewnn/Makefile b/japanese/jvim3-freewnn/Makefile
index ae3756aa38fc..51b60f0b9e1c 100644
--- a/japanese/jvim3-freewnn/Makefile
+++ b/japanese/jvim3-freewnn/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Wnn4
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3-wnn6/Makefile b/japanese/jvim3-wnn6/Makefile
index 67a0452392a2..4347bf16810e 100644
--- a/japanese/jvim3-wnn6/Makefile
+++ b/japanese/jvim3-wnn6/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Wnn6
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3-wnn7/Makefile b/japanese/jvim3-wnn7/Makefile
index 67a0452392a2..4347bf16810e 100644
--- a/japanese/jvim3-wnn7/Makefile
+++ b/japanese/jvim3-wnn7/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	jvim3 for Wnn6
-# Version required:	3.0-2.0j
 # Date created:		98/11/17
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile
index 0ac163ba215f..f199d1421738 100644
--- a/japanese/jvim3/Makefile
+++ b/japanese/jvim3/Makefile
@@ -1,17 +1,18 @@
 # New ports collection makefile for:    jvim3
-# Version required:     3.0-2.0j
 # Date created:         98/11/17
 # Whom:                 Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	vim
-PKGNAME?=	ja-jvim${INPUT_METHOD}-3.0.2.0j
+PORTNAME=	jvim
+PORTVERSION=	3.0.2.0j
+PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese editors
 MASTER_SITES=	ftp://ftp.vim.org/pub/vim/unix/ \
 		http://hp.vector.co.jp/authors/VA003457/vim/vim3/2.0/
-DISTFILES=	vim-3.0.tar.gz ${JPATCH}
+DISTFILES=	vim-3.0.tar.gz \
+		${JPATCH}
 
 MAINTAINER=	taoka@FreeBSD.org
 
@@ -22,13 +23,13 @@ PATCHDIR=	${.CURDIR}/../jvim3/patches
 FILESDIR=	${.CURDIR}/../jvim3/files
 PLIST=		${.CURDIR}/../jvim3/pkg/PLIST
 EXTRACT_ONLY=	vim-3.0.tar.gz
+WRKSRC=		${WRKDIR}/vim
 MAKEFILE=	makjunix.mak
 MAN1=		jvim3.1
 
-VERSION=	3.0.2.0j
 JPATCH=		jvim.2.0.tar.gz
-PLIST_SUB=	VERSION=${VERSION}
-PORT_DOCDIR=	${PREFIX}/share/doc/ja-jvim-${VERSION}
+PLIST_SUB=	VERSION=${PORTVERSION}
+PORT_DOCDIR=	${PREFIX}/share/doc/ja-jvim-${PORTVERSION}
 # -DUSE_X11 is the cause of a problem treating Japanese
 MACHINE=	 -DBSD_UNIX -DUSE_LOCALE -DUSE_X11
 CC=		cc -O -g -Wall -traditional -Dconst= -I${X11BASE}/include
diff --git a/japanese/k10/Makefile b/japanese/k10/Makefile
index 29c9c0854754..6c386f49559b 100644
--- a/japanese/k10/Makefile
+++ b/japanese/k10/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	naga10
-# Version required:	1.1
 # Date created:		25 Feb 1998
 # Whom:	Eiji-usagi-MATSUmoto <usagi@ruby.club.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	knj10-1.1
-PKGNAME=	ja-naga10-1.1
+PORTNAME=	naga10
+PORTVERSION=	1.1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA013391/fonts/
+DISTNAME=	knj10-${PORTVERSION}
 
 MAINTAINER=	usagi@clave.gr.jp
 
diff --git a/japanese/k12/Makefile b/japanese/k12/Makefile
index ed34028e5ef8..83301a748cc1 100644
--- a/japanese/k12/Makefile
+++ b/japanese/k12/Makefile
@@ -1,17 +1,18 @@
 # New ports collection makefile for:	k12font
-# Version required:	1.1
 # Date created:		24 June 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kaname_k12_bdf
-PKGNAME=	ja-kaname12-1.1
+PORTNAME=	kaname12
+PORTVERSION=	1.1
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.din.or.jp/~storm/fonts/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} knm_new_linux.tar.gz
+DISTNAME=	kaname_k12_bdf
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		knm_new_linux.tar.gz
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
diff --git a/japanese/kakasi/Makefile b/japanese/kakasi/Makefile
index 0bc7db8b885c..2053dec02eba 100644
--- a/japanese/kakasi/Makefile
+++ b/japanese/kakasi/Makefile
@@ -1,15 +1,14 @@
 # New ports collection makefile for:	kakasi
-# Version required:		2.3.1
 # Date created:			26 Mar. 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kakasi-2.3.1
-PKGNAME=	ja-kakasi-2.3.1
+PORTNAME=	kakasi
+PORTVERSION=	2.3.1
 CATEGORIES=	japanese
-MASTER_SITES=  ftp://kakasi.namazu.org/pub/kakasi/
+MASTER_SITES=	ftp://kakasi.namazu.org/pub/kakasi/
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/kanji18/Makefile b/japanese/kanji18/Makefile
index 21267495059f..483fe3be4ca3 100644
--- a/japanese/kanji18/Makefile
+++ b/japanese/kanji18/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:	kanji18
-# Version required:	1.0
 # Date created:		23 November 1999
 # Whom:			Yoshiro MIHIRA <sanpei@sanpei.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME?=	kanji18
-PKGNAME=	ja-${DISTNAME}-1.0
+PORTNAME=	kanji
+PORTVERSION?=	1.0
+PKGNAMESUFFIX?=	18
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=   ${MASTER_SITE_PORTS_JP}
 MASTER_SITE_SUBDIR=	${DISTNAME}
+DISTNAME=	${PORTNAME}
 DISTFILES?=	573.z 574.z 575.z 576.z 577.z 578.z 579.z 580.z 581.z
 
 MAINTAINER=     sanpei@sanpei.org
diff --git a/japanese/kanji26/Makefile b/japanese/kanji26/Makefile
index 8320f0104188..665dc62c6208 100644
--- a/japanese/kanji26/Makefile
+++ b/japanese/kanji26/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	kanji26
-# Version required:	1.0
 # Date created:		23 November 1999
 # Whom:			Yoshiro MIHIRA <sanpei@sanpei.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME?=	kanji26
+PKGNAMESUFFIX=	26
 DISTFILES?=	793.gz 794.gz 795.gz 796.gz 797.gz 798.gz 799.gz \
 		800.gz 802.gz 816.gz 817.gz 818.gz 819.gz 820.gz 821.gz
 
diff --git a/japanese/kappa20/Makefile b/japanese/kappa20/Makefile
index d1b5b67a02b2..0606cd640ef3 100644
--- a/japanese/kappa20/Makefile
+++ b/japanese/kappa20/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	kappafont
-# Version required:	0.3
 # Date created:		8 Oct 1998
 # Whom: Kawaguti Ginga <ginga@athena.club.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Kappa20-0.3
-PKGNAME=	ja-kappa20-0.3
+PORTNAME=	kappa20
+PORTVERSION=	0.3
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/misc/character/fonts/kappa/
+DISTNAME=	Kappa20-${PORTVERSION}
 
 MAINTAINER=	ginga@athena.club.ne.jp
 
diff --git a/japanese/kbanner/Makefile b/japanese/kbanner/Makefile
index 9b60ee6ac6bc..ed0be2997e6b 100644
--- a/japanese/kbanner/Makefile
+++ b/japanese/kbanner/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:    kbanner
-# Version required:	2.1
 # Date created:		Fri Feb 26 15:07:10 PST 1999
 # Whom:			sumikawa
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kbanner2
-PKGNAME=	kbanner-2.1
+PORTNAME=	kbanner
+PORTVERSION=	2.1
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1993/oct/
 EXTRACT_SUFX=	.tar.Z
+DISTNAME=	${PORTNAME}${PORTVERSION:R}
 
 MAINTAINER=	sumikawa@kame.net
 
-WRKSRC=		$(WRKDIR)/kbanner2.1
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 ALL_TARGET=	kbanner
 MAN1=		kbanner.1
 
diff --git a/japanese/kcc/Makefile b/japanese/kcc/Makefile
index 1e2a9475f4f2..e8ac47e12381 100644
--- a/japanese/kcc/Makefile
+++ b/japanese/kcc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for: kcc
-# Version required:	2.0
 # Date created:		26 May 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kcc
-PKGNAME=	ja-kcc-1.0
+PORTNAME=	kcc
+PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/kinput2-canna+freewnn+sj3/Makefile b/japanese/kinput2-canna+freewnn+sj3/Makefile
index 2428b9b8f370..34e72c157896 100644
--- a/japanese/kinput2-canna+freewnn+sj3/Makefile
+++ b/japanese/kinput2-canna+freewnn+sj3/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna+sj3+wnn4
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-canna+freewnn/Makefile b/japanese/kinput2-canna+freewnn/Makefile
index 04a1ab50faaf..d3b05926385d 100644
--- a/japanese/kinput2-canna+freewnn/Makefile
+++ b/japanese/kinput2-canna+freewnn/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna+wnn4
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-canna+sj3+wnn6/Makefile b/japanese/kinput2-canna+sj3+wnn6/Makefile
index 76cf8b124db5..b7735a8f85aa 100644
--- a/japanese/kinput2-canna+sj3+wnn6/Makefile
+++ b/japanese/kinput2-canna+sj3+wnn6/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna+sj3+wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-canna+sj3+wnn7/Makefile b/japanese/kinput2-canna+sj3+wnn7/Makefile
index 76cf8b124db5..b7735a8f85aa 100644
--- a/japanese/kinput2-canna+sj3+wnn7/Makefile
+++ b/japanese/kinput2-canna+sj3+wnn7/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna+sj3+wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-canna+sj3/Makefile b/japanese/kinput2-canna+sj3/Makefile
index f899c5b6ed69..1817973faf00 100644
--- a/japanese/kinput2-canna+sj3/Makefile
+++ b/japanese/kinput2-canna+sj3/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna+sj3
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-canna+wnn6/Makefile b/japanese/kinput2-canna+wnn6/Makefile
index c2d2c2cd03a0..9a59110afb5c 100644
--- a/japanese/kinput2-canna+wnn6/Makefile
+++ b/japanese/kinput2-canna+wnn6/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna+wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-canna+wnn7/Makefile b/japanese/kinput2-canna+wnn7/Makefile
index c2d2c2cd03a0..9a59110afb5c 100644
--- a/japanese/kinput2-canna+wnn7/Makefile
+++ b/japanese/kinput2-canna+wnn7/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna+wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-canna/Makefile b/japanese/kinput2-canna/Makefile
index fc12f5be836b..bb220a07410d 100644
--- a/japanese/kinput2-canna/Makefile
+++ b/japanese/kinput2-canna/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-canna
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-freewnn+sj3/Makefile b/japanese/kinput2-freewnn+sj3/Makefile
index 466c294014ae..08647680baa6 100644
--- a/japanese/kinput2-freewnn+sj3/Makefile
+++ b/japanese/kinput2-freewnn+sj3/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-sj3+wnn4
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-freewnn/Makefile b/japanese/kinput2-freewnn/Makefile
index 0991a6324adc..94a30f9dc74f 100644
--- a/japanese/kinput2-freewnn/Makefile
+++ b/japanese/kinput2-freewnn/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	kinput2-wnn4
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kinput2-v3
-PKGNAME=	ja-kinput2${INPUT_METHOD}-3.0
+PORTNAME=	kinput2
+PORTVERSION=	3.0
+PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/ 
+DISTNAME=	kinput2-v3
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/kinput2-sj3+wnn6/Makefile b/japanese/kinput2-sj3+wnn6/Makefile
index e1bc13d06835..1f4ec8fb0568 100644
--- a/japanese/kinput2-sj3+wnn6/Makefile
+++ b/japanese/kinput2-sj3+wnn6/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-sj3+wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-sj3+wnn7/Makefile b/japanese/kinput2-sj3+wnn7/Makefile
index e1bc13d06835..1f4ec8fb0568 100644
--- a/japanese/kinput2-sj3+wnn7/Makefile
+++ b/japanese/kinput2-sj3+wnn7/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-sj3+wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-sj3/Makefile b/japanese/kinput2-sj3/Makefile
index c0fac8c117a9..ee68ce5c5986 100644
--- a/japanese/kinput2-sj3/Makefile
+++ b/japanese/kinput2-sj3/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-sj3
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-wnn6/Makefile b/japanese/kinput2-wnn6/Makefile
index a4e7a3acda16..8c83d2b7c22d 100644
--- a/japanese/kinput2-wnn6/Makefile
+++ b/japanese/kinput2-wnn6/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2-wnn7/Makefile b/japanese/kinput2-wnn7/Makefile
index a4e7a3acda16..8c83d2b7c22d 100644
--- a/japanese/kinput2-wnn7/Makefile
+++ b/japanese/kinput2-wnn7/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kinput2-wnn6
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile
index 0991a6324adc..94a30f9dc74f 100644
--- a/japanese/kinput2/Makefile
+++ b/japanese/kinput2/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	kinput2-wnn4
-# Version required:	3.0
 # Date created:		19 Dec 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kinput2-v3
-PKGNAME=	ja-kinput2${INPUT_METHOD}-3.0
+PORTNAME=	kinput2
+PORTVERSION=	3.0
+PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/x11/kinput2/ 
+DISTNAME=	kinput2-v3
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/kon2-14dot/Makefile b/japanese/kon2-14dot/Makefile
index dc9cc66a41bb..79fa3b4f2b73 100644
--- a/japanese/kon2-14dot/Makefile
+++ b/japanese/kon2-14dot/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	kon2 with 14dot font
-# Version required:     0.3
 # Date created:         11 Apr 1997
 # Whom:                 Makoto Matsushita <matusita@jp.freebsd.org>
 #
diff --git a/japanese/kon2-16dot/Makefile b/japanese/kon2-16dot/Makefile
index 8db62ddca937..503bd10b5bb3 100644
--- a/japanese/kon2-16dot/Makefile
+++ b/japanese/kon2-16dot/Makefile
@@ -1,19 +1,20 @@
 # New ports collection makefile for:	kon2 with 16dot font
-# Version required:     0.3
 # Date created:         11 Apr 1997
 # Whom:                 Makoto Matsushita <matusita@jp.freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kon2-0.3
-PKGNAME=	ja-kon2-${KONFONT}-0.3
+PORTNAME=	kon2
+PORTVERSION=	0.3
+PKGNAMESUFFIX=	-${KONFONT}
 CATEGORIES=	japanese
 # note kon is only in first directory and fonts are only in second directory
 MASTER_SITES=	ftp://ftp.tut.ac.jp/Linux/Packages/Utils/ \
 		ftp://ftp.xfree86.org/pub/XFree86/3.3.3/untarred/xc/fonts/bdf/misc/ \
 		ftp://ftp.iij.ad.jp/pub/X/XFree86/3.3.3/untarred/xc/fonts/bdf/misc/
-DISTFILES=	kon2-0.3.tar.gz \
+DISTNAME=	kon2-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		k14.bdf 7x14rk.bdf \
 		jiskan16.bdf 8x16rk.bdf
 
@@ -23,7 +24,7 @@ ONLY_FOR_ARCHS=	i386
 
 MAN1=		kon.1
 MANLANG=	ja
-EXTRACT_ONLY=	kon2-0.3.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 DOCDIR=		${PREFIX}/share/doc/kon2
 
diff --git a/japanese/kterm/Makefile b/japanese/kterm/Makefile
index d83abf5f6294..ecf568af4f2a 100644
--- a/japanese/kterm/Makefile
+++ b/japanese/kterm/Makefile
@@ -1,31 +1,31 @@
 # New ports collection makefile for:	kterm
-# Version required:	6.2
 # Date created:		18 November 1994
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kterm-6.2.0
-PKGNAME=	ja-kterm-6.2.0
+PORTNAME=	kterm
+PORTVERSION=	6.2.0
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		${MASTER_SITE_PORTS_JP} \
 		http://people.FreeBSD.org/~shige/ports/kterm/
 MASTER_SITE_SUBDIR=	applications kterm
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		README.wallpaper.ja
 
 MAINTAINER=	shige@FreeBSD.org
 
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-DISTFILES=	${DISTNAME}.tar.gz README.wallpaper.ja
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	kterm
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/ \
 		http://www.asahi-net.or.jp/~hc3j-tkg/kterm/
-PATCHFILES=	kterm-6.2.0.NFS-xauth.patch \
-		kterm-6.2.0-wpi.patch.gz
-DIST_SUBDIR=	kterm
+PATCHFILES=	${DISTNAME}.NFS-xauth.patch \
+		${DISTNAME}-wpi.patch.gz
 PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
diff --git a/japanese/kterm16c/Makefile b/japanese/kterm16c/Makefile
index b31bf9393cce..cbc65266bcd9 100644
--- a/japanese/kterm16c/Makefile
+++ b/japanese/kterm16c/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	kterm of 16 colors
-# Version required:	6.2
 # Date created:		18 November 1994
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	kterm-6.2.0
-PKGNAME=	ja-kterm16c-6.2.0
+PORTNAME=	kterm16c
+PORTVERSION=	6.2.0
 CATEGORIES=	japanese x11
 MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
 		ftp://ftp.interface-business.de/pub/outgoing/ \
 		ftp://ftp.cs.bris.ac.uk/pub/users/hedley/
-DISTFILES=	kterm-6.2.0.tar.gz pcemu1.01alpha.tar.gz
-EXTRACT_ONLY=	kterm-6.2.0.tar.gz
+DISTNAME=	kterm-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		pcemu1.01alpha.tar.gz
 
 MASTER_SITE_SUBDIR=	applications
 
@@ -22,10 +22,12 @@ MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DIST_SUBDIR=	kterm
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/x11/kterm/ \
 		http://karin.ip.titech.ac.jp/~takagi/kterm/
-PATCHFILES=	kterm-6.2.0.NFS-xauth.patch \
-		kterm-6.2.0-wpr1.patch.gz
+PATCHFILES=	${DISTNAME}.NFS-xauth.patch \
+		${DISTNAME}-wpr1.patch.gz
 PATCH_DIST_STRIP= -p1
 
 USE_IMAKE=	yes
diff --git a/japanese/lambdamoo/Makefile b/japanese/lambdamoo/Makefile
index cfb6a931e3ac..7c85876ecd8f 100644
--- a/japanese/lambdamoo/Makefile
+++ b/japanese/lambdamoo/Makefile
@@ -1,24 +1,25 @@
 # New ports collection makefile for:	LambdaMOO
-# Version required:	1.8.0r8
 # Date created:		Jul 3 1999
 # Whom:			Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	LambdaMOO-1.8.0r8
-PKGNAME=	ja-lambdamoo-1.8.0r8
+PORTNAME=	lambdamoo
+PORTVERSION=	1.8.0r8
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.place.org/pub/moo/unofficial/ \
 		ftp://ftp.leo.chubu.ac.jp/pub/network/mnews/
-DISTFILES=	LambdaMOO-1.8.0r8.tar.gz mnews122.tar.gz
+DISTNAME=	LambdaMOO-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		mnews122.tar.gz
 
 PATCH_SITES=	http://people.FreeBSD.org/~flathill/distfiles/
 PATCHFILES=	ja-lambdamoo-19990704.patch.gz
 
 MAINTAINER=	flathill@FreeBSD.ORG
 
-WRKSRC=		${WRKDIR}/MOO-1.8.0r8
+WRKSRC=		${WRKDIR}/MOO-${PORTVERSION}
 GNU_CONFIGURE=	yes
 ALL_TARGET=
 
diff --git a/japanese/latex2html/Makefile b/japanese/latex2html/Makefile
index ca6f5ba98732..45d3d1f21c71 100644
--- a/japanese/latex2html/Makefile
+++ b/japanese/latex2html/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	 ja-latex2html
-# Version required:	98.1jpatch-2.1
 # Date created:		3 Apr 1999
 # Whom:			Sugimoto Sadahiro <ixtl@utmc.or.jp>
 #
@@ -8,13 +7,15 @@
 # Default image format is GIF.
 # If you prefer PNG to GIF, define USE_PNG (`make -DUSE_PNG`).
 
-DISTNAME=	latex2html-98.1p1
-PKGNAME= 	ja-latex2html-98.1j2.1
+PORTNAME=	latex2html
+PORTVERSION=	${VERSION}j${JP_VERSION}
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www-dsed.llnl.gov/files/programs/unix/latex2html/sources/ \
 		ftp://ftp.mpn.com/pub/nikos/latex2html-mirror/sources/ \
 		http://www.topstudio.co.jp/~kmuto/software/latex2html/patch/98-1/
-DISTFILES=	latex2html-98.1p1.tar.gz latex2html-98.1jpatch-2.1.tar.gz
+DISTNAME=	${PORTNAME}-${VERSION}p1
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-${VERSION}jpatch-${JP_VERSION}.tar.gz
 
 MAINTAINER=	ixtl@utmc.or.jp
 
@@ -27,6 +28,9 @@ RUN_DEPENDS=	${PREFIX}/bin/latex:${PORTSDIR}/print/latex \
 RUN_DEPENDS +=	${X11BASE}/bin/pnmtopng:${PORTSDIR}/graphics/pnmtopng
 .endif
 
+VERSION=	98.1
+JP_VERSION=	2.1
+
 WRKSRC=	${WRKDIR}/latex2html
 USE_PERL5=	yes
 NO_BUILD=	yes
diff --git a/japanese/less/Makefile b/japanese/less/Makefile
index 380e9c4ddb21..b03e8f588c38 100644
--- a/japanese/less/Makefile
+++ b/japanese/less/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	jless
-# Version required:	332
 # Date created:		7 March 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	less-332
-PKGNAME=	ja-less-332
+PORTNAME=	less
+PORTVERSION=	332
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.big.or.jp/pub/usr2/jam/less/contrib/
@@ -17,13 +16,12 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://ftp.big.or.jp/pub/usr2/jam/less/
-PATCHFILES=	less-332-iso242.patch.gz \
-		less-332-iso242-243.patch.gz \
-		less-332-iso243-244.patch.gz \
-		less-332-iso244-245.patch.gz \
-		less-332-iso245-247.patch.gz \
-		less-332-iso247-248.patch.gz
-
+PATCHFILES=	${DISTNAME}-iso242.patch.gz \
+		${DISTNAME}-iso242-243.patch.gz \
+		${DISTNAME}-iso243-244.patch.gz \
+		${DISTNAME}-iso244-245.patch.gz \
+		${DISTNAME}-iso245-247.patch.gz \
+		${DISTNAME}-iso247-248.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	nobu@psrc.isac.co.jp
diff --git a/japanese/lesw/Makefile b/japanese/lesw/Makefile
index 8e0bee1eadcb..143fdc84e85a 100644
--- a/japanese/lesw/Makefile
+++ b/japanese/lesw/Makefile
@@ -1,26 +1,26 @@
 # New ports collection makefile for:	lesw
-# Version required:	332
 # Date created:		11 November 1998
 # Whom:			Toshihiko Kodama <kodama@ayame.mfd.cs.fujitsu.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	less-332
-PKGNAME=	ja-lesw-332
+PORTNAME=	lesw
+PORTVERSION=	332
 CATEGORIES=	japanese
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ftp.big.or.jp/pub/usr2/jam/less/contrib/
+DISTNAME=	less-${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.big.or.jp/pub/usr2/jam/less/ \
 		http://www.st.rim.or.jp/~sasami/lesw/
-PATCHFILES=	less-332-iso242.patch.gz \
-		less-332-iso242-243.patch.gz \
-		less-332-iso243-244.patch.gz \
-		less-332-iso244-245.patch.gz \
-		less-332-iso245-247.patch.gz \
-		less-332-iso247-248.patch.gz \
-		lw332i248p10c.patch.gz
+PATCHFILES=	${DISTNAME}-iso242.patch.gz \
+		${DISTNAME}-iso242-243.patch.gz \
+		${DISTNAME}-iso243-244.patch.gz \
+		${DISTNAME}-iso244-245.patch.gz \
+		${DISTNAME}-iso245-247.patch.gz \
+		${DISTNAME}-iso247-248.patch.gz \
+		lw${PORTVERSION}i248p10c.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	kodama@ayame.mfd.cs.fujitsu.co.jp
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index 1fc2a12179e9..3012797cfa3f 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for:	libicq
-# Version required:		0.33
 # Date Created:			22 Oct 1998
 # Whom:				Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libicq-0.33
-PKGNAME=	ja-libicq-0.33
+PORTNAME=	libicq
+PORTVERSION=	0.33
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.korsoft.com/pub/gicq/ \
 		http://www.nectar.com/distfiles/
 
 PATCH_SITES=	http://people.FreeBSD.org/~flathill/distfiles/ \
 		http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
-PATCHFILES=	libicq-0.33ja.patch
+PATCHFILES=	${DISTNAME}ja.patch
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	flathill@FreeBSD.org
diff --git a/japanese/libimg/Makefile b/japanese/libimg/Makefile
index c312576e175a..5c1a24e307de 100644
--- a/japanese/libimg/Makefile
+++ b/japanese/libimg/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	img
-# Version required:	1.2b2
 # Date created:		25 March 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	img1.2b2
-PKGNAME=	ja-libimg-1.2b2
+PORTNAME=	libimg
+PORTVERSION=	1.2b2
 CATEGORIES=	graphics tk80 japanese
 MASTER_SITES=	ftp://ftp.neosoft.com/pub/tcl/sorted/packages-8.0/graphics/Img/1.2/ \
 		http://www.aaa-int.or.jp/~jfactory/TkStep/dist/
+DISTNAME=	img${PORTVERSION}
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
diff --git a/japanese/libjcode/Makefile b/japanese/libjcode/Makefile
index 30ffcb475fa7..3bdbc4894edb 100644
--- a/japanese/libjcode/Makefile
+++ b/japanese/libjcode/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	libjcode
-# Version required:	1.00
 # Date created:		8 MAY 1999
 # Whom:			Shuichi Tanaka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	libjcode
-PKGNAME=	ja-libjcode-1.00
+PORTNAME=	libjcode
+PORTVERSION=	1.00
 CATEGORIES=	japanese net
 MASTER_SITES=	http://keemun.soraneko.com/gtkicq/archives/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	stanaka@bb.mbn.or.jp
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-1.00
+WRKSRC=		${WRKDIR}/${DISTNAME}-${PORTVERSION}
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/libjcode.a	${PREFIX}/lib/libjcode.a
diff --git a/japanese/libslang/Makefile b/japanese/libslang/Makefile
index 42a1f72486c5..090ae7449141 100644
--- a/japanese/libslang/Makefile
+++ b/japanese/libslang/Makefile
@@ -1,25 +1,29 @@
 # New ports collection makefile for:	ja-S-lang library
-# Version required:	1.4.0jp0
 # Date created:		3 September 1999
 # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	slang-1.3.10jp0-20000123
-PKGNAME=	ja-libslang-1.4.0.j0
+PORTNAME=	libslang
+PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese devel
 MASTER_SITES=	http://home.sprintmail.com/~kikutani/slang/ \
 		http://www.actweb.ne.jp/k-yosino/
+DISTNAME=	slang-${PREV_VERSION}-20000123
 
 PATCH_SITES=	http://www.actweb.ne.jp/k-yosino/
-PATCHFILES=	1.3.10jp0__1.4.0jp0.diff.gz
+PATCHFILES=	${PREV_VERSION}__${VERSION}jp${JP_VERSION}.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mega@minz.org
 
+VERSION=	1.4.0
+JP_VERSION=	0
+PREV_VERSION=	1.3.10jp0
+
 GNU_CONFIGURE=	yes
-WRKSRC=		${WRKDIR}/slang-1.3.10jp0
+WRKSRC=		${WRKDIR}/slang-${PREV_VERSION}
 CONFIGURE_ARGS=	--includedir=${PREFIX}/include/slang
 ALL_TARGET=	all elf
 INSTALL_TARGET=	install-elf
diff --git a/japanese/linux-netscape47-communicator/Makefile b/japanese/linux-netscape47-communicator/Makefile
index c1b6b1653015..01913e353712 100644
--- a/japanese/linux-netscape47-communicator/Makefile
+++ b/japanese/linux-netscape47-communicator/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.7x
 # Date created:		24 Mar 2000
 # Whom:			imura@FreeBSD.org
 #
diff --git a/japanese/linux-netscape47-navigator/Makefile b/japanese/linux-netscape47-navigator/Makefile
index 0656ef96d573..ea4e4e8e50d9 100644
--- a/japanese/linux-netscape47-navigator/Makefile
+++ b/japanese/linux-netscape47-navigator/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.7x
 # Date created:		26 Mar 2000
 # Whom:			sada@FreeBSD.org
 #
diff --git a/japanese/linux_locale/Makefile b/japanese/linux_locale/Makefile
index ba9f90df4f16..db5a4062d1d0 100644
--- a/japanese/linux_locale/Makefile
+++ b/japanese/linux_locale/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:    ja-linux_locale
-# Version required:	13
 # Date created:         March 20 2000
 # Whom:                 imura@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME=	locale-ja_${VERSION}
-PKGNAME=	ja-linux_locale-13.0
+PORTNAME=	linux_locale
+PORTVERSION=	${VERSION}.0
 CATEGORIES=	japanese emulators linux
 MASTER_SITES=	ftp://ftp.debian.org/debian/dists/potato/main/source/admin/ \
 		http://people.FreeBSD.org/~imura/distfiles/
+DISTNAME=	locale-ja_${VERSION}
 
 MAINTAINER=	imura@FreeBSD.org
 
diff --git a/japanese/lipsf/Makefile b/japanese/lipsf/Makefile
index da8f50edfb4e..1685dc571426 100644
--- a/japanese/lipsf/Makefile
+++ b/japanese/lipsf/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for: lipsf
-# Version required:	1.14a
 # Date created:		6 Dec 1996
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lpsf114a
-PKGNAME=	ja-lipsf-1.14a
+PORTNAME=	lipsf
+PORTVERSION=	1.14a
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/unix/writing/print/
 EXTRACT_SUFX=	.tgz
+DISTNAME=	lpsf${PORTVERSION:S/.//}
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
-WRKSRC=		${WRKDIR}/lipsf-114a
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.//}
 
 MANLANG=	ja
 MAN1=		lipsf.1 pols.1
diff --git a/japanese/lookup-emacs20/Makefile b/japanese/lookup-emacs20/Makefile
index 71646b2a6670..cd75f541378c 100644
--- a/japanese/lookup-emacs20/Makefile
+++ b/japanese/lookup-emacs20/Makefile
@@ -1,12 +1,13 @@
 # New ports collection makefile for:	lookup for Emacs20
-# Version required:	1.2
 # Date created:		98/11/19
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-lookup-emacs20-1.2
+PORTNAME=	lookup
+PORTVERSION=	1.2
+PKGNAMESUFFIX=	-emacs20
 CATEGORIES=	japanese elisp
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile
index c2245fc2ef12..7a05a0dbe27b 100644
--- a/japanese/lookup-emacs21/Makefile
+++ b/japanese/lookup-emacs21/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	lookup for Mule 2.3
-# Version required:	1.2
 # Date created:		98/11/19
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lookup-1.2
-PKGNAME?=	ja-lookup-mule-1.2
+PORTNAME=	lookup
+PORTVERSION=	1.2
+PKGNAMESUFFIX?=	-mule
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/lookup/DIST/
 
@@ -37,7 +37,7 @@ do-install:
 	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
 	${RM} ${ELISPDIR}/lookup-compile.el
-	${SED} -e 's,@VERSION@,1.2,' -e 's,@pkgemacsdir@,${ELISPDIR},' \
+	${SED} -e 's,@VERSION@,${PORTVERSION},' -e 's,@pkgemacsdir@,${ELISPDIR},' \
 		${WRKSRC}/lisp/lookup-vars.el.in > ${ELISPDIR}/lookup-vars.el
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup-guide.info ${PORTINFODIR}
diff --git a/japanese/lookup-mule/Makefile b/japanese/lookup-mule/Makefile
index c2245fc2ef12..7a05a0dbe27b 100644
--- a/japanese/lookup-mule/Makefile
+++ b/japanese/lookup-mule/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	lookup for Mule 2.3
-# Version required:	1.2
 # Date created:		98/11/19
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lookup-1.2
-PKGNAME?=	ja-lookup-mule-1.2
+PORTNAME=	lookup
+PORTVERSION=	1.2
+PKGNAMESUFFIX?=	-mule
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/lookup/DIST/
 
@@ -37,7 +37,7 @@ do-install:
 	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
 	${RM} ${ELISPDIR}/lookup-compile.el
-	${SED} -e 's,@VERSION@,1.2,' -e 's,@pkgemacsdir@,${ELISPDIR},' \
+	${SED} -e 's,@VERSION@,${PORTVERSION},' -e 's,@pkgemacsdir@,${ELISPDIR},' \
 		${WRKSRC}/lisp/lookup-vars.el.in > ${ELISPDIR}/lookup-vars.el
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup-guide.info ${PORTINFODIR}
diff --git a/japanese/lookup-xemacs/Makefile b/japanese/lookup-xemacs/Makefile
index 798dc083b88c..614b175b3f81 100644
--- a/japanese/lookup-xemacs/Makefile
+++ b/japanese/lookup-xemacs/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	lookup for XEmacs
-# Version required:	1.2
 # Date created:		98/11/19
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-lookup-xemacs-1.2
+PKGNAMESUFFIX=	-xemacs
 
 MASTERDIR=	${.CURDIR}/../lookup-mule
 EMACS=		xemacs
diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile
index c2245fc2ef12..7a05a0dbe27b 100644
--- a/japanese/lookup/Makefile
+++ b/japanese/lookup/Makefile
@@ -1,13 +1,13 @@
 # New ports collection makefile for:	lookup for Mule 2.3
-# Version required:	1.2
 # Date created:		98/11/19
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lookup-1.2
-PKGNAME?=	ja-lookup-mule-1.2
+PORTNAME=	lookup
+PORTVERSION=	1.2
+PKGNAMESUFFIX?=	-mule
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/lookup/DIST/
 
@@ -37,7 +37,7 @@ do-install:
 	${MKDIR} ${ELISPDIR} ${PORTINFODIR};
 	${INSTALL_DATA} ${WRKSRC}/lisp/*.el ${ELISPDIR}
 	${RM} ${ELISPDIR}/lookup-compile.el
-	${SED} -e 's,@VERSION@,1.2,' -e 's,@pkgemacsdir@,${ELISPDIR},' \
+	${SED} -e 's,@VERSION@,${PORTVERSION},' -e 's,@pkgemacsdir@,${ELISPDIR},' \
 		${WRKSRC}/lisp/lookup-vars.el.in > ${ELISPDIR}/lookup-vars.el
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup.info* ${PORTINFODIR}
 	${INSTALL_DATA} ${WRKSRC}/texi/lookup-guide.info ${PORTINFODIR}
diff --git a/japanese/lynx-current/Makefile b/japanese/lynx-current/Makefile
index ba8f8478f86e..335a65546d4d 100644
--- a/japanese/lynx-current/Makefile
+++ b/japanese/lynx-current/Makefile
@@ -1,25 +1,30 @@
 # New ports collection makefile for:	ja-lynx-current
-# Version required:     2.8.3dev.16
 # Date created:         10 August 1998
 # Whom:                 Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lynx2.8.3dev.16
-PKGNAME=	ja-lynx-2.8.3dev.16
+PORTNAME=	lynx
+PORTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
 CATEGORIES=	japanese www
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://people.FreeBSD.org/~shige/ports/distfiles/ \
 		http://sol.slcc.edu/lynx/current/
+DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
+
 
 MAINTAINER=	shige@FreeBSD.org
 
 FORBIDDEN=  "Riddled with buffer overflows exploitable by a malicious server to execute code as the local user."
 
+WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
+
+VERSION=	2.8.3
+MINOR_VERSION=	dev.16
+
 USE_BZIP2=	YES
 NO_LATEST_LINK=	YES
-WRKSRC=		${WRKDIR}/lynx2-8-3
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-screen=ncurses --with-zlib \
 		--libdir="${PREFIX}/${LYNX_LIB}" \
diff --git a/japanese/lynx/Makefile b/japanese/lynx/Makefile
index 2a80de9c8467..78ab01da22bd 100644
--- a/japanese/lynx/Makefile
+++ b/japanese/lynx/Makefile
@@ -1,21 +1,24 @@
 # New ports collection makefile for:	ja-lynx
-# Version required:     2.8.2 release 1
 # Date created:         10 August 1998
 # Whom:                 Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       lynx2.8.2rel.1
-PKGNAME=        ja-lynx-2.8.2.rel1
+PORTNAME=	lynx
+PORTVERSION=	${VERSION}.${MINOR_VERSION:S/.//}
 CATEGORIES=	japanese www
 MASTER_SITES=   http://sol.slcc.edu/lynx/current/
+DISTNAME=	${PORTNAME}${VERSION}${MINOR_VERSION}
 
 MAINTAINER=	shige@FreeBSD.org
 
 FORBIDDEN=  "Riddled with buffer overflows exploitable by a malicious server to execute code as the local user."
 
-WRKSRC=		${WRKDIR}/lynx2-8-2
+WRKSRC=		${WRKDIR}/${PORTNAME}${VERSION:S/./-/g}
+
+VERSION=	2.8.2
+MINOR_VERSION=	rel.1
 
 USE_BZIP2?=	YES
 GNU_CONFIGURE=  YES
diff --git a/japanese/lyx-doc/Makefile b/japanese/lyx-doc/Makefile
index 68ef67339531..329ecb820f0e 100644
--- a/japanese/lyx-doc/Makefile
+++ b/japanese/lyx-doc/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	lyx-doc
-# Version required:	1.0.3
 # Date created:		10 Nov 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja_LyX_Doc.1.0.3
-PKGNAME=	ja-lyx_doc-1.0.3
+PORTNAME=	lyx_doc
+PORTVERSION=	1.0.3
 CATEGORIES=	japanese print
 MASTER_SITES=	http://www.hiei.kit.ac.jp/~hitomi/lyx/
+DISTNAME=	ja_LyX_Doc.${PORTVERSION}
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
diff --git a/japanese/lyx/Makefile b/japanese/lyx/Makefile
index 185442f5dfc2..36cba2f8330f 100644
--- a/japanese/lyx/Makefile
+++ b/japanese/lyx/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	lyx
-# Version required:	1.0.3
 # Date created:		27 April 1999
 # Whom:			Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	lyx-1.0.3
-PKGNAME=	ja-lyx-1.0.3
+PORTNAME=	lyx
+PORTVERSION=	1.0.3
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.lyx.org/pub/lyx/stable/ \
 		ftp://la1ad.uio.no/pub/lyx/ \
 		ftp://alpha.tat.physik.uni-tuebingen.de/pub/lyx/stable/ \
 		ftp://ftp.sdsc.edu/pub/other/lyx/stable/ \
 		http://cgi.din.or.jp/~kawakami/product/LyX/
-DISTFILES=	lyx-1.0.3.tar.gz lyx-jp-kit0.10b4for1.0.3.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-jp-kit0.10b4for${PORTVERSION}.tar.gz
 
 MAINTAINER=	flathill@FreeBSD.ORG
 
diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile
index 5624e38b7ec1..d225e7fb5356 100644
--- a/japanese/magicpoint/Makefile
+++ b/japanese/magicpoint/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	magicpoint (with vflib)
-# Version required:	1.05a
 # Date created:		25 Dec 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
@@ -11,7 +10,8 @@ COMMENT=	${.CURDIR}/pkg/COMMENT
 
 LIB_DEPENDS=	VFlib2.24:${PORTSDIR}/japanese/vflib
 
-PKGNAME=	ja-magicpoint-1.06a
+PORTNAME=	magicpoint
+PORTVERSION=	1.06a
 CATEGORIES=	japanese
 
 MAINTAINER=	itojun@itojun.org
diff --git a/japanese/makejvf/Makefile b/japanese/makejvf/Makefile
index dcedc0eda2fb..2110902501f5 100644
--- a/japanese/makejvf/Makefile
+++ b/japanese/makejvf/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:   makejvf-fkr-1.0
-# Version required:    1.0
 # Date created:        6 Oct 1999
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	makejvf-1.0-fkr
-PKGNAME=	ja-makejvf-fkr-1.0
+PORTNAME=	makejvf-fkr
+PORTVERSION=	1.0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.tooyoo.l.u-tokyo.ac.jp/pub/TeX/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/jvf/ \
 		${MASTER_SITE_LOCAL}
+DISTNAME=	makejvf-${PORTVERSION}-fkr
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		standard${EXTRACT_SUFX} nmin-ngoth${EXTRACT_SUFX} \
 		jis${EXTRACT_SUFX} morisawa${EXTRACT_SUFX}
diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile
index 20be9ffa4a7c..f16adf87ef58 100644
--- a/japanese/man-doc/Makefile
+++ b/japanese/man-doc/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Japanese man documents
-# Version required:	3.4
 # Date created:		6 January 1997
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jpman-3.4
-PKGNAME=	ja-man-doc-3.4
+PORTNAME=	man-doc
+PORTVERSION=	3.4
 CATEGORIES=	japanese
 DISTFILES=	# none
 
diff --git a/japanese/man/Makefile b/japanese/man/Makefile
index 05a374375550..277c01e726aa 100644
--- a/japanese/man/Makefile
+++ b/japanese/man/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	jman - japanese man with EUC
-# Version required:	1.1h
 # Date created:		4 December 1996
 # Whom:			Kiriyama Kazuhiko <kiri@kiri.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jp-man-1.1h
-PKGNAME=	ja-man-1.1h
+PORTNAME=	man
+PORTVERSION=	1.1h
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://daemon.jp.freebsd.org/pub/FreeBSD-jp/man-jp/ \
 		${MASTER_SITE_PORTS_JP}
+DISTNAME=	jp-${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	kuriyama@FreeBSD.org
 
diff --git a/japanese/mendexk-euc/Makefile b/japanese/mendexk-euc/Makefile
index dcb43e1c4dd5..ee98696860c7 100644
--- a/japanese/mendexk-euc/Makefile
+++ b/japanese/mendexk-euc/Makefile
@@ -1,16 +1,17 @@
 # New ports collection makefile for:    mendexk-euc
-# Version required:     2.4d
 # Date created:         1 Dec 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mendexk2.4d
-PKGNAME=	ja-mendexk-euc-2.4d
+PORTNAME=	mendexk
+PORTVERSION=	2.4d
+PKGNAMESUFFIX=	-euc
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${KPATHSEA_PARENT}${EXTRACT_SUFX}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/mendexk-sjis/Makefile b/japanese/mendexk-sjis/Makefile
index ee92dd97038d..4df62f6400c0 100644
--- a/japanese/mendexk-sjis/Makefile
+++ b/japanese/mendexk-sjis/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:    mendexk-sjis
-# Version required:     2.4d
 # Date created:         1 Dec 1997
 # Whom:                 Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mendexk2.4d
-PKGNAME=	ja-mendexk-sjis-2.4d
+PORTNAME=	mendexk
+PKGNAMESUFFIX=	-sjis
+PORTVERSION=	2.4d
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/mendex/ \
 		ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
+DISTNAME=	${PORTNAME}${PORTVERSION}
+
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${KPATHSEA_PARENT}${EXTRACT_SUFX}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
diff --git a/japanese/mh/Makefile b/japanese/mh/Makefile
index 04d10f23c908..b83f82e7225b 100644
--- a/japanese/mh/Makefile
+++ b/japanese/mh/Makefile
@@ -1,23 +1,26 @@
 # New ports collection makefile for:	mh (Japanese)
-# Version required:	6.8.4
 # Date created:		28 March 1995
 # Whom:			Akito FUJITA <fujita@zoo.ncl.omron.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mh-6.8.4-JP-3.03
-PKGNAME=	ja-mh-6.8.4.3.03
+PORTNAME=	mh
+PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese mail
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		ftp://komadori.planet.sci.kobe-u.ac.jp/pub/MH/ \
 		ftp://ftp.chem.eng.himeji-tech.ac.jp/pub/net/mh/
+DISTNAME=	${PORTNAME}-${VERSION}-JP-${JP_VERSION}
 
 MAINTAINER=	motoyuki@freebsd.org
 
 BUILD_DEPENDS=	jless:${PORTSDIR}/japanese/less
 RUN_DEPENDS=	jless:${PORTSDIR}/japanese/less
 
+VERSION=	6.8.4
+JP_VERSION=	3.03
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-batchmode \
 		--enable-apop=${PREFIX}/etc/pop.auth --enable-rpop
diff --git a/japanese/mhonarc/Makefile b/japanese/mhonarc/Makefile
index 9f997122e07c..1afe1f60437e 100644
--- a/japanese/mhonarc/Makefile
+++ b/japanese/mhonarc/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	MHonArc
-# Version required:		2.3.3
 # Date created:			17 March 1999
 # Whom:				Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	MHonArc2.3.3
-PKGNAME=	ja-mhonarc-2.3.3
+PORTNAME=	mhonarc
+PORTVERSION=	2.3.3
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.oac.uci.edu/indiv/ehood/tar/ \
 		ftp://hhobel.phl.univie.ac.at/MHonArc/ \
@@ -16,11 +15,13 @@ MASTER_SITES=	http://www.oac.uci.edu/indiv/ehood/tar/ \
 		http://www.perl.com/CPAN/authors/id/EHOOD/ \
 		http://www.shiratori.riec.tohoku.ac.jp/~p-katoh/Hack/Docs/mhonarc-jp/ \
 		http://people.FreeBSD.org/~flathill/distfiles/
-DISTFILES=	MHonArc2.3.3.tar.gz iso2022.pl
+DISTNAME=	MHonArc${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		iso2022.pl
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	flathill@FreeBSD.org
 
-EXTRACT_ONLY=	MHonArc2.3.3.tar.gz
 Y2K=		http://www.oac.uci.edu/indiv/ehood/MHonArc/doc/faq/general.html#y2k
 
 USE_PERL5=	Yes
diff --git a/japanese/micq/Makefile b/japanese/micq/Makefile
index 182e2ed62746..b6e9bae14e83 100644
--- a/japanese/micq/Makefile
+++ b/japanese/micq/Makefile
@@ -1,25 +1,24 @@
 # New ports collection makefile for:	micq
-# Version required:			0.4.3
 # Date created:				31 Oct 1998
 # Whom:					flathill
 #
 # $FreeBSD$
 #
 
-DISTNAME=	micq-0.4.3
-PKGNAME=	ja-micq-0.4.3
+PORTNAME=	micq
+PORTVERSION=	0.4.3
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://micq.chatzone.org/pub/micq/V0.4.3/ \
 		http://people.FreeBSD.org/~flathill/distfiles/
 EXTRACT_SUFX=	.tgz
 
 PATCH_SITES=	http://people.FreeBSD.org/~flathill/distfiles/
-PATCHFILES=	micq-0.4.3-jp.patch
+PATCHFILES=	${DISTNAME}-jp.patch
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	flathill@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/micq-0.4.3
+WRKSRC=		${WRKDIR}/${DISTNAME}
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/micq ${PREFIX}/bin
diff --git a/japanese/mimekit/Makefile b/japanese/mimekit/Makefile
index 45d0795a4ba3..a4fdb46b4720 100644
--- a/japanese/mimekit/Makefile
+++ b/japanese/mimekit/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	mimekit
-# Version required:		1.7
 # Date created:			9 April 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mimekit1.7
-PKGNAME=	ja-mimekit-1.7
+PORTNAME=	mimekit
+PORTVERSION=	1.7
 CATEGORIES=	japanese devel mail
 MASTER_SITES=	ftp://etlport.etl.go.jp/pub/ccipr/DeleGate/ \
 		ftp://ftp.iij.ad.jp/pub/mail/mime/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/mnews-gnspool/Makefile b/japanese/mnews-gnspool/Makefile
index 4fb52a06dee7..9aeea4c0a0e7 100644
--- a/japanese/mnews-gnspool/Makefile
+++ b/japanese/mnews-gnspool/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mnews-gnspool
-# Version required:		1.22
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mnews-gnspool-1.22
+PKGNAMESUFFIX=	-gnspool
 
 RUN_DEPENDS=	gnspool:${PORTSDIR}/japanese/gn-gnspool
 
diff --git a/japanese/mnews-im/Makefile b/japanese/mnews-im/Makefile
index fdd4ed0a123e..ab2aba0be6ab 100644
--- a/japanese/mnews-im/Makefile
+++ b/japanese/mnews-im/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mnews-im
-# Version required:		1.22
 # Date created:			03 Jan 2000
 # Whom:				SADA Kenji <sada@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mnews-im-1.22
+PKGNAMESUFFIX=	-im
 
 RUN_DEPENDS=	imput:${PORTSDIR}/mail/im
 
diff --git a/japanese/mnews/Makefile b/japanese/mnews/Makefile
index bb730961bd78..6ac23cd9ca0b 100644
--- a/japanese/mnews/Makefile
+++ b/japanese/mnews/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	mnews
-# Version required:		1.22
 # Date created:			23 Sep 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mnews122
-PKGNAME?=	ja-mnews-1.22
+PORTNAME=	mnews
+PORTVERSION=	1.22
 CATEGORIES=	japanese news ipv6
 MASTER_SITES=	ftp://ftp.leo.chubu.ac.jp/pub/network/mnews/
+DISTNAME=	mnews${PORTVERSION:S/.//}
 
 MAINTAINER=	seiken@ARGV.AC
 
-WRKSRC=		${WRKDIR}/mnews-1.22/build
+WRKSRC=		${WRKDIR}/mnews-${PORTVERSION}/build
 MAN1=		mnews.1
 MANLANG=	ja
 
diff --git a/japanese/mtools/Makefile b/japanese/mtools/Makefile
index f7027a2e3703..4a361ecc6a04 100644
--- a/japanese/mtools/Makefile
+++ b/japanese/mtools/Makefile
@@ -1,22 +1,21 @@
 # New ports collection makefile for:    mtools + support 1232KB , Unicode LFN
-# Version required:     3.6
 # Date created:		6 October 1997
 # Whom:			WATANABE junya <junya-w@remus.dti.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mtools-3.6
-PKGNAME=	ja-mtools-3.6
+PORTNAME=	mtools
+PORTVERSION=	3.6
 CATEGORIES=	japanese emulators
 MASTER_SITES=	${MASTER_SITE_GNU} \
 		ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
-DISTFILES=	mtools-3.6.tar.gz mtools-3.6.PC98.patch.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${DISTNAME}.PC98.patch.gz
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	junya-w@remus.dti.ne.jp
 
-EXTRACT_ONLY=	mtools-3.6.tar.gz
-
 GNU_CONFIGURE=  yes
 CONFIGURE_ARGS=	--enable-xdf
 CONFIGURE_TARGET=	# empty
diff --git a/japanese/muggy/Makefile b/japanese/muggy/Makefile
index 7f72128a8336..08973d2692b8 100644
--- a/japanese/muggy/Makefile
+++ b/japanese/muggy/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	Muggy for ja-TkStep
-# Version required:	1.2
 # Date created:		25 March 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
diff --git a/japanese/mule-canna+freewnn+sj3/Makefile b/japanese/mule-canna+freewnn+sj3/Makefile
index b57c6d840ee5..e038f7c78bc6 100644
--- a/japanese/mule-canna+freewnn+sj3/Makefile
+++ b/japanese/mule-canna+freewnn+sj3/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna, sj3 and Wnn4
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna+sj3+wnn4-2.3
+PKGNAMESUFFIX=	-canna+sj3+wnn4
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-canna+freewnn/Makefile b/japanese/mule-canna+freewnn/Makefile
index 1b0ce4973975..b36d487ebac4 100644
--- a/japanese/mule-canna+freewnn/Makefile
+++ b/japanese/mule-canna+freewnn/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna and Wnn4
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna+wnn4-2.3
+PKGNAMESUFFIX=	-canna+wnn4
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-canna+sj3+wnn6/Makefile b/japanese/mule-canna+sj3+wnn6/Makefile
index de024dbae34e..1024913f4faf 100644
--- a/japanese/mule-canna+sj3+wnn6/Makefile
+++ b/japanese/mule-canna+sj3+wnn6/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna, sj3 and Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna+sj3+wnn6-2.3
+PKGNAMESUFFIX=	-canna+sj3+wnn6
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-canna+sj3+wnn7/Makefile b/japanese/mule-canna+sj3+wnn7/Makefile
index de024dbae34e..1024913f4faf 100644
--- a/japanese/mule-canna+sj3+wnn7/Makefile
+++ b/japanese/mule-canna+sj3+wnn7/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna, sj3 and Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna+sj3+wnn6-2.3
+PKGNAMESUFFIX=	-canna+sj3+wnn6
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-canna+sj3/Makefile b/japanese/mule-canna+sj3/Makefile
index c2ad6d89ceb5..d623c1fc2bc6 100644
--- a/japanese/mule-canna+sj3/Makefile
+++ b/japanese/mule-canna+sj3/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna and sj3
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna+sj3-2.3
+PKGNAMESUFFIX=	-canna+sj3
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-canna+wnn6/Makefile b/japanese/mule-canna+wnn6/Makefile
index ba1729418754..e16ac7ae5a5f 100644
--- a/japanese/mule-canna+wnn6/Makefile
+++ b/japanese/mule-canna+wnn6/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna and Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna+wnn6-2.3
+PKGNAMESUFFIX=	-canna+wnn6
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-canna+wnn7/Makefile b/japanese/mule-canna+wnn7/Makefile
index ba1729418754..e16ac7ae5a5f 100644
--- a/japanese/mule-canna+wnn7/Makefile
+++ b/japanese/mule-canna+wnn7/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna and Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna+wnn6-2.3
+PKGNAMESUFFIX=	-canna+wnn6
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-canna/Makefile b/japanese/mule-canna/Makefile
index 7db1408db03b..9b082632ebac 100644
--- a/japanese/mule-canna/Makefile
+++ b/japanese/mule-canna/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Canna
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-canna-2.3
+PKGNAMESUFFIX=	-canna
 CATEGORIES=	japanese editors
 
 CANNA=		yes
diff --git a/japanese/mule-freewnn+sj3/Makefile b/japanese/mule-freewnn+sj3/Makefile
index a08c5a355882..2c6fb83e59c2 100644
--- a/japanese/mule-freewnn+sj3/Makefile
+++ b/japanese/mule-freewnn+sj3/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with sj3 and Wnn4
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-sj3+wnn4-2.3
+PKGNAMESUFFIX=	-sj3+wnn4
 CATEGORIES=	japanese editors
 
 SJ3=		yes
diff --git a/japanese/mule-freewnn/Makefile b/japanese/mule-freewnn/Makefile
index 098ef5b2da7a..401f0188d64c 100644
--- a/japanese/mule-freewnn/Makefile
+++ b/japanese/mule-freewnn/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Wnn4
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-wnn4-2.3
+PKGNAMESUFFIX=	-wnn4
 CATEGORIES=	japanese editors
 
 WNN4=		yes
diff --git a/japanese/mule-sj3+wnn6/Makefile b/japanese/mule-sj3+wnn6/Makefile
index ae6c34eb00b2..7173c41608c9 100644
--- a/japanese/mule-sj3+wnn6/Makefile
+++ b/japanese/mule-sj3+wnn6/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with sj3 and Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-sj3+wnn6-2.3
+PKGNAMESUFFIX=	-sj3+wnn6
 CATEGORIES=	japanese editors
 
 SJ3=		yes
diff --git a/japanese/mule-sj3+wnn7/Makefile b/japanese/mule-sj3+wnn7/Makefile
index ae6c34eb00b2..7173c41608c9 100644
--- a/japanese/mule-sj3+wnn7/Makefile
+++ b/japanese/mule-sj3+wnn7/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with sj3 and Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-sj3+wnn6-2.3
+PKGNAMESUFFIX=	-sj3+wnn6
 CATEGORIES=	japanese editors
 
 SJ3=		yes
diff --git a/japanese/mule-sj3/Makefile b/japanese/mule-sj3/Makefile
index 21a0ff329aa6..fd4d004e761b 100644
--- a/japanese/mule-sj3/Makefile
+++ b/japanese/mule-sj3/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with sj3
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-sj3-2.3
+PKGNAMESUFFIX=	-sj3
 CATEGORIES=	japanese editors
 
 SJ3=		yes
diff --git a/japanese/mule-wnn6/Makefile b/japanese/mule-wnn6/Makefile
index 88f874c5b5aa..7efc7665b988 100644
--- a/japanese/mule-wnn6/Makefile
+++ b/japanese/mule-wnn6/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-wnn6-2.3
+PKGNAMESUFFIX=	-wnn6
 CATEGORIES=	japanese editors
 
 WNN6=		yes
diff --git a/japanese/mule-wnn7/Makefile b/japanese/mule-wnn7/Makefile
index 88f874c5b5aa..7efc7665b988 100644
--- a/japanese/mule-wnn7/Makefile
+++ b/japanese/mule-wnn7/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	mule 2.3@19.34 with Wnn6
-# Version required:	2.3@19.34
 # Date created:		7 July 1997
 # Whom:			Satoshi Taoka <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-mule-wnn6-2.3
+PKGNAMESUFFIX=	-wnn6
 CATEGORIES=	japanese editors
 
 WNN6=		yes
diff --git a/japanese/mutt-devel/Makefile b/japanese/mutt-devel/Makefile
index 7cc40598fccd..ccd99b34b095 100644
--- a/japanese/mutt-devel/Makefile
+++ b/japanese/mutt-devel/Makefile
@@ -1,22 +1,23 @@
 # New ports collection makefile for:	ja-mutt
-# Version required:	1.0i
 # Date created:		5 Sep 1999
 # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mutt-1.0.1i
-PKGNAME=	ja-mutt-1.0.1.j0
+PORTNAME=	mutt
+PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese mail
 MASTER_SITES=	ftp://ftp.gbnet.net/pub/mutt-international/ \
 		ftp://ftp.guug.de/pub/mutt/ \
 		ftp://ftp.guug.de/pub/mutt/historic/ \
 		http://www.hiei.kit.ac.jp/~hitomi/mutt/
-DISTFILES=	mutt-1.0.1i.tar.gz manual_ja-1.0i-2.tar.gz
+DISTNAME=	${PORTNAME}-${VERSION}i
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		manual_ja-${VERSION:R}i-2.tar.gz
 
 PATCH_SITES=	http://kondara.sdri.co.jp/~kikutani/slang/
-PATCHFILES=	mutt-1.0.1i-jp0.patch.gz
+PATCHFILES=	${DISTNAME}-jp${JP_VERSION}.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
@@ -27,10 +28,13 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext \
 		automake:${PORTSDIR}/devel/automake
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
+VERSION=	1.0.1
+JP_VERSION=	0
+
 DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/mutt-1.0.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix --with-included-gettext \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/share/mutt \
diff --git a/japanese/mutt/Makefile b/japanese/mutt/Makefile
index 7cc40598fccd..ccd99b34b095 100644
--- a/japanese/mutt/Makefile
+++ b/japanese/mutt/Makefile
@@ -1,22 +1,23 @@
 # New ports collection makefile for:	ja-mutt
-# Version required:	1.0i
 # Date created:		5 Sep 1999
 # Whom:			IWASHITA Yoji <shuna@pop16.odn.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mutt-1.0.1i
-PKGNAME=	ja-mutt-1.0.1.j0
+PORTNAME=	mutt
+PORTVERSION=	${VERSION}.j${JP_VERSION}
 CATEGORIES=	japanese mail
 MASTER_SITES=	ftp://ftp.gbnet.net/pub/mutt-international/ \
 		ftp://ftp.guug.de/pub/mutt/ \
 		ftp://ftp.guug.de/pub/mutt/historic/ \
 		http://www.hiei.kit.ac.jp/~hitomi/mutt/
-DISTFILES=	mutt-1.0.1i.tar.gz manual_ja-1.0i-2.tar.gz
+DISTNAME=	${PORTNAME}-${VERSION}i
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		manual_ja-${VERSION:R}i-2.tar.gz
 
 PATCH_SITES=	http://kondara.sdri.co.jp/~kikutani/slang/
-PATCHFILES=	mutt-1.0.1i-jp0.patch.gz
+PATCHFILES=	${DISTNAME}-jp${JP_VERSION}.patch.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	shuna@pop16.odn.ne.jp
@@ -27,10 +28,13 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/msgfmt:${PORTSDIR}/devel/gettext \
 		automake:${PORTSDIR}/devel/automake
 RUN_DEPENDS=	urlview:${PORTSDIR}/textproc/urlview
 
+VERSION=	1.0.1
+JP_VERSION=	0
+
 DIST_SUBDIR=	mutt
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/mutt-1.0.1
+WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
 CONFIGURE_ARGS=	--with-slang --enable-locales-fix --with-included-gettext \
 		--enable-flock --disable-fcntl \
 		--sysconfdir=${PREFIX}/share/mutt \
diff --git a/japanese/namazu/Makefile b/japanese/namazu/Makefile
index 4c47720402d7..23c18694c5c5 100644
--- a/japanese/namazu/Makefile
+++ b/japanese/namazu/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	namazu
-# Version required:	1.3.0.11
 # Date created:		17 March 1998
 # Whom:			Seiichirou Hiraoka
 #
 # $FreeBSD$
 #
 
-DISTNAME=	namazu-1.3.0.11
-PKGNAME=	ja-namazu-1.3.0.11
+PORTNAME=	namazu
+PORTVERSION=	1.3.0.11
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.namazu.org/stable/ \
 		http://people.FreeBSD.org/~flathill/distfiles/
@@ -22,6 +21,6 @@ RUN_DEPENDS=	kakasi:${PORTSDIR}/japanese/kakasi \
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
-WRKSRC=		${WRKDIR}/namazu-1.3.0.11/src
+WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 .include <bsd.port.mk>
diff --git a/japanese/namazu2/Makefile b/japanese/namazu2/Makefile
index 483d129006d4..42813787a338 100644
--- a/japanese/namazu2/Makefile
+++ b/japanese/namazu2/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTNAME=	ja-namazu2
+PORTNAME=	namazu2
 PORTVERSION=	2.0.3
 CATEGORIES=	japanese textproc
 MASTER_SITES=	http://www.namazu.org/stable/
diff --git a/japanese/ndtpd/Makefile b/japanese/ndtpd/Makefile
index 576a03498616..5763b283e75b 100644
--- a/japanese/ndtpd/Makefile
+++ b/japanese/ndtpd/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	ndtpd
-# Version required:		2.3.7
 # Date created:			4 Aug 1998
 # Whom:				Motoyuki Kasahara <m-kasahr@sra.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ndtpd-2.3.7
-PKGNAME=	ja-ndtpd-2.3.7
+PORTNAME=	ndtpd
+PORTVERSION=	2.3.7
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/net/ndtp/ndtpd/
 
diff --git a/japanese/ne/Makefile b/japanese/ne/Makefile
index a36da22c66d2..2458333b27d1 100644
--- a/japanese/ne/Makefile
+++ b/japanese/ne/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:    nxedit
-# Version required:    3.04
 # Date created:        15 Nov 1999
 # Whom:                SASAKI Shunsuke <ele@pop17.odn.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ne-3.04
-PKGNAME=	ja-ne-3.04
+PORTNAME=	ne
+PORTVERSION=	3.04
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA018758/archive/
 
diff --git a/japanese/nethack/Makefile b/japanese/nethack/Makefile
index df5cf6cdf189..9fb5ea4d5c4e 100644
--- a/japanese/nethack/Makefile
+++ b/japanese/nethack/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.2.2 + 1.0.5.19970924
 # Date created:		13 February 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	ja-nethack-1.0.5.19970924
+PORTNAME=	nethack
+PORTVERSION=	1.0.5.19970924
 CATEGORIES=	japanese games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	${PORTNAME}-3.2.2
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/nethack/
-PATCHFILES=	jnethack-1.0.5.19970924.gz
+PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/nethack32/Makefile b/japanese/nethack32/Makefile
index df5cf6cdf189..9fb5ea4d5c4e 100644
--- a/japanese/nethack32/Makefile
+++ b/japanese/nethack32/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.2.2 + 1.0.5.19970924
 # Date created:		13 February 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	ja-nethack-1.0.5.19970924
+PORTNAME=	nethack
+PORTVERSION=	1.0.5.19970924
 CATEGORIES=	japanese games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	${PORTNAME}-3.2.2
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/nethack/
-PATCHFILES=	jnethack-1.0.5.19970924.gz
+PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/nethack34/Makefile b/japanese/nethack34/Makefile
index df5cf6cdf189..9fb5ea4d5c4e 100644
--- a/japanese/nethack34/Makefile
+++ b/japanese/nethack34/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	nethack
-# Version required:	3.2.2 + 1.0.5.19970924
 # Date created:		13 February 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nethack-3.2.2
-PKGNAME=	ja-nethack-1.0.5.19970924
+PORTNAME=	nethack
+PORTVERSION=	1.0.5.19970924
 CATEGORIES=	japanese games
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	nethack
+DISTNAME=	${PORTNAME}-3.2.2
 
 PATCH_SITES=	ftp://mitsuko.jaist.ac.jp/pub/nethack/
-PATCHFILES=	jnethack-1.0.5.19970924.gz
+PATCHFILES=	j${PORTNAME}-${PORTVERSION}.gz
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/netscape-fonts/Makefile b/japanese/netscape-fonts/Makefile
index 5e93a2651388..a6b02790166a 100644
--- a/japanese/netscape-fonts/Makefile
+++ b/japanese/netscape-fonts/Makefile
@@ -1,12 +1,12 @@
 # Ports collection makefile for: Japanese Font Setup for Netscape browsers
-# Version required:	1.0
 # Date created:		22 Jun 1998
 # Whom:                 sada
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-netscape-fonts-1.0
+PORTNAME=	netscape-fonts
+PORTVERSION=	1.0
 CATEGORIES=	japanese www x11-fonts
 DISTFILES=	# empty
 
diff --git a/japanese/netscape3.language/Makefile b/japanese/netscape3.language/Makefile
index dcef25f9cfff..b43070cbf48f 100644
--- a/japanese/netscape3.language/Makefile
+++ b/japanese/netscape3.language/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for: netscape3.language
-# Version required:	3.04
 # Date created:		17 November 1997
 # Whom:			SADA Kenji <sada@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-netscape-3.04
+PORTNAME=	netscape
+PORTVERSION=	3.04
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.bpel.tutics.tut.ac.jp/~take/Netscape/etc/ \
 		http://www.bpel.tutics.tut.ac.jp/~take/Netscape/resources/
@@ -16,9 +16,8 @@ DISTFILES=	NLS.tar.gz \
 
 MAINTAINER=	sada@FreeBSD.org
 
-RUN_DEPENDS= \
-	${PREFIX}/bin/netscape:${PORTSDIR}/www/netscape3 \
-	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
+RUN_DEPENDS=	${LOCALBASE}/bin/netscape:${PORTSDIR}/www/netscape3 \
+		${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
 DIST_SUBDIR=	netscape3
 NO_WRKSUBDIR=	YES
diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index e79866906483..db50424b0b3a 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.08
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
-PKGNAME=	ja-netscape-${BROWSER_ARC}-${BROWSER_VERSION}
+PORTNAME=	netscape-${BROWSER_ARC}
+PORTVERSION=	${BROWSER_VERSION}
 CATEGORIES=	japanese www
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.bres.tsukuba.ac.jp/~yohta/netscape/
+DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
 
 MAINTAINER=	sada@FreeBSD.org
 
diff --git a/japanese/netscape4-navigator/Makefile b/japanese/netscape4-navigator/Makefile
index 2aa5539d457d..89f11f6a1013 100644
--- a/japanese/netscape4-navigator/Makefile
+++ b/japanese/netscape4-navigator/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.08
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.org
 #
diff --git a/japanese/netscape47-communicator/Makefile b/japanese/netscape47-communicator/Makefile
index bdfb9361543e..4a4d3f7f0712 100644
--- a/japanese/netscape47-communicator/Makefile
+++ b/japanese/netscape47-communicator/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.7*
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
diff --git a/japanese/netscape47-navigator/Makefile b/japanese/netscape47-navigator/Makefile
index f6e0e7fa5a8e..9580d70739aa 100644
--- a/japanese/netscape47-navigator/Makefile
+++ b/japanese/netscape47-navigator/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.7
 # Date created:		29 Dec 1998
 # Whom:			sada@FreeBSD.org
 #
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index e79866906483..db50424b0b3a 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.08
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
-PKGNAME=	ja-netscape-${BROWSER_ARC}-${BROWSER_VERSION}
+PORTNAME=	netscape-${BROWSER_ARC}
+PORTVERSION=	${BROWSER_VERSION}
 CATEGORIES=	japanese www
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.bres.tsukuba.ac.jp/~yohta/netscape/
+DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
 
 MAINTAINER=	sada@FreeBSD.org
 
diff --git a/japanese/newosaka/Makefile b/japanese/newosaka/Makefile
index af4145ad4191..7a741215480c 100644
--- a/japanese/newosaka/Makefile
+++ b/japanese/newosaka/Makefile
@@ -1,19 +1,20 @@
 # New ports collection makefile for:   newosaka
-# Version required:    1.0
 # Date created:        20 January 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	newosaka
-PKGNAME=	ja-newosaka-1.0
+PORTNAME=	newosaka
+PORTVERSION=	1.0
 CATEGORIES+=	japanese
 MASTER_SITES=	ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
 DISTFILES=	new-osaka.tar.gz
 
 MAINTAINER=	nakai@FreeBSD.org
 
+WRKSRC=		${WRKDIR}/${PORTNAME}
+
 do-build:
 	(cd ${WRKSRC}; ${CC} ${CFLAGS} -o osaka osaka.c -I${WRKSRC})
 
diff --git a/japanese/ng-canna/Makefile b/japanese/ng-canna/Makefile
index 1e2508129761..aacf611f48db 100644
--- a/japanese/ng-canna/Makefile
+++ b/japanese/ng-canna/Makefile
@@ -1,21 +1,22 @@
 # New ports collection Makefile for: ja-ng-canna
-# Version required:	ng1.3Lcanna1.0.2
 # Date created:		11 January 1999
 # Whom:				HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ng13Lcanna1.0.2
-PKGNAME=	ja-ng-canna-1.3l
+PORTNAME=	ng
+PORTVERSION=	1.3L
+PKGNAMESUFFIX=	-canna
 CATEGORIES=	japanese editors
 MASTER_SITES=	http://www3.tky.3web.ne.jp/~quiver/ng/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}canna1.0.2
 
 MAINTAINER=	honda@kashio.info.mie-u.ac.jp
 
 LIB_DEPENDS=    canna:${PORTSDIR}/japanese/Canna
 
-WRKSRC=		${WRKDIR}/ng
+WRKSRC=		${WRKDIR}/${PORTNAME}
 ALL_TARGET=	ng
 
 post-patch:
diff --git a/japanese/ng-devel/Makefile b/japanese/ng-devel/Makefile
index fe3751340b68..65903c6d3e4d 100644
--- a/japanese/ng-devel/Makefile
+++ b/japanese/ng-devel/Makefile
@@ -1,19 +1,18 @@
 # New ports collection makefile for:    Ng
-# Version required:     1.3L
 # Date created:         18 November 1998
 # Whom:                 Kawaguti Ginga <ginga@athena.club.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       ng-1.3L
-PKGNAME=        ja-ng-1.3l
+PORTNAME=	ng
+PORTVERSION=	1.3L
 CATEGORIES=     japanese editors
 MASTER_SITES=   ftp://ftp.iis.u-tokyo.ac.jp/unix/Editor/
 
 MAINTAINER=     ginga@athena.club.ne.jp
 
-WRKSRC=         ${WRKDIR}/Ng-1.3L
+WRKSRC=         ${WRKDIR}/Ng-${PORTVERSION}
 ALL_TARGET=	ng
 
 post-patch:
diff --git a/japanese/ng/Makefile b/japanese/ng/Makefile
index fe3751340b68..65903c6d3e4d 100644
--- a/japanese/ng/Makefile
+++ b/japanese/ng/Makefile
@@ -1,19 +1,18 @@
 # New ports collection makefile for:    Ng
-# Version required:     1.3L
 # Date created:         18 November 1998
 # Whom:                 Kawaguti Ginga <ginga@athena.club.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       ng-1.3L
-PKGNAME=        ja-ng-1.3l
+PORTNAME=	ng
+PORTVERSION=	1.3L
 CATEGORIES=     japanese editors
 MASTER_SITES=   ftp://ftp.iis.u-tokyo.ac.jp/unix/Editor/
 
 MAINTAINER=     ginga@athena.club.ne.jp
 
-WRKSRC=         ${WRKDIR}/Ng-1.3L
+WRKSRC=         ${WRKDIR}/Ng-${PORTVERSION}
 ALL_TARGET=	ng
 
 post-patch:
diff --git a/japanese/ngraph-fonts/Makefile b/japanese/ngraph-fonts/Makefile
index b13d02b1efc8..9609ad97542d 100644
--- a/japanese/ngraph-fonts/Makefile
+++ b/japanese/ngraph-fonts/Makefile
@@ -1,12 +1,12 @@
 # Ports collection makefile for: Japanese Font Setup for math/ngraph
-# Version required:	1.0
 # Date created:		6 December 1999
 # Whom:			Yoshiro MIHIRA <sanpei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-ngraph-fonts-1.0
+PORTNAME=	ngraph-fonts
+PORTVERSION=	1.0
 CATEGORIES=	japanese math x11-fonts
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/japanese/nkf/Makefile b/japanese/nkf/Makefile
index 272c7ccdfcac..e745df764ba0 100644
--- a/japanese/nkf/Makefile
+++ b/japanese/nkf/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	nkf
-# Version required:	1.71
 # Date created:		5 February 1995
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nkf171
-PKGNAME=	ja-nkf-1.71
+PORTNAME=	nkf
+PORTVERSION=	1.71
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.ie.u-ryukyu.ac.jp/pub/software/kono/ \
 		ftp://ftp.win.ne.jp/pub/misc/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/tools/code-conv/nkf/
 EXTRACT_SUFX=	.shar
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/nvi-euc-jp/Makefile b/japanese/nvi-euc-jp/Makefile
index d9cdd604fadc..4482ec09df5e 100644
--- a/japanese/nvi-euc-jp/Makefile
+++ b/japanese/nvi-euc-jp/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	nvi-1.79 + multilingual patch(euc-jp)
-# Version required:	1.79
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-nvi-eucjp-1.79.19991117
+PKGNAMESUFFIX=	-eucjp
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 COMMENT=	${.CURDIR}/pkg/COMMENT
diff --git a/japanese/nvi-iso-2022-jp/Makefile b/japanese/nvi-iso-2022-jp/Makefile
index e8acace68047..3dc83934dac5 100644
--- a/japanese/nvi-iso-2022-jp/Makefile
+++ b/japanese/nvi-iso-2022-jp/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	nvi-1.79 + multilingual patch(iso-2022-jp)
-# Version required:	1.79
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-nvi-iso2022jp-1.79.19991117
+PKGNAMESUFFIX=	-iso2022jp
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 COMMENT=	${.CURDIR}/pkg/COMMENT
diff --git a/japanese/nvi-sjis/Makefile b/japanese/nvi-sjis/Makefile
index 9bc1cb7f9433..a24c2011903e 100644
--- a/japanese/nvi-sjis/Makefile
+++ b/japanese/nvi-sjis/Makefile
@@ -1,12 +1,11 @@
 # New ports collection makefile for:	nvi-1.79 + multilingual patch(sjis)
-# Version required:	1.79
 # Date created:		6 Mar 1997
 # Whom:			Jun-ichiro itojun Itoh <itojun@itojun.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-nvi-sjis-1.79.19991117
+PKGNAMESUFFIX=	-sjis
 
 MASTERDIR=	${.CURDIR}/../../editors/nvi-m17n
 COMMENT=	${.CURDIR}/pkg/COMMENT
diff --git a/japanese/okphone/Makefile b/japanese/okphone/Makefile
index a8f1ade83780..91bb4c259794 100644
--- a/japanese/okphone/Makefile
+++ b/japanese/okphone/Makefile
@@ -1,18 +1,17 @@
 # New ports collection makefile for:	okphone
-# Version required:	1.2
 # Date created:		7 February 1996
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	okphone-1.2
-PKGNAME=	ja-okphone-1.2
+PORTNAME=	okphone
+PORTVERSION=	1.2
 CATEGORIES=	japanese net
 MASTER_SITES=	ftp://ftp.fit.ac.jp/pub/Net/okphone/
 
 PATCH_SITES=	ftp://ftp.fit.ac.jp/pub/Net/okphone/patch/
-PATCHFILES=	okphone-1.2.FreeBSD-patch.rev2.gz
+PATCHFILES=	${DISTNAME}.FreeBSD-patch.rev2.gz
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/oleo/Makefile b/japanese/oleo/Makefile
index b6f59b1c27e9..dfcb602ce451 100644
--- a/japanese/oleo/Makefile
+++ b/japanese/oleo/Makefile
@@ -1,21 +1,21 @@
 # New ports collection makefile for:	ja-oleo
-# Version required:	1.6
 # Date created:		2 March 1997
 # Whom:			Yoshiro MIHIRA
 #
 # $FreeBSD$
 #
 
-DISTNAME=	oleo-1.6
-PKGNAME=	ja-oleo-1.6
+PORTNAME=	oleo
+PORTVERSION=	1.6
 CATEGORIES=	japanese math
 MASTER_SITES=	http://www.hh.iij4u.or.jp/~hayasida/oleo/ \
 		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	oleo
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} oleo-doc.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-doc.tar.gz
 
 PATCH_SITES=	http://www.hh.iij4u.or.jp/%7Ehayasida/oleo/
-PATCHFILES=	oleo-1.6-1.6jb2.diff.gz
+PATCHFILES=	${DISTNAME}-${PORTVERSION}jb2.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=    sanpei@sanpei.org
author	Akinori MUSHA <knu@FreeBSD.org>	2000-04-11 14:15:53 +0000
committer	Akinori MUSHA <knu@FreeBSD.org>	2000-04-11 14:15:53 +0000
commit	edcf8b3594b5df6440713253552b675fb0234474 (patch)
tree	cb86ff29b6c34e6d077c56ce53ca461f9623f343
parent	7b4b0c4f33915abb1f15e37f30ce951ba7aa94e6 (diff)
download	ports-edcf8b3594b5df6440713253552b675fb0234474.tar.gz ports-edcf8b3594b5df6440713253552b675fb0234474.zip