Update the japanese/[o-t]* ports with the new

PORT{NAME,VERSION}/PKGNAME{PRE,SUF}FIX variables.
author: knu <knu@FreeBSD.org> 2000-04-12 22:38:12 +0800
committer: knu <knu@FreeBSD.org> 2000-04-12 22:38:12 +0800
commit: bbefe911602a99ae8eef0107c5a54a1238569918 (patch)
tree: e6a784c6fcf9fb5518d628b989fe84202164cacf /japanese
parent: df90bfb709b014707e299439696404a9c2b543f8 (diff)
download: freebsd-ports-gnome-bbefe911602a99ae8eef0107c5a54a1238569918.tar.gz
freebsd-ports-gnome-bbefe911602a99ae8eef0107c5a54a1238569918.tar.zst
freebsd-ports-gnome-bbefe911602a99ae8eef0107c5a54a1238569918.zip
112 files changed, 363 insertions, 1531 deletions
diff --git a/japanese/ddskk/Makefile b/japanese/ddskk/Makefile
index bb195f33474e..33dd3e19a210 100644
--- a/japanese/ddskk/Makefile
+++ b/japanese/ddskk/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	skk-elisp
-# Version required:	9.6
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skk9.6
-PKGNAME=	ja-skk-elisp-9.6
+PORTNAME=	skk-elisp
+PORTVERSION=	9.6
 CATEGORIES=	japanese elisp
-MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
+MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/${PORTVERSION}/
+DISTNAME=	skk${PORTVERSION}
 
 MAINTAINER=	matusita@jp.freebsd.org
 
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PREFIX}/share/skk/${SKKJISYO}:${SKK_MASTERDIR}
 SKKJISYO_SIZE?=	L
 SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 SKK_MASTERDIR=	${.CURDIR}/../../japanese/skk-jisyo
-WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-9.6
+WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-${PORTVERSION}
 
 # we cannot use skk-9.6 on emacs20
 EMACS=		mule
diff --git a/japanese/onew-canna+freewnn/Makefile b/japanese/onew-canna+freewnn/Makefile
index 9a3b5874e7cf..add244d57c65 100644
--- a/japanese/onew-canna+freewnn/Makefile
+++ b/japanese/onew-canna+freewnn/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	ONEW 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-onew-canna+wnn4-2.2.10
 CANNA=		yes
 WNN4=		yes
 
diff --git a/japanese/onew-canna+wnn6/Makefile b/japanese/onew-canna+wnn6/Makefile
index 546239b6f05c..55107d9338a0 100644
--- a/japanese/onew-canna+wnn6/Makefile
+++ b/japanese/onew-canna+wnn6/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	ONEW 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-onew-canna+wnn6-2.2.10
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/onew-canna+wnn7/Makefile b/japanese/onew-canna+wnn7/Makefile
index 546239b6f05c..55107d9338a0 100644
--- a/japanese/onew-canna+wnn7/Makefile
+++ b/japanese/onew-canna+wnn7/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	ONEW 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-onew-canna+wnn6-2.2.10
 CANNA=		yes
 WNN6=		yes
 
diff --git a/japanese/onew-canna/Makefile b/japanese/onew-canna/Makefile
index 0b5e4724b30b..7e7e4f67face 100644
--- a/japanese/onew-canna/Makefile
+++ b/japanese/onew-canna/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	ONEW for Canna
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-onew-canna-2.2.10
 CANNA=		yes
 
 MASTERDIR=	${.CURDIR}/../onew-wnn4
diff --git a/japanese/onew-freewnn/Makefile b/japanese/onew-freewnn/Makefile
index f0d149e51eb9..e12d80183ca7 100644
--- a/japanese/onew-freewnn/Makefile
+++ b/japanese/onew-freewnn/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	ONEW for Wnn4
-# 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-onew-wnn4-2.2.10
+PORTNAME=	onew
+PORTVERSION?=	2.2.10
+PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 		ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/
+DISTNAME=	jvim2.0r+${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/onew
+WRKSRC=		${WRKDIR}/${PORTNAME}
 # A value 'all' must not be set to TARGET.
 ALL_TARGET=	
 
diff --git a/japanese/onew-wnn6/Makefile b/japanese/onew-wnn6/Makefile
index c706a8d657e7..df734714d3aa 100644
--- a/japanese/onew-wnn6/Makefile
+++ b/japanese/onew-wnn6/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	ONEW for Wnn6
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-onew-wnn6-2.2.10
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../onew-wnn4
diff --git a/japanese/onew-wnn7/Makefile b/japanese/onew-wnn7/Makefile
index c706a8d657e7..df734714d3aa 100644
--- a/japanese/onew-wnn7/Makefile
+++ b/japanese/onew-wnn7/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	ONEW for Wnn6
-# Version required:	jvim2.0r+onew2.2.10
 # Date created:		5 Sep 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-onew-wnn6-2.2.10
 WNN6=		yes
 
 MASTERDIR=	${.CURDIR}/../onew-wnn4
diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile
index f0d149e51eb9..e12d80183ca7 100644
--- a/japanese/onew/Makefile
+++ b/japanese/onew/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	ONEW for Wnn4
-# 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-onew-wnn4-2.2.10
+PORTNAME=	onew
+PORTVERSION?=	2.2.10
+PKGNAMESUFFIX=	${INPUT_METHOD}
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Japan/onew/ \
 		ftp://ftp.leo.chubu.ac.jp/pub/editor/jvim/
+DISTNAME=	jvim2.0r+${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/onew
+WRKSRC=		${WRKDIR}/${PORTNAME}
 # A value 'all' must not be set to TARGET.
 ALL_TARGET=	
 
diff --git a/japanese/p5-Jcode/Makefile b/japanese/p5-Jcode/Makefile
index ae3aefc3ba6e..42822a4ba819 100644
--- a/japanese/p5-Jcode/Makefile
+++ b/japanese/p5-Jcode/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	Jcode
-# Version required:	0.60
 # Date created:		7 Nov 1999
 # Whom:			Jun Kuriyama <kuriyama@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Jcode-0.60
-PKGNAME=	ja-p5-Jcode-0.60
+PORTNAME=	Jcode
+PORTVERSION=	0.60
 CATEGORIES=	japanese perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	../../authors/id/D/DA/DANKOGAI
@@ -24,7 +23,11 @@ MAN3=		Jcode.3 Jcode::Unicode.3 Jcode::Unicode::Constants.3 \
 		Jcode::Unicode::NoXS.3
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-Text-Kakasi/Makefile b/japanese/p5-Text-Kakasi/Makefile
index e8e195f62742..920ddcba3b81 100644
--- a/japanese/p5-Text-Kakasi/Makefile
+++ b/japanese/p5-Text-Kakasi/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	p5-kakasi
-# Version required:	1.01
 # Date created:		25 February 2000
 # Whom:			Akinori MUSHA aka knu <knu@idaemons.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	Text-Kakasi-1.01
-PKGNAME=	ja-p5-Text-Kakasi-1.01
+PORTNAME=	Text-Kakasi
+PORTVERSION=	1.01
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://www.daionet.gr.jp/~knok/kakasi/
 
@@ -20,7 +19,11 @@ USE_PERL5=	YES
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		Text::Kakasi.3
 
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-jcode.pl/Makefile b/japanese/p5-jcode.pl/Makefile
index a15ec7cb6663..792b107928ef 100644
--- a/japanese/p5-jcode.pl/Makefile
+++ b/japanese/p5-jcode.pl/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	p5-jcode.pl
-# Version required:			2.10
 # Date created:				26 Jun 1998
 # Whom:					SADA Kenji <sada@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	jcode.pl-2.10
-PKGNAME=	ja-p5-jcode.pl-2.10
+PORTNAME=	jcode.pl
+PORTVERSION=	2.10
 CATEGORIES=	japanese perl5
 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@FreeBSD.org
 
@@ -26,8 +25,12 @@ PLIST_SUB=	INSTALL_BASE=${INSTALL_BASE}
 INSTALL_BASE=	lib/perl5/site_perl/${PERL_VER}
 INSTALL_DIR=	${PREFIX}/${INSTALL_BASE}
 
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
 do-install:
 	${MKDIR} ${INSTALL_DIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME} ${INSTALL_DIR}/jcode.pl
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile
index ae0c92165303..4a57ade2665d 100644
--- a/japanese/p5-manual/Makefile
+++ b/japanese/p5-manual/Makefile
@@ -1,17 +1,17 @@
 # New ports collection makefile for:	perl5jman
-# Version required:	5.000
 # Date created:		29 June 1998
 # Whom:			SADA Kenji <sada@e-mail.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.000man-j
-PKGNAME=	ja-p5-man-5.000
+PORTNAME=	man
+PORTVERSION=	5.000
 CATEGORIES=	japanese perl5
 MASTER_SITES=	ftp://ftp.sra.co.jp/pub/lang/perl/
+DISTNAME=	perl${PORTVERSION}${PORTNAME}-j
 
-MAINTAINER=	sada@e-mail.ne.jp
+MAINTAINER=	sada@FreeBSD.org
 
 NO_BUILD=	yes
 MANPREFIX=	${PREFIX}/man/ja
@@ -29,6 +29,10 @@ CAT3=		Abbrev.3pm AnyDBMFile.3pm AutoLoader.3pm AutoSplit.3pm \
 		Open2.3pm Open3.3pm POSIX.3pm Ping.3pm Socket.3pm \
 		integer.3pm less.3pm sigtrap.3pm strict.3pm subs.3pm
 
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
 post-extract:
 	@cd ${WRKDIR} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \
 		perl5man.tgz ${EXTRACT_AFTER_ARGS}
@@ -45,7 +49,7 @@ do-install:
 .endfor
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
 
 plist:
 	@${ECHO} -n >${PLIST}
diff --git a/japanese/p5-mkres/Makefile b/japanese/p5-mkres/Makefile
index b40199bde0f5..25f08e3351ee 100644
--- a/japanese/p5-mkres/Makefile
+++ b/japanese/p5-mkres/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	mkres.pl
-# Version required:	1.4
 # Date created:		29 Jun 1998
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	mkres.pl-1.4
-PKGNAME=	ja-p5-mkres-1.4
+PORTNAME=	mkres
+PORTVERSION=	1.4
 CATEGORIES=	japanese perl5
 MASTER_SITES=	http://ftp.infonets.hiroshima-u.ac.jp/~taoka/FreeBSD/tt/
-EXTRACT_SUFX=	''
+EXTRACT_SUFX=	# none
+DISTNAME=	${PORTNAME}.pl-${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
 
@@ -19,6 +19,10 @@ RUN_DEPENDS=	mkttfdir:${PORTSDIR}/print/perlftlib
 USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
 
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
 do-extract:
 		@${RM} -rf ${WRKDIR}
 		@${MKDIR} ${WRKDIR}
@@ -35,4 +39,4 @@ do-install:
 		${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \
 			${PREFIX}/bin/mkres.pl
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index a5c2568ae63e..acb6215ab220 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	p5-nkf
-# Version required:	0.01
 # Date created:		23 Feb 2000
 # Whom:			max
 #
 # $FreeBSD$
 #
 
-DISTNAME=	nkf171
-PKGNAME=	ja-p5-nkf-0.01
+PORTNAME=	nkf
+PORTVERSION=	0.01
 CATEGORIES=	japanese perl5
 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}171
 
 MAINTAINER=	max@FreeBSD.org
 
@@ -25,7 +25,11 @@ WRKSRC=	${WRKDIR}/NKF
 MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=		NKF.3
 
+.include <bsd.port.pre.mk>
+
+PKGNAMEPREFIX:=	${PKGNAMEPREFIX}p5-
+
 do-configure:
 	@ cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/japanese/paledit/Makefile b/japanese/paledit/Makefile
index 147e4852b030..d38c4aef5cc9 100644
--- a/japanese/paledit/Makefile
+++ b/japanese/paledit/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	paledit
-# Version required:	1.0
 # Date created:		14 Jan 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	paledit-0.91
-PKGNAME=	ja-${DISTNAME}
+PORTNAME=	paledit
+PORTVERSION=	0.91
 CATEGORIES=	japanese sysutils
 MASTER_SITES=	http://www.swlab.csce.kyushu-u.ac.jp/~nom/prj/paledit/
 
diff --git a/japanese/perl5/Makefile b/japanese/perl5/Makefile
index ba825666e07b..2e6e9cbc283e 100644
--- a/japanese/perl5/Makefile
+++ b/japanese/perl5/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	ja-perl5
-# Version required:	5.005_03
 # Date created:		7 January 1997
 # Whom:			Yoshiro MIHIRA
 #
 # $FreeBSD$
 #
 
-DISTNAME=	perl5.005_03
-PKGNAME=	ja-perl-5.005.03
+PORTNAME=	perl
+PORTVERSION=	${JPERL_VER}.${JPERL_VER_PL}
 CATEGORIES=	japanese perl5
 MASTER_SITES=	ftp://ftp.cpan.org/CPAN/src/5.0/ \
 		ftp://ftp.funet.fi/pub/languages/perl/CPAN/src/5.0/ \
@@ -21,6 +20,7 @@ MASTER_SITES=	ftp://ftp.cpan.org/CPAN/src/5.0/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/src/5.0/ \
 		ftp://ftp.delphi.com/pub/mirrors/packages/perl/CPAN/src/5.0/ \
 		ftp://uiarchive.cso.uiuc.edu/pub/lang/perl/CPAN/src/5.0/
+DISTNAME=	${PORTNAME}${JPERL_VER}_${JPERL_VER_PL}
 
 PATCH_SITES=	ftp://ftp.cpan.org/CPAN/authors/id/WATANABE/ \
 		ftp://ftp.funet.fi/pub/languages/perl/CPAN/authors/id/WATANABE/ \
@@ -34,7 +34,7 @@ PATCH_SITES=	ftp://ftp.cpan.org/CPAN/authors/id/WATANABE/ \
 		ftp://ftp.cis.ufl.edu/pub/perl/CPAN/authors/id/WATANABE/ \
 		ftp://ftp.delphi.com/pub/mirrors/packages/perl/CPAN/authors/id/WATANABE/ \
 		ftp://uiarchive.cso.uiuc.edu/pub/lang/perl/CPAN/authors/id/WATANABE/
-PATCHFILES=	jperl5.005_03-990822.pat.gz
+PATCHFILES=	j${DISTNAME}-990822.pat.gz
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	shige@FreeBSD.org
@@ -46,8 +46,9 @@ CONFIGURE_SCRIPT=	Configure
 CONFIGURE_ARGS=		-sde -Dprefix=${PREFIX} -Duseshrplib \
 			-Dlibperl=libperl.so.${PERL_SHLIBVER}
 
-JPERL_VERSION=	5.00503
 JPERL_VER=	5.005
+JPERL_VER_PL=	03
+JPERL_VERSION=	${JPERL_VER}${JPERL_VER_PL}
 .if ${PORTOBJFORMAT} == "aout"
 PERL_SHLIBVER=	1.0
 .else
diff --git a/japanese/pgp.language/Makefile b/japanese/pgp.language/Makefile
index a02663d7fcf7..c3d5fbf7e022 100644
--- a/japanese/pgp.language/Makefile
+++ b/japanese/pgp.language/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for: pgp.language (japanese)
-# Version required:     2.6.3ia
 # Date created:         9 May 1997
 # Whom:                 Hironori Ikura <hikura@kaisei.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pgp263i-${PGP_LANGUAGE}
-PKGNAME=	jp-pgp-2.6.3
+PORTNAME=	pgp
+PORTVERSION=	2.6.3
 CATEGORIES=	japanese security
 MASTER_SITES=	ftp://ftp.win.or.jp/pub/network/pgp/2.x/lang/ \
 		ftp://ftp.ifi.uio.no/pub/pgp/2.x/lang/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}i-japanese
 
 MAINTAINER=	hikura@kaisei.org
 
diff --git a/japanese/pine/Makefile b/japanese/pine/Makefile
deleted file mode 100644
index a7f5d3cb0f5f..000000000000
--- a/japanese/pine/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-# New ports collection makefile for:	jp-pine
-# Version required:	3.95lj1.1b3
-# Date created:		01 May 1996
-# Whom:			masafumi
-#
-# $FreeBSD$
-#
-
-DISTNAME=	pine3.95
-PKGNAME=	ja-pine-3.95
-CATEGORIES=	japanese mail
-MASTER_SITES=	ftp://ftp.cac.washington.edu/pine/ \
-		${MASTER_SITE_PORTS_JP}
-DISTFILES=	pine3.95.tar.gz pine3.95lj1.1b2.tar.gz
-
-PATCHFILES=	pine3.95lj1.1b2-b3.diff.gz
-PATCH_SITES=	${MASTER_SITE_PORTS_JP}
-
-MAINTAINER=	max@FreeBSD.org
-
-BROKEN_ELF=	yes
-
-LIB_DEPENDS=	canna.1:${PORTSDIR}/japanese/Canna
-BUILD_DEPENDS=	${PREFIX}/lib/libcanna.a:${PORTSDIR}/japanese/Canna
-
-EXTRACT_ONLY=	pine3.95.tar.gz
-MAN1=		pine.1 pilot.1 pico.1
-
-pre-patch:
-	@(cd ${WRKSRC}; \
-	  tar zxf ${DISTDIR}/pine3.95lj1.1b2.tar.gz; \
-	  patch -s -p0 < japan/pine3.95lj1.1b2.diff)
-
-do-build:
-	(cd ${WRKSRC}; ./build bsf)
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pico ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pilot ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pine ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/bin/libpico.so.1.3 $(PREFIX)/lib
-	${INSTALL_MAN} ${WRKSRC}/doc/pico.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/pilot.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/pine.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/lib/pine
-	${INSTALL_DATA} ${WRKSRC}/pine/pine.hlp ${PREFIX}/lib/pine
-	${INSTALL_DATA} ${WRKSRC}/pine/pine.ndx ${PREFIX}/lib/pine
-	${INSTALL_DATA} ${WRKSRC}/pine/pine_ja.hlp ${PREFIX}/lib/pine
-	${INSTALL_DATA} ${WRKSRC}/pine/pine_ja.ndx ${PREFIX}/lib/pine
-	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
-.include <bsd.port.mk>
diff --git a/japanese/pine/distinfo b/japanese/pine/distinfo
deleted file mode 100644
index fba68dd421b9..000000000000
--- a/japanese/pine/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (pine3.95.tar.gz) = e99dd57904a035571776d7dc0c632d46
-MD5 (pine3.95lj1.1b2.tar.gz) = 13d549f7140e2c85c417dbed397a7810
-MD5 (pine3.95lj1.1b2-b3.diff.gz) = 5ea9dfcbc92de6da4c5efb8453a33fd7
diff --git a/japanese/pine/files/patch-aa b/japanese/pine/files/patch-aa
deleted file mode 100644
index 61a22c67432d..000000000000
--- a/japanese/pine/files/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-*** pico/os_unix.c.orig	Fri Sep 20 13:43:41 1996
---- pico/os_unix.c	Fri Sep 20 13:44:43 1996
-***************
-*** 1527,1533 ****
-  #endif
-      extern int  sys_nerr;
-  
-!     return((err >= 0 && err < sys_nerr) ? sys_errlist[err] : NULL);
-  }
-  
-  
---- 1527,1533 ----
-  #endif
-      extern int  sys_nerr;
-  
-!     return(((err >= 0) && (err < sys_nerr)) ? (char*)sys_errlist[err] : NULL);
-  }
-  
-  
diff --git a/japanese/pine/files/patch-ab b/japanese/pine/files/patch-ab
deleted file mode 100644
index a4a347426dbb..000000000000
--- a/japanese/pine/files/patch-ab
+++ /dev/null
@@ -1,106 +0,0 @@
-*** pico/makefile.bsf.orig	Fri Sep 20 13:44:43 1996
---- pico/makefile.bsf	Fri Sep 20 13:44:43 1996
-***************
-*** 0 ****
---- 1,101 ----
-+ #
-+ #   Michael Seibel
-+ #   Networks and Distributed Computing
-+ #   Computing and Communications
-+ #   University of Washington
-+ #   Administration Builiding, AG-44
-+ #   Seattle, Washington, 98195, USA
-+ #   Internet: mikes@cac.washington.edu
-+ #
-+ #   Please address all bugs and comments to "pine-bugs@cac.washington.edu"
-+ #
-+ #
-+ #   Pine and Pico are registered trademarks of the University of Washington.
-+ #   No commercial use of these trademarks may be made without prior written
-+ #   permission of the University of Washington.
-+ #
-+ #   Pine, Pico, and Pilot software and its included text are Copyright
-+ #   1989-1996 by the University of Washington.
-+ #
-+ #   The full text of our legal notices is contained in the file called
-+ #   CPYRIGHT, included with this distribution.
-+ #
-+ 
-+ #
-+ # Makefile for the FreeBSD shared-lib version of the PINE composer library and 
-+ # stand-alone editor pico.
-+ #
-+ 
-+ #includes symbol info for debugging 
-+ DASHO=		# -g
-+ #for normal build
-+ #DASHO=		-O
-+ 
-+ STDCFLAGS=	-DBSDI -DBSDI2 -DPOSIX -DJOB_CONTROL -DANSI -DMOUSE \
-+ 		-I/usr/local/include
-+ EXTRACFLAGS=	-DKANJI -DCANNA -DHELPFILE
-+ CFLAGS+=		$(EXTRACFLAGS) $(DASHO) $(STDCFLAGS)
-+ 
-+ # switches for library building
-+ LIBCMD=		ar
-+ LIBARGS=	ru
-+ RANLIB=		ranlib
-+ 
-+ EXTRALIBES=	-lcanna -L/usr/local/lib
-+ LIBS=		$(EXTRALIBES) -ltermcap
-+ 
-+ OFILES=		attach.o ansi.o basic.o bind.o browse.o buffer.o \
-+ 		composer.o display.o file.o fileio.o line.o osdep.o \
-+ 		pico.o random.o region.o search.o spell.o tcap.o window.o \
-+ 		word.o kanji.o jctype.o canna.o
-+ 
-+ # Lets be elite and not retype in the above
-+ SOFILES=	${OFILES:.o=.so}
-+ 
-+ CFILES=		attach.c ansi.c basic.c bind.c browse.c buffer.c \
-+ 		composer.c display.c file.c fileio.c line.c osdep.c \
-+ 		pico.c random.c region.c search.c spell.c tcap.c window.c \
-+ 		word.c kanji.c jctype.c canna.c
-+ 
-+ HFILES=		estruct.h edef.h efunc.h ebind.h pico.h osdep.h \
-+ 		kanji.h jctype.h canna.h
-+ 
-+ # Need this for the shared library rule to work correctly
-+ .SUFFIXES: .o .so
-+ 
-+ #
-+ # dependencies for the Unix versions of pico and libpico.a
-+ #
-+ all:		pico pilot
-+ 
-+ osdep.c:	os_unix.c
-+ 		rm -f osdep.c
-+ 		cp os_unix.c osdep.c
-+ 
-+ osdep.h:	os_unix.h
-+ 		rm -f osdep.h
-+ 		cp os_unix.h osdep.h
-+ 
-+ libpico.a:	osdep.c osdep.h $(OFILES)
-+ 		$(LIBCMD) $(LIBARGS) libpico.a $(OFILES)
-+ 		$(RANLIB) libpico.a
-+ 
-+ libpico.so.1.3:	osdep.c osdep.h $(SOFILES)
-+ 		ld -Bshareable -x -o libpico.so.1.3 $(SOFILES)
-+ 
-+ pico:		main.c libpico.so.1.3
-+ 		$(CC) $(CFLAGS) main.c -L. -lpico $(LIBS) -o pico
-+ 
-+ pilot:		pilot.c libpico.so.1.3
-+ 		$(CC) $(CFLAGS) pilot.c -L. -lpico $(LIBS) -o pilot
-+ 
-+ .c.so:		; $(CC) -fpic -DPIC -c $(CFLAGS) ${@:.so=.c} -o $@
-+ 
-+ .c.o:		; $(CC) -c $(CFLAGS) $*.c
-+ 
-+ $(OFILES):	$(HFILES)
-+ 
-+ $(SOFILES):	$(HFILES)
-+ 
-+ clean:
-+ 		rm -f *.a *.so.1.3 *.o *.so *~ osdep.c osdep.h pico pilot
diff --git a/japanese/pine/files/patch-ac b/japanese/pine/files/patch-ac
deleted file mode 100644
index 856c2ff86530..000000000000
--- a/japanese/pine/files/patch-ac
+++ /dev/null
@@ -1,421 +0,0 @@
-*** pine/osdep/os-bsf.h.in.orig	Fri Sep 20 13:44:43 1996
---- pine/osdep/os-bsf.h.in	Fri Sep 20 13:44:44 1996
-***************
-*** 0 ****
---- 1,416 ----
-+ /*----------------------------------------------------------------------
-+ 
-+             T H E    P I N E    M A I L   S Y S T E M
-+ 
-+    Laurence Lundblade and Mike Seibel
-+    Networks and Distributed Computing
-+    Computing and Communications
-+    University of Washington
-+    Administration Builiding, AG-44
-+    Seattle, Washington, 98195, USA
-+    Internet: lgl@CAC.Washington.EDU
-+              mikes@CAC.Washington.EDU
-+ 
-+    Please address all bugs and comments to "pine-bugs@cac.washington.edu"
-+ 
-+ 
-+    Pine and Pico are registered trademarks of the University of Washington.
-+    No commercial use of these trademarks may be made without prior written
-+    permission of the University of Washington.
-+ 
-+    Pine, Pico, and Pilot software and its included text are Copyright
-+    1989-1996 by the University of Washington.
-+ 
-+    The full text of our legal notices is contained in the file called
-+    CPYRIGHT, included with this distribution.
-+ 
-+ 
-+    Pine is in part based on The Elm Mail System:
-+     ***********************************************************************
-+     *  The Elm Mail System  -  Revision: 2.13                             *
-+     *                                                                     *
-+     * 			Copyright (c) 1986, 1987 Dave Taylor              *
-+     * 			Copyright (c) 1988, 1989 USENET Community Trust   *
-+     ***********************************************************************
-+  
-+ 
-+   ----------------------------------------------------------------------*/
-+ 
-+ #ifndef _OS_INCLUDED
-+ #define _OS_INCLUDED
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+ 
-+    This first section has some constants that you may want to change
-+    for your configuration.  This is the BSD/386 Gamma 4.1 version of the
-+    os.h file.
-+    Further down in the file are os-dependent things that need to be set up
-+    correctly for each os.  They aren't interesting, they just have to be
-+    right.  There are also a few constants down there that may be of
-+    interest to some.
-+ 
-+  ----*/
-+ 
-+ /*----------------------------------------------------------------------
-+    Define this if you want the disk quota to be checked on startup.
-+    Of course, this only makes sense if your system has quotas.  If it doesn't,
-+    there should be a dummy disk_quota() routine in os-xxx.c so that defining
-+    this won't be harmful anyway.
-+  ----*/
-+ /* #define USE_QUOTAS  /* comment out if you never want quotas checked */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    Define this if you want to allow the users to change their From header
-+    line when they send out mail.  The users will still have to configure
-+    either default-composer-hdrs or customized-hdrs to get at the From
-+    header, even if this is set.
-+  ----*/
-+ #define ALLOW_CHANGING_FROM  /* comment out to not allow changing From */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    Define this if you want to allow users to turn on the feature that
-+    enables sending to take place in a fork()'d child.  This may reduce
-+    the time on the user's wall clock it takes to post mail.
-+    NOTE: You'll also have to make sure the appropriate osdep/postreap.*
-+          file is included in the os-*.ic file for your system.
-+  ----*/
-+ #define BACKGROUND_POST  /* comment out to disable posting from child */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Turn this on if you want to disable the keyboard lock function.
-+  ----*/
-+ /* #define NO_KEYBOARD_LOCK */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Turn this on to trigger QP encoding of sent message text if it contains
-+   "From " at the beginning of a line or "." on a line by itself.
-+  ----*/
-+ /* #define ENCODE_FROMS */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Timeouts (seconds)
-+  ----*/
-+ #define DF_MAILCHECK      "150" /* How often to check for new mail, by
-+ 				   default.  There's some expense in doing
-+ 				   this so it shouldn't be done too
-+ 				   frequently.  (Can be set in config
-+ 				   file now.)  */
-+ 
-+ /*----------------------------------------------------------------------
-+     Check pointing (seconds)
-+  ----*/
-+ #define CHECK_POINT_TIME (7*60) /* Check point the mail file (write changes
-+ 				   to disk) if more than CHECK_POINT_TIME
-+ 				   seconds have passed since the first
-+ 				   change was made.  Depending on what is
-+ 				   happening, we may wait up to three times
-+ 				   this long, since we don't want to do the
-+ 				   slow check pointing and irritate the user. */
-+                                      
-+ #define CHECK_POINT_FREQ   (12) /* Check point the mail file if there have been
-+                                    at least this many (status) changes to the
-+ 				   current mail file.  We may wait longer if
-+ 				   it isn't a good time to do the checkpoint. */
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+  In scrolling through text, the number of lines from the previous
-+  screen to overlap when showing the next screen.  Usually set to two.
-+  ----*/
-+ #define	DF_OVERLAP	"2"
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+  When scrolling screens, the number of lines from top and bottom of
-+  the screen to initiate single-line scrolling.
-+  ----*/
-+ #define	DF_MARGIN	"0"
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+  Default fill column for pine composer and maximum fill column.  The max
-+  is used to stop people from setting their custom fill column higher than
-+  that number.  Note that DF_FILLCOL is a string but MAX_FILLCOL is an integer.
-+  ----*/
-+ #define	DF_FILLCOL	"74"
-+ #define	MAX_FILLCOL	80
-+ 
-+ 
-+ 
-+ /*----- System-wide config file ----------------------------------------*/
-+ #define SYSTEM_PINERC             "@PREFIX@/etc/pine.conf"
-+ #define SYSTEM_PINERC_FIXED       "@PREFIX@/etc/pine.conf.fixed"
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    The default folder names and folder directories (some for backwards
-+    compatibility).  Think hard before changing any of these.
-+  ----*/
-+ #define DF_DEFAULT_FCC            "sent-mail"
-+ #define DEFAULT_SAVE              "saved-messages"
-+ #define POSTPONED_MAIL            "postponed-mail"
-+ #define POSTPONED_MSGS            "postponed-msgs"
-+ #define INTERRUPTED_MAIL          ".pine-interrupted-mail"
-+ #define DEADLETTER                "dead.letter"
-+ #define DF_MAIL_DIRECTORY         "mail"
-+ #define INBOX_NAME                "INBOX"
-+ #define DF_SIGNATURE_FILE         ".signature"
-+ #define DF_ELM_STYLE_SAVE         "no"
-+ #define DF_HEADER_IN_REPLY        "no"
-+ #define DF_OLD_STYLE_REPLY        "no"
-+ #define DF_USE_ONLY_DOMAIN_NAME   "no"
-+ #define DF_FEATURE_LEVEL          "sapling"
-+ #define DF_SAVE_BY_SENDER         "no"
-+ #define DF_SORT_KEY               "arrival"
-+ #define DF_AB_SORT_RULE           "fullname-with-lists-last"
-+ #define DF_SAVED_MSG_NAME_RULE    "default-folder"
-+ #define DF_FCC_RULE               "default-fcc"
-+ #define DF_STANDARD_PRINTER       "lpr"
-+ #define ANSI_PRINTER              "attached-to-ansi"
-+ #define DF_ADDRESSBOOK            ".addressbook"
-+ #define DF_BUGS_FULLNAME          "Pine Developers"
-+ #define DF_BUGS_ADDRESS           "pine-bugs@cac.washington.edu"
-+ #define DF_SUGGEST_FULLNAME       "Pine Developers"
-+ #define DF_SUGGEST_ADDRESS        "pine-suggestions@cac.washington.edu"
-+ #define DF_PINEINFO_FULLNAME      "Pine-Info News Group"
-+ #define DF_PINEINFO_ADDRESS       "pine-info@cac.washington.edu"
-+ #define DF_LOCAL_FULLNAME         "Local Support"
-+ #define DF_LOCAL_ADDRESS          "postmaster"
-+ #define DF_KBLOCK_PASSWD_COUNT    "1"
-+ 
-+ /*----------------------------------------------------------------------
-+    The default printer when pine starts up for the first time with no printer
-+  ----*/
-+ #define DF_DEFAULT_PRINTER        ANSI_PRINTER
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+ 
-+    OS dependencies, BSD/386 Gamma 4.1 version.  See also the os-bsi.c files.
-+    The following stuff may need to be changed for a new port, but once
-+    the port is done, it won't change.  At the bottom of the file are a few
-+    constants that you may want to configure differently than they
-+    are configured, but probably not.
-+ 
-+  ----*/
-+ 
-+ 
-+ 
-+ /*----------------- Are we ANSI? ---------------------------------------*/
-+ #define ANSI		/* this is an ANSI compiler */
-+ 
-+ /*------ If our compiler doesn't understand type void ------------------*/
-+ /* #define void char     /* no void in compiler */
-+ 
-+ 
-+ 
-+ /*------- Some more includes that should usually be correct ------------*/
-+ #include <pwd.h>
-+ #include <sys/wait.h>
-+ #include <sys/stat.h>
-+ #include <fcntl.h>
-+ #include <netdb.h>
-+ 
-+ 
-+ 
-+ /*----------------- locale.h -------------------------------------------*/
-+ #include <locale.h>  /* To make matching and sorting work right */
-+ 
-+ 
-+ 
-+ /*----------------- time.h ---------------------------------------------*/
-+ #include <time.h>
-+ /* plain time.h isn't enough on some systems */
-+ /* #include <sys/time.h>  /* For struct timeval usually in time.h */ 
-+ 
-+ 
-+ 
-+ /*--------------- signal.h ---------------------------------------------*/
-+ #include <signal.h>      /* sometimes both required, sometimes */
-+ /* #include <sys/signal.h>  /* only one or the other */
-+ 
-+ #define SigType void     /* value returned by sig handlers is void */
-+ /* #define SigType int      /* value returned by sig handlers is int */
-+ 
-+ #define POSIX_SIGNALS    /* use POSIX signal semantics (ttyin.c) */
-+ /* #define SYSV_SIGNALS    /* use System-V signal semantics (ttyin.c) */
-+ 
-+ 
-+ 
-+ 
-+ /*-------------- A couple typedef's for integer sizes ------------------*/
-+ typedef unsigned int usign32_t;
-+ typedef unsigned short usign16_t;
-+ 
-+ 
-+ 
-+ /*-------------- qsort argument type -----------------------------------*/
-+ #define QSType void  /* qsort arg is of type void * */
-+ /* #define QSType char  /* qsort arg is of type char * */
-+ 
-+ 
-+ 
-+ /*-------------- fcntl flag to set non-blocking IO ---------------------*/
-+ #define	NON_BLOCKING_IO	O_NONBLOCK		/* POSIX style */
-+ /* #define	NON_BLOCKING_IO	FNDELAY		/* good ol' bsd style  */
-+ 
-+ 
-+ #ifdef HELPFILE
-+ #undef HELPFILE
-+ #define HELPFILE        "@PREFIX@/lib/pine/pine.hlp"
-+ #define HELPINDEX       "@PREFIX@/lib/pine/pine.ndx"
-+ #endif
-+ 
-+ /*------ how help text is referenced (always char ** on Unix) ----------*/
-+ #ifdef HELPFILE
-+ #define HelpType char **
-+ #define HelpType short
-+ #define NO_HELP  (-1)
-+ #else
-+ #define HelpType char **
-+ #define NO_HELP (char **)NULL
-+ #endif
-+ 
-+ 
-+ /*
-+  * Choose one of the following three terminal drivers
-+  */
-+ 
-+ /*--------- Good 'ol BSD -----------------------------------------------*/
-+ /* #include <sgtty.h>      /* BSD-based systems */
-+ 
-+ /*--------- System V terminal driver -----------------------------------*/
-+ /* #define HAVE_TERMIO     /* this is for pure System V */
-+ /* #include <termio.h>     /* Sys V */
-+ 
-+ /*--------- POSIX terminal driver --------------------------------------*/
-+ #define HAVE_TERMIOS    /* this is an alternative */
-+ #include <termios.h>    /* POSIX */
-+ 
-+ 
-+ 
-+ /*-------- Use poll system call instead of select ----------------------*/
-+ /* #define USE_POLL        /* use the poll() system call instead of select() */
-+ 
-+ 
-+ 
-+ /*-------- Use terminfo database instead of termcap --------------------*/
-+ /* #define USE_TERMINFO    /* use terminfo instead of termcap */
-+ 
-+ 
-+ 
-+ /*-- What argument does wait(2) take? Define this if it is a union -----*/
-+ /* #define HAVE_WAIT_UNION  /* the arg to wait is a union wait * */
-+ 
-+ 
-+ 
-+ /*-------- Is window resizing available? -------------------------------*/
-+ #if defined(TIOCGWINSZ) && defined(SIGWINCH)
-+ #define RESIZING  /* SIGWINCH and friends */
-+ #endif
-+ 
-+ 
-+ 
-+ /*-------- If no vfork, use regular fork -------------------------------*/
-+ /* #define vfork fork  /* vfork is just a lightweight fork, so can use fork */
-+ 
-+ 
-+ 
-+ /*----- The usual sendmail configuration for sending mail on Unix ------*/
-+ #define SENDMAIL	"/usr/sbin/sendmail"
-+ #define SENDMAILFLAGS	"-bs -odb -oem"	/* send via smtp with backgroud
-+ 					   delivery and mail back errors */
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+    If no nntp-servers are defined, this program will be used to post news.
-+  ----*/
-+ #define SENDNEWS	"/usr/local/news/lib/inews -h"	/* news posting cmd */
-+ 
-+ 
-+ /*--------- Program employed by users to change their password ---------*/
-+ #define	PASSWD_PROG	"/usr/bin/passwd"
-+ 
-+ 
-+ /*-------------- A couple constants used to size arrays ----------------*/
-+ #include <sys/param.h>          /* Get it from param.h if available */
-+ #undef MAXPATH                  /* Sometimes defined in param.h differently */
-+ #define MAXPATH MAXPATHLEN      /* Longest pathname we ever expect */
-+ /* #define MAXPATH        (512)    /* Longest pathname we ever expect */
-+ #define MAXFOLDER      (64)     /* Longest foldername we ever expect */  
-+ 
-+ 
-+ /*-- Max screen pine will display on. Used to define some array sizes --*/
-+ #define MAX_SCREEN_COLS  (170) 
-+ #define MAX_SCREEN_ROWS  (200) 
-+ 
-+ 
-+ /*---- When no screen size can be discovered this is the size used -----*/
-+ #define DEFAULT_LINES_ON_TERMINAL	(24)
-+ #define DEFAULT_COLUMNS_ON_TERMINAL	(80)
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Where to put the output of pine in debug mode. Files are created
-+  in the user's home directory and have a number appended to them when
-+  there is more than one.
-+  ----*/
-+ #define DEBUGFILE	".pine-debug"
-+ 
-+ /*----------------------------------------------------------------------
-+     The number of debug files to save in the user's home diretory. The files
-+  are useful for figuring out what a user did when he complains that something
-+  went wrong. It's important to keep a bunch around, usually 4, so that the
-+  debug file in question will still be around when the problem gets 
-+  investigated. Users tend to go in and out of Pine a few times and there
-+  is one file for each pine invocation
-+  ----*/
-+ #define NUMDEBUGFILES 4
-+ 
-+ /*----------------------------------------------------------------------
-+    The default debug level to set (approximate meanings):
-+        1 logs only highest level events and errors
-+        2 logs events like file writes
-+        3
-+        4 logs each command
-+        5
-+        6 
-+        7 logs details of command execution (7 is highest to run any production)
-+        8
-+        9 logs gross details of command execution
-+  ----*/
-+ #define DEFAULT_DEBUG 2
-+ 
-+ 
-+ 
-+ /*----------------------------------------------------------------------
-+     Various maximum field lengths, probably shouldn't be changed.
-+  ----*/
-+ #define MAX_FULLNAME     (100) 
-+ #define MAX_NICKNAME      (40)
-+ #define MAX_ADDRESS      (200)
-+ #define MAX_NEW_LIST     (500)  /* Max addrs to be added when creating list */
-+ #define MAX_SEARCH       (100)  /* Longest string to search for             */
-+ #define MAX_ADDR_EXPN   (1000)  /* Longest expanded addr                    */
-+ #define MAX_ADDR_FIELD (10000)  /* Longest fully-expanded addr field        */
-+ 
-+ 
-+ #endif /* _OS_INCLUDED */
-+ 
-+ 
diff --git a/japanese/pine/files/patch-ad b/japanese/pine/files/patch-ad
deleted file mode 100644
index 7291e4e445a4..000000000000
--- a/japanese/pine/files/patch-ad
+++ /dev/null
@@ -1,138 +0,0 @@
-*** pine/osdep/os-bsf.ic.orig	Fri Sep 20 13:44:44 1996
---- pine/osdep/os-bsf.ic	Fri Sep 20 13:44:44 1996
-***************
-*** 0 ****
---- 1,133 ----
-+ ;
-+ ; FreeBSD os-fbs.ic file for building os-fbs.c.
-+ ;
-+ ; Boilerplate header.
-+ include(header)
-+ 
-+ ; Can_access function.  Just calls access.  Only one version available.
-+ include(canacces)
-+ 
-+ ; File_size function.  Only one version available.
-+ include(filesize)
-+ 
-+ ; Is_writable_dir function.  Only one version available.
-+ include(writ_dir)
-+ 
-+ ; Create_mail_dir function.  All Unixes use creatdir and DOS
-+ ; uses creatdir.dos.
-+ include(creatdir)
-+ 
-+ ; Rename_file function.  All Unixes use rename and DOS uses
-+ ; rename.dos.  There is also one called rename.hom which
-+ ; is currently unused.  Hom stands for homemade.
-+ include(rename)
-+ 
-+ ; Build_path function.  All Unixes use bld_path and DOS
-+ ; uses bld_path.dos.
-+ include(bld_path)
-+ 
-+ ; Last_cmpnt function.  All Unixes use lstcmpnt and DOS
-+ ; uses lstcmpnt.dos.
-+ include(lstcmpnt)
-+ 
-+ ; Expand_foldername function.  All Unixes use expnfldr and DOS
-+ ; uses expnfldr.dos.
-+ include(expnfldr)
-+ 
-+ ; Fnexpand function.  All Unixes use fnexpand and DOS
-+ ; uses fnexpand.dos.
-+ include(fnexpand)
-+ 
-+ ; Filter_filename function.  All Unixes use fltrname and DOS
-+ ; uses fltrname.dos.
-+ include(fltrname)
-+ 
-+ ; There are several versions of disk quotas.  Standard BSD-style quotas
-+ ; (Australian) include diskquot.  Systems which don't have quotas use
-+ ; diskquot.non.  Systems which use Sun-style quotas are slightly more
-+ ; complicated.  They usually require different include files.  They are
-+ ; set up to include the file sunquota and prepend include file info to
-+ ; that.  See diskquot.*.
-+ include(diskquot.non)
-+ 
-+ ; Read_file function.  All Unixes use readfile and DOS
-+ ; uses readfile.dos.
-+ include(readfile)
-+ 
-+ ; Create_tmpfile function.  This usually just calls the ANSI standard
-+ ; tmpfile function if there is one.  That is the version in the file tempfile.
-+ ; There is also a tempfile.non for Unix systems which don't have a tmpfile
-+ ; function already.
-+ include(tempfile)
-+ 
-+ ; Temp_nam function.  This usually just calls the "standard"
-+ ; tmpnam function if there is one.  That is the version in the file tempnam.
-+ include(tempnam)
-+ 
-+ ; Coredump function.  Version called coredump just calls abort, coredump.fpe
-+ ; uses a floating point exception to cause the coredump on some systems.
-+ include(coredump)
-+ 
-+ ; This is usually a call to gethostname.  That version is in the file hostname.
-+ ; There is also a version called hostname.una which uses the uname system
-+ ; call commonly found in SysV systems.  An unused version called
-+ ; hostname.hom also exists.
-+ include(hostname)
-+ 
-+ ; Getdomainnames function.  All Unixes use domnames and DOS
-+ ; uses domnames.dos.
-+ include(domnames)
-+ 
-+ ; Canonical_name function.  All Unixes use canonicl and DOS
-+ ; uses canonicl.dos.
-+ include(canonicl)
-+ 
-+ ; This file includes two functions, have_job_control and stop_process.
-+ ; The Unix version is called jobcntrl and the slightly-different DOS
-+ ; version is jobcntrl.dos.
-+ include(jobcntrl)
-+ 
-+ ; Error_desciption function.  All Unixes use err_desc.  The version
-+ ; called err_desc.dos is the same except that it doesn't declare the
-+ ; variable sys_errlist[], which is already declared.  There
-+ ; is also a version called err_desc.hom which is unused.
-+ include(err_desc.dos)
-+ 
-+ ; There are six functions in this include.  They are get_system_login,
-+ ; get_system_fullname, get_system_homedir, get_system_passwd, gcos_name,
-+ ; and local_name_lookup.  The Unix version is pw_stuff and the dos version
-+ ; is pw_stuff.dos.  There is also a pw_stuff.fun.  Fun stands for funny
-+ ; GCOS field.  It's currently unused.
-+ include(pw_stuff)
-+ 
-+ ; Change_passwd function.  Unixes use chnge_pw.
-+ ; There is also a DOS version.
-+ include(chnge_pw)
-+ 
-+ ; Mime_can_display function.  Only a single version of this now.
-+ include(mimedisp)
-+ 
-+ ; Most systems have the ANSI fgetpos and fsetpos functions.  For those,
-+ ; use fgetpos.  If a system doesn't have it use fgetpos.non.
-+ include(fgetpos)
-+ 
-+ ; These functions are similar to popen(), but allow both an input stream 
-+ ; and an output buffer.
-+ include(pipe)
-+ 
-+ ; These functions are used to wait on a fork'd child doing our posting
-+ include(postreap.wtp)
-+ 
-+ ; These functions are used to hand messages off to local mail transport
-+ ; and posting agents (typically, "sendmail").
-+ include(sendmail)
-+ 
-+ ; This function is used to actually spawn the given command (usually dredged
-+ ; from mailcap) on the given data file (usually on /tmp).
-+ include(execview)
-+ 
-+ ; This includes the various routines to support printing
-+ include(print)
-+ 
-+ ; Debug file maintenance.
-+ include(debuging)
diff --git a/japanese/pine/files/patch-ae b/japanese/pine/files/patch-ae
deleted file mode 100644
index 21aff24f255d..000000000000
--- a/japanese/pine/files/patch-ae
+++ /dev/null
@@ -1,161 +0,0 @@
-*** pine/makefile.bsf.orig	Fri Sep 20 13:44:43 1996
---- pine/makefile.bsf	Fri Sep 20 13:44:43 1996
-***************
-*** 0 ****
---- 1,156 ----
-+ #
-+ #            T H E    P I N E    M A I L   S Y S T E M
-+ #
-+ #   Laurence Lundblade and Mike Seibel
-+ #   Networks and Distributed Computing
-+ #   Computing and Communications
-+ #   University of Washington
-+ #   Administration Building, AG-44
-+ #   Seattle, Washington, 98195, USA
-+ #   Internet: lgl@CAC.Washington.EDU
-+ #             mikes@CAC.Washington.EDU
-+ #
-+ #   Please address all bugs and comments to "pine-bugs@cac.washington.edu"
-+ #
-+ #
-+ #   Pine and Pico are registered trademarks of the University of Washington.
-+ #   No commercial use of these trademarks may be made without prior written
-+ #   permission of the University of Washington.
-+ #
-+ #   Pine, Pico, and Pilot software and its included text are Copyright
-+ #   1989-1996 by the University of Washington.
-+ #
-+ #   The full text of our legal notices is contained in the file called
-+ #   CPYRIGHT, included with this distribution.
-+ #
-+ #
-+ #   Pine is in part based on The Elm Mail System:
-+ #    ***********************************************************************
-+ #    *  The Elm Mail System  -  Revision: 2.13                             *
-+ #    *                                                                     *
-+ #    * 			Copyright (c) 1986, 1987 Dave Taylor               *
-+ #    * 			Copyright (c) 1988, 1989 USENET Community Trust    *
-+ #    ***********************************************************************
-+ #
-+ #
-+ 
-+ 
-+ #
-+ #     Make file for the Pine mail system for FreeBSD
-+ #
-+ #
-+ #   Most commonly fiddled flags for compiler.
-+ #   Uncomment the setttings desired here
-+ #
-+ RM=          rm -f
-+ LN=          ln -s
-+ MAKE=        make
-+ #OPTIMIZE=    -O
-+ PROFILE=     # -pg
-+ DEBUG=       # -g -DDEBUG
-+ 
-+ IMAPDIR=     ../c-client
-+ PICODIR=     ../pico
-+ 
-+ STDLIBES=    -ltermlib -lcrypt
-+ #LOCLIBES=   $(PICODIR)/libpico.a $(IMAPDIR)/c-client.a
-+ LOCLIBES=    -lpico ${IMAPDIR}/c-client.a
-+ LOCLIBDIR=   -L$(PICODIR)
-+ EXTRALIBES=  -L/usr/local/lib -lcanna
-+ LIBES=       $(LOCLIBDIR) $(LOCLIBES) $(EXTRALIBES) $(STDLIBES)
-+ 
-+ STDCFLAGS=   -DBSDI -DSYSTYPE=\"BSF\" -DMOUSE -I/usr/local/include
-+ EXTRACFLAGS= -DKANJI -DCANNA -DHELPFILE
-+ CFLAGS+=      $(OPTIMIZE) $(PROFILE) $(DEBUG) $(EXTRACFLAGS) $(STDCFLAGS)
-+ 
-+ obj=    addrbook.o adrbklib.o args.o context.o filter.o \
-+ 	folder.o help.o imap.o init.o mailcap.o mailcmd.o \
-+ 	mailindx.o mailpart.o mailview.o newmail.o other.o pine.o \
-+ 	reply.o screen.o send.o signals.o status.o strings.o ttyin.o \
-+ 	ttyout.o os.o
-+ 
-+ cfiles= addrbook.c adrbklib.c args.c context.c filter.c \
-+ 	folder.c help.c helptext.c imap.c init.c mailcap.c mailcmd.c \
-+ 	mailindx.c mailpart.c mailview.c newmail.c other.c pine.c \
-+ 	reply.c screen.c send.c signals.c status.c strings.c ttyin.c \
-+ 	ttyout.c os.c
-+ 
-+ HELPSRCS=       pine.hlp pine_ja.hlp
-+ HELPINDXS=      pine.ndx pine_ja.ndx
-+ 
-+ pine:  $(obj) $(LOCLIBES)
-+ 	echo "char datestamp[]="\"`LC_TIME=C date`\"";" > date.c
-+ 	echo "char hoststamp[]="\"`hostname`\"";" >> date.c
-+ 	$(CC) $(LDFLAGS) $(CFLAGS) -o pine $(obj) date.c $(LIBES)
-+ 
-+ $(HELPINDXS) helptext.h:        helpindx $(HELPSRCS)
-+ 		./helpindx pine.hlp pine.ndx helptext.h
-+ 		./helpindx pine_ja.hlp pine_ja.ndx /dev/null
-+ 
-+ helpindx:       helpindx.c
-+ 		$(CC) $(CFLAGS) -o $@ helpindx.c
-+ 
-+ # this is not part of pine
-+ pine-use:	pine-use.c
-+ 	$(CC) -o pine-use pine-use.c
-+ 
-+ clean:
-+ 	$(RM) *.o os.h os.c helptext.c helptext.h
-+ 	cd osdep; make clean; cd ..
-+ 
-+ 
-+ HEADERS= headers.h pine.h os.h helptext.h context.h \
-+ 	  $(IMAPDIR)/mail.h $(IMAPDIR)/osdep.h
-+ 
-+ addrbook.o:	addrbook.c  $(HEADERS) adrbklib.h $(PICODIR)/pico.h
-+ adrbklib.o: 	adrbklib.c  $(HEADERS) adrbklib.h
-+ args.o:		args.c      $(HEADERS)
-+ context.o:	context.c   $(HEADERS) $(IMAPDIR)/misc.h
-+ filter.o:	filter.c    $(HEADERS) $(PICODIR)/pico.h
-+ folder.o:	folder.c    $(HEADERS)
-+ help.o:		help.c      $(HEADERS)
-+ helptext.o:	helptext.c
-+ imap.o:	        imap.c      $(HEADERS)
-+ init.o:		init.c      $(HEADERS)
-+ mailcap.o:	mailcap.c   $(HEADERS)
-+ mailcmd.o:	mailcmd.c   $(HEADERS) $(PICODIR)/pico.h
-+ mailindx.o:	mailindx.c  $(HEADERS)
-+ mailpart.o:	mailpart.c  $(HEADERS)
-+ mailview.o:	mailview.c  $(HEADERS)
-+ newmail.o:	newmail.c   $(HEADERS)
-+ os.o:		os.c 	    $(HEADERS)
-+ other.o:	other.c     $(HEADERS) $(PICODIR)/pico.h
-+ pine.o:		pine.c      $(HEADERS)
-+ reply.o:	reply.c     $(HEADERS)
-+ screen.o:	screen.c    $(HEADERS)
-+ send.o:	        send.c      $(HEADERS) $(IMAPDIR)/smtp.h $(PICODIR)/pico.h
-+ signals.o:	signals.c   $(HEADERS)
-+ status.o:	status.c    $(HEADERS)
-+ strings.o:	strings.c   $(HEADERS)
-+ ttyin.o:	ttyin.c     $(HEADERS)
-+ ttyout.o:	ttyout.c    $(HEADERS)
-+ 
-+ os.h:	osdep/os-bsf.h
-+ 	$(RM) os.h
-+ 	$(LN) osdep/os-bsf.h os.h
-+ 
-+ #helptext.c:	pine.hlp
-+ #		./cmplhelp.sh  < pine.hlp > helptext.c
-+ 
-+ #helptext.h:	pine.hlp
-+ #		./cmplhlp2.sh  < pine.hlp > helptext.h
-+ 
-+ os.c:	osdep/os-bsf.c
-+ 	$(RM) os.c
-+ 	$(LN) osdep/os-bsf.c os.c
-+ 
-+ osdep/os-bsf.c:	osdep/bld_path osdep/canacces osdep/canonicl \
-+ 		osdep/chnge_pw osdep/coredump osdep/creatdir \
-+ 		osdep/diskquot.non osdep/domnames osdep/err_desc.dos \
-+ 		osdep/expnfldr osdep/fgetpos osdep/filesize osdep/fltrname \
-+ 		osdep/fnexpand osdep/header osdep/hostname \
-+ 		osdep/jobcntrl osdep/lstcmpnt osdep/mimedisp osdep/pipe \
-+ 		osdep/print osdep/pw_stuff osdep/readfile osdep/debuging \
-+ 		osdep/rename osdep/tempfile osdep/tempnam osdep/writ_dir \
-+ 		osdep/sendmail osdep/execview osdep/os-bsf.ic
-+ 	cd osdep; $(MAKE) includer os-bsf.c; cd ..
diff --git a/japanese/pine/files/patch-af b/japanese/pine/files/patch-af
deleted file mode 100644
index 8c0b03077df9..000000000000
--- a/japanese/pine/files/patch-af
+++ /dev/null
@@ -1,37 +0,0 @@
-*** imap/ANSI/c-client/Makefile.orig	Tue Jan 21 14:26:05 1997
---- imap/ANSI/c-client/Makefile	Tue Jan 21 14:38:27 1997
-***************
-*** 36,43 ****
-  BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \
-  	news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \
-  	osdep.o sm_unix.o newsrc.o
-! CC=cc
-! CFLAGS=$(EXTRACFLAGS)
-  DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
-  MAKE=make
---- 36,43 ----
-  BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \
-  	news.o nntpcunx.o phile.o dummy.o smtp.o nntp.o rfc822.o misc.o \
-  	osdep.o sm_unix.o newsrc.o
-! #CC=cc
-! #CFLAGS=$(EXTRACFLAGS)
-  DEFAULTDRIVERS=imap nntp pop3 mh tenex mtx mmdf bezerk news phile dummy
-  LN=ln -s
-  MAKE=make
-***************
-*** 125,130 ****
---- 125,137 ----
-  		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
-  		ACTIVEFILE=/usr/lib/news/active NEWSSPOOL=/usr/spool/news \
-  		RSHPATH=/usr/bin/rsh CFLAGS="-g -O -pipe -DNFSKLUDGE $(EXTRACFLAGS)"
-+ 
-+ bsf:	# FreeBSD
-+ 	$(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \
-+ 		STDPROTO=bezerkproto MAILSPOOL=/var/mail \
-+ 		ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \
-+               RSHPATH=/usr/bin/rsh CFLAGS="${CFLAGS} -DNFSKLUDGE $(EXTRACFLAGS)" \
-+ 		LDFLAGS="-lcrypt"
-  
-  cvx:	# Convex
-  	$(MAKE) mtest OS=$@ EXTRADRIVERS="$(EXTRADRIVERS)" \
diff --git a/japanese/pine/files/patch-ag b/japanese/pine/files/patch-ag
deleted file mode 100644
index 62e141e4ddf6..000000000000
--- a/japanese/pine/files/patch-ag
+++ /dev/null
@@ -1,36 +0,0 @@
-*** imap/ANSI/c-client/mh.c.orig	Thu May 16 03:49:54 1996
---- imap/ANSI/c-client/mh.c	Fri Sep 20 13:44:42 1996
-***************
-*** 807,813 ****
-    stat (LOCAL->dir,&sbuf);
-    if (sbuf.st_ctime != LOCAL->scantime) {
-      struct direct **names = NIL;
-!     long nfiles = scandir (LOCAL->dir,&names,mh_select,mh_numsort);
-      old = nmsgs ? mail_elt (stream,nmsgs)->data1 : 0;
-  				/* note scanned now */
-      LOCAL->scantime = sbuf.st_ctime;
---- 807,813 ----
-    stat (LOCAL->dir,&sbuf);
-    if (sbuf.st_ctime != LOCAL->scantime) {
-      struct direct **names = NIL;
-!     long nfiles = scandir (LOCAL->dir,&names,mh_select,(void*)mh_numsort);
-      old = nmsgs ? mail_elt (stream,nmsgs)->data1 : 0;
-  				/* note scanned now */
-      LOCAL->scantime = sbuf.st_ctime;
-***************
-*** 1049,1055 ****
-      return NIL;
-    }
-    mh_file (tmp,mailbox);	/* build file name we will use */
-!   if (nfiles = scandir (tmp,&names,mh_select,mh_numsort)) {
-  				/* largest number */
-      last = atoi (names[nfiles-1]->d_name);    
-      for (i = 0; i < nfiles; ++i) /* free directory */
---- 1049,1055 ----
-      return NIL;
-    }
-    mh_file (tmp,mailbox);	/* build file name we will use */
-!   if (nfiles = scandir (tmp,&names,mh_select,(void*)mh_numsort)) {
-  				/* largest number */
-      last = atoi (names[nfiles-1]->d_name);    
-      for (i = 0; i < nfiles; ++i) /* free directory */
diff --git a/japanese/pine/files/patch-ah b/japanese/pine/files/patch-ah
deleted file mode 100644
index 821655583887..000000000000
--- a/japanese/pine/files/patch-ah
+++ /dev/null
@@ -1,19 +0,0 @@
-*** imap/ANSI/c-client/news.c.orig	Thu May 16 03:50:02 1996
---- imap/ANSI/c-client/news.c	Fri Sep 20 13:44:42 1996
-***************
-*** 309,315 ****
-  	   stream->mailbox + 1);
-    while (s = strchr (s,'.')) *s = '/';
-  				/* scan directory */
-!   if ((nmsgs = scandir (tmp,&names,news_select,news_numsort)) >= 0) {
-      stream->local = fs_get (sizeof (NEWSLOCAL));
-      LOCAL->dirty = NIL;		/* no update to .newsrc needed yet */
-      LOCAL->dir = cpystr (tmp);	/* copy directory name for later */
---- 309,315 ----
-  	   stream->mailbox + 1);
-    while (s = strchr (s,'.')) *s = '/';
-  				/* scan directory */
-!   if ((nmsgs = scandir (tmp,&names,news_select,(void*)news_numsort)) >= 0) {
-      stream->local = fs_get (sizeof (NEWSLOCAL));
-      LOCAL->dirty = NIL;		/* no update to .newsrc needed yet */
-      LOCAL->dir = cpystr (tmp);	/* copy directory name for later */
diff --git a/japanese/pine/files/patch-ak b/japanese/pine/files/patch-ak
deleted file mode 100644
index c9f014c50282..000000000000
--- a/japanese/pine/files/patch-ak
+++ /dev/null
@@ -1,50 +0,0 @@
-*** imap/Makefile.orig	Tue Jan 21 11:08:23 1997
---- imap/Makefile	Tue Jan 21 11:04:47 1997
-***************
-*** 47,53 ****
-  
-  # ANSI compiler ports.  Note for SCO you may have to set LN to "copy -rom"
-  
-! a32 a41 aix bs2 bsi d-g drs lnx lyn mct mnt neb nxt osf sc5 sco sgi slx sos:
-  	$(MAKE) build SYSTYPE=ANSI OS=$@
-  
-  # Non-ANSI compiler ports.
---- 47,53 ----
-  
-  # ANSI compiler ports.  Note for SCO you may have to set LN to "copy -rom"
-  
-! a32 a41 aix bs2 bsi bsf d-g drs lnx lyn mct mnt neb nxt osf sc5 sco sgi slx sos:
-  	$(MAKE) build SYSTYPE=ANSI OS=$@
-  
-  # Non-ANSI compiler ports.
-***************
-*** 82,87 ****
---- 82,90 ----
-  #bs2:
-  #	$(MAKE) build SYSTYPE=ANSI OS=bsi
-  
-+ bsf:
-+ 	$(MAKE) build OS=bsf PROCESS=an
-+ 
-  pt1:
-  	$(MAKE) build SYSTYPE=non-ANSI OS=ptx
-  
-***************
-*** 92,99 ****
-  	$(LN) $(SYSTYPE) systype
-  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
-  	cd $(SYSTYPE)/ms;$(MAKE)
-! 	cd $(SYSTYPE)/ipopd;$(MAKE)
-! 	cd $(SYSTYPE)/imapd;$(MAKE)
-  
-  clean:
-  	$(RM) systype
---- 95,102 ----
-  	$(LN) $(SYSTYPE) systype
-  	cd $(SYSTYPE)/c-client; $(MAKE) $(OS)
-  	cd $(SYSTYPE)/ms;$(MAKE)
-! #       cd $(SYSTYPE)/ipopd;$(MAKE)
-! #       cd $(SYSTYPE)/imapd;$(MAKE)
-  
-  clean:
-  	$(RM) systype
diff --git a/japanese/pine/files/patch-al b/japanese/pine/files/patch-al
deleted file mode 100644
index 8418f09adcfe..000000000000
--- a/japanese/pine/files/patch-al
+++ /dev/null
@@ -1,55 +0,0 @@
-*** build.orig	Tue Jan 21 14:26:05 1997
---- build	Tue Jan 21 14:55:43 1997
-***************
-*** 168,181 ****
-          cd $PHOME/bin
-          rm -f pine mtest imapd pico pilot
-          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
--         if [ -s ../c-client/mtest ] ; then ln ../c-client/mtest mtest ; fi
--         if [ -s ../imapd/imapd ] ;    then ln ../imapd/imapd imapd    ; fi
-          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
-          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-          cd $PHOME
-          echo ''
-          echo "Links to executables are in bin directory:"
--         size bin/pine bin/mtest bin/imapd bin/pico bin/pilot
-          echo "Done"
-          ;;
-  
---- 168,180 ----
-          cd $PHOME/bin
-          rm -f pine mtest imapd pico pilot
-          if [ -s ../pine/pine ] ;      then ln ../pine/pine  pine      ; fi
-          if [ -s ../pico/pico ] ;      then ln ../pico/pico pico ; fi
-          if [ -s ../pico/pilot ] ;     then ln ../pico/pilot pilot ; fi
-+         if [ -s ../pico/libpico.so.1.3 ] ;     
-+ 		then ln ../pico/libpico.so.1.3 libpico.so.1.3 ; fi
-          cd $PHOME
-          echo ''
-          echo "Links to executables are in bin directory:"
-          echo "Done"
-          ;;
-  
-***************
-*** 186,195 ****
-  	make clean
-          echo "Cleaning Pine"
-          cd $PHOME/pine
-!         make -f makefile.ult clean
-          echo "Cleaning pico"
-          cd $PHOME/pico
-!         make $makeargs -f makefile.ult clean
-          echo "Done"
-          cd $PHOME
-          ;;
---- 185,194 ----
-  	make clean
-          echo "Cleaning Pine"
-          cd $PHOME/pine
-!         make -f makefile.bsf clean
-          echo "Cleaning pico"
-          cd $PHOME/pico
-!         make $makeargs -f makefile.bsf clean
-          echo "Done"
-          cd $PHOME
-          ;;
diff --git a/japanese/pine/pkg-comment b/japanese/pine/pkg-comment
deleted file mode 100644
index ad5c6194dd01..000000000000
--- a/japanese/pine/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-Program for Internet News and E-mail with Japanese Support
diff --git a/japanese/pine/pkg-descr b/japanese/pine/pkg-descr
deleted file mode 100644
index 7cc83c75415b..000000000000
--- a/japanese/pine/pkg-descr
+++ /dev/null
@@ -1,17 +0,0 @@
-Pine for FreeBSD 2.x is a tool for reading, sending, and managing
-electronic messages.  It was designed specifically with novice
-computer users in mind, but can be tailored to accommodate the needs
-of "power users" as well.  Pine uses Internet message protocols (e.g.
-RFC-822, SMTP, MIME, IMAP, NNTP) and runs on Unix and PCs.  This
-package also includes the Pico editor, the IMAP daemon, a POP2 server, 
-and a POP3 server.
-
-This version supports kanji input using Canna.  Canna can be started
-by ^@ (or ctrl-space) in the Pico editor.
-
-If you want to use the spell checking feature of pine, set the
-environment variable SPELL to "/usr/local/bin/ispell -l".
-
-An optional configuration file "pine.conf" can be put into /usr/local/etc
-to set system wide defaults.  The format of this file is identical to the 
-.pinerc file that is auto-generated by pine in your home directory.
diff --git a/japanese/pine/pkg-plist b/japanese/pine/pkg-plist
deleted file mode 100644
index 0192a1a6c4c0..000000000000
--- a/japanese/pine/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-bin/pico
-bin/pilot
-bin/pine
-lib/libpico.so.1.3
-@exec /sbin/ldconfig -m %B
-@unexec /sbin/ldconfig -R
-lib/pine/pine.hlp
-lib/pine/pine.ndx
-lib/pine/pine_ja.hlp
-lib/pine/pine_ja.ndx
diff --git a/japanese/pine/scripts/configure b/japanese/pine/scripts/configure
deleted file mode 100644
index 4b79832cc6ce..000000000000
--- a/japanese/pine/scripts/configure
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sed s+@PREFIX@+${PREFIX}+ ${WRKSRC}/pine/osdep/os-bsf.h.in >${WRKSRC}/pine/osdep/os-bsf.h
diff --git a/japanese/plain2/Makefile b/japanese/plain2/Makefile
index da5148c0548b..62b8f4a09a3a 100644
--- a/japanese/plain2/Makefile
+++ b/japanese/plain2/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	plain2
-# Version required:	2.54
 # Date created:		20 April 1997
 # Whom:			nkazushi@highway.or.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	plain2-2.54
-PKGNAME=	ja-plain2-2.54
+PORTNAME=	plain2
+PORTVERSION=	2.54
 CATEGORIES=	textproc
 MASTER_SITES=	ftp://ftp.nec.co.jp/pub/packages/plain2/
 
diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile
index 32984cfbbcab..2842f6bf9902 100644
--- a/japanese/plan/Makefile
+++ b/japanese/plan/Makefile
@@ -1,6 +1,5 @@
 # ex:ts=8
 # Ports collection makefile for:  plan
-# Version required: 0.0
 # Date created:			  Sat Jan 31, 1998
 # Whom:				  David O'Brien (obrien@cs.ucdavis.edu)
 #
@@ -15,8 +14,6 @@ MASTERDIR=	${.CURDIR}/../../deskutils/plan
 
 .include	"${MASTERDIR}/Makefile"
 
-PKGNAME=	ja-${DISTNAME}
-
 MAINTAINER=	obrien@FreeBSD.org
 
 PLIST=		${WRKDIR}/PLIST
diff --git a/japanese/platex-common/Makefile b/japanese/platex-common/Makefile
index 7595dc183ee5..120a284460df 100644
--- a/japanese/platex-common/Makefile
+++ b/japanese/platex-common/Makefile
@@ -1,18 +1,20 @@
 # New ports collection makefile for:	platex2e-common
-# Version required:		<1999/08/09>
 # Date created:			05 Oct 1997
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	base-9906
-PKGNAME=	ja-platex2e-common-1999.08.09
+PORTNAME=	platex2e
+PORTVERSION=	1999.08.09
+PKGNAMESUFFIX=	-common
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1999-08-09/ \
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/${PORTVERSION:S/./-/g}/ \
 		ftp://ftp.ams.org/pub/tex/ \
 		${MASTER_SITE_LOCAL}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ecfonts-1.0.tar.gz tfm.tar \
+DISTFILES=	base-9906.tar.gz \
+		ecfonts-1.0.tar.gz \
+		tfm.tar \
 		amsfonts-sources.tar.Z
 
 MAINTAINER=	max@FreeBSD.org
@@ -22,9 +24,8 @@ RUN_DEPENDS=	ptex-common:${PORTSDIR}/japanese/ptex-common
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
 WRKSRC=		${WRKDIR}/base
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} ecfonts-1.0.tar.gz  \
-		amsfonts-sources.tar.Z
-DIST_SUBDIR=	platex2e
+EXTRACT_ONLY=	${DISTFILES:Ntfm.tar}
+DIST_SUBDIR=	${PORTNAME}
 
 TEXMF=		${PREFIX}/share/texmf
 
diff --git a/japanese/platex-euc/Makefile b/japanese/platex-euc/Makefile
index faa1abde2f92..e2d26ce01ea3 100644
--- a/japanese/platex-euc/Makefile
+++ b/japanese/platex-euc/Makefile
@@ -1,26 +1,27 @@
 # New ports collection makefile for:	platex2e-euc
-# Version required:		<1999/08/09>
 # Date created:			05 Oct 1997
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pl19990809e
-PKGNAME=	ja-platex2e-euc-1999.08.09
+PORTNAME=	platex2e
+PORTVERSION=	1999.08.09
+PKGNAMESUFFIX=	-euc
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1999-08-09/
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/${PORTVERSION:S/./-/g}/
+DISTNAME=	pl${PORTVERSION:S/.//g}e
 
 MAINTAINER=	max@FreeBSD.org
 
-BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-euc \
+BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		platex-common:${PORTSDIR}/japanese/platex-common
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-euc \
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		platex-common:${PORTSDIR}/japanese/platex-common
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
-WRKSRC=		${WRKDIR}/19990809
-DIST_SUBDIR=	platex2e
+WRKSRC=		${WRKDIR}/${PORTVERSION:S/.//g}
+DIST_SUBDIR=	${PORTNAME}
 
 TEXMF=		${PREFIX}/share/texmf
 
diff --git a/japanese/platex-jis/Makefile b/japanese/platex-jis/Makefile
index 98e73e2a2053..0f6e3676c525 100644
--- a/japanese/platex-jis/Makefile
+++ b/japanese/platex-jis/Makefile
@@ -1,26 +1,27 @@
 # New ports collection makefile for:	platex2e-jis
-# Version required:		<1999/08/09>
 # Date created:			05 Oct 1997
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pl19990809j
-PKGNAME=	ja-platex2e-jis-1999.08.09
+PORTNAME=	platex2e
+PKGNAMESUFFIX=	-jis
+PORTVERSION=	1999.08.09
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1999-08-09/
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/${PORTVERSION:S/./-/g}/
+DISTNAME=	pl${PORTVERSION:S/.//g}j
 
 MAINTAINER=	max@FreeBSD.org
 
-BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-jis \
+BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		platex-common:${PORTSDIR}/japanese/platex-common
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-jis \
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		platex-common:${PORTSDIR}/japanese/platex-common
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
-WRKSRC=		${WRKDIR}/19990809
-DIST_SUBDIR=	platex2e
+WRKSRC=		${WRKDIR}/${PORTVERSION:S/.//g}
+DIST_SUBDIR=	${PORTNAME}
 
 TEXMF=		${PREFIX}/share/texmf
 
diff --git a/japanese/platex-sjis/Makefile b/japanese/platex-sjis/Makefile
index 3287b50e6890..c44fd0529f04 100644
--- a/japanese/platex-sjis/Makefile
+++ b/japanese/platex-sjis/Makefile
@@ -1,26 +1,27 @@
 # New ports collection makefile for:	platex2e-sjis
-# Version required:		<1999/08/09>
 # Date created:			05 Oct 1997
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	pl19990809s
-PKGNAME=	ja-platex2e-sjis-1999.08.09
+PORTNAME=	platex2e
+PORTVERSION=	1999.08.09
+PKGNAMESUFFIX=	-sjis
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/1999-08-09/
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/${PORTVERSION:S/./-/g}/
+DISTNAME=	pl${PORTVERSION:S/.//g}s
 
 MAINTAINER=	max@FreeBSD.org
 
-BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-sjis \
+BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		platex-common:${PORTSDIR}/japanese/platex-common
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-sjis \
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		platex-common:${PORTSDIR}/japanese/platex-common
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
-WRKSRC=		${WRKDIR}/19990809
-DIST_SUBDIR=	platex2e
+WRKSRC=		${WRKDIR}/${PORTVERSION:S/.//g}
+DIST_SUBDIR=	${PORTNAME}
 
 TEXMF=		${PREFIX}/share/texmf
 
diff --git a/japanese/platex209-euc/Makefile b/japanese/platex209-euc/Makefile
index fdd8680e52cb..9fb5a861c8f0 100644
--- a/japanese/platex209-euc/Makefile
+++ b/japanese/platex209-euc/Makefile
@@ -1,21 +1,22 @@
 # New ports collection makefile for:	platex209-euc
-# Version required:	2.09
 # Date created:		01 Jan 1998
 # Whom:			Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	platex209
-PKGNAME=	ja-platex209-euc-1.0
+PORTNAME=	platex209
+PORTVERSION=	1.0
+PKGNAMESUFFIX=	-euc
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
-BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-euc \
+BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		nkf:${PORTSDIR}/japanese/nkf
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-euc
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX}
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of platex209-*
 
diff --git a/japanese/platex209-jis/Makefile b/japanese/platex209-jis/Makefile
index 3fa55264f106..31da41323ae7 100644
--- a/japanese/platex209-jis/Makefile
+++ b/japanese/platex209-jis/Makefile
@@ -1,20 +1,21 @@
 # New ports collection makefile for:	platex209-jis
-# Version required:	2.09
 # Date created:		01 Jan 1998
 # Whom:			Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	platex209
-PKGNAME=	ja-platex209-jis-1.0
+PORTNAME=	platex209
+PORTVERSION=	1.0
+PKGNAMESUFFIX=	-jis
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
-BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-jis
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-jis
+BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX}
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX}
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of platex209-*
 
diff --git a/japanese/platex209-sjis/Makefile b/japanese/platex209-sjis/Makefile
index fe6d9e5618c8..24de15ec2197 100644
--- a/japanese/platex209-sjis/Makefile
+++ b/japanese/platex209-sjis/Makefile
@@ -1,21 +1,22 @@
 # New ports collection makefile for:	platex209-sjis
-# Version required:	2.09
 # Date created:		01 Jan 1998
 # Whom:			Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	platex209
-PKGNAME=	ja-platex209-sjis-1.0
+PORTNAME=	platex209
+PORTVERSION=	1.0
+PKGNAMESUFFIX=	-sjis
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
-BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-sjis \
+BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		nkf:${PORTSDIR}/japanese/nkf
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-sjis
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX}
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of platex209-*
 
diff --git a/japanese/platex209/Makefile b/japanese/platex209/Makefile
index fdd8680e52cb..9fb5a861c8f0 100644
--- a/japanese/platex209/Makefile
+++ b/japanese/platex209/Makefile
@@ -1,21 +1,22 @@
 # New ports collection makefile for:	platex209-euc
-# Version required:	2.09
 # Date created:		01 Jan 1998
 # Whom:			Makoto WATANABE <watanabe@zlab.phys.nagoya-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	platex209
-PKGNAME=	ja-platex209-euc-1.0
+PORTNAME=	platex209
+PORTVERSION=	1.0
+PKGNAMESUFFIX=	-euc
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/platex/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	watanabe@zlab.phys.nagoya-u.ac.jp
 
-BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-euc \
+BUILD_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX} \
 		nkf:${PORTSDIR}/japanese/nkf
-RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex-euc
+RUN_DEPENDS=	ptex:${PORTSDIR}/japanese/ptex${PKGNAMESUFFIX}
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of platex209-*
 
diff --git a/japanese/postgresql-tcltk/Makefile b/japanese/postgresql-tcltk/Makefile
index e1744ae85765..8f044d6373d7 100644
--- a/japanese/postgresql-tcltk/Makefile
+++ b/japanese/postgresql-tcltk/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	PostgreSQL-j
-# Version required:	6.5.3
 # Date created:		09 Nov 1999
 # Whom:			Ichiro Fukuhara <ichiro@ichiro.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postgresql-6.5.3
-PKGNAME=	ja-postgresql-6.5.3
+PORTNAME=	postgresql
+PORTVERSION=	6.5.3
 CATEGORIES=	japanese databases
-MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
-		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.5.3/
+MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
+		ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION}/ \
+		ftp://ftp.postgresql.org/pub/
 
 MAINTAINER=	ichiro@ichiro.org
 
diff --git a/japanese/postgresql/Makefile b/japanese/postgresql/Makefile
index e1744ae85765..8f044d6373d7 100644
--- a/japanese/postgresql/Makefile
+++ b/japanese/postgresql/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	PostgreSQL-j
-# Version required:	6.5.3
 # Date created:		09 Nov 1999
 # Whom:			Ichiro Fukuhara <ichiro@ichiro.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postgresql-6.5.3
-PKGNAME=	ja-postgresql-6.5.3
+PORTNAME=	postgresql
+PORTVERSION=	6.5.3
 CATEGORIES=	japanese databases
-MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
-		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.5.3/
+MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
+		ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION}/ \
+		ftp://ftp.postgresql.org/pub/
 
 MAINTAINER=	ichiro@ichiro.org
 
diff --git a/japanese/postgresql7/Makefile b/japanese/postgresql7/Makefile
index e1744ae85765..8f044d6373d7 100644
--- a/japanese/postgresql7/Makefile
+++ b/japanese/postgresql7/Makefile
@@ -1,17 +1,16 @@
 # New ports collection makefile for:	PostgreSQL-j
-# Version required:	6.5.3
 # Date created:		09 Nov 1999
 # Whom:			Ichiro Fukuhara <ichiro@ichiro.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	postgresql-6.5.3
-PKGNAME=	ja-postgresql-6.5.3
+PORTNAME=	postgresql
+PORTVERSION=	6.5.3
 CATEGORIES=	japanese databases
-MASTER_SITES=	ftp://ftp.postgresql.org/pub/ \
-		ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
-		ftp://ftp.sra.co.jp/pub/cmd/postgres/6.5.3/
+MASTER_SITES=	ftp://ftp.jaist.ac.jp/pub/dbms/PostgreSQL/ \
+		ftp://ftp.sra.co.jp/pub/cmd/postgres/${PORTVERSION}/ \
+		ftp://ftp.postgresql.org/pub/
 
 MAINTAINER=	ichiro@ichiro.org
 
diff --git a/japanese/ppxp/Makefile b/japanese/ppxp/Makefile
index 52abe69f1b71..2c86adcb3c2c 100644
--- a/japanese/ppxp/Makefile
+++ b/japanese/ppxp/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for: ppxp
-# Version required:	depend on ports/net/ppxp
 # Date created:         01 Jan 1999
 # Whom:                 sada@FreeBSD.org
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-${DISTNAME}
 MASTERDIR=	${.CURDIR}/../../net/ppxp
 
 MAINTAINER=	sada@FreeBSD.org
diff --git a/japanese/prn/Makefile b/japanese/prn/Makefile
index b872c66504ca..23362316948f 100644
--- a/japanese/prn/Makefile
+++ b/japanese/prn/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	prn
-# Version required:	2.0
 # Date created:		19 Jun 1997
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	prn
-PKGNAME=	ja-prn-1.0
+PORTNAME=	prn
+PORTVERSION=	1.0
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ports.jp.freebsd.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
+DISTNAME=	${PORTNAME}
 
 MAINTAINER=	taoka@FreeBSD.org
 
diff --git a/japanese/ptex-base/Makefile b/japanese/ptex-base/Makefile
index b6afb38097d9..94fe81bf98ed 100644
--- a/japanese/ptex-base/Makefile
+++ b/japanese/ptex-base/Makefile
@@ -1,23 +1,26 @@
 # New ports collection makefile for:	pTeX-common
-# Version required:	2.1.8
 # Date created:		05 Oct 1997
 # Whom:			max
 #
 # $FreeBSD$
 #
 
-DISTNAME=	web2c-7.2
-PKGNAME=	ja-ptex-common-2.1.8
+PORTNAME=	ptex
+PORTVERSION=	2.1.8
+PKGNAMESUFFIX=	-common
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz texmflib-7.3.tar.gz
+DISTNAME=	web2c-7.2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		web-7.2.tar.gz \
+		texmflib-7.3.tar.gz
 
 MAINTAINER=	max@FreeBSD.org
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
 USE_GMAKE=	yes
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
-DIST_SUBDIR=	ptex
+EXTRACT_ONLY=	${DISTFILES:Ntexmflib-*}
+DIST_SUBDIR=	${PORTNAME}
 STRIP=		# some shell scripts
 MAN1=		access.1 amstex.1 bibtex.1 dmp.1 dvicopy.1 dvitype.1	\
 		eplain.1 etex.1 gftodvi.1 gftopk.1 gftype.1 kpsestat.1	\
diff --git a/japanese/ptex-common/Makefile b/japanese/ptex-common/Makefile
index b6afb38097d9..94fe81bf98ed 100644
--- a/japanese/ptex-common/Makefile
+++ b/japanese/ptex-common/Makefile
@@ -1,23 +1,26 @@
 # New ports collection makefile for:	pTeX-common
-# Version required:	2.1.8
 # Date created:		05 Oct 1997
 # Whom:			max
 #
 # $FreeBSD$
 #
 
-DISTNAME=	web2c-7.2
-PKGNAME=	ja-ptex-common-2.1.8
+PORTNAME=	ptex
+PORTVERSION=	2.1.8
+PKGNAMESUFFIX=	-common
 CATEGORIES=	japanese print
 MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/web2c/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz texmflib-7.3.tar.gz
+DISTNAME=	web2c-7.2
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		web-7.2.tar.gz \
+		texmflib-7.3.tar.gz
 
 MAINTAINER=	max@FreeBSD.org
 
 MANUAL_PACKAGE_BUILD=	incompatible with other versions of ptex-*
 USE_GMAKE=	yes
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} web-7.2.tar.gz
-DIST_SUBDIR=	ptex
+EXTRACT_ONLY=	${DISTFILES:Ntexmflib-*}
+DIST_SUBDIR=	${PORTNAME}
 STRIP=		# some shell scripts
 MAN1=		access.1 amstex.1 bibtex.1 dmp.1 dvicopy.1 dvitype.1	\
 		eplain.1 etex.1 gftodvi.1 gftopk.1 gftype.1 kpsestat.1	\
diff --git a/japanese/ptex-euc/Makefile b/japanese/ptex-euc/Makefile
index 93c1908feb51..3e71018ccf61 100644
--- a/japanese/ptex-euc/Makefile
+++ b/japanese/ptex-euc/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	pTeX-euc
-# Version required:	2.1.8
 # Date created:		05 Oct 1997
 # Whom:			max
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ptex218
-PKGNAME=	ja-ptex-euc-2.1.8
+PORTNAME=	ptex
+PORTVERSION=	2.1.8
+PKGNAMESUFFIX=	-euc
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-euc.tar.gz \
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/${DISTNAME}/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		plib-1.4${PKGNAMESUFFIX}.tar.gz \
 		Makefile.in.patch.txt
 
 MAINTAINER=	max@FreeBSD.org
@@ -43,7 +45,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4${PKGNAMESUFFIX}.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex-jis/Makefile b/japanese/ptex-jis/Makefile
index cee67a0ca440..e7189d2f7f1e 100644
--- a/japanese/ptex-jis/Makefile
+++ b/japanese/ptex-jis/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	pTeX-jis
-# Version required:	2.1.8
 # Date created:		05 Oct 1997
 # Whom:			max
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ptex218
-PKGNAME=	ja-ptex-jis-2.1.8
+PORTNAME=	ptex
+PORTVERSION=	2.1.8
+PKGNAMESUFFIX=	-jis
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-jis.tar.gz \
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/${DISTNAME}/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		plib-1.4${PKGNAMESUFFIX}.tar.gz \
 		Makefile.in.patch.txt
 
 MAINTAINER=	max@FreeBSD.org
@@ -43,7 +45,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-jis.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4${PKGNAMESUFFIX}.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex-pkfonts118/Makefile b/japanese/ptex-pkfonts118/Makefile
index df640400a036..5bbebcde64b5 100644
--- a/japanese/ptex-pkfonts118/Makefile
+++ b/japanese/ptex-pkfonts118/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:   ptex-pkfonts
-# Version required:    ?
 # Date created:        24 Dec 1999
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
diff --git a/japanese/ptex-pkfonts240/Makefile b/japanese/ptex-pkfonts240/Makefile
index e2014c0c42db..a3387073a769 100644
--- a/japanese/ptex-pkfonts240/Makefile
+++ b/japanese/ptex-pkfonts240/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:   ptex-pkfonts
-# Version required:    ?
 # Date created:        24 Dec 1999
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
diff --git a/japanese/ptex-pkfonts300/Makefile b/japanese/ptex-pkfonts300/Makefile
index 88b587e7a8be..cef6ed1c6757 100644
--- a/japanese/ptex-pkfonts300/Makefile
+++ b/japanese/ptex-pkfonts300/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:   ptex-pkfonts
-# Version required:    ?
 # Date created:        24 Dec 1999
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ptex-pkfonts
-PKGNAME?=	ja-ptex-pkfonts${RESOLUTION}-1.0
+PORTNAME=	ptex-pkfonts
+PORTVERSION=	1.0
+PKGNAMESUFFIX=	${RESOLUTION}
 CATEGORIES=	japanese print
-DISTFILES=	#null
+DISTFILES=	# none
 
 MAINTAINER=	inagaki@tg.rim.or.jp
 
diff --git a/japanese/ptex-pkfonts360/Makefile b/japanese/ptex-pkfonts360/Makefile
index a622071e9099..7a8456928f03 100644
--- a/japanese/ptex-pkfonts360/Makefile
+++ b/japanese/ptex-pkfonts360/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:   ptex-pkfonts
-# Version required:    ?
 # Date created:        24 Dec 1999
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
diff --git a/japanese/ptex-pkfonts400/Makefile b/japanese/ptex-pkfonts400/Makefile
index ad38557c3190..e1bd7f177791 100644
--- a/japanese/ptex-pkfonts400/Makefile
+++ b/japanese/ptex-pkfonts400/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:   ptex-pkfonts
-# Version required:    ?
 # Date created:        24 Dec 1999
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
diff --git a/japanese/ptex-pkfonts600/Makefile b/japanese/ptex-pkfonts600/Makefile
index 0a1b8073a302..cde33fd4dce1 100644
--- a/japanese/ptex-pkfonts600/Makefile
+++ b/japanese/ptex-pkfonts600/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:   ptex-pkfonts
-# Version required:    ?
 # Date created:        24 Dec 1999
 # Whom:                Kentaro Inagaki <inagaki@tg.rim.or.jp>
 #
diff --git a/japanese/ptex-sjis/Makefile b/japanese/ptex-sjis/Makefile
index 69f3cf8a57c0..d7d3643cb568 100644
--- a/japanese/ptex-sjis/Makefile
+++ b/japanese/ptex-sjis/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	pTeX-sjis
-# Version required:	2.1.8
 # Date created:		05 Oct 1997
 # Whom:			max
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ptex218
-PKGNAME=	ja-ptex-sjis-2.1.8
+PORTNAME=	ptex
+PORTVERSION=	2.1.8
+PKGNAMESUFFIX=	-sjis
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-sj.tar.gz \
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/${DISTNAME}/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		plib-1.4${PKGNAMESUFFIX:S/sjis/sj/}.tar.gz \
 		Makefile.in.patch.txt
 
 MAINTAINER=	max@FreeBSD.org
@@ -43,7 +45,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-sj.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4${PKGNAMESUFFIX:S/sjis/sj/}.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/ptex/Makefile b/japanese/ptex/Makefile
index 93c1908feb51..3e71018ccf61 100644
--- a/japanese/ptex/Makefile
+++ b/japanese/ptex/Makefile
@@ -1,16 +1,18 @@
 # New ports collection makefile for:	pTeX-euc
-# Version required:	2.1.8
 # Date created:		05 Oct 1997
 # Whom:			max
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ptex218
-PKGNAME=	ja-ptex-euc-2.1.8
+PORTNAME=	ptex
+PORTVERSION=	2.1.8
+PKGNAMESUFFIX=	-euc
 CATEGORIES=	japanese print
-MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/ptex218/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} plib-1.4-euc.tar.gz \
+MASTER_SITES=	ftp://ftp.ascii.co.jp/pub/TeX/ascii-ptex/${DISTNAME}/
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		plib-1.4${PKGNAMESUFFIX}.tar.gz \
 		Makefile.in.patch.txt
 
 MAINTAINER=	max@FreeBSD.org
@@ -43,7 +45,7 @@ pre-patch:
 	  ${PATCH} ${PATCH_DIST_ARGS}
 
 pre-install:
-	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4-euc.tar.gz
+	@${TAR} -C ${PREFIX}/share -zxf ${DISTDIR}/${DIST_SUBDIR}/plib-1.4${PKGNAMESUFFIX}.tar.gz
 
 post-install:
 .for bin in ${BINARIES}
diff --git a/japanese/qkc/Makefile b/japanese/qkc/Makefile
index 12ea5bcf6e88..c479b0e85f5c 100644
--- a/japanese/qkc/Makefile
+++ b/japanese/qkc/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	qkcc
-# Version required:		1.0
 # Date created:			03 May 1996
 # Whom:				Masafumi NAKANE <max@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	qkcc100
-PKGNAME=	ja-qkc-1.0
+PORTNAME=	qkc
+PORTVERSION=	1.0
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/oct/ \
 		ftp://ftp.iis.u-tokyo.ac.jp/pub1/unix/Kanji/
+DISTNAME=	${PORTNAME}c100
 
 MAINTAINER=	max@FreeBSD.org
 
diff --git a/japanese/recjis/Makefile b/japanese/recjis/Makefile
index 1002d4e629ba..31ee9e3bfa87 100644
--- a/japanese/recjis/Makefile
+++ b/japanese/recjis/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:   recjis
-# Version required:    1.0
 # Date created:        05 February 1997
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	recjis-1.0
-PKGNAME=	ja-recjis-1.0
+PORTNAME=	recjis
+PORTVERSION=	1.0
 CATEGORIES+=	japanese
 MASTER_SITES=	ftp://ftp.leo.chubu.ac.jp/pub/tools/
-DISTFILES=	recjis.tar.gz
+DISTFILES=	${PORTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	nakai@FreeBSD.org
 
diff --git a/japanese/ruby-tcltklib/Makefile b/japanese/ruby-tcltklib/Makefile
index 113d08cf12b2..662f3ddc8076 100644
--- a/japanese/ruby-tcltklib/Makefile
+++ b/japanese/ruby-tcltklib/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:    ja-rubytk
-# Version required:     (depends on ${MASTERDIR})
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-rubytk-${VERSION}
 CATEGORIES=	japanese x11-toolkits
 
 MAINTAINER=	yasuf@big.or.jp
diff --git a/japanese/ruby-tk/Makefile b/japanese/ruby-tk/Makefile
index 113d08cf12b2..662f3ddc8076 100644
--- a/japanese/ruby-tk/Makefile
+++ b/japanese/ruby-tk/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:    ja-rubytk
-# Version required:     (depends on ${MASTERDIR})
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-rubytk-${VERSION}
 CATEGORIES=	japanese x11-toolkits
 
 MAINTAINER=	yasuf@big.or.jp
diff --git a/japanese/ruby14-tcltklib/Makefile b/japanese/ruby14-tcltklib/Makefile
index 113d08cf12b2..662f3ddc8076 100644
--- a/japanese/ruby14-tcltklib/Makefile
+++ b/japanese/ruby14-tcltklib/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:    ja-rubytk
-# Version required:     (depends on ${MASTERDIR})
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-rubytk-${VERSION}
 CATEGORIES=	japanese x11-toolkits
 
 MAINTAINER=	yasuf@big.or.jp
diff --git a/japanese/ruby14-tk/Makefile b/japanese/ruby14-tk/Makefile
index 113d08cf12b2..662f3ddc8076 100644
--- a/japanese/ruby14-tk/Makefile
+++ b/japanese/ruby14-tk/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:    ja-rubytk
-# Version required:     (depends on ${MASTERDIR})
 # Date created:         15 March 1999
 # Whom:                 Yasuhiro Fukuma <yasuf@big.or.jp>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-rubytk-${VERSION}
 CATEGORIES=	japanese x11-toolkits
 
 MAINTAINER=	yasuf@big.or.jp
diff --git a/japanese/rxvt/Makefile b/japanese/rxvt/Makefile
index ec468339eadb..5cdae131b2e4 100644
--- a/japanese/rxvt/Makefile
+++ b/japanese/rxvt/Makefile
@@ -1,13 +1,12 @@
 # New ports collection Makefile for: ja-rxvt
-# Version required:	2.7.2
 # Date created:         11 May 1999
 # Whom:                 HONDA Yasuhiro <honda@kashio.info.mie-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	rxvt-2.7.2
-PKGNAME=	ja-rxvt-2.7.2
+PORTNAME=	rxvt
+PORTVERSION=	2.7.2
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
 
diff --git a/japanese/samba/Makefile b/japanese/samba/Makefile
index 671837f71e34..8174fda1d23a 100644
--- a/japanese/samba/Makefile
+++ b/japanese/samba/Makefile
@@ -1,21 +1,23 @@
 # New ports collection makefile for:	samba
-# Version required:			2.0.5a
 # Date created:				27 Dec 1999
 # Whom:					Shinya Sasaki <pcmaster@osk3.3web.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	samba-2.0.5a-JP2-1.3
-PKGNAME=	ja-samba-2.0.5a.2
+PORTNAME=	samba
+PORTVERSION=	2.0.5a.2
 CATEGORIES=	japanese net
-MASTER_SITES=	ftp://ftp.samba.gr.jp/pub/samba-jp/samba-2.0.5a-JP2/ \
+MASTER_SITES=	ftp://ftp.samba.gr.jp/pub/samba-jp/${SAMBA_JP_NAME}/ \
 		http://www3.osk.3web.ne.jp/~pcmaster/network/samba/
+DISTNAME=	${SAMBA_JP_NAME}-1.3
 
 MAINTAINER=	pcmaster@osk3.3web.ne.jp
 
 Y2K=		http://us1.samba.org/samba/docs/sambay2k.html
 
+SAMBA_JP_NAME=	${PORTNAME}-${PORTVERSION:R}-JP${PORTVERSION:E}
+
 # directories
 VARDIR=		/var
 SAMBA_SPOOL=	${VARDIR}/spool/samba
@@ -36,7 +38,6 @@ CONFIGURE_ARGS+=--with-krb5=${KRB5_HOME}
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
-#WRKSRC=		${WRKDIR}/samba-2.0.5a-JP2/source
 
 MANLANG=	"" ja
 MAN1=		nmblookup.1 smbstatus.1 smbclient.1 smbrun.1 smbtar.1 \
@@ -47,7 +48,7 @@ MAN8=		smbd.8 nmbd.8 smbpasswd.8 swat.8 \
 		smbmount.8 smbumount.8 smbmnt.8
 
 post-extract:
-	${MV} ${WRKDIR}/samba-2.0.5a-JP2 ${WRKDIR}/${DISTNAME}
+	${MV} ${WRKDIR}/${SAMBA_JP_NAME} ${WRKDIR}/${DISTNAME}
 
 post-install:
 	${MKDIR} ${PREFIX}/share/examples/samba
diff --git a/japanese/sdic/Makefile b/japanese/sdic/Makefile
index 805eea4bf5b3..2cb182fb609f 100644
--- a/japanese/sdic/Makefile
+++ b/japanese/sdic/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	sdic
-# Version required:	2.1.2
 # Date created:        	09 Sep 1999
 # Whom:			Kazumasa Nishizawa <kazumasa@selab.tutkie.tut.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sdic-2.1.2
-PKGNAME=	ja-sdic-2.1.2
+PORTNAME=	sdic
+PORTVERSION=	2.1.2
 CATEGORIES=	japanese elisp
 MASTER_SITES=	ftp://pine.kuee.kyoto-u.ac.jp/pub/tsuchiya/sdic/
 
diff --git a/japanese/sed/Makefile b/japanese/sed/Makefile
index 37a454a0941e..6da23928dd13 100644
--- a/japanese/sed/Makefile
+++ b/japanese/sed/Makefile
@@ -1,16 +1,15 @@
 # New ports collection makefile for:	sed+mb
-# Version required:	3.02+mb1.08
 # Date created:		2 April 1995
 # Whom:			Nobuhiro Yasutomi <nobu@psrc.isac.co.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sed-3.02
-PKGNAME=	ja-sed-3.02
+PORTNAME=	sed
+PORTVERSION=	3.02
 CATEGORIES=	japanese textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	sed
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
@@ -18,7 +17,7 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 PATCH_SITES=	http://member.nifty.ne.jp/wills/program/
-PATCHFILES=	sedmb108.diff.gz
+PATCHFILES=	${PORTNAME}mb108.diff.gz
 PATCH_DIST_STRIP=	-p1
 FETCH_BEFORE_ARGS=	-b
 
diff --git a/japanese/seizedesktop/Makefile b/japanese/seizedesktop/Makefile
index 6b56f77ae22f..4f5db2c6e1c8 100644
--- a/japanese/seizedesktop/Makefile
+++ b/japanese/seizedesktop/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	JDE's SeizeDesktop for ja-TkStep
-# Version required:	0.1
 # Date created:		25 March 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile
index 6ea4e34f5a39..62b9a2eb114e 100644
--- a/japanese/sj3-lib/Makefile
+++ b/japanese/sj3-lib/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	SJ3
-# Version required:	2.0.1.20
 # Date created:		18 Aug 1998
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sj3-2.0.1.20
-PKGNAME=	ja-sj3-2.0.1.20
+PORTNAME=	sj3
+PORTVERSION=	2.0.1.20
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile
index 6ea4e34f5a39..62b9a2eb114e 100644
--- a/japanese/sj3-server/Makefile
+++ b/japanese/sj3-server/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	SJ3
-# Version required:	2.0.1.20
 # Date created:		18 Aug 1998
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sj3-2.0.1.20
-PKGNAME=	ja-sj3-2.0.1.20
+PORTNAME=	sj3
+PORTVERSION=	2.0.1.20
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
diff --git a/japanese/sj3/Makefile b/japanese/sj3/Makefile
index 6ea4e34f5a39..62b9a2eb114e 100644
--- a/japanese/sj3/Makefile
+++ b/japanese/sj3/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	SJ3
-# Version required:	2.0.1.20
 # Date created:		18 Aug 1998
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sj3-2.0.1.20
-PKGNAME=	ja-sj3-2.0.1.20
+PORTNAME=	sj3
+PORTVERSION=	2.0.1.20
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
diff --git a/japanese/sjxa/Makefile b/japanese/sjxa/Makefile
index 88d160cb52af..c861e6f991ae 100644
--- a/japanese/sjxa/Makefile
+++ b/japanese/sjxa/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	SJXA
-# Version required:	1.5.11
 # Date created:		10 Aug 1996
 # Whom:			Hidekazu Kuroki <hidekazu@cs.titech.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	sjxa-1.5.11
-PKGNAME=	ja-sjxa-1.5.11
+PORTNAME=	sjxa
+PORTVERSION=	1.5.11
 CATEGORIES=	japanese x11
 MASTER_SITES=	ftp://ftp.sony.co.jp/pub/unsupported/src/ \
 		ftp://ftp.cs.titech.ac.jp/pub/japanese/sj3/
diff --git a/japanese/skk-elisp/Makefile b/japanese/skk-elisp/Makefile
index bb195f33474e..33dd3e19a210 100644
--- a/japanese/skk-elisp/Makefile
+++ b/japanese/skk-elisp/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	skk-elisp
-# Version required:	9.6
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skk9.6
-PKGNAME=	ja-skk-elisp-9.6
+PORTNAME=	skk-elisp
+PORTVERSION=	9.6
 CATEGORIES=	japanese elisp
-MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
+MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/${PORTVERSION}/
+DISTNAME=	skk${PORTVERSION}
 
 MAINTAINER=	matusita@jp.freebsd.org
 
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${PREFIX}/share/skk/${SKKJISYO}:${SKK_MASTERDIR}
 SKKJISYO_SIZE?=	L
 SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 SKK_MASTERDIR=	${.CURDIR}/../../japanese/skk-jisyo
-WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-9.6
+WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-${PORTVERSION}
 
 # we cannot use skk-9.6 on emacs20
 EMACS=		mule
diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile
index ffc83d511942..eb74b0d749fe 100644
--- a/japanese/skk-jisyo/Makefile
+++ b/japanese/skk-jisyo/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	skk-jisyo
-# Version required:	9.6
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skk9.6
-PKGNAME=	ja-skk-jisyo${SKKJISYO_SIZE}-9.6
+PORTNAME=	skk-jisyo
+PORTVERSION=	9.6
+PKGNAMESUFFIX=	${SKKJISYO_SIZE}
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
+MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/${PORTVERSION}/
+DISTNAME=	skk${PORTVERSION}
 
 MAINTAINER=	matusita@jp.freebsd.org
 
@@ -22,7 +23,7 @@ SKKJISYO_SIZE_INVALID=	yes
 .endif
 SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 
-WRKSRC=		${WRKDIR}/skk-9.6
+WRKSRC=		${WRKDIR}/skk-${PORTVERSION}
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
 INSTALL_TARGET=	install-jisyo
diff --git a/japanese/skk-tools/Makefile b/japanese/skk-tools/Makefile
index ff7dfc7a8dc1..ec1905fc32df 100644
--- a/japanese/skk-tools/Makefile
+++ b/japanese/skk-tools/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	skk-tools
-# Version required:	9.6
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skk9.6
-PKGNAME=	ja-skk-tools-9.6
+PORTNAME=	skk-tools
+PORTVERSION=	9.6
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
+MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/${PORTVERSION}/
+DISTNAME=	skk${PORTVERSION}
 
 MAINTAINER=	matusita@jp.freebsd.org
 
 BUILD_DEPENDS=	/nonexistent:${SKK_MASTERDIR}:configure
 
 SKK_MASTERDIR=	${.CURDIR}/../../japanese/skk-jisyo
-WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-9.6
+WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-${PORTVERSION}
 MAKE_ARGS=	SUBDIRS='jisyo-tools'
 
 .include <bsd.port.mk>
diff --git a/japanese/skk/Makefile b/japanese/skk/Makefile
index 8bc6f5febfd8..194b66579ec3 100644
--- a/japanese/skk/Makefile
+++ b/japanese/skk/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	skk
-# Version required:	9.6
 # Date created:		04 Mar 1997
 # Whom:			Makoto Matsushita <matusita@jp.freebsd.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skk9.6
-PKGNAME=	ja-skk-9.6
+PORTNAME=	skk
+PORTVERSION=	9.6
 CATEGORIES=	japanese elisp
 MASTER_SITES=	# empty
 DISTFILES=	# empty
diff --git a/japanese/skk10-elisp-emacs20/Makefile b/japanese/skk10-elisp-emacs20/Makefile
index bc8ac6ad2f91..58b5d3647ac6 100644
--- a/japanese/skk10-elisp-emacs20/Makefile
+++ b/japanese/skk10-elisp-emacs20/Makefile
@@ -1,15 +1,16 @@
 # New ports collection makefile for:	skk10-elisp-emacs20
-# Version required:	10.57
 # Date created:		21 September 1999
 # Whom:			Shigeyuki FUKUSHIMA <shige@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skk${SKK10_VER}
-PKGNAME=	ja-skk-elisp-${EMACS_PORT_NAME}-${SKK10_VER}
+PORTNAME=	skk-elisp
+PORTVERSION=	${SKK10_VER}
+PKGNAMESUFFIX=	-${EMACS_PORT_NAME}
 CATEGORIES=	japanese elisp
 MASTER_SITES=	http://openlab.ring.gr.jp/skk/
+DISTNAME=	skk${SKK10_VER}
 
 MAINTAINER?=	shige@FreeBSD.org
 
diff --git a/japanese/skkfep/Makefile b/japanese/skkfep/Makefile
index c3c09e78d683..3b612a057d99 100644
--- a/japanese/skkfep/Makefile
+++ b/japanese/skkfep/Makefile
@@ -1,15 +1,15 @@
 # New ports collection Makefile for:	skkfep
-# Version required:	0.85
 # Date created:		22 Jul 1998
 # Whom:			Yusuke Nawano <azuki@azkey.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=       skkfep0.85
-PKGNAME=        ja-skkfep-0.85
-CATEGORIES=     japanese
-MASTER_SITES=   ftp://ftp.azkey.org/pub/misc/skkfep/
+PORTNAME=	skkfep
+PORTVERSION=	0.85
+CATEGORIES=	japanese
+MASTER_SITES=	ftp://ftp.azkey.org/pub/misc/skkfep/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.azkey.org/pub/misc/skkfep/
 PATCHFILES=	skkfep111.diff.gz
diff --git a/japanese/skkinput/Makefile b/japanese/skkinput/Makefile
index b4c48e02a076..916b8cfbef8e 100644
--- a/japanese/skkinput/Makefile
+++ b/japanese/skkinput/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	skkinput
-# Version required:	2.00
 # Date created:		28 Jan 1998
 # Whom:			Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skkinput-2.03
-PKGNAME=	ja-skkinput-2.03
+PORTNAME=	skkinput
+PORTVERSION=	2.03
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://member.nifty.ne.jp/Tatari_SAKAMOTO/
 
diff --git a/japanese/skkinput3/Makefile b/japanese/skkinput3/Makefile
index b4c48e02a076..916b8cfbef8e 100644
--- a/japanese/skkinput3/Makefile
+++ b/japanese/skkinput3/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	skkinput
-# Version required:	2.00
 # Date created:		28 Jan 1998
 # Whom:			Murata Shuuichirou <mrt@mickey.ai.kyutech.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skkinput-2.03
-PKGNAME=	ja-skkinput-2.03
+PORTNAME=	skkinput
+PORTVERSION=	2.03
 CATEGORIES=	japanese x11
 MASTER_SITES=	http://member.nifty.ne.jp/Tatari_SAKAMOTO/
 
diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile
index 52c637219441..22a3cfc512c0 100644
--- a/japanese/skkserv/Makefile
+++ b/japanese/skkserv/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	skkserv
-# Version required:	9.6
 # Date created:		31 Oct 1998
 # Whom:			Shigeyuki FUKUSHIMA <shige@kuis.kyoto-u.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	skk9.6
-PKGNAME=	ja-skkserv-9.6
+PORTNAME=	skkserv
+PORTVERSION=	9.6
 CATEGORIES=	japanese
-MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/9.6/
+MASTER_SITES=	ftp://skk.kuis.kyoto-u.ac.jp/skk/${PORTVERSION}/
+DISTNAME=	skk${PORTVERSION}
 
 MAINTAINER=	matusita@jp.freebsd.org
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${PREFIX}/share/skk/${SKKJISYO}:${SKK_MASTERDIR}
 SKKJISYO_SIZE?=	L
 SKKJISYO?=	SKK-JISYO.${SKKJISYO_SIZE}
 SKK_MASTERDIR=	${.CURDIR}/../../japanese/skk-jisyo
-WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-9.6
+WRKSRC=		${WRKDIRPREFIX}${SKK_MASTERDIR}/work/skk-${PORTVERSION}
 MAKE_ARGS=	SUBDIRS='skkserv'
 
 STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/skkserv.sh
diff --git a/japanese/slrn/Makefile b/japanese/slrn/Makefile
index 3acf68d079d1..e055b2293056 100644
--- a/japanese/slrn/Makefile
+++ b/japanese/slrn/Makefile
@@ -1,28 +1,28 @@
 # New ports collection makefile for:	ja-slrn
-# Version required:	0.9.6.2jp0
 # Date created:		6 Sept 1999
 # Whom:			Takashi Mega <mega@minz.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	slrn-0.9.6.2
-PKGNAME=	ja-slrn-0.9.6.2
+PORTNAME=	slrn
+PORTVERSION=	0.9.6.2
 CATEGORIES=	japanese news
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slrn/ \
 		http://kondara.sdri.co.jp/~kikutani/slang/
-DISTFILES=	slrn-0.9.6.2.tar.gz  slrn-doc-j0.9.5.6-0.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-doc-j0.9.5.6-0.tar.gz
 
 PATCH_SITES=	ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
-PATCHFILES= 	slrn-0.9.6.2jp0.pat.gz
+PATCHFILES= 	${PORTNAME}-${PORTVERSION}jp0.pat.gz
 PATCH_DIST_STRIP=-p1
 
 MAINTAINER=	ukatsuta@mud.biglobe.ne.jp
 
 LIB_DEPENDS=	slang.2:${PORTSDIR}/japanese/libslang
 
-WRKSRC=		${WRKDIR}/slrn-0.9.6.2
-JDOCSRC=	${WRKDIR}/slrn-doc-j0.9.5.6-0
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+JDOCSRC=	${WRKDIR}/${PORTNAME}-doc-j0.9.5.6-0
 GNU_CONFIGURE=	yes
 ALL_TARGET=	all slrnpull
 MANLANG=	'' ja
diff --git a/japanese/tcl76/Makefile b/japanese/tcl76/Makefile
index b6f7671877ba..b761b5e80ea1 100644
--- a/japanese/tcl76/Makefile
+++ b/japanese/tcl76/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	tcl7.6jp
-# Version required:	7.6p2jp
 # Date created:		11 March 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl7.6p2
-PKGNAME=	ja-tcl-7.6
+PORTNAME=	tcl
+PORTVERSION=	7.6
 CATEGORIES=	japanese lang
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl7_6/
+DISTNAME=	${PORTNAME}${PORTVERSION}p2
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tcl7.6jp-patch.gz
+PATCHFILES=	${PORTNAME}${PORTVERSION}jp-patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -21,7 +21,7 @@ USE_AUTOCONF=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
 
-VERSION=	7.6jp
+VERSION=	${PORTVERSION}jp
 
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} -E ${PATCH_DIST_STRIP}
@@ -32,7 +32,7 @@ PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRI
 .include <bsd.port.pre.mk>
 
 post-extract:
-	@${MV} ${WRKDIR}/tcl7.6 ${WRKDIR}/${DISTNAME}
+	@${MV} ${WRKDIR}/${PORTNAME}${PORTVERSION} ${WRKDIR}/${DISTNAME}
 
 post-configure:
 	@${ECHO} "We will NOT only make shared library, but also static one."
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 565804440301..f347f0ae2820 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -1,22 +1,22 @@
 # New ports collection makefile for:	ja-tcl8.0
-# Version required:	8.0
 # Date created:		23 Jan 1998
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcl8.0.5
-PKGNAME=	ja-tcl-8.0.5
+PORTNAME=	tcl
+PORTVERSION=	8.0.5
 CATEGORIES=	japanese lang tcl80
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
+MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl${VERSION:S/./_/}/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tcl8.0.5jp1.7.patch.gz
+PATCHFILES=	${PORTNAME}${PORTVERSION}jp1.7.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
-VERSION=	8.0
+VERSION=	${PORTVERSION:R}
 TOPDIR=		${WRKDIR}/${DISTNAME}
 WRKSRC=		${TOPDIR}/unix
 .if defined(PATCH_DEBUG)
diff --git a/japanese/tcsh-nls-asuka/Makefile b/japanese/tcsh-nls-asuka/Makefile
index a0b5266eaf41..ceb4ad99c76f 100644
--- a/japanese/tcsh-nls-asuka/Makefile
+++ b/japanese/tcsh-nls-asuka/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for: ja-tcsh NLS catalog (Soryu Asuka Langley)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-asuka-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	asuka
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.asuka
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-ayanami/Makefile b/japanese/tcsh-nls-ayanami/Makefile
index a40c482e7094..b00cbb4224a2 100644
--- a/japanese/tcsh-nls-ayanami/Makefile
+++ b/japanese/tcsh-nls-ayanami/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for:	ja-tcsh NLS catalog (Ayanami Rei)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-ayanami-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	ayanami
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.ayanami
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-generic/Makefile b/japanese/tcsh-nls-generic/Makefile
index 4d3fd3475e01..07ef0a3e6618 100644
--- a/japanese/tcsh-nls-generic/Makefile
+++ b/japanese/tcsh-nls-generic/Makefile
@@ -1,28 +1,33 @@
 # New ports collection makefile for:	ja-tcsh NLS catalog (Generic Japanese)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-.if !defined(NLSSRC)
-DISTNAME=	tcsh-6.08.05
-PKGNAME=	ja-tcsh-nls-generic-6.08.05
+PORTNAME=	tcsh-nls
+PORTVERSION=	6.08.05
+PKGNAMESUFFIX=	-${CATALOGNAME}
 CATEGORIES=	japanese shells
-MASTER_SITES=	ftp://ftp.astron.com/pub/tcsh/ ${MASTER_SITE_PORTS_JP}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.add2${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+DISTNAME=	tcsh-${PORTVERSION}.add2
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
-PATCH_DIST_STRIP=	-p1
-NLSSRC=		${DISTNAME}/nls/ja
-.endif
-
 BUILD_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
 RUN_DEPENDS=	tcsh:${PORTSDIR}/japanese/tcsh
 
-WRKSRC=		${WRKDIR}/tcsh-6.08.05.add2
+CATALOGNAME?=	generic
+
+.if ${CATALOGNAME} == generic
+MASTER_SITES+=	ftp://ftp.astron.com/pub/tcsh/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		tcsh-${PORTVERSION}${EXTRACT_SUFX}
+
+NLSSRC=		tcsh-${PORTVERSION}/nls/ja
+.else
+NLSSRC=		${DISTNAME}/nls/ja.${CATALOGNAME}
+.endif
 
 NLSDIR=		${PREFIX}/share/nls
 GENCAT=		/usr/bin/gencat
diff --git a/japanese/tcsh-nls-koshiki/Makefile b/japanese/tcsh-nls-koshiki/Makefile
index 771f108271d3..345423b09894 100644
--- a/japanese/tcsh-nls-koshiki/Makefile
+++ b/japanese/tcsh-nls-koshiki/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for: ja-tcsh NLS catalog (Koshiki Yukari)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-koshiki-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	koshiki
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.koshiki
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-merril/Makefile b/japanese/tcsh-nls-merril/Makefile
index 32de6dca9de9..8c99e6f3ab08 100644
--- a/japanese/tcsh-nls-merril/Makefile
+++ b/japanese/tcsh-nls-merril/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for:	ja-tcsh NLS catalog (Merril)
-# Version required:	6.08.05
 # Date created:		6 January 1999
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-merril-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	merril
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.merril
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-miyakonjo/Makefile b/japanese/tcsh-nls-miyakonjo/Makefile
index 21a865c56ba5..ecef524b18e8 100644
--- a/japanese/tcsh-nls-miyakonjo/Makefile
+++ b/japanese/tcsh-nls-miyakonjo/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for:	ja-tcsh NLS catalog (Miyakonjo)
-# Version required:	6.08.05
 # Date created:		6 January 1999
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-miyakonjo-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	miyakonjo
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.miyakonjo
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-multi/Makefile b/japanese/tcsh-nls-multi/Makefile
index f7c01acb8339..6d1de93b4144 100644
--- a/japanese/tcsh-nls-multi/Makefile
+++ b/japanese/tcsh-nls-multi/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for:	ja-tcsh NLS catalog (Multi)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-multi-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	multi
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.multi
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-rishu/Makefile b/japanese/tcsh-nls-rishu/Makefile
index d8965e7a3c9f..d78ed2a3eb6c 100644
--- a/japanese/tcsh-nls-rishu/Makefile
+++ b/japanese/tcsh-nls-rishu/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for:	ja-tcsh NLS catalog (Rishu)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-rishu-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	rishu
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.rishu
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-roomi/Makefile b/japanese/tcsh-nls-roomi/Makefile
index 1ac59d9ab0f9..02ee70db83cc 100644
--- a/japanese/tcsh-nls-roomi/Makefile
+++ b/japanese/tcsh-nls-roomi/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for: ja-tcsh NLS catalog (Roomi)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-roomi-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	roomi
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.roomi
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh-nls-ruri2/Makefile b/japanese/tcsh-nls-ruri2/Makefile
index b169360c72a8..7f7751221190 100644
--- a/japanese/tcsh-nls-ruri2/Makefile
+++ b/japanese/tcsh-nls-ruri2/Makefile
@@ -1,21 +1,16 @@
 # New ports collection makefile for:	ja-tcsh NLS catalog (Hoshino Ruri)
-# Version required:	6.08.05
 # Date created:		19 August 1998
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05.add2
-PKGNAME=	ja-tcsh-nls-ruri2-6.08.05
-CATEGORIES=	japanese shells
-MASTER_SITES=	${MASTER_SITE_PORTS_JP}
+CATALOGNAME=	ruri2
 
 MAINTAINER=	issei@jp.FreeBSD.org
 
 MASTERDIR=	${.CURDIR}/../tcsh-nls-generic
 PKGDIR=		${.CURDIR}/pkg
 PLIST=		${MASTERDIR}/pkg/PLIST
-NLSSRC=		${DISTNAME}/nls/ja.ruri2
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/tcsh/Makefile b/japanese/tcsh/Makefile
index 5c7c63a3e8a4..49607e671a52 100644
--- a/japanese/tcsh/Makefile
+++ b/japanese/tcsh/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for:	tcsh with multibyte support enabled
-# Version required:	6.08.05
 # Date created:		29 November 1997
 # Whom:			Issei Suzuki <issei@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tcsh-6.08.05
-PKGNAME=	ja-tcsh-6.08.05
+PORTNAME=	tcsh
+PORTVERSION=	6.08.05
 CATEGORIES=	japanese shells
 MASTER_SITES=	ftp://ftp.astron.com/pri/
 
diff --git a/japanese/texinfo/Makefile b/japanese/texinfo/Makefile
index e028b70c9ade..bb7f08205065 100644
--- a/japanese/texinfo/Makefile
+++ b/japanese/texinfo/Makefile
@@ -1,20 +1,19 @@
 # New ports collection makefile for: texinfo
-# Version required: 4.0
 # Date created: 18 Aug 1999
 # Whom: Mitsuru Yoshida <mitsuru@riken.go.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	texinfo-4.0
-PKGNAME=	ja-texinfo-4.0
+PORTNAME=	texinfo
+PORTVERSION=	4.0
 CATEGORIES=	japanese print
 MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	texinfo
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 PATCH_SITES=	ftp://jupiter.fsci.fuk.kindai.ac.jp/pub/ptex/utils/ \
 		http://www.fsci.fuk.kindai.ac.jp/aftp/pub/ptex/utils/
-PATCHFILES=	texinfo-4.0-j.diff.gz
+PATCHFILES=	${DISTNAME}-j.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	mitsuru@riken.go.jp
diff --git a/japanese/tgif/Makefile b/japanese/tgif/Makefile
index 69ce55b46493..696e1889b93c 100644
--- a/japanese/tgif/Makefile
+++ b/japanese/tgif/Makefile
@@ -1,15 +1,15 @@
 # New ports collection makefile for:	tgif-j
-# Version required:	4.0.17
 # Date created:		8 Dec 1995
 # Whom:			Mita Yoshio <mita@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-tgif-980222
-PKGNAME=	ja-tgif-4.1.16
+PORTNAME=	tgif
+PORTVERSION=	4.1.16
 CATEGORIES=	japanese
 MASTER_SITES=	http://home.jp.FreeBSD.org/~mita/LOCAL_PORTS/
+DISTNAME=	ja-${PORTNAME}-980222
 
 MAINTAINER=	mita@jp.FreeBSD.org
 
diff --git a/japanese/tgif2tex/Makefile b/japanese/tgif2tex/Makefile
index 51a5df10cab6..9a8d2b8e2aff 100644
--- a/japanese/tgif2tex/Makefile
+++ b/japanese/tgif2tex/Makefile
@@ -1,12 +1,10 @@
 # New ports collection makefile for:	tgif2tex for Japanese
-# Version required:	1.46
 # Date created:		12 Mar 1998
 # Whom:			Satoshi TAOKA <taoka@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PKGNAME=	ja-tgif2tex-1.46
 CATEGORIES=	japanese print
 
 RUN_DEPENDS=	nkf:${PORTSDIR}/japanese/nkf
@@ -17,6 +15,6 @@ PORTSDOCDIR=	${PREFIX}/share/doc/ja-tgif2tex
 DOCSRC=		Makefile \
 		how-to-use.tex \
 		sample1.obj \
-		sample2.obj \
+		sample2.obj
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/timidity++-slang/Makefile b/japanese/timidity++-slang/Makefile
index 619e5cfadd31..ce0cf2c5a566 100644
--- a/japanese/timidity++-slang/Makefile
+++ b/japanese/timidity++-slang/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	TiMidity++
-# Version required:	1.3.10
 # Date created:		27 Feb 1999
 # Whom:			Yoichi Asai <yatt@msc.biglobe.ne.jp>
 #
diff --git a/japanese/timidity++-tcltk/Makefile b/japanese/timidity++-tcltk/Makefile
index 3e48327bcb8d..d278ceac9f53 100644
--- a/japanese/timidity++-tcltk/Makefile
+++ b/japanese/timidity++-tcltk/Makefile
@@ -1,5 +1,4 @@
 # New ports collection makefile for:	TiMidity++
-# Version required:	1.3.10
 # Date created:		27 Feb 1999
 # Whom:			Yoichi Asai <yatt@msc.biglobe.ne.jp>
 #
diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile
index d27b01e00027..e85bd0191431 100644
--- a/japanese/tk42/Makefile
+++ b/japanese/tk42/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	tk4.2p2JP
-# Version required:	4.2p2jp
 # Date created:		
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tk4.2p2
-PKGNAME=	ja-tk-4.2
+PORTNAME=	tk
+PORTVERSION=	4.2
 CATEGORIES=	japanese x11-toolkits
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl7_6/
+DISTNAME=	${PORTNAME}${PORTVERSION}p2
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tk4.2jp-patch.gz
+PATCHFILES=	${PORTNAME}${VERSION}-patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -32,12 +32,12 @@ PATCH_DIST_ARGS=	-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_DIST_STRI
 PATCH_ARGS=		-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_STRIP}
 .endif
 
-VERSION=	4.2jp
+VERSION=	${PORTVERSION}jp
 
 .include <bsd.port.pre.mk>
 
 post-extract:
-	@${MV} ${WRKDIR}/tk4.2 ${WRKDIR}/${DISTNAME}
+	@${MV} ${WRKDIR}/${PORTNAME}${PORTVERSION} ${WRKDIR}/${DISTNAME}
 
 post-configure:
 	@${ECHO} "We will NOT only make shared library, but also static one."
diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index 18013c9adcd8..a6ec332b2528 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -1,24 +1,24 @@
 # New ports collection makefile for:	ja-tk8.0
-# Version required:	8.0
 # Date created:		26 Dec 1997
 # Whom:			taguchi@tohoku.iij.ad.jp
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tk8.0.5
-PKGNAME=	ja-tk-8.0.5
+PORTNAME=	tk
+PORTVERSION=	8.0.5
 CATEGORIES=	japanese x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tk8.0.5jp1.7.patch.gz
+PATCHFILES=	${PORTNAME}${PORTVERSION}jp1.7.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
 LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80
 
-VERSION=	8.0
+VERSION=	${PORTVERSION:R}
 TOPDIR=		${WRKDIR}/${DISTNAME}
 WRKSRC=		${TOPDIR}/unix
 .if defined(PATCH_DEBUG)
diff --git a/japanese/tkdesk/Makefile b/japanese/tkdesk/Makefile
index bc9c1bcf93e6..c00d1e7d19f7 100644
--- a/japanese/tkdesk/Makefile
+++ b/japanese/tkdesk/Makefile
@@ -1,18 +1,18 @@
 # New ports collection makefile for:	tkdesk
-# Version required:     1.1
 # Date created:         21 Sep 1999
 # Whom:                 Yoichi ASAI <yatt@msc.biglobe.ne.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tkdesk-1.1
-PKGNAME=	ja-tkdesk-1.1p58
+PORTNAME=	tkdesk
+PORTVERSION=	${VERSION}${VERSION_PL}
 CATEGORIES=	japanese x11-fm tk42
 MASTER_SITES=	http://people.mainz.netsurf.de/~bolik/tkdesk/
+DISTNAME=	${PORTNAME}-${VERSION}
 
 PATCH_SITES=	http://www.linet.gr.jp/~mituiwa/
-PATCHFILES=	tkdesk-1.1-jmenu-p58.diff
+PATCHFILES=	tkdesk-${VERSION}-jmenu-${VERSION_PL}.diff
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	yatt@msc.biglobe.ne.jp
@@ -21,6 +21,9 @@ LIB_DEPENDS=	tk42jp.1:${PORTSDIR}/japanese/tk42
 RUN_DEPENDS=	imali:${PORTSDIR}/mail/im \
 		easypr:${PORTSDIR}/japanese/easypr
 
+VERSION=	1.1
+VERSION_PL=	p58
+
 USE_XLIB=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index ebb001a022e5..5a336a1301f5 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -1,19 +1,19 @@
 # New ports collection makefile for:	TkStep
-# Version required:	8.0.4
 # Date created:		25 March 1999
 # Whom:			KIRIYAMA Kazuhiko <kiri@pis.toba-cmt.ac.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tk8.0.4
-PKGNAME=	ja-tkstep-8.0.4
+PORTNAME=	tkstep
+PORTVERSION=	8.0.4
 CATEGORIES=	japanese tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
+DISTNAME=	tk${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/ \
 		http://www.aaa-int.or.jp/~jfactory/TkStep/dist/
-PATCHFILES=	tk8.0.4jp1.3.patch.gz tk8.0.4-Stepnize.gz
+PATCHFILES=	tk${PORTVERSION}jp1.3.patch.gz tk${PORTVERSION}-Stepnize.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
diff --git a/japanese/today/Makefile b/japanese/today/Makefile
index bdc8c069b67f..bfad24f88275 100644
--- a/japanese/today/Makefile
+++ b/japanese/today/Makefile
@@ -1,15 +1,17 @@
 # New ports collection makefile for:	today
-# Version required:	2.11a
 # Date created:		24 June 1996
 # Whom:			ABURAYER Rewsirow <pcs51674@asciinet.or.jp>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-today-2.11a
+PORTNAME=	today
+PORTVERSION=	2.11a
 CATEGORIES=	japanese games
 MASTER_SITES=	ftp://ftp.vector.co.jp/pack/dos/personal/calendar/today/
-DISTFILES=	td211as.lzh td211am.lzh
+DISTNAME=	ja-${PORTNAME}-${PORTVERSION}
+DISTFILES=	td${PORTVERSION:S/.//}s.lzh \
+		td${PORTVERSION:S/.//}m.lzh
 
 MAINTAINER=	rewsirow@ff.iij4u.or.jp
 
diff --git a/japanese/truetypefonts/Makefile b/japanese/truetypefonts/Makefile
index 1795e47dc298..60ad2a4e569e 100644
--- a/japanese/truetypefonts/Makefile
+++ b/japanese/truetypefonts/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	Japanese TrueType fonts
-# Version required:	1998.10.20
 # Date created:		16 November 1998
 # Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=	ja-truetypefonts-1998.10.20
+PORTNAME=	truetypefonts
+PORTVERSION=	1998.10.20
 CATEGORIES=	japanese x11-fonts
 MASTER_SITES=	http://www.linux.or.jp/%7Eishikawa/linux/dists/FreeType/
-DISTFILES=	xtt-fonts_0.19981020-3.tar.gz
+DISTNAME=	xtt-fonts_0.${PORTVERSION:S/.//g}-3
 
 MAINTAINER=	candy@kgc.co.jp
 
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/xtt-fonts-0.19981020
+WRKSRC=		${WRKDIR}/xtt-fonts-0.${PORTVERSION:S/.//g}
 NO_BUILD=	yes
 FONTDIR=	${PREFIX}/lib/X11/fonts/TrueType
 
diff --git a/japanese/tvi/Makefile b/japanese/tvi/Makefile
index 1d28681f57f2..936819fb880c 100644
--- a/japanese/tvi/Makefile
+++ b/japanese/tvi/Makefile
@@ -1,13 +1,12 @@
 # New ports collection makefile for: tvi
-# Version required:	0.9.2
 # Date created:		3 Jan 1999
 # Whom:			SUGIMURA Takashi <sugimura@jp.FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	tvi-0.9.2
-PKGNAME=	ja-tvi-0.9.2
+PORTNAME=	tvi
+PORTVERSION=	0.9.2
 CATEGORIES=	japanese
 MASTER_SITES=	http://www.kt.rim.or.jp/~motomu/tvi/Arc/
 
diff --git a/japanese/typist/Makefile b/japanese/typist/Makefile
index f4b564bd4d0f..518bea20827a 100644
--- a/japanese/typist/Makefile
+++ b/japanese/typist/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	typist
-# Version required:		2.0
 # Date created:			26 May 1997
 # Whom:				Satoshi TAOKA
 #
 # $FreeBSD$
 #
 
-DISTNAME=	typist2.0
-PKGNAME=	ja-typist-2.0
+PORTNAME=	typist
+PORTVERSION=	2.0
 CATEGORIES=	japanese
 MASTER_SITES=	ftp://tuba.csedu.kobe-u.ac.jp/pub/UNIX/
 EXTRACT_SUFX=	.src.tar.gz
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	taoka@FreeBSD.org
author	knu <knu@FreeBSD.org>	2000-04-12 22:38:12 +0800
committer	knu <knu@FreeBSD.org>	2000-04-12 22:38:12 +0800
commit	bbefe911602a99ae8eef0107c5a54a1238569918 (patch)
tree	e6a784c6fcf9fb5518d628b989fe84202164cacf /japanese
parent	df90bfb709b014707e299439696404a9c2b543f8 (diff)
download	freebsd-ports-gnome-bbefe911602a99ae8eef0107c5a54a1238569918.tar.gz freebsd-ports-gnome-bbefe911602a99ae8eef0107c5a54a1238569918.tar.zst freebsd-ports-gnome-bbefe911602a99ae8eef0107c5a54a1238569918.zip