Update to 4.08.

6 files changed, 33 insertions, 83 deletions

diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index d097d0a0a3bf..b7c199fa03d5 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -1,76 +1,73 @@
 # New ports collection makefile for: Netscape browser with Japanese resources
-# Version required:	4.07
+# Version required:	4.08
 # Date created:		13 Mar 1998
-# Whom:			sada
+# Whom:			sada@FreeBSD.ORG
 #
-# $Id: Makefile,v 1.9 1998/11/24 15:09:09 sada Exp $
+# $Id: Makefile,v 1.10 1998/12/13 19:09:45 sada Exp $
 #
 
-DISTNAME=	ja-netscape-${BROWSER}
+DISTNAME=	ja-netscape-${BROWSER}-${BROWSER_VERSION}
 CATEGORIES=	japanese www
 MASTER_SITES=	http://www.bres.tsukuba.ac.jp/~yohta/netscape/ \
-		${RESOURCE_SITES}
-DISTFILES=	${EXTRACT_ONLY} ${RESOURCE_FILE}
+		${PORTKIT_SITES}
+DISTFILES=	${JAPANIZE_KIT} ${PORTKIT}
 
 MAINTAINER=	sada@FreeBSD.ORG
 
-RUN_DEPENDS?= \
-	${PREFIX}/bin/${BROWSER}:${PORTSDIR}/www/netscape4-${BROWSER_NAME} \
-	${FONT_DEPEND}
+RUN_DEPENDS=	${PREFIX}/bin/${BROWSER}-${BROWSER_VERSION}:${PORTSDIR}/www/netscape4-${BROWSER} \
+		${FONT_DEPEND}
 
-EXTRACT_ONLY=	${JAPANIZE_KIT}
-MAN1=		ja-${BROWSER_NAME}.1
+MAN1=		ja-netscape.1
 MANLANG=	ja
 NO_BUILD=	yes
+PLIST=		${.CURDIR}/pkg/PLIST
+PLIST_SUB=	NSUBDIR=${NSUBDIR} LANG=${LANG}
 WRKSRC=		${WRKDIR}/netscape-ja_euc
 
-BROWSER=	${BROWSER_NAME}-${BROWSER_VERSION}
-BROWSER_NAME?=	communicator
-BROWSER_VER=	4
-BROWSER_VERSION?= 4.07
-FILES_DIR?=	${FILESDIR}
-FONT_DEPEND=	\
-	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
+BROWSER?=	communicator
+BROWSER_CMD?=	ja-${BROWSER}-4
+BROWSER_VERSION?= 4.08
+FONT_DEPEND=	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 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};g" \
+			-e "s;@BROWSER@;${BROWSER}-${BROWSER_VERSION};g" \
 			-e "s;@LANG@;${LANG};g"
 MANDIR=		${MANPREFIX}/man/${MANLANG}
-MANFILE?=	${FILES_DIR}/${MAN1}
 NDIR=		${PREFIX}/${NSUBDIR}
 NSUBDIR?=	lib/netscape
-PLIST_SUB=	NSUBDIR=${NSUBDIR} BROWSER=${BROWSER} LANG=${LANG}
-# Below two lines could be overwritten,
-# and you could create new ja-netscape4 with new resource.
-RESOURCE_FILE?= ja-netscape-resource-${BROWSER_VERSION}.gz
-RESOURCE_SITES?= http://WWW.JP.FreeBSD.ORG/~sada/distfiles/ \
+PORTKIT?=	ja-netscape4-portkit.1998.1227.tar.gz
+PORTKIT_DIR=	${WRKDIR}/portkit
+PORTKIT_SITES=	http://WWW.JP.FreeBSD.ORG/~sada/distfiles/ \
 		http://WWW.FreeBSD.ORG/~sada/distfiles/
 
 .SILENT:
 
-post-extract:
-	${GZCAT} ${DISTDIR}/${RESOURCE_FILE} >${WRKSRC}/Netscape
-
 do-configure:
-	${MAKESCRIPT} ${FILES_DIR}/start.sh.in >${WRKDIR}/start.sh
+	${MAKESCRIPT} ${PORTKIT_DIR}/start.sh.in >${WRKDIR}/start.sh
+	${CP} ${PORTKIT_DIR}/Netscape.${BROWSER} ${WRKDIR}/Netscape
+	${CP} ${PORTKIT_DIR}/splash.${BROWSER} ${WRKDIR}/splash
+	${CP} ${WRKDIR}/splash ${WRKDIR}/about
 
 do-install:
-	${INSTALL_DATA} ${FILES_DIR}/preferences.js ${NDIR}
+	${INSTALL_DATA} ${PORTKIT_DIR}/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 netscape.cfg plugins splash
+.for f in mail.msg netscape.cfg plugins
 	${INSTALL_DATA} ${WRKSRC}/$f ${NDIR}/${LANG}/
 .endfor
+.for f in Netscape about splash
+	${INSTALL_DATA} ${WRKDIR}/$f ${NDIR}/${LANG}/
+.endfor
 	${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${WRKSRC}/nethelp-v406.nif \
 		-C ${NDIR}/${LANG}
-	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/ja-${BROWSER}
-	${LN} -sf ja-${BROWSER} ${PREFIX}/bin/netscape
+	${INSTALL_SCRIPT} ${WRKDIR}/start.sh ${PREFIX}/bin/${BROWSER_CMD}
+	${LN} -sf ${BROWSER_CMD} ${PREFIX}/bin/netscape
 	${MKDIR} ${MANDIR}/man1
-	${INSTALL_MAN} ${MANFILE} ${MANDIR}/man1
+	${INSTALL_MAN} ${PORTKIT_DIR}/${MAN1} ${MANDIR}/man1
 
 .include <bsd.port.mk>
diff --git a/japanese/netscape4-communicator/distinfo b/japanese/netscape4-communicator/distinfo
index 09be2a9d51c1..8d589b7fa589 100644
--- a/japanese/netscape4-communicator/distinfo
+++ b/japanese/netscape4-communicator/distinfo
@@ -1,2 +1,2 @@
 MD5 (communicator-ja-euc-v407-export.generic-generic-generic.tar.gz) = b9ea038c83741e70aec74cc0e782646d
-MD5 (ja-netscape-resource-4.07.gz) = 6b3f227a4f2fac08459298d8e4addf3b
+MD5 (ja-netscape4-portkit.1998.1227.tar.gz) = 1f2f2148166d1dad002fec44bfc0d0f1
diff --git a/japanese/netscape4-communicator/files/patch-aa b/japanese/netscape4-communicator/files/patch-aa
deleted file mode 100644
index 11e64d5362e6..000000000000
--- a/japanese/netscape4-communicator/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- Netscape.ad-ja_euc.orig	Sat Oct 10 03:54:43 1998
-+++ Netscape.ad-ja_euc	Sat Oct 10 03:57:12 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:
-@@ -4800,6 +4800,8 @@
- !*openURLDialog.width:				500
- *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
diff --git a/japanese/netscape4-communicator/files/preferences.js b/japanese/netscape4-communicator/files/preferences.js
deleted file mode 100644
index 9d41df80d14f..000000000000
--- a/japanese/netscape4-communicator/files/preferences.js
+++ /dev/null
@@ -1,5 +0,0 @@
-// 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
deleted file mode 100644
index 44e8b7f6902c..000000000000
--- a/japanese/netscape4-communicator/files/start.sh.in
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-if [ ! -d $HOME/.netscape ]; then
-	mkdir -m 700 $HOME/.netscape
-	cp @RDIR@/preferences.js $HOME/.netscape
-	chmod 644 $HOME/.netscape/preferences.js
-fi
-export LANG=ja_JP.EUC
-export LC_ALL=${LANG}
-export LC_CTYPE=${LANG}
-export MOZILLA_HOME=@NDIR@
-export CLASSPATH=.:${MOZILLA_HOME}
-export NS_NETHELP_PATH=${MOZILLA_HOME}/${LANG}
-export XKEYSYMDB=@X11BASE@/lib/X11/XKeysymDB
-export XAPPLRESDIR=@RDIR@
-export TIMID_DIR=/usr/local/lib/timidity
-export XCMSDB=/dev/null
-if [ x$JA_NETSCAPE_USE_LD_PRELOAD != x -a x$JA_NETSCAPE_USE_LD_PRELOAD != xno ]; then
-	export LD_PRELOAD=libxpg4.so.2.0
-else
-	export PATH_LOCALE=@RDIR@/locale
-fi
-exec ${MOZILLA_HOME}/@BROWSER@.bin $*
diff --git a/japanese/netscape4-communicator/pkg-plist b/japanese/netscape4-communicator/pkg-plist
index a43c09e2edb5..7f0a3eccd549 100644
--- a/japanese/netscape4-communicator/pkg-plist
+++ b/japanese/netscape4-communicator/pkg-plist
@@ -1,4 +1,4 @@
-bin/ja-%%BROWSER%%
+bin/ja-communicator-4
 @exec ln -sf %f %B/netscape
 %%NSUBDIR%%/%%LANG%%/Netscape
 %%NSUBDIR%%/%%LANG%%/about