Set MOZILLA_HOME to correct value even if the netscape package name ends in

the NetBSD package version number "nbX".  This fixes installing this
package after the recent updates of communicator and navigator.  Also use
the variables MOZILLA_HOME and NS_PLUGIN_DIR in the PLISTs to isolate
references to the same directory to one location.

4 files changed, 19 insertions, 23 deletions

diff --git a/www/ns-plugger-common/Makefile b/www/ns-plugger-common/Makefile
index a8a0c9b1911..c1d2b7b7e74 100644
--- a/www/ns-plugger-common/Makefile
+++ b/www/ns-plugger-common/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2001/02/17 17:22:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2001/03/06 10:17:43 jlam Exp $
 #
 
 DISTNAME=		plugger-3.2-linux-x86-glibc
@@ -15,11 +15,8 @@ BINNAME?=		common
 
 .if ${BINNAME} != common
 DEPENDS+=		${BINNAME}-*:../../www/${BINNAME}
-
-MOZILLA_HOME=		${PREFIX}/lib/netscape/${NSNAME}
-NS_VERS=		${NSNAME:C/.*-//}
-
-PLIST_SUBST+=		NS_VERS=${NS_VERS} BINNAME=${BINNAME}
+MOZILLA_HOME=		${PREFIX}/lib/netscape/${NSNAME:C/nb[0-9]+$//}
+PLIST_SUBST+=		MOZILLA_HOME=${MOZILLA_HOME:S/${PREFIX}\///}
 .else
 DEPENDS+=		suse_base>=6.3:../../emulators/suse_base
 .endif
@@ -35,25 +32,24 @@ PLUGGERFULL=		${DISTNAME:C/-linux-x86-glibc//}
 PLUGGERVERS=		${PLUGGERFULL:C/.*-//}
 PLUGGERNAME=		${PLUGGERFULL:C/-.*//}
 NS_PLUGINS_DIR=		${PREFIX}/lib/netscape/plugins
+DOCDIR=			${PREFIX}/share/doc/plugger
+
+PLIST_SUBST+=		NS_PLUGINS_DIR=${NS_PLUGINS_DIR:S/${PREFIX}\///}
 
 CHECK_SHLIBS=		no
 
 do-install:
 .if ${BINNAME} != common
-		cd ${WRKSRC} && \
-		${INSTALL_DATA} pluggerrc ${MOZILLA_HOME}
+	cd ${WRKSRC}; ${INSTALL_DATA} pluggerrc ${MOZILLA_HOME}/pluggerrc
 .else
-		cd ${WRKSRC} && \
-		${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} && \
-		${INSTALL_PROGRAM} plugger.so ${NS_PLUGINS_DIR} && \
-		${INSTALL_DATA} plugger.7 ${PREFIX}/man/man7 && \
-		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/plugger && \
-		${INSTALL_DATA} README ${PREFIX}/share/doc/plugger && \
-		${INSTALL_DATA} COPYING ${PREFIX}/share/doc/plugger
+	${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} ${DOCDIR}
+	cd ${WRKSRC}; ${INSTALL_PROGRAM} plugger.so ${NS_PLUGINS_DIR}
+	cd ${WRKSRC}; ${INSTALL_DATA} plugger.7 ${PREFIX}/man/man7
+	cd ${WRKSRC}; ${INSTALL_DATA} README COPYING ${DOCDIR}
 .endif
 
 .include "../../mk/bsd.pkg.mk"
 
 .if ${BINNAME} != common
-NSNAME!=	( ${PKG_INFO} 2>/dev/null -e ${BINNAME} || ${ECHO} "" )
+NSNAME!=	${PKG_INFO} -e ${BINNAME} || ${ECHO}
 .endif
diff --git a/www/ns-plugger-common/pkg/PLIST b/www/ns-plugger-common/pkg/PLIST
index 6f4d4fa52a1..affc4574a0e 100644
--- a/www/ns-plugger-common/pkg/PLIST
+++ b/www/ns-plugger-common/pkg/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/22 11:02:12 rh Exp $
-lib/netscape/plugins/plugger.so
+@comment $NetBSD: PLIST,v 1.2 2001/03/06 10:17:44 jlam Exp $
+${NS_PLUGINS_DIR}/plugger.so
 man/man7/plugger.7
 share/doc/plugger/README
 share/doc/plugger/COPYING
-@unexec rmdir -p %D/lib/netscape/plugins 2>/dev/null || true
 @dirrm share/doc/plugger
+@unexec rmdir -p %D/${NS_PLUGINS_DIR} 2>/dev/null || true
diff --git a/www/ns-plugger-communicator/pkg/PLIST b/www/ns-plugger-communicator/pkg/PLIST
index 6ba5a7f90c1..03f02ae366a 100644
--- a/www/ns-plugger-communicator/pkg/PLIST
+++ b/www/ns-plugger-communicator/pkg/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/22 11:04:05 rh Exp $
-lib/netscape/${BINNAME}-${NS_VERS}/pluggerrc
+@comment $NetBSD: PLIST,v 1.2 2001/03/06 10:17:44 jlam Exp $
+${MOZILLA_HOME}/pluggerrc
diff --git a/www/ns-plugger-navigator/pkg/PLIST b/www/ns-plugger-navigator/pkg/PLIST
index 1e73216bb8e..03f02ae366a 100644
--- a/www/ns-plugger-navigator/pkg/PLIST
+++ b/www/ns-plugger-navigator/pkg/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/08/22 11:05:21 rh Exp $
-lib/netscape/${BINNAME}-${NS_VERS}/pluggerrc
+@comment $NetBSD: PLIST,v 1.2 2001/03/06 10:17:44 jlam Exp $
+${MOZILLA_HOME}/pluggerrc