Upgrade to 4.06, major cleanup. Split into two ports (communicator and

navigator after repository copy).  Old netscape4 is deleted.

PR:             8188 (part)
Submitted by:   sada@e-mail.ne.jp

18 files changed, 255 insertions, 408 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index 890aaf2b837e..57bdb10a511f 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.150 1998/10/09 00:12:52 kuriyama Exp $
+# $Id: Makefile,v 1.151 1998/10/09 00:27:09 kuriyama Exp $
 #
 
     SUBDIR += Canna
@@ -99,8 +99,10 @@
     SUBDIR += mule-wnn6
     SUBDIR += ndtpd
     SUBDIR += nethack
+    SUBDIR += netscape-fonts
     SUBDIR += netscape3.language
-    SUBDIR += netscape4
+    SUBDIR += netscape4-communicator
+    SUBDIR += netscape4-navigator
     SUBDIR += newosaka
     SUBDIR += nkf
     SUBDIR += nvi-euc-jp
diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index 68f7609b136e..d0478b5fbf92 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -1,143 +1,64 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.04
+# Version required:	4.06
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.3 1998/03/21 05:04:53 itojun Exp $
+# $Id: Makefile,v 1.4 1998/04/01 01:49:24 asami Exp $
 #
 
-DISTNAME=	ja-netscape4
+DISTNAME=	ja-netscape-${BROWSER}
 CATEGORIES=	japanese www
+MASTER_SITES=	http://www.bres.tsukuba.ac.jp/~yohta/netscape/
+DISTFILES=	communicator-ja-euc-v406-export.generic-generic-generic.tar.gz
 
-.if !defined(NAVIGATOR)
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
-DISTFILE=	communicator-v404-export.x86-unknown-freebsd.tar.gz
-BROWSER=	communicator
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILE=	navigator-v404-export.x86-unknown-freebsd.tar.gz
-BROWSER=	navigator
-.endif
-.if !defined(ENGLISH)
-RESOURCE_BASE=	Netscape-jp-v404
-MSG_LANG=
-.else
-RESOURCE_BASE=	Netscape-us-v404
-MSG_LANG=		-us
-.endif
-RUN_DEPENDS=	${X11BASE}/lib/X11/k12:${PORTSDIR}/japanese/k12 \
-		${X11BASE}/lib/X11/fonts/misc/5x10B.pcf.Z:${PORTSDIR}/japanese/k10
+MAINTAINER?=	sada@e-mail.ne.jp
 
-MANUAL_PACKAGE_BUILD=	have to set ENGLISH and NAGIVATOR variables
+RUN_DEPENDS= \
+	${PREFIX}/bin/${BROWSER}:${PORTSDIR}/www/netscape4-${BROWSER_NAME} \
+	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
-DISTFILES=	${DISTFILE}
-EXTRACT_ONLY=	${DISTFILE}
-MASTER_SITES+=	http://www.bpel.tutics.tut.ac.jp/~take/Netscape/etc/ \
-		ftp://ftp.bres.tsukuba.ac.jp/pub/misc/netscape/
-RESOURCE_POSTFIX=	19971218.ad
-RESOURCE_NAME=	${RESOURCE_BASE}.${RESOURCE_POSTFIX}
-DISTFILES+=	NLS.tar.gz ${RESOURCE_NAME}.gz
-PKGNAME=	ja-${BROWSER}${MSG_LANG}-4.04
-PLIST=		${PKGDIR}/PLIST.${PKGNAME}
-MD5_FILE=	${FILESDIR}/md5.${PKGNAME}
-EXSRC=		${WRKSRC}/examples/${PKGNAME}
-EXDIST=		${PREFIX}/share/examples/${PKGNAME}
-EXFILES=	patch.XLC_LOCALE
-DOCDIST=	${PREFIX}/share/doc/${PKGNAME}
-DOCFILES=	setup.doc
-
-MAINTAINER=	sada@E-mail.NE.JP
-
-NO_WRKSUBDIR=	Yes
-NO_BUILD=	Yes
+MAN1=		ja-${BROWSER_NAME}.1
+MANLANG=	ja
+NO_BUILD=	yes
 STRIP=
+WRKSRC=		${WRKDIR}/netscape-ja_euc
 
-NDIR=		${PREFIX}/lib/${PKGNAME}
-BINDIR=		${PREFIX}/bin
-NLSDIR=		${NDIR}/nls
-RESSUB=		ja_JP.EUC
-RESDIR=		${NDIR}/${RESSUB}
-LOCDIR=		${NDIR}/locale
-
-.SILENT:
-
-pre-fetch:
-.if !defined(NAVIGATOR)
-	@${ECHO_MSG} "NOTE: You can install navigator (not communicator) by \"make NAVIGATOR=yes install\"."
-.endif
-.if !defined(ENGLISH)
-	@${ECHO_MSG} "NOTE: You can install English-menu version by \"make ENGLISH=yes install\"."
-.endif
-
-post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/NLS.tar.gz -C ${WRKDIR}
-	${CAT} ${DISTDIR}/${RESOURCE_NAME}.gz \
-		| ${GUNZIP_CMD} > ${WRKDIR}/${RESOURCE_BASE}.ad
-
+BROWSER=	${BROWSER_NAME}-${BROWSER_VER}
+BROWSER_NAME?=	communicator
+BROWSER_VER=	4.06
+LANG=		ja_JP.EUC
+NDIR=		${PREFIX}/lib/netscape
 MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 			-e "s;@PREFIX@;${PREFIX};g" \
-			-e "s;@NDIR@;${NDIR};g"
+			-e "s;@NDIR@;${NDIR};g" \
+			-e "s;@RDIR@;${NDIR};g" \
+			-e "s;@BROWSER@;${BROWSER};g" \
+			-e "s;@LANG@;${LANG};g"
+MANDIR=		${MANPREFIX}/man/${MANLANG}
+MANFILE?=	${FILESDIR}/${MAN1}
 
-do-configure:
-#	${MAKESCRIPT} ${FILESDIR}/netscape.sh > ${WRKSRC}/netscape.sh
-	${MAKESCRIPT} ${FILESDIR}/ja-netscape.sh > ${WRKSRC}/ja-netscape.sh
-	${ECHO} -n 'Communicator,4.04.0.97330,' > ${WRKSRC}/infile
-	${ECHO} ${NDIR} >> ${WRKSRC}/infile
-#
-	${MAKESCRIPT} ${FILESDIR}/setup.pl >${WRKSRC}/setup.pl
-	${MKDIR} ${EXSRC}
-	for i in ${EXFILES}; do \
-		${MAKESCRIPT} ${FILESDIR}/$${i} >${EXSRC}/$${i}; \
-	done
+.SILENT:
 
-do-install:
-	${MKDIR} ${NDIR}/java/classes
-	${INSTALL_DATA} ${WRKSRC}/*.jar ${NDIR}/java/classes
-	${INSTALL_PROGRAM} ${WRKSRC}/vreg ${NDIR}
-	for i in ${WRKSRC}/*.nif; do \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} -C ${NDIR}; \
-	done
-	${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}
-	${RM} -rf ${NDIR}/movemail-src
-	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
-	/usr/sbin/chown -R bin:bin ${NDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/ja-netscape.sh ${BINDIR}/${PKGNAME}
-	/bin/ln -sf ${PKGNAME} ${BINDIR}/netscape
-#
-	${MKDIR} ${NLSDIR}/local_im_tbl
-	${INSTALL_DATA} ${WRKDIR}/nls/*.*  ${NLSDIR}
-	${INSTALL_DATA} ${WRKDIR}/nls/C  ${NLSDIR}
-	${RM} -f ${NLSDIR}/*.orig
-	${INSTALL_DATA} ${WRKDIR}/nls/local_im_tbl/* ${NLSDIR}/local_im_tbl
-	${MKDIR} ${RESDIR}
-	${INSTALL_DATA} ${WRKDIR}/${RESOURCE_BASE}.ad ${RESDIR}/Netscape
-	${MKDIR} ${LOCDIR}
-	/bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 ${LOCDIR}/ja_JP.EUC
-	${INSTALL_SCRIPT} ${WRKSRC}/setup.pl ${NDIR}
-	${NDIR}/setup.pl install
-#
-	${MKDIR} ${EXDIST}
-	for i in ${EXFILES}; do \
-		${INSTALL_SCRIPT} ${EXSRC}/$${i} ${EXDIST}; \
-	done
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIST}
-	${INSTALL_DATA} ${FILESDIR}/setup.doc ${DOCDIST}
+do-configure:
+	${MAKESCRIPT} ${FILESDIR}/start.sh.in >${WRKDIR}/start.sh
+.if defined(USE_14DOT_FONT)
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
+	 |${FILESDIR}/14dot.sed >${WRKSRC}/Netscape
+.else
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc >${WRKSRC}/Netscape
 .endif
-#
 
-plist:
-	${ECHO} bin/${PKGNAME} > ${PLIST}
-	${ECHO} @exec /bin/ln -sf %f %B/netscape >> ${PLIST}
-	${ECHO} @exec /bin/mkdir -p %D/lib/${PKGNAME}/locale >> ${PLIST}
-	${ECHO} @exec /bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 %D/lib/${PKGNAME}/locale/ja_JP.EUC >> ${PLIST}
-	${ECHO} @unexec /bin/rm -f %D/lib/${PKGNAME}/locale/ja_JP.EUC >> ${PLIST}
-	mkplist lib/${PKGNAME} >> ${PLIST}
-	mkplist share/examples/${PKGNAME} >> ${PLIST}
-	mkplist share/doc/${PKGNAME} >> ${PLIST}
-#
-
-post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+do-install:
+	${INSTALL_DATA} ${FILESDIR}/preferences.js ${NDIR}
+	${MKDIR} ${NDIR}/locale
+	${LN} -sf /usr/share/locale/en_US.ISO_8859-1 ${NDIR}/locale/${LANG}
+	${MKDIR} ${NDIR}/${LANG}
+.for f in Netscape about mail.msg nethelp-v406.nif netscape.cfg plugins splash
+	${INSTALL_DATA} ${WRKSRC}/$f ${NDIR}/${LANG}/
+.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/ja-${BROWSER}
+	${LN} -sf ja-${BROWSER} ${PREFIX}/bin/netscape
+	${MKDIR} ${MANDIR}/man1
+	${INSTALL_MAN} ${MANFILE} ${MANDIR}/man1
 
 .include <bsd.port.mk>
diff --git a/japanese/netscape4-communicator/distinfo b/japanese/netscape4-communicator/distinfo
new file mode 100644
index 000000000000..ef6125bf71d3
--- /dev/null
+++ b/japanese/netscape4-communicator/distinfo
@@ -0,0 +1 @@
+MD5 (communicator-ja-euc-v406-export.generic-generic-generic.tar.gz) = 0e11651005415443cb978879a08b913a
diff --git a/japanese/netscape4-communicator/files/patch-aa b/japanese/netscape4-communicator/files/patch-aa
new file mode 100644
index 000000000000..3346f402001e
--- /dev/null
+++ b/japanese/netscape4-communicator/files/patch-aa
@@ -0,0 +1,31 @@
+--- Netscape.ad-ja_euc.orig	Fri Sep 11 19:29:46 1998
++++ Netscape.ad-ja_euc	Wed Oct  7 17:06:49 1998
+@@ -94,7 +94,7 @@
+ !Solaris[EUC]   *appDir location:     /usr/openwin/lib/locale/ja/netscape
+ !Solaris[Sjis]  *appDir location:     /usr/openwin/lib/locale/ja_JP.PCK/netscape
+ 
+-*appDir:			/usr/X11R6/lib/X11/ja_JP.EUC/netscape
++*appDir:			@NDIR@/@LANG@
+ 
+ ! This resource is the same as the -visual command line option, which selects
+ ! an X visual on which the windows should be created.  Legal options are:
+@@ -4801,6 +4801,9 @@
+ *openURLDialog*openInEditor.labelString: Composer で開く
+ *openURLDialog*openInBrowser.labelString: Navigator で開く
+ 
++*openURLDialog*XmTextField.fontList:\
++-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
++
+ *message_popup.title:			Netscape
+ *message_popup*OK.labelString:	OK
+ *message_popup*OkLabelString:	OK
+@@ -6720,6 +6723,9 @@
+ 
+ !! Maximum number of pixels an item can be dragged (for one mouse motion)
+ *toolBox*dragThreshold:					10
++
++*mainForm.toolBox.urlBarItem.urlBarMainForm.urlComboBox.Text.fontList:\
++-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+ 
+ !!
+ !! *toolBar
diff --git a/japanese/netscape4-communicator/files/preferences.js b/japanese/netscape4-communicator/files/preferences.js
new file mode 100644
index 000000000000..9d41df80d14f
--- /dev/null
+++ b/japanese/netscape4-communicator/files/preferences.js
@@ -0,0 +1,5 @@
+// Netscape User Preferences
+// This is a generated file!  Do not edit.
+
+user_pref("intl.character_set", 2309);
+user_pref("intl.font_spec_list", "schumacher-clean-120-noscale-fixed-x-user-defined,schumacher-clean-120-noscale-prop-x-user-defined,nsPseudoFont-courier-180-noscale-fixed-UTF-8,nsPseudoFont-helvetica-180-noscale-prop-UTF-8,isas-fangsong ti-120-noscale-fixed-gb_2312-80,isas-fangsong ti-120-noscale-prop-gb_2312-80,daewoo-gothic-0-noscale-fixed-ks_c_5601-1987,daewoo-gothic-0-noscale-prop-ks_c_5601-1987,misc-fixed-130-noscale-fixed-jis_x0201,misc-fixed-130-noscale-prop-jis_x0201,netscape-fixed-130-noscale-fixed-jis_x0208-1983,netscape-fixed-130-noscale-prop-jis_x0208-1983,misc-fixed-130-noscale-fixed-iso-8859-1,adobe-new century schoolbook-140-noscale-prop-iso-8859-1,");
diff --git a/japanese/netscape4-communicator/files/start.sh.in b/japanese/netscape4-communicator/files/start.sh.in
new file mode 100644
index 000000000000..01c273940b1e
--- /dev/null
+++ b/japanese/netscape4-communicator/files/start.sh.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+CHMOD='/bin/chmod'
+CP='/bin/cp -p'
+MKDIR='/bin/mkdir -p'
+export LANG; LANG=ja_JP.EUC
+export LC_ALL; LC_ALL=$LANG
+export LC_CTYPE; LC_CTYPE=$LANG
+export MOZILLA_HOME; MOZILLA_HOME=@NDIR@
+export MOZILLA_NO_ASYNC; MOZILLA_NO_ASYNC=True
+export CLASSPATH; CLASSPATH=.:$MOZILLA_HOME
+export XENVIRONMENT; XENVIRONMENT=${MOZILLA_HOME}/Nescape.ad
+export XKEYSYMDB; XKEYSYMDB=@X11BASE@/lib/X11/XKeysymDB
+export XAPPLRESDIR; XAPPLRESDIR=@RDIR@
+export XNLSPATH; XNLSPATH=${MOZILLA_HOME}/nls
+export PATH_LOCALE; PATH_LOCALE=@RDIR@/locale
+export NPX_PLUGIN_PATH; NPX_PLUGIN_PATH=${MOZILLA_HOME}/plugins
+export TIMID_DIR; TIMID_DIR=/usr/local/lib/timidity
+export XCMSDB; XCMSDB=/dev/null
+exec ${MOZILLA_HOME}/@BROWSER@.bin $*
diff --git a/japanese/netscape4-communicator/pkg-comment b/japanese/netscape4-communicator/pkg-comment
index 89107695f3c1..3ce3007b6ff6 100644
--- a/japanese/netscape4-communicator/pkg-comment
+++ b/japanese/netscape4-communicator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard with Japanese resources
+netscape web-surfboard with Japanese resources
diff --git a/japanese/netscape4-communicator/pkg-descr b/japanese/netscape4-communicator/pkg-descr
index c1d8aba8bfcd..ab6c745f7865 100644
--- a/japanese/netscape4-communicator/pkg-descr
+++ b/japanese/netscape4-communicator/pkg-descr
@@ -1,16 +1,9 @@
-This is the netscape web-surfboard.  Please read the file
-"/usr/local/lib/netscape/LICENSE" for the licensing terms.
+This is the netscape web-surfboard.
+Please read the file `/usr/local/lib/netscape/LICENSE'
+for the licensing terms.
 
-You could build the port as
- % make [ NAVIGATOR=yes ] [ ENGLISH=yes ]
-and could install as
- % make [ NAVIGATOR=yes ] [ ENGLISH=yes ] install
-
-options:
- NAVIGATOR	build the browser ``Navigator-4.04''
- ENGLISH	use English messages and menues
-
-Please read `/usr/local/share/examples/ja-*-4.04/setup.doc'.
+This port's explanation (written in Japanese):
+ <URL:http://www.rr.iij4u.or.jp/~sada/netscape.html>
 
 - SADA Kenji
 sada@e-mail.ne.jp
diff --git a/japanese/netscape4-communicator/pkg-plist b/japanese/netscape4-communicator/pkg-plist
new file mode 100644
index 000000000000..20b812955974
--- /dev/null
+++ b/japanese/netscape4-communicator/pkg-plist
@@ -0,0 +1,15 @@
+bin/ja-communicator-4.06
+@exec /bin/ln -sf %f %B/netscape
+lib/netscape/ja_JP.EUC/Netscape
+lib/netscape/ja_JP.EUC/about
+lib/netscape/ja_JP.EUC/mail.msg
+lib/netscape/ja_JP.EUC/nethelp-v406.nif
+lib/netscape/ja_JP.EUC/netscape.cfg
+lib/netscape/ja_JP.EUC/plugins
+lib/netscape/ja_JP.EUC/splash
+lib/netscape/preferences.js
+@exec /bin/mkdir -p %B/locale
+@exec /bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 %B/locale/ja_JP.EUC
+@unexec rm -f %B/locale/ja_JP.EUC
+@dirrm lib/netscape/locale
+@dirrm lib/netscape/ja_JP.EUC
diff --git a/japanese/netscape4-navigator/Makefile b/japanese/netscape4-navigator/Makefile
index 68f7609b136e..09d254c0789b 100644
--- a/japanese/netscape4-navigator/Makefile
+++ b/japanese/netscape4-navigator/Makefile
@@ -1,143 +1,18 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.04
+# Version required:	4.06
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.3 1998/03/21 05:04:53 itojun Exp $
+# $Id: Makefile,v 1.4 1998/04/01 01:49:24 asami Exp $
 #
 
-DISTNAME=	ja-netscape4
-CATEGORIES=	japanese www
+MAINTAINER=	sada@e-mail.ne.jp
 
-.if !defined(NAVIGATOR)
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
-DISTFILE=	communicator-v404-export.x86-unknown-freebsd.tar.gz
-BROWSER=	communicator
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILE=	navigator-v404-export.x86-unknown-freebsd.tar.gz
-BROWSER=	navigator
-.endif
-.if !defined(ENGLISH)
-RESOURCE_BASE=	Netscape-jp-v404
-MSG_LANG=
-.else
-RESOURCE_BASE=	Netscape-us-v404
-MSG_LANG=		-us
-.endif
-RUN_DEPENDS=	${X11BASE}/lib/X11/k12:${PORTSDIR}/japanese/k12 \
-		${X11BASE}/lib/X11/fonts/misc/5x10B.pcf.Z:${PORTSDIR}/japanese/k10
+FILESDIR=	${MASTER_DIR}/files
+PATCHDIR=	${MASTER_DIR}/patches
 
-MANUAL_PACKAGE_BUILD=	have to set ENGLISH and NAGIVATOR variables
+BROWSER_NAME=	navigator
+MANFILE=	${.CURDIR}/files/${MAN1}
+MASTER_DIR=	${.CURDIR}/../netscape4-communicator
 
-DISTFILES=	${DISTFILE}
-EXTRACT_ONLY=	${DISTFILE}
-MASTER_SITES+=	http://www.bpel.tutics.tut.ac.jp/~take/Netscape/etc/ \
-		ftp://ftp.bres.tsukuba.ac.jp/pub/misc/netscape/
-RESOURCE_POSTFIX=	19971218.ad
-RESOURCE_NAME=	${RESOURCE_BASE}.${RESOURCE_POSTFIX}
-DISTFILES+=	NLS.tar.gz ${RESOURCE_NAME}.gz
-PKGNAME=	ja-${BROWSER}${MSG_LANG}-4.04
-PLIST=		${PKGDIR}/PLIST.${PKGNAME}
-MD5_FILE=	${FILESDIR}/md5.${PKGNAME}
-EXSRC=		${WRKSRC}/examples/${PKGNAME}
-EXDIST=		${PREFIX}/share/examples/${PKGNAME}
-EXFILES=	patch.XLC_LOCALE
-DOCDIST=	${PREFIX}/share/doc/${PKGNAME}
-DOCFILES=	setup.doc
-
-MAINTAINER=	sada@E-mail.NE.JP
-
-NO_WRKSUBDIR=	Yes
-NO_BUILD=	Yes
-STRIP=
-
-NDIR=		${PREFIX}/lib/${PKGNAME}
-BINDIR=		${PREFIX}/bin
-NLSDIR=		${NDIR}/nls
-RESSUB=		ja_JP.EUC
-RESDIR=		${NDIR}/${RESSUB}
-LOCDIR=		${NDIR}/locale
-
-.SILENT:
-
-pre-fetch:
-.if !defined(NAVIGATOR)
-	@${ECHO_MSG} "NOTE: You can install navigator (not communicator) by \"make NAVIGATOR=yes install\"."
-.endif
-.if !defined(ENGLISH)
-	@${ECHO_MSG} "NOTE: You can install English-menu version by \"make ENGLISH=yes install\"."
-.endif
-
-post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/NLS.tar.gz -C ${WRKDIR}
-	${CAT} ${DISTDIR}/${RESOURCE_NAME}.gz \
-		| ${GUNZIP_CMD} > ${WRKDIR}/${RESOURCE_BASE}.ad
-
-MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
-			-e "s;@PREFIX@;${PREFIX};g" \
-			-e "s;@NDIR@;${NDIR};g"
-
-do-configure:
-#	${MAKESCRIPT} ${FILESDIR}/netscape.sh > ${WRKSRC}/netscape.sh
-	${MAKESCRIPT} ${FILESDIR}/ja-netscape.sh > ${WRKSRC}/ja-netscape.sh
-	${ECHO} -n 'Communicator,4.04.0.97330,' > ${WRKSRC}/infile
-	${ECHO} ${NDIR} >> ${WRKSRC}/infile
-#
-	${MAKESCRIPT} ${FILESDIR}/setup.pl >${WRKSRC}/setup.pl
-	${MKDIR} ${EXSRC}
-	for i in ${EXFILES}; do \
-		${MAKESCRIPT} ${FILESDIR}/$${i} >${EXSRC}/$${i}; \
-	done
-
-do-install:
-	${MKDIR} ${NDIR}/java/classes
-	${INSTALL_DATA} ${WRKSRC}/*.jar ${NDIR}/java/classes
-	${INSTALL_PROGRAM} ${WRKSRC}/vreg ${NDIR}
-	for i in ${WRKSRC}/*.nif; do \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} -C ${NDIR}; \
-	done
-	${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}
-	${RM} -rf ${NDIR}/movemail-src
-	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
-	/usr/sbin/chown -R bin:bin ${NDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/ja-netscape.sh ${BINDIR}/${PKGNAME}
-	/bin/ln -sf ${PKGNAME} ${BINDIR}/netscape
-#
-	${MKDIR} ${NLSDIR}/local_im_tbl
-	${INSTALL_DATA} ${WRKDIR}/nls/*.*  ${NLSDIR}
-	${INSTALL_DATA} ${WRKDIR}/nls/C  ${NLSDIR}
-	${RM} -f ${NLSDIR}/*.orig
-	${INSTALL_DATA} ${WRKDIR}/nls/local_im_tbl/* ${NLSDIR}/local_im_tbl
-	${MKDIR} ${RESDIR}
-	${INSTALL_DATA} ${WRKDIR}/${RESOURCE_BASE}.ad ${RESDIR}/Netscape
-	${MKDIR} ${LOCDIR}
-	/bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 ${LOCDIR}/ja_JP.EUC
-	${INSTALL_SCRIPT} ${WRKSRC}/setup.pl ${NDIR}
-	${NDIR}/setup.pl install
-#
-	${MKDIR} ${EXDIST}
-	for i in ${EXFILES}; do \
-		${INSTALL_SCRIPT} ${EXSRC}/$${i} ${EXDIST}; \
-	done
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIST}
-	${INSTALL_DATA} ${FILESDIR}/setup.doc ${DOCDIST}
-.endif
-#
-
-plist:
-	${ECHO} bin/${PKGNAME} > ${PLIST}
-	${ECHO} @exec /bin/ln -sf %f %B/netscape >> ${PLIST}
-	${ECHO} @exec /bin/mkdir -p %D/lib/${PKGNAME}/locale >> ${PLIST}
-	${ECHO} @exec /bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 %D/lib/${PKGNAME}/locale/ja_JP.EUC >> ${PLIST}
-	${ECHO} @unexec /bin/rm -f %D/lib/${PKGNAME}/locale/ja_JP.EUC >> ${PLIST}
-	mkplist lib/${PKGNAME} >> ${PLIST}
-	mkplist share/examples/${PKGNAME} >> ${PLIST}
-	mkplist share/doc/${PKGNAME} >> ${PLIST}
-#
-
-post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
-
-.include <bsd.port.mk>
+.include "${MASTER_DIR}/Makefile"
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index 68f7609b136e..d0478b5fbf92 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -1,143 +1,64 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.04
+# Version required:	4.06
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.3 1998/03/21 05:04:53 itojun Exp $
+# $Id: Makefile,v 1.4 1998/04/01 01:49:24 asami Exp $
 #
 
-DISTNAME=	ja-netscape4
+DISTNAME=	ja-netscape-${BROWSER}
 CATEGORIES=	japanese www
+MASTER_SITES=	http://www.bres.tsukuba.ac.jp/~yohta/netscape/
+DISTFILES=	communicator-ja-euc-v406-export.generic-generic-generic.tar.gz
 
-.if !defined(NAVIGATOR)
-MASTER_SITES=	ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/professional_edition/
-DISTFILE=	communicator-v404-export.x86-unknown-freebsd.tar.gz
-BROWSER=	communicator
-.else
-MASTER_SITES=   ftp://ftp.netscape.com/pub/communicator/4.04/development/english/unix/freebsd/navigator_standalone/
-DISTFILE=	navigator-v404-export.x86-unknown-freebsd.tar.gz
-BROWSER=	navigator
-.endif
-.if !defined(ENGLISH)
-RESOURCE_BASE=	Netscape-jp-v404
-MSG_LANG=
-.else
-RESOURCE_BASE=	Netscape-us-v404
-MSG_LANG=		-us
-.endif
-RUN_DEPENDS=	${X11BASE}/lib/X11/k12:${PORTSDIR}/japanese/k12 \
-		${X11BASE}/lib/X11/fonts/misc/5x10B.pcf.Z:${PORTSDIR}/japanese/k10
+MAINTAINER?=	sada@e-mail.ne.jp
 
-MANUAL_PACKAGE_BUILD=	have to set ENGLISH and NAGIVATOR variables
+RUN_DEPENDS= \
+	${PREFIX}/bin/${BROWSER}:${PORTSDIR}/www/netscape4-${BROWSER_NAME} \
+	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
-DISTFILES=	${DISTFILE}
-EXTRACT_ONLY=	${DISTFILE}
-MASTER_SITES+=	http://www.bpel.tutics.tut.ac.jp/~take/Netscape/etc/ \
-		ftp://ftp.bres.tsukuba.ac.jp/pub/misc/netscape/
-RESOURCE_POSTFIX=	19971218.ad
-RESOURCE_NAME=	${RESOURCE_BASE}.${RESOURCE_POSTFIX}
-DISTFILES+=	NLS.tar.gz ${RESOURCE_NAME}.gz
-PKGNAME=	ja-${BROWSER}${MSG_LANG}-4.04
-PLIST=		${PKGDIR}/PLIST.${PKGNAME}
-MD5_FILE=	${FILESDIR}/md5.${PKGNAME}
-EXSRC=		${WRKSRC}/examples/${PKGNAME}
-EXDIST=		${PREFIX}/share/examples/${PKGNAME}
-EXFILES=	patch.XLC_LOCALE
-DOCDIST=	${PREFIX}/share/doc/${PKGNAME}
-DOCFILES=	setup.doc
-
-MAINTAINER=	sada@E-mail.NE.JP
-
-NO_WRKSUBDIR=	Yes
-NO_BUILD=	Yes
+MAN1=		ja-${BROWSER_NAME}.1
+MANLANG=	ja
+NO_BUILD=	yes
 STRIP=
+WRKSRC=		${WRKDIR}/netscape-ja_euc
 
-NDIR=		${PREFIX}/lib/${PKGNAME}
-BINDIR=		${PREFIX}/bin
-NLSDIR=		${NDIR}/nls
-RESSUB=		ja_JP.EUC
-RESDIR=		${NDIR}/${RESSUB}
-LOCDIR=		${NDIR}/locale
-
-.SILENT:
-
-pre-fetch:
-.if !defined(NAVIGATOR)
-	@${ECHO_MSG} "NOTE: You can install navigator (not communicator) by \"make NAVIGATOR=yes install\"."
-.endif
-.if !defined(ENGLISH)
-	@${ECHO_MSG} "NOTE: You can install English-menu version by \"make ENGLISH=yes install\"."
-.endif
-
-post-extract:
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/NLS.tar.gz -C ${WRKDIR}
-	${CAT} ${DISTDIR}/${RESOURCE_NAME}.gz \
-		| ${GUNZIP_CMD} > ${WRKDIR}/${RESOURCE_BASE}.ad
-
+BROWSER=	${BROWSER_NAME}-${BROWSER_VER}
+BROWSER_NAME?=	communicator
+BROWSER_VER=	4.06
+LANG=		ja_JP.EUC
+NDIR=		${PREFIX}/lib/netscape
 MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 			-e "s;@PREFIX@;${PREFIX};g" \
-			-e "s;@NDIR@;${NDIR};g"
+			-e "s;@NDIR@;${NDIR};g" \
+			-e "s;@RDIR@;${NDIR};g" \
+			-e "s;@BROWSER@;${BROWSER};g" \
+			-e "s;@LANG@;${LANG};g"
+MANDIR=		${MANPREFIX}/man/${MANLANG}
+MANFILE?=	${FILESDIR}/${MAN1}
 
-do-configure:
-#	${MAKESCRIPT} ${FILESDIR}/netscape.sh > ${WRKSRC}/netscape.sh
-	${MAKESCRIPT} ${FILESDIR}/ja-netscape.sh > ${WRKSRC}/ja-netscape.sh
-	${ECHO} -n 'Communicator,4.04.0.97330,' > ${WRKSRC}/infile
-	${ECHO} ${NDIR} >> ${WRKSRC}/infile
-#
-	${MAKESCRIPT} ${FILESDIR}/setup.pl >${WRKSRC}/setup.pl
-	${MKDIR} ${EXSRC}
-	for i in ${EXFILES}; do \
-		${MAKESCRIPT} ${FILESDIR}/$${i} >${EXSRC}/$${i}; \
-	done
+.SILENT:
 
-do-install:
-	${MKDIR} ${NDIR}/java/classes
-	${INSTALL_DATA} ${WRKSRC}/*.jar ${NDIR}/java/classes
-	${INSTALL_PROGRAM} ${WRKSRC}/vreg ${NDIR}
-	for i in ${WRKSRC}/*.nif; do \
-		${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} $${i} -C ${NDIR}; \
-	done
-	${INSTALL_DATA} ${FILESDIR}/mailcap ${NDIR}
-	${RM} -rf ${NDIR}/movemail-src
-	${WRKSRC}/vreg ${NDIR}/registry ${WRKSRC}/infile
-	/usr/sbin/chown -R bin:bin ${NDIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/ja-netscape.sh ${BINDIR}/${PKGNAME}
-	/bin/ln -sf ${PKGNAME} ${BINDIR}/netscape
-#
-	${MKDIR} ${NLSDIR}/local_im_tbl
-	${INSTALL_DATA} ${WRKDIR}/nls/*.*  ${NLSDIR}
-	${INSTALL_DATA} ${WRKDIR}/nls/C  ${NLSDIR}
-	${RM} -f ${NLSDIR}/*.orig
-	${INSTALL_DATA} ${WRKDIR}/nls/local_im_tbl/* ${NLSDIR}/local_im_tbl
-	${MKDIR} ${RESDIR}
-	${INSTALL_DATA} ${WRKDIR}/${RESOURCE_BASE}.ad ${RESDIR}/Netscape
-	${MKDIR} ${LOCDIR}
-	/bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 ${LOCDIR}/ja_JP.EUC
-	${INSTALL_SCRIPT} ${WRKSRC}/setup.pl ${NDIR}
-	${NDIR}/setup.pl install
-#
-	${MKDIR} ${EXDIST}
-	for i in ${EXFILES}; do \
-		${INSTALL_SCRIPT} ${EXSRC}/$${i} ${EXDIST}; \
-	done
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIST}
-	${INSTALL_DATA} ${FILESDIR}/setup.doc ${DOCDIST}
+do-configure:
+	${MAKESCRIPT} ${FILESDIR}/start.sh.in >${WRKDIR}/start.sh
+.if defined(USE_14DOT_FONT)
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
+	 |${FILESDIR}/14dot.sed >${WRKSRC}/Netscape
+.else
+	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc >${WRKSRC}/Netscape
 .endif
-#
 
-plist:
-	${ECHO} bin/${PKGNAME} > ${PLIST}
-	${ECHO} @exec /bin/ln -sf %f %B/netscape >> ${PLIST}
-	${ECHO} @exec /bin/mkdir -p %D/lib/${PKGNAME}/locale >> ${PLIST}
-	${ECHO} @exec /bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 %D/lib/${PKGNAME}/locale/ja_JP.EUC >> ${PLIST}
-	${ECHO} @unexec /bin/rm -f %D/lib/${PKGNAME}/locale/ja_JP.EUC >> ${PLIST}
-	mkplist lib/${PKGNAME} >> ${PLIST}
-	mkplist share/examples/${PKGNAME} >> ${PLIST}
-	mkplist share/doc/${PKGNAME} >> ${PLIST}
-#
-
-post-install:
-	@${CAT} ${PKGDIR}/MESSAGE
+do-install:
+	${INSTALL_DATA} ${FILESDIR}/preferences.js ${NDIR}
+	${MKDIR} ${NDIR}/locale
+	${LN} -sf /usr/share/locale/en_US.ISO_8859-1 ${NDIR}/locale/${LANG}
+	${MKDIR} ${NDIR}/${LANG}
+.for f in Netscape about mail.msg nethelp-v406.nif netscape.cfg plugins splash
+	${INSTALL_DATA} ${WRKSRC}/$f ${NDIR}/${LANG}/
+.endfor
+	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/ja-${BROWSER}
+	${LN} -sf ja-${BROWSER} ${PREFIX}/bin/netscape
+	${MKDIR} ${MANDIR}/man1
+	${INSTALL_MAN} ${MANFILE} ${MANDIR}/man1
 
 .include <bsd.port.mk>
diff --git a/japanese/netscape48-communicator/distinfo b/japanese/netscape48-communicator/distinfo
new file mode 100644
index 000000000000..ef6125bf71d3
--- /dev/null
+++ b/japanese/netscape48-communicator/distinfo
@@ -0,0 +1 @@
+MD5 (communicator-ja-euc-v406-export.generic-generic-generic.tar.gz) = 0e11651005415443cb978879a08b913a
diff --git a/japanese/netscape48-communicator/files/patch-aa b/japanese/netscape48-communicator/files/patch-aa
new file mode 100644
index 000000000000..3346f402001e
--- /dev/null
+++ b/japanese/netscape48-communicator/files/patch-aa
@@ -0,0 +1,31 @@
+--- Netscape.ad-ja_euc.orig	Fri Sep 11 19:29:46 1998
++++ Netscape.ad-ja_euc	Wed Oct  7 17:06:49 1998
+@@ -94,7 +94,7 @@
+ !Solaris[EUC]   *appDir location:     /usr/openwin/lib/locale/ja/netscape
+ !Solaris[Sjis]  *appDir location:     /usr/openwin/lib/locale/ja_JP.PCK/netscape
+ 
+-*appDir:			/usr/X11R6/lib/X11/ja_JP.EUC/netscape
++*appDir:			@NDIR@/@LANG@
+ 
+ ! This resource is the same as the -visual command line option, which selects
+ ! an X visual on which the windows should be created.  Legal options are:
+@@ -4801,6 +4801,9 @@
+ *openURLDialog*openInEditor.labelString: Composer で開く
+ *openURLDialog*openInBrowser.labelString: Navigator で開く
+ 
++*openURLDialog*XmTextField.fontList:\
++-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
++
+ *message_popup.title:			Netscape
+ *message_popup*OK.labelString:	OK
+ *message_popup*OkLabelString:	OK
+@@ -6720,6 +6723,9 @@
+ 
+ !! Maximum number of pixels an item can be dragged (for one mouse motion)
+ *toolBox*dragThreshold:					10
++
++*mainForm.toolBox.urlBarItem.urlBarMainForm.urlComboBox.Text.fontList:\
++-adobe-courier-medium-r-*-*-*-120-*-*-*-*-iso8859-*
+ 
+ !!
+ !! *toolBar
diff --git a/japanese/netscape48-communicator/files/preferences.js b/japanese/netscape48-communicator/files/preferences.js
new file mode 100644
index 000000000000..9d41df80d14f
--- /dev/null
+++ b/japanese/netscape48-communicator/files/preferences.js
@@ -0,0 +1,5 @@
+// Netscape User Preferences
+// This is a generated file!  Do not edit.
+
+user_pref("intl.character_set", 2309);
+user_pref("intl.font_spec_list", "schumacher-clean-120-noscale-fixed-x-user-defined,schumacher-clean-120-noscale-prop-x-user-defined,nsPseudoFont-courier-180-noscale-fixed-UTF-8,nsPseudoFont-helvetica-180-noscale-prop-UTF-8,isas-fangsong ti-120-noscale-fixed-gb_2312-80,isas-fangsong ti-120-noscale-prop-gb_2312-80,daewoo-gothic-0-noscale-fixed-ks_c_5601-1987,daewoo-gothic-0-noscale-prop-ks_c_5601-1987,misc-fixed-130-noscale-fixed-jis_x0201,misc-fixed-130-noscale-prop-jis_x0201,netscape-fixed-130-noscale-fixed-jis_x0208-1983,netscape-fixed-130-noscale-prop-jis_x0208-1983,misc-fixed-130-noscale-fixed-iso-8859-1,adobe-new century schoolbook-140-noscale-prop-iso-8859-1,");
diff --git a/japanese/netscape48-communicator/files/start.sh.in b/japanese/netscape48-communicator/files/start.sh.in
new file mode 100644
index 000000000000..01c273940b1e
--- /dev/null
+++ b/japanese/netscape48-communicator/files/start.sh.in
@@ -0,0 +1,19 @@
+#!/bin/sh
+CHMOD='/bin/chmod'
+CP='/bin/cp -p'
+MKDIR='/bin/mkdir -p'
+export LANG; LANG=ja_JP.EUC
+export LC_ALL; LC_ALL=$LANG
+export LC_CTYPE; LC_CTYPE=$LANG
+export MOZILLA_HOME; MOZILLA_HOME=@NDIR@
+export MOZILLA_NO_ASYNC; MOZILLA_NO_ASYNC=True
+export CLASSPATH; CLASSPATH=.:$MOZILLA_HOME
+export XENVIRONMENT; XENVIRONMENT=${MOZILLA_HOME}/Nescape.ad
+export XKEYSYMDB; XKEYSYMDB=@X11BASE@/lib/X11/XKeysymDB
+export XAPPLRESDIR; XAPPLRESDIR=@RDIR@
+export XNLSPATH; XNLSPATH=${MOZILLA_HOME}/nls
+export PATH_LOCALE; PATH_LOCALE=@RDIR@/locale
+export NPX_PLUGIN_PATH; NPX_PLUGIN_PATH=${MOZILLA_HOME}/plugins
+export TIMID_DIR; TIMID_DIR=/usr/local/lib/timidity
+export XCMSDB; XCMSDB=/dev/null
+exec ${MOZILLA_HOME}/@BROWSER@.bin $*
diff --git a/japanese/netscape48-communicator/pkg-comment b/japanese/netscape48-communicator/pkg-comment
index 89107695f3c1..3ce3007b6ff6 100644
--- a/japanese/netscape48-communicator/pkg-comment
+++ b/japanese/netscape48-communicator/pkg-comment
@@ -1 +1 @@
-netscape ver 4 web-surfboard with Japanese resources
+netscape web-surfboard with Japanese resources
diff --git a/japanese/netscape48-communicator/pkg-descr b/japanese/netscape48-communicator/pkg-descr
index c1d8aba8bfcd..ab6c745f7865 100644
--- a/japanese/netscape48-communicator/pkg-descr
+++ b/japanese/netscape48-communicator/pkg-descr
@@ -1,16 +1,9 @@
-This is the netscape web-surfboard.  Please read the file
-"/usr/local/lib/netscape/LICENSE" for the licensing terms.
+This is the netscape web-surfboard.
+Please read the file `/usr/local/lib/netscape/LICENSE'
+for the licensing terms.
 
-You could build the port as
- % make [ NAVIGATOR=yes ] [ ENGLISH=yes ]
-and could install as
- % make [ NAVIGATOR=yes ] [ ENGLISH=yes ] install
-
-options:
- NAVIGATOR	build the browser ``Navigator-4.04''
- ENGLISH	use English messages and menues
-
-Please read `/usr/local/share/examples/ja-*-4.04/setup.doc'.
+This port's explanation (written in Japanese):
+ <URL:http://www.rr.iij4u.or.jp/~sada/netscape.html>
 
 - SADA Kenji
 sada@e-mail.ne.jp
diff --git a/japanese/netscape48-communicator/pkg-plist b/japanese/netscape48-communicator/pkg-plist
new file mode 100644
index 000000000000..20b812955974
--- /dev/null
+++ b/japanese/netscape48-communicator/pkg-plist
@@ -0,0 +1,15 @@
+bin/ja-communicator-4.06
+@exec /bin/ln -sf %f %B/netscape
+lib/netscape/ja_JP.EUC/Netscape
+lib/netscape/ja_JP.EUC/about
+lib/netscape/ja_JP.EUC/mail.msg
+lib/netscape/ja_JP.EUC/nethelp-v406.nif
+lib/netscape/ja_JP.EUC/netscape.cfg
+lib/netscape/ja_JP.EUC/plugins
+lib/netscape/ja_JP.EUC/splash
+lib/netscape/preferences.js
+@exec /bin/mkdir -p %B/locale
+@exec /bin/ln -sf /usr/share/locale/en_US.ISO_8859-1 %B/locale/ja_JP.EUC
+@unexec rm -f %B/locale/ja_JP.EUC
+@dirrm lib/netscape/locale
+@dirrm lib/netscape/ja_JP.EUC