* Expand ``nethelp-v406.nif''.

* Remove obsolete environment variables.
* Change the default message fonts 16dots -> 14dots.
  A user could change the work by setting up the environment
  ``USE_16DOT_FONT''.
* Change the calling way for the SED script.
* Enable to switch the locale function of ``LD_PRELOAD'' method
  instead of ``PATH LOCALE'' one,
  by the environment ``JA_NETSCAPE_USE_LD_PRELOAD''.
* Follow up the distribution resource file's update
  and change the md5.
PR:		ports/8529
Submitted by:	myself
Obtained from:	sada's local machine

4 files changed, 164 insertions, 46 deletions

diff --git a/japanese/netscape48-communicator/Makefile b/japanese/netscape48-communicator/Makefile
index ec52a6f..e84b007 100644
--- a/japanese/netscape48-communicator/Makefile
+++ b/japanese/netscape48-communicator/Makefile
@@ -3,19 +3,19 @@
 # Date created:		13 Mar 1998
 # Whom:			sada
 #
-# $Id: Makefile,v 1.5 1998/10/09 04:22:17 asami Exp $
+# $Id: Makefile,v 1.6 1998/10/09 22:27:47 asami 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
+DISTFILES?=	communicator-ja-euc-v407-export.generic-generic-generic.tar.gz
 
-MAINTAINER?=	sada@e-mail.ne.jp
+MAINTAINER=	sada@e-mail.ne.jp
 
-RUN_DEPENDS= \
+RUN_DEPENDS?= \
 	${PREFIX}/bin/${BROWSER}:${PORTSDIR}/www/netscape4-${BROWSER_NAME} \
-	${PKG_DBDIR}/ja-netscape-fonts-1.0:${PORTSDIR}/japanese/netscape-fonts
+	${FONT_DEPEND}
 
 MAN1=		ja-${BROWSER_NAME}.1
 MANLANG=	ja
@@ -23,11 +23,13 @@ NO_BUILD=	yes
 STRIP=
 WRKSRC=		${WRKDIR}/netscape-ja_euc
 
-BROWSER=	${BROWSER_NAME}-${BROWSER_VER}
+BROWSER=	${BROWSER_NAME}-${BROWSER_VERSION}
 BROWSER_NAME?=	communicator
-BROWSER_VER=	4.07
+BROWSER_VER=	4
+BROWSER_VERSION?= 4.07
 LANG=		ja_JP.EUC
-NDIR=		${PREFIX}/lib/netscape
+NDIR=		${PREFIX}/${NSUBDIR}
+NSUBDIR?=	lib/netscape
 MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 			-e "s;@PREFIX@;${PREFIX};g" \
 			-e "s;@NDIR@;${NDIR};g" \
@@ -36,16 +38,19 @@ MAKESCRIPT=	${SED} -e "s;@X11BASE@;${X11BASE};g" \
 			-e "s;@LANG@;${LANG};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
 
 .SILENT:
 
 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
+.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:
@@ -53,9 +58,11 @@ do-install:
 	${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
+.for f in Netscape about mail.msg netscape.cfg plugins splash
 	${INSTALL_DATA} ${WRKSRC}/$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
 	${MKDIR} ${MANDIR}/man1
diff --git a/japanese/netscape48-communicator/distinfo b/japanese/netscape48-communicator/distinfo
index cd9ad12..3e4e216 100644
--- a/japanese/netscape48-communicator/distinfo
+++ b/japanese/netscape48-communicator/distinfo
@@ -1 +1 @@
-MD5 (communicator-ja-euc-v407-export.generic-generic-generic.tar.gz) = c7ab0c57198e9cd6dcbc8fb63fbb8bb8
+MD5 (communicator-ja-euc-v407-export.generic-generic-generic.tar.gz) = b9ea038c83741e70aec74cc0e782646d
diff --git a/japanese/netscape48-communicator/files/start.sh.in b/japanese/netscape48-communicator/files/start.sh.in
index 01c2739..b9ec582 100644
--- a/japanese/netscape48-communicator/files/start.sh.in
+++ b/japanese/netscape48-communicator/files/start.sh.in
@@ -1,19 +1,17 @@
 #!/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
+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/netscape48-communicator/pkg-plist b/japanese/netscape48-communicator/pkg-plist
index 2c22357..a43c09e 100644
--- a/japanese/netscape48-communicator/pkg-plist
+++ b/japanese/netscape48-communicator/pkg-plist
@@ -1,15 +1,128 @@
-bin/ja-communicator-4.07
-@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
+bin/ja-%%BROWSER%%
+@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%%/nethelp/Back_dep.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Back_dis.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Back_sel.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Back_up.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Blank.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/Button.js
+%%NSUBDIR%%/%%LANG%%/nethelp/CntData.js
+%%NSUBDIR%%/%%LANG%%/nethelp/CntTool.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/CntTool.js
+%%NSUBDIR%%/%%LANG%%/nethelp/Exit_dep.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Exit_sel.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Exit_up.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Forw_dep.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Forw_dis.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Forw_sel.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Forw_up.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Header.js
+%%NSUBDIR%%/%%LANG%%/nethelp/IdxData.js
+%%NSUBDIR%%/%%LANG%%/nethelp/IdxFill.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/IdxKey.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/IdxTool.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/IdxTopic.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/Local-1.js
+%%NSUBDIR%%/%%LANG%%/nethelp/NSHIfrm.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/NavUI.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/NoJSerr.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/Prnt_dep.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Prnt_sel.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Prnt_up.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Stack.js
+%%NSUBDIR%%/%%LANG%%/nethelp/Status.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/System.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/System.js
+%%NSUBDIR%%/%%LANG%%/nethelp/ToolUI.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/Tool_dep.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Tool_sel.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/Tool_up.gif
+%%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/composer/comp.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/compHdr.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/composer.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/composer/comtlbr2.gif
+%%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/help.hpf
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/messengr/mailbox.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/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/shared/admnIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/calIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/collIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/commIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/compIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/confIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/ibmIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/messIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/navIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared/netIcon.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/netwatch.gif
+%%NSUBDIR%%/%%LANG%%/nethelp/picsfail.htm
+%%NSUBDIR%%/%%LANG%%/nethelp/picsfail.jar
+@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/shared
+@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/nscal
+@dirrm %%NSUBDIR%%/%%LANG%%/nethelp/netscape/netcastr
+@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