Upgrade v4.51 to v4.6.

6 files changed, 55 insertions, 58 deletions

diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index 11f61cac8d4f..60945bab4eef 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.19 1999/05/02 14:11:41 sada Exp $
+# $Id: Makefile,v 1.20 1999/05/20 17:37:19 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
@@ -25,6 +25,7 @@ PKGINSTALL=	${WRKDIR}/INSTALL
 PLIST=		${.CURDIR}/pkg/PLIST
 PLIST_SUB=	NSUBDIR=${NSUBDIR} LANG=${LANG}
 WRKSRC=		${WRKDIR}/netscape-ja_euc
+FILESDIR?=	${.CURDIR}/files
 
 BROWSER?=	communicator
 BROWSER_BIN?=	${BROWSER}-${BROWSER_VERSION}.bin
@@ -42,10 +43,12 @@ MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 MANDIR=		${MANPREFIX}/man/${MANLANG}
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
-PORTKIT=	ja-netscape-portkit.1999.0502.tar.gz
+PORTKIT?=	ja-netscape-portkit.1999.0502.tar.gz
 PORTKIT_DIR=	${WRKDIR}/portkit
 PORTKIT_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://WWW.FreeBSD.ORG/~sada/distfiles/
+NETHELP?=	nethelp-v406
+
 .SILENT:
 
 do-configure:
@@ -67,7 +70,7 @@ do-install:
 .for f in Netscape about splash
 	${INSTALL_DATA} ${WRKDIR}/$f ${NDIR}/${LANG}/
 .endfor
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/nethelp-v406.nif \
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/${NETHELP}.nif \
 		${EXTRACT_AFTER_ARGS} -C ${NDIR}/${LANG}
 	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/${BROWSER_CMD}
 	${LN} -sf ${BROWSER_CMD} ${PREFIX}/bin/netscape
diff --git a/japanese/netscape47-communicator/Makefile b/japanese/netscape47-communicator/Makefile
index af32a2eacf88..8dbad47282d0 100644
--- a/japanese/netscape47-communicator/Makefile
+++ b/japanese/netscape47-communicator/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.5
+# Version required:	4.6
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.5 1999/05/02 14:11:46 sada Exp $
+# $Id: Makefile,v 1.6 1999/05/20 15:10:44 sada Exp $
 #
 
 BROKEN=		REPOSITORY COPIED
@@ -12,14 +12,12 @@ MASTERDIR=	${.CURDIR}/../netscape4-communicator
 
 MAINTAINER=	sada@FreeBSD.ORG
 
-RUN_DEPENDS=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape45-${BROWSER} \
-		${FONT_DEPEND}
+RUN_DEPENDS=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape46-${BROWSER}
 
-FILESDIR?=	${.CURDIR}/files
-
-BROWSER_CMD=	ja-${BROWSER}-45
-BROWSER_VERSION= 4.51
-JAPANIZE_KIT=	communicator-ja-euc-v45-export.generic-generic-generic.tar.gz
-NSUBDIR?=	netscape-4.51
+BROWSER_CMD=	ja-${BROWSER}-46
+BROWSER_VERSION=	4.6
+JAPANIZE_KIT=	communicator-ja-euc-v46-export.generic-generic-generic.tar.gz
+PORTKIT=	ja-netscape-portkit.1999.0521.tar.gz
+NETHELP=	nethelp-v451
 
 .include "${MASTERDIR}/Makefile"
diff --git a/japanese/netscape47-communicator/distinfo b/japanese/netscape47-communicator/distinfo
index 53d511de9b28..a48e21614d2e 100644
--- a/japanese/netscape47-communicator/distinfo
+++ b/japanese/netscape47-communicator/distinfo
@@ -1,2 +1,2 @@
-MD5 (communicator-ja-euc-v45-export.generic-generic-generic.tar.gz) = 925fd472be775f1cf174609b44b0adc2
-MD5 (ja-netscape-portkit.1999.0502.tar.gz) = 48460118b88ba0ccaa2bd47ebe60e55a
+MD5 (communicator-ja-euc-v46-export.generic-generic-generic.tar.gz) = 10596607a51e35e336ac1d3070008557
+MD5 (ja-netscape-portkit.1999.0521.tar.gz) = 525111257595d5a56a3f92733e65ae47
diff --git a/japanese/netscape47-communicator/pkg-plist b/japanese/netscape47-communicator/pkg-plist
index b593039ab00e..487ff435cbd7 100644
--- a/japanese/netscape47-communicator/pkg-plist
+++ b/japanese/netscape47-communicator/pkg-plist
@@ -1,15 +1,12 @@
-bin/ja-communicator-45
+bin/ja-communicator-46
 @exec ln -sf %f %B/netscape
-%%NSUBDIR%%/%%LANG%%/Netscape
-%%NSUBDIR%%/%%LANG%%/about
-%%NSUBDIR%%/%%LANG%%/mail.msg
-%%NSUBDIR%%/%%LANG%%/netscape.cfg
-%%NSUBDIR%%/%%LANG%%/plugins
-%%NSUBDIR%%/%%LANG%%/splash
 @exec mkdir -p %D/%%NSUBDIR%%/locale
 @exec ln -sf /usr/share/locale/en_US.ISO_8859-1 %D/%%NSUBDIR%%/locale/%%LANG%%
 @unexec rm -f %D/%%NSUBDIR%%/locale/%%LANG%%
 @dirrm %%NSUBDIR%%/locale
+%%NSUBDIR%%/%%LANG%%/Netscape
+%%NSUBDIR%%/%%LANG%%/about
+%%NSUBDIR%%/%%LANG%%/mail.msg
 %%NSUBDIR%%/%%LANG%%/nethelp/Back_dep.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/Back_dis.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/Back_sel.gif
@@ -50,12 +47,12 @@ bin/ja-communicator-45
 %%NSUBDIR%%/%%LANG%%/nethelp/Topic.js
 %%NSUBDIR%%/%%LANG%%/nethelp/Utility.js
 %%NSUBDIR%%/%%LANG%%/nethelp/Wait.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/fftp
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/collabra/coll.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/collabra/collHdr.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/collabra/collabra.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/collabra/discgrps.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/collabra/help.hpf
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/collabra/mailbox2.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/comp.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/compHdr.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/composer.gif
@@ -63,43 +60,36 @@ bin/ja-communicator-45
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/fmtlbr3.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/help.hpf
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/tagicon2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/brws2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/chat2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/circle2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/conf.htm
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/confHdr.htm
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/confernc.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/eraser2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/fhndtl2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/filex2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/help.hpf
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/horline2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/line2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/pointer2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/rect2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/txttool2.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc/whtbd2.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/home/help.hpf
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/home/home.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/home/home.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/home/homeHdr.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/abook.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/compbar.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/help.hpf
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/mailbox.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/mailbox2.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/mess.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/messHdr.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/messengr.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/mpctrl.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/newsgrp.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/tabs.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/navigatr/help.hpf
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/navigatr/nav.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/navigatr/navHdr.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/navigatr/navigatr.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/netcastr/help.hpf
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/netcastr/net.htm
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/netcastr/netHdr.htm
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/netcastr/netcastr.gif
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/nscal/index.html
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/Contents.htm
-%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/NetHelp1.css
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/abook.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/collabra.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/compbar.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/discgrps.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/help.hpf
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/mailbox2.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/news.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/news/newsgrp.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/NetHelpm.css
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/NetHelpu.css
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/NetHelpw.css
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/admnIcon.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/calIcon.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/collIcon.gif
@@ -110,19 +100,24 @@ bin/ja-communicator-45
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/messIcon.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/navIcon.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/netIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/trouble/help.hpf
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/trouble/trouble.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/netwatch.gif
 %%NSUBDIR%%/%%LANG%%/nethelp/picsfail.htm
 %%NSUBDIR%%/%%LANG%%/nethelp/picsfail.jar
+%%NSUBDIR%%/%%LANG%%/nethelp/scraps
+%%NSUBDIR%%/%%LANG%%/netscape.cfg
+%%NSUBDIR%%/%%LANG%%/plugins
+%%NSUBDIR%%/%%LANG%%/splash
+%%NSUBDIR%%/preferences.js
+@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/trouble
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared
-@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/nscal
-@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/netcastr
+@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/news
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/navigatr
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/home
-@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/confernc
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/collabra
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape
 @dirrm %%NSUBDIR%%/%%LANG%%/nethelp
 @dirrm %%NSUBDIR%%/%%LANG%%
-%%NSUBDIR%%/preferences.js
diff --git a/japanese/netscape47-navigator/Makefile b/japanese/netscape47-navigator/Makefile
index db83db27da6a..d109c8587f13 100644
--- a/japanese/netscape47-navigator/Makefile
+++ b/japanese/netscape47-navigator/Makefile
@@ -1,9 +1,9 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.51
+# Version required:	4.6
 # Date created:		29 Dec 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.2 1999/05/02 14:11:50 sada Exp $
+# $Id: Makefile,v 1.3 1999/05/20 15:10:47 sada Exp $
 #
 
 BROKEN=		REPOSITORY COPIED
@@ -12,9 +12,7 @@ MAINTAINER=	sada@FreeBSD.ORG
 
 FILESDIR=	${BASEDIR}/files
 
-BASEDIR=	${.CURDIR}/../netscape45-communicator
+BASEDIR=	${.CURDIR}/../netscape46-communicator
 BROWSER=	navigator
-BROWSER_BIN=	navigator-4.5.1.bin
-NSUBDIR=	lib/netscape
 
 .include	"${BASEDIR}/Makefile"
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index 11f61cac8d4f..60945bab4eef 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -3,7 +3,7 @@
 # Date created:		13 Mar 1998
 # Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.19 1999/05/02 14:11:41 sada Exp $
+# $Id: Makefile,v 1.20 1999/05/20 17:37:19 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
@@ -25,6 +25,7 @@ PKGINSTALL=	${WRKDIR}/INSTALL
 PLIST=		${.CURDIR}/pkg/PLIST
 PLIST_SUB=	NSUBDIR=${NSUBDIR} LANG=${LANG}
 WRKSRC=		${WRKDIR}/netscape-ja_euc
+FILESDIR?=	${.CURDIR}/files
 
 BROWSER?=	communicator
 BROWSER_BIN?=	${BROWSER}-${BROWSER_VERSION}.bin
@@ -42,10 +43,12 @@ MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 MANDIR=		${MANPREFIX}/man/${MANLANG}
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
-PORTKIT=	ja-netscape-portkit.1999.0502.tar.gz
+PORTKIT?=	ja-netscape-portkit.1999.0502.tar.gz
 PORTKIT_DIR=	${WRKDIR}/portkit
 PORTKIT_SITES=	${MASTER_SITE_PORTS_JP} \
 		http://WWW.FreeBSD.ORG/~sada/distfiles/
+NETHELP?=	nethelp-v406
+
 .SILENT:
 
 do-configure:
@@ -67,7 +70,7 @@ do-install:
 .for f in Netscape about splash
 	${INSTALL_DATA} ${WRKDIR}/$f ${NDIR}/${LANG}/
 .endfor
-	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/nethelp-v406.nif \
+	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/${NETHELP}.nif \
 		${EXTRACT_AFTER_ARGS} -C ${NDIR}/${LANG}
 	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/${BROWSER_CMD}
 	${LN} -sf ${BROWSER_CMD} ${PREFIX}/bin/netscape