Update of resource file.

  Make the wrapper to initialize Japanese font settings
at the first startup time.

6 files changed, 42 insertions, 26 deletions

diff --git a/japanese/netscape4-communicator/Makefile b/japanese/netscape4-communicator/Makefile
index 8801b4cd2a29..4365fdc1efac 100644
--- a/japanese/netscape4-communicator/Makefile
+++ b/japanese/netscape4-communicator/Makefile
@@ -3,20 +3,22 @@
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.7 1998/11/16 19:52:58 sada Exp $
+# $Id: Makefile,v 1.8 1998/11/17 17:20:54 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}
 CATEGORIES=	japanese www
-MASTER_SITES=	http://www.bres.tsukuba.ac.jp/~yohta/netscape/
-DISTFILES?=	communicator-ja-euc-v407-export.generic-generic-generic.tar.gz
+MASTER_SITES=	http://www.bres.tsukuba.ac.jp/~yohta/netscape/ \
+		${RESOURCE_SITES}
+DISTFILES?=	${EXTRACT_ONLY} ${RESOURCE_FILE}
 
-MAINTAINER=	sada@freebsd.org
+MAINTAINER=	sada@FreeBSD.ORG
 
 RUN_DEPENDS?= \
 	${PREFIX}/bin/${BROWSER}:${PORTSDIR}/www/netscape4-${BROWSER_NAME} \
-	${FONT_DEPEND}
+	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
+EXTRACT_ONLY=	communicator-ja-euc-v407-export.generic-generic-generic.tar.gz
 MAN1=		ja-${BROWSER_NAME}.1
 MANLANG=	ja
 NO_BUILD=	yes
@@ -38,19 +40,19 @@ MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 MANDIR=		${MANPREFIX}/man/${MANLANG}
 MANFILE?=	${FILESDIR}/${MAN1}
 PLIST_SUB=	NSUBDIR=${NSUBDIR} BROWSER=${BROWSER} LANG=${LANG}
-FONT_DEPEND= \
-	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
+# 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.rr.iij4u.or.jp/~sada/distfiles/ \
+		http://www.freebsd.org/~sada/distfiles/
 
 .SILENT:
 
+post-extract:
+	${GZCAT} ${DISTDIR}/${RESOURCE_FILE} >${WRKSRC}/Netscape
+
 do-configure:
 	${MAKESCRIPT} ${FILESDIR}/start.sh.in >${WRKDIR}/start.sh
-.if defined(USE_16DOT_FONT)
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc >${WRKSRC}/Netscape
-.else
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
-	| ${SED} -f ${FILESDIR}/14dot.sed >${WRKSRC}/Netscape
-.endif
 
 do-install:
 	${INSTALL_DATA} ${FILESDIR}/preferences.js ${NDIR}
diff --git a/japanese/netscape4-communicator/distinfo b/japanese/netscape4-communicator/distinfo
index 3e4e216035f2..44f5fe81f344 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 (ja-netscape-resource-4.07.gz) = 4355e69481e84600d9a7d0192e47c70b
diff --git a/japanese/netscape4-communicator/files/start.sh.in b/japanese/netscape4-communicator/files/start.sh.in
index b9ec582bae73..44e8b7f6902c 100644
--- a/japanese/netscape4-communicator/files/start.sh.in
+++ b/japanese/netscape4-communicator/files/start.sh.in
@@ -1,4 +1,9 @@
 #!/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}
diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index 8801b4cd2a29..4365fdc1efac 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -3,20 +3,22 @@
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.7 1998/11/16 19:52:58 sada Exp $
+# $Id: Makefile,v 1.8 1998/11/17 17:20:54 sada Exp $
 #
 
 DISTNAME=	ja-netscape-${BROWSER}
 CATEGORIES=	japanese www
-MASTER_SITES=	http://www.bres.tsukuba.ac.jp/~yohta/netscape/
-DISTFILES?=	communicator-ja-euc-v407-export.generic-generic-generic.tar.gz
+MASTER_SITES=	http://www.bres.tsukuba.ac.jp/~yohta/netscape/ \
+		${RESOURCE_SITES}
+DISTFILES?=	${EXTRACT_ONLY} ${RESOURCE_FILE}
 
-MAINTAINER=	sada@freebsd.org
+MAINTAINER=	sada@FreeBSD.ORG
 
 RUN_DEPENDS?= \
 	${PREFIX}/bin/${BROWSER}:${PORTSDIR}/www/netscape4-${BROWSER_NAME} \
-	${FONT_DEPEND}
+	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
 
+EXTRACT_ONLY=	communicator-ja-euc-v407-export.generic-generic-generic.tar.gz
 MAN1=		ja-${BROWSER_NAME}.1
 MANLANG=	ja
 NO_BUILD=	yes
@@ -38,19 +40,19 @@ MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 MANDIR=		${MANPREFIX}/man/${MANLANG}
 MANFILE?=	${FILESDIR}/${MAN1}
 PLIST_SUB=	NSUBDIR=${NSUBDIR} BROWSER=${BROWSER} LANG=${LANG}
-FONT_DEPEND= \
-	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
+# 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.rr.iij4u.or.jp/~sada/distfiles/ \
+		http://www.freebsd.org/~sada/distfiles/
 
 .SILENT:
 
+post-extract:
+	${GZCAT} ${DISTDIR}/${RESOURCE_FILE} >${WRKSRC}/Netscape
+
 do-configure:
 	${MAKESCRIPT} ${FILESDIR}/start.sh.in >${WRKDIR}/start.sh
-.if defined(USE_16DOT_FONT)
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc >${WRKSRC}/Netscape
-.else
-	${MAKESCRIPT} ${WRKSRC}/Netscape.ad-ja_euc \
-	| ${SED} -f ${FILESDIR}/14dot.sed >${WRKSRC}/Netscape
-.endif
 
 do-install:
 	${INSTALL_DATA} ${FILESDIR}/preferences.js ${NDIR}
diff --git a/japanese/netscape48-communicator/distinfo b/japanese/netscape48-communicator/distinfo
index 3e4e216035f2..44f5fe81f344 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 (ja-netscape-resource-4.07.gz) = 4355e69481e84600d9a7d0192e47c70b
diff --git a/japanese/netscape48-communicator/files/start.sh.in b/japanese/netscape48-communicator/files/start.sh.in
index b9ec582bae73..44e8b7f6902c 100644
--- a/japanese/netscape48-communicator/files/start.sh.in
+++ b/japanese/netscape48-communicator/files/start.sh.in
@@ -1,4 +1,9 @@
 #!/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}