Share plugins directory with www/communicator.

3 files changed, 28 insertions, 21 deletions

diff --git a/www/navigator/Makefile b/www/navigator/Makefile
index fd9d2948a47..90217e8fcc2 100644
--- a/www/navigator/Makefile
+++ b/www/navigator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 1999/08/18 08:56:13 agc Exp $
+# $NetBSD: Makefile,v 1.19 1999/09/04 16:38:30 jlam Exp $
 #
 # Every effort has been made to keep the communicator and navigator
 # Makefiles as similar as possible.
@@ -56,40 +56,46 @@ NO_BUILD=	yes
 
 WRKSRC=         ${WRKDIR}/${BINNAME}-v${NS_VERS_SHORT}.${WRKNAME}
 MOZILLA_HOME=	${PREFIX}/lib/netscape/${PKGNAME}
-PLIST_SRC=	${WRKDIR}/.PLIST_SRC
-NS_PLIST_SED=	"s,\$${NS_VERS},${NS_VERS},g"
+NS_PLUGINS_DIR=	${PREFIX}/lib/netscape/plugins
 
 .include "../../mk/bsd.prefs.mk"
 
+PLIST_SRC=	${PKGDIR}/PLIST.pre \
+		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} \
+		${PKGDIR}/PLIST.post
+PLIST_SUBST+=	NS_VERS=${NS_VERS}
+
 .if (${NS_ENCRYPTION} == "us")
 MASTER_SITES=
 RESTRICTED=		"128-bit key strong encryption; export-controlled"
 MIRROR_DISTFILE=	no
 ONLY_FOR_PLATFORM=	*-*-alpha *-*-i386
+DOWNLOAD=		http://www.netscape.com/download/
 
 do-fetch:
 	@if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
-	    ${ECHO_MSG}; \
+	    ${ECHO_MSG} "==============================================================="; \
 	    ${ECHO_MSG} "    The 128-bit key strong encryption version of"; \
-	    ${ECHO_MSG} "        Netscape for this platform must be fetched"; \
-	    ${ECHO_MSG} "        into ${DISTDIR} from"; \
-	    ${ECHO_MSG} "        http://www.netscape.com/download/"; \
-	    ${ECHO_MSG}; \
+	    ${ECHO_MSG} "    Netscape for this platform must be fetched"; \
+	    ${ECHO_MSG} "    into \"${DISTDIR}\" from the following URL:"; \
+	    ${ECHO_MSG} "    ${DOWNLOAD}"; \
+	    ${ECHO_MSG} "==============================================================="; \
+	    ${FALSE}; \
 	fi
 .endif
 
 do-install:
-	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.pre >${PLIST_SRC}
 	${MKDIR} ${MOZILLA_HOME}/java/classes
 	${INSTALL_SCRIPT} ${WRKSRC}/vreg ${MOZILLA_HOME}
 .for file in ifc11.jar iiop10.jar jae40.jar java40.jar jio40.jar jsd10.jar \
     ldap30.jar resource.jar scd10.jar
 	${INSTALL_DATA} ${WRKSRC}/${file} ${MOZILLA_HOME}/java/classes
 .endfor
-	cd ${MOZILLA_HOME} ; tar xpzf ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif
-	cd ${MOZILLA_HOME} ; tar xpzf ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif
+	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/nethelp-v${NS_VERS_SHORT}.nif
+	cd ${MOZILLA_HOME} ; ${GTAR} xpzf ${WRKSRC}/netscape-v${NS_VERS_SHORT}.nif
 
 	${SED} -e 's#@@MOZILLA_HOME@@#${MOZILLA_HOME}#g' \
+	       -e 's#@@NS_PLUGINS_DIR@@#${NS_PLUGINS_DIR}#g' \
 	    <${FILESDIR}/${BINNAME}.sh >${WRKDIR}/${BINNAME}.sh
 	${INSTALL_SCRIPT} ${WRKDIR}/${BINNAME}.sh ${PREFIX}/bin/${PKGNAME}
 	${RM} -f ${PREFIX}/bin/${BINNAME}
@@ -104,13 +110,9 @@ do-install:
 	${MV} ${MOZILLA_HOME}/netscape ${MOZILLA_HOME}/netscape_nis
 	${MV} ${MOZILLA_HOME}/netscape_dns ${MOZILLA_HOME}/netscape
 .endif
-
-	${SED} -e ${NS_PLIST_SED} \
-		${PKGDIR}/PLIST.${LOWER_OPSYS}-${MACHINE_ARCH} >>${PLIST_SRC}
+	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR}
 
 	${CHOWN} -R 0:0 ${MOZILLA_HOME}
 	${CHMOD} -R go-w ${MOZILLA_HOME}
 
-	${SED} -e ${NS_PLIST_SED} ${PKGDIR}/PLIST.post >>${PLIST_SRC}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/navigator/files/navigator.sh b/www/navigator/files/navigator.sh
index 7dff49a8cf8..b673eb60d45 100644
--- a/www/navigator/files/navigator.sh
+++ b/www/navigator/files/navigator.sh
@@ -1,8 +1,11 @@
 #!/bin/sh
 #
-# $NetBSD: navigator.sh,v 1.2 1999/06/18 23:14:17 abs Exp $
+# $NetBSD: navigator.sh,v 1.3 1999/09/04 16:38:30 jlam Exp $
 #
 MOZILLA_HOME=@@MOZILLA_HOME@@ ;	export MOZILLA_HOME
-XNLSPATH=$MOZILLA_HOME/nls ;		export XNLSPATH
-XKEYSYMDB=$MOZILLA_HOME/XKeysymDB ;	export XKEYSYMDB
-exec $MOZILLA_HOME/netscape "$@"
+NS_PLUGINS_DIR=@@NS_PLUGINS_DIR@@;	export NS_PLUGINS_DIR
+XNLSPATH=${MOZILLA_HOME}/nls ;		export XNLSPATH
+XKEYSYMDB=${MOZILLA_HOME}/XKeysymDB ;	export XKEYSYMDB
+NPX_PLUGIN_PATH=${NS_PLUGINS_DIR}:${MOZILLA_HOME}/plugins:${HOME}/.netscape/plugins ;	export NPX_PLUGIN_PATH
+
+exec ${MOZILLA_HOME}/netscape "$@"
diff --git a/www/navigator/pkg/PLIST.post b/www/navigator/pkg/PLIST.post
index 80ae8eeddbd..36a6ebe4097 100644
--- a/www/navigator/pkg/PLIST.post
+++ b/www/navigator/pkg/PLIST.post
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.post,v 1.5 1999/06/14 21:40:05 cgd Exp $
+@comment $NetBSD: PLIST.post,v 1.6 1999/09/04 16:38:30 jlam Exp $
 @dirrm lib/netscape/navigator-${NS_VERS}/plugins
 @dirrm lib/netscape/navigator-${NS_VERS}/nethelp/netscape/shared
 @dirrm lib/netscape/navigator-${NS_VERS}/nethelp/netscape/navigatr
@@ -11,4 +11,6 @@
 @dirrm lib/netscape/navigator-${NS_VERS}/java/classes
 @dirrm lib/netscape/navigator-${NS_VERS}/java
 @dirrm lib/netscape/navigator-${NS_VERS}
+@exec mkdir -p %D/lib/netscape/plugins
+@unexec rmdir %D/lib/netscape/plugins 2>/dev/null || true
 @unexec rmdir %D/lib/netscape 2>/dev/null || true