12 files changed, 36 insertions, 37 deletions
diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index ea8a645..e798669 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -6,48 +6,49 @@
 # $FreeBSD$
 #
 
-DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
+DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
+PKGNAME=	ja-netscape-${BROWSER_ARC}-${BROWSER_VERSION}
 CATEGORIES=	japanese www
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.bres.tsukuba.ac.jp/~yohta/netscape/
-DISTFILES=	${JAPANIZE_KIT}
 
 MAINTAINER=	sada@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape4-${BROWSER}
+RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
 RUN_DEPENDS+=	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
 MAN1=		ja-netscape.1
 MANLANG=	ja
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/INSTALL
-PLIST=		${.CURDIR}/pkg/PLIST
-PLIST_SUB=	NSUBDIR=${NSUBDIR} LANG=${LANG}
+PLIST_SUB=	BROWSER=${BROWSER_ARC} NSUBDIR=${NSUBDIR} LANG=${LANG} VER=${BROWSER_VER}
 WRKSRC=		${WRKDIR}/netscape-ja_euc
 
 BROWSER?=	communicator
-BROWSER_BIN?=	${BROWSER}-${BROWSER_VERSION}.bin
-BROWSER_CMD?=	ja-${BROWSER}-4
+BROWSER_ARC?=	${BROWSER}
+BROWSER_BIN?=	${BROWSER_ARC}-${BROWSER_VERSION}.bin
+BROWSER_CMD?=	ja-${BROWSER_ARC}-${BROWSER_VER}
+BROWSER_VER?=	4
 BROWSER_VERSION?= 4.08
-JAPANIZE_KIT?=	communicator-ja-euc-v407-export.generic-generic-generic.tar.gz
 LANG=		ja_JP.EUC
 MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 			-e "s;@PREFIX@;${PREFIX};g" \
 			-e "s;@NDIR@;${NDIR};g" \
 			-e "s;@RDIR@;${NDIR};g" \
-			-e "s;@BROWSER@;${BROWSER}-${BROWSER_VERSION};g" \
+			-e "s;@BROWSER@;${BROWSER_ARC}-${BROWSER_VERSION};g" \
 			-e "s;@BROWSER_BIN@;${BROWSER_BIN};g" \
 			-e "s;@LANG@;${LANG};g"
 MANDIR=		${MANPREFIX}/man/${MANLANG}
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
 NETHELP?=	nethelp-v406
+START_SCRIPT?=	${MASTERDIR}/files/start.sh.in
 
 .SILENT:
 
 do-configure:
-	${MAKESCRIPT} ${MASTERDIR}/files/start.sh.in >${WRKDIR}/start.sh
+	${MAKESCRIPT} ${START_SCRIPT} >${WRKDIR}/start.sh
 	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
 	 | ${SED} "s/-dt-interface system-medium-\*-\*-S\*-\*-\*-\*-\*-\*-\*-\*-\*:/-misc-fixed-medium-r-normal--14-\*-\*-\*-\*-\*-iso8859-1; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0:/;" \
 	 >${WRKDIR}/Netscape
diff --git a/japanese/netscape4-communicator/distinfo b/japanese/netscape4-communicator/distinfo
index 3e4e216..128ea78 100644
--- a/japanese/netscape4-communicator/distinfo
+++ b/japanese/netscape4-communicator/distinfo
@@ -1 +1,2 @@
 MD5 (communicator-ja-euc-v407-export.generic-generic-generic.tar.gz) = b9ea038c83741e70aec74cc0e782646d
+MD5 (communicator-ja-euc-v472-export.generic-generic-generic.tar.gz) = ada5444f8678039d1f4daeaa3cc6b90a
diff --git a/japanese/netscape4-communicator/files/start.sh.in b/japanese/netscape4-communicator/files/start.sh.in
index 5eac0e7..ad9e9b3 100644
--- a/japanese/netscape4-communicator/files/start.sh.in
+++ b/japanese/netscape4-communicator/files/start.sh.in
@@ -4,7 +4,7 @@ if [ ! -d $HOME/.netscape ]; then
 	cp @RDIR@/preferences.js $HOME/.netscape
 	chmod 644 $HOME/.netscape/preferences.js
 fi
-export LANG=ja_JP.EUC
+export LANG=@LANG@
 export LC_ALL=${LANG}
 export LC_CTYPE=${LANG}
 export MOZILLA_HOME=@NDIR@
diff --git a/japanese/netscape4-communicator/pkg-plist b/japanese/netscape4-communicator/pkg-plist
index 1be97b5..6ee24c5 100644
--- a/japanese/netscape4-communicator/pkg-plist
+++ b/japanese/netscape4-communicator/pkg-plist
@@ -1,4 +1,4 @@
-bin/ja-communicator-4
+bin/ja-%%BROWSER%%-%%VER%%
 @exec ln -sf %f %B/netscape
 %%NSUBDIR%%/netscape.cfg
 %%NSUBDIR%%/%%LANG%%/Netscape
diff --git a/japanese/netscape4-navigator/Makefile b/japanese/netscape4-navigator/Makefile
index 9ccbec3..2aa5539 100644
--- a/japanese/netscape4-navigator/Makefile
+++ b/japanese/netscape4-navigator/Makefile
@@ -8,8 +8,6 @@
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
 
-MAINTAINER=	sada@FreeBSD.org
-
 BROWSER=	navigator
 
 .include	"${MASTERDIR}/Makefile"
diff --git a/japanese/netscape47-communicator/Makefile b/japanese/netscape47-communicator/Makefile
index 77f645b..bdfb936 100644
--- a/japanese/netscape47-communicator/Makefile
+++ b/japanese/netscape47-communicator/Makefile
@@ -6,16 +6,16 @@
 # $FreeBSD$
 #
 
-RUN_DEPENDS=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape47-${BROWSER}
+DISTNAME=	communicator-ja-euc-v472-export.generic-generic-generic
 
 MASTERDIR=	${.CURDIR}/../netscape4-communicator
-FILESDIR=	${.CURDIR}/../netscape47-communicator/files
-PATCHDIR=	${.CURDIR}/../netscape47-communicator/patches
-PKGDIR=		${.CURDIR}/../netscape47-communicator/pkg
+SUBMASTERDIR=	${.CURDIR}/../netscape${BROWSER_VER}-communicator
+FILESDIR=	${SUBMASTERDIR}/files
+PATCHDIR=	${SUBMASTERDIR}/patches
+PKGDIR=		${SUBMASTERDIR}/pkg
 
-BROWSER_CMD=	ja-${BROWSER}-47
+BROWSER_VER=	47
 BROWSER_VERSION=	4.72
-JAPANIZE_KIT=	communicator-ja-euc-v472-export.generic-generic-generic.tar.gz
 NETHELP=	nethelp-v47
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/netscape47-communicator/pkg-plist b/japanese/netscape47-communicator/pkg-plist
index 416e9d0..915f454 100644
--- a/japanese/netscape47-communicator/pkg-plist
+++ b/japanese/netscape47-communicator/pkg-plist
@@ -1,4 +1,4 @@
-bin/ja-communicator-47
+bin/ja-%%BROWSER%%-47
 @exec ln -sf %f %B/netscape
 @exec mkdir -p %D/%%NSUBDIR%%/locale
 @exec ln -sf /usr/share/locale/en_US.ISO_8859-1 %D/%%NSUBDIR%%/locale/%%LANG%%
diff --git a/japanese/netscape47-navigator/Makefile b/japanese/netscape47-navigator/Makefile
index 6fce97f..f6e0e7f 100644
--- a/japanese/netscape47-navigator/Makefile
+++ b/japanese/netscape47-navigator/Makefile
@@ -6,9 +6,6 @@
 # $FreeBSD$
 #
 
-FILESDIR=	${BASEDIR}/files
-
-BASEDIR=	${.CURDIR}/../netscape47-communicator
 BROWSER=	navigator
 
-.include	"${BASEDIR}/Makefile"
+.include	"${.CURDIR}/../netscape47-communicator/Makefile"
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index ea8a645..e798669 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -6,48 +6,49 @@
 # $FreeBSD$
 #
 
-DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
+DISTNAME?=	communicator-ja-euc-v407-export.generic-generic-generic
+PKGNAME=	ja-netscape-${BROWSER_ARC}-${BROWSER_VERSION}
 CATEGORIES=	japanese www
 MASTER_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://www.bres.tsukuba.ac.jp/~yohta/netscape/
-DISTFILES=	${JAPANIZE_KIT}
 
 MAINTAINER=	sada@FreeBSD.org
 
 # ?= for ports that include this Makefile
-RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape4-${BROWSER}
+RUN_DEPENDS?=	${PREFIX}/bin/${BROWSER_ARC}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape${BROWSER_VER}-${BROWSER}
 RUN_DEPENDS+=	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
 MAN1=		ja-netscape.1
 MANLANG=	ja
 NO_BUILD=	yes
 PKGINSTALL=	${WRKDIR}/INSTALL
-PLIST=		${.CURDIR}/pkg/PLIST
-PLIST_SUB=	NSUBDIR=${NSUBDIR} LANG=${LANG}
+PLIST_SUB=	BROWSER=${BROWSER_ARC} NSUBDIR=${NSUBDIR} LANG=${LANG} VER=${BROWSER_VER}
 WRKSRC=		${WRKDIR}/netscape-ja_euc
 
 BROWSER?=	communicator
-BROWSER_BIN?=	${BROWSER}-${BROWSER_VERSION}.bin
-BROWSER_CMD?=	ja-${BROWSER}-4
+BROWSER_ARC?=	${BROWSER}
+BROWSER_BIN?=	${BROWSER_ARC}-${BROWSER_VERSION}.bin
+BROWSER_CMD?=	ja-${BROWSER_ARC}-${BROWSER_VER}
+BROWSER_VER?=	4
 BROWSER_VERSION?= 4.08
-JAPANIZE_KIT?=	communicator-ja-euc-v407-export.generic-generic-generic.tar.gz
 LANG=		ja_JP.EUC
 MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 			-e "s;@PREFIX@;${PREFIX};g" \
 			-e "s;@NDIR@;${NDIR};g" \
 			-e "s;@RDIR@;${NDIR};g" \
-			-e "s;@BROWSER@;${BROWSER}-${BROWSER_VERSION};g" \
+			-e "s;@BROWSER@;${BROWSER_ARC}-${BROWSER_VERSION};g" \
 			-e "s;@BROWSER_BIN@;${BROWSER_BIN};g" \
 			-e "s;@LANG@;${LANG};g"
 MANDIR=		${MANPREFIX}/man/${MANLANG}
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
 NETHELP?=	nethelp-v406
+START_SCRIPT?=	${MASTERDIR}/files/start.sh.in
 
 .SILENT:
 
 do-configure:
-	${MAKESCRIPT} ${MASTERDIR}/files/start.sh.in >${WRKDIR}/start.sh
+	${MAKESCRIPT} ${START_SCRIPT} >${WRKDIR}/start.sh
 	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
 	 | ${SED} "s/-dt-interface system-medium-\*-\*-S\*-\*-\*-\*-\*-\*-\*-\*-\*:/-misc-fixed-medium-r-normal--14-\*-\*-\*-\*-\*-iso8859-1; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0208.1983-0; -misc-fixed-medium-r-normal--14-*-*-*-*-*-jisx0201.1976-0:/;" \
 	 >${WRKDIR}/Netscape
diff --git a/japanese/netscape48-communicator/distinfo b/japanese/netscape48-communicator/distinfo
index 3e4e216..128ea78 100644
--- a/japanese/netscape48-communicator/distinfo
+++ b/japanese/netscape48-communicator/distinfo
@@ -1 +1,2 @@
 MD5 (communicator-ja-euc-v407-export.generic-generic-generic.tar.gz) = b9ea038c83741e70aec74cc0e782646d
+MD5 (communicator-ja-euc-v472-export.generic-generic-generic.tar.gz) = ada5444f8678039d1f4daeaa3cc6b90a
diff --git a/japanese/netscape48-communicator/files/start.sh.in b/japanese/netscape48-communicator/files/start.sh.in
index 5eac0e7..ad9e9b3 100644
--- a/japanese/netscape48-communicator/files/start.sh.in
+++ b/japanese/netscape48-communicator/files/start.sh.in
@@ -4,7 +4,7 @@ if [ ! -d $HOME/.netscape ]; then
 	cp @RDIR@/preferences.js $HOME/.netscape
 	chmod 644 $HOME/.netscape/preferences.js
 fi
-export LANG=ja_JP.EUC
+export LANG=@LANG@
 export LC_ALL=${LANG}
 export LC_CTYPE=${LANG}
 export MOZILLA_HOME=@NDIR@
diff --git a/japanese/netscape48-communicator/pkg-plist b/japanese/netscape48-communicator/pkg-plist
index 1be97b5..6ee24c5 100644
--- a/japanese/netscape48-communicator/pkg-plist
+++ b/japanese/netscape48-communicator/pkg-plist
@@ -1,4 +1,4 @@
-bin/ja-communicator-4
+bin/ja-%%BROWSER%%-%%VER%%
 @exec ln -sf %f %B/netscape
 %%NSUBDIR%%/netscape.cfg
 %%NSUBDIR%%/%%LANG%%/Netscape