Apply the changes in pkg/13265 by John Darrow <John.P.Darrow@wheaton.edu>

to fix xpkgwedge problems.

4 files changed, 29 insertions, 29 deletions

diff --git a/www/navigator3/Makefile b/www/navigator3/Makefile
index 5ebe27a9cff..fc9bb25e9dc 100644
--- a/www/navigator3/Makefile
+++ b/www/navigator3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2001/09/09 20:36:53 agc Exp $
+# $NetBSD: Makefile,v 1.6 2001/09/14 04:00:25 jlam Exp $
 
 DISTNAME=		netscape-v304-export.x86-unknown-bsd
 PKGNAME=		navigator3-3.04
@@ -18,21 +18,21 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
 WRKSRC=			${WRKDIR}
-USE_X11BASE=		yes
+USE_X11BASE=		YES
 SCRIPTS_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
-NO_BUILD=		yes
+NO_BUILD=		YES
 
 do-install:
-	${INSTALL_DATA_DIR} ${X11BASE}/share/netscape
-	${INSTALL_DATA_DIR} ${X11BASE}/share/netscape/nls
-	${INSTALL_DATA_DIR} ${X11BASE}/share/netscape/java
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape ${X11BASE}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/netscape.bin ${X11BASE}/bin # XXX
-	${INSTALL_SCRIPT} ${WRKSRC}/movemail ${X11BASE}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/movemail.bin ${X11BASE}/bin # XXX
-	${INSTALL_DATA} ${WRKSRC}/nls/C ${X11BASE}/share/netscape/nls
-	${INSTALL_DATA} ${WRKSRC}/nls/nls.dir ${X11BASE}/share/netscape/nls
-	${INSTALL_DATA} ${WRKSRC}/java_301 ${X11BASE}/share/netscape/java
-	${INSTALL_DATA} ${WRKSRC}/mailcap ${X11BASE}/share/netscape
+	${INSTALL_DATA_DIR} ${PREFIX}/share/netscape
+	${INSTALL_DATA_DIR} ${PREFIX}/share/netscape/nls
+	${INSTALL_DATA_DIR} ${PREFIX}/share/netscape/java
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape3 ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/netscape3.bin ${PREFIX}/bin # XXX
+	${INSTALL_SCRIPT} ${WRKSRC}/movemail ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/movemail.bin ${PREFIX}/bin # XXX
+	${INSTALL_DATA} ${WRKSRC}/nls/C ${PREFIX}/share/netscape/nls
+	${INSTALL_DATA} ${WRKSRC}/nls/nls.dir ${PREFIX}/share/netscape/nls
+	${INSTALL_DATA} ${WRKSRC}/java_301 ${PREFIX}/share/netscape/java
+	${INSTALL_DATA} ${WRKSRC}/mailcap ${PREFIX}/share/netscape
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/navigator3/files/netscape.sh b/www/navigator3/files/netscape.sh
index 33ec0da6c79..6170f406114 100644
--- a/www/navigator3/files/netscape.sh
+++ b/www/navigator3/files/netscape.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 export XKEYSYMDB ; XKEYSYMDB=@X11BASE@/lib/X11/XKeysymDB
-export XNLSPATH  ; XNLSPATH=@X11BASE@/share/netscape/nls
-export XAPPLRESDIR ; XAPPLRESDIR=@X11BASE@/lib/X11/app-defaults
-export CLASSPATH ; CLASSPATH=@X11BASE@/share/netscape/java/java_301
-exec @EXECDIR@/netscape.bin "$@"
+export XNLSPATH  ; XNLSPATH=@PREFIX@/share/netscape/nls
+export XAPPLRESDIR ; XAPPLRESDIR=@PREFIX@/lib/X11/app-defaults
+export CLASSPATH ; CLASSPATH=@PREFIX@/share/netscape/java/java_301
+exec @EXECDIR@/netscape3.bin "$@"
diff --git a/www/navigator3/pkg/PLIST b/www/navigator3/pkg/PLIST
index c32a2c1f097..42bbd81a5f7 100644
--- a/www/navigator3/pkg/PLIST
+++ b/www/navigator3/pkg/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 1999/07/21 23:09:02 garbled Exp $
-bin/netscape
-bin/netscape.bin
+@comment $NetBSD: PLIST,v 1.2 2001/09/14 04:00:25 jlam Exp $
+bin/netscape3
+bin/netscape3.bin
 bin/movemail
 bin/movemail.bin
 share/netscape/nls/C
diff --git a/www/navigator3/scripts/configure b/www/navigator3/scripts/configure
index 51c4239c2bc..cec6687e950 100644
--- a/www/navigator3/scripts/configure
+++ b/www/navigator3/scripts/configure
@@ -6,19 +6,19 @@ i386)	NSBINARY=netscape ;;
 *)	NSBINARY=foobar ;;
 esac
 
-if [ ! -f ${WRKSRC}/netscape.bin ] ; then
-    mv ${WRKSRC}/${NSBINARY} ${WRKSRC}/netscape.bin
+if [ ! -f ${WRKSRC}/netscape3.bin ] ; then
+    mv ${WRKSRC}/${NSBINARY} ${WRKSRC}/netscape3.bin
 fi
 if [ ! -f ${WRKSRC}/movemail.bin ] ; then
     mv ${WRKSRC}/movemail ${WRKSRC}/movemail.bin
 fi
 
-sed -e "s;@X11BASE@;${X11BASE};g" -e "s;@LIBDIR@;${LIBDIR};g" \
-    -e "s;@EXECDIR@;${X11BASE}/bin;g" \
-	${FILESDIR}/netscape.sh >${WRKSRC}/netscape
-chmod +x ${WRKSRC}/netscape
-sed -e "s;@X11BASE@;${X11BASE};g" -e "s;@LIBDIR@;${LIBDIR};g" \
-    -e "s;@EXECDIR@;${X11BASE}/bin;g" \
+sed -e "s;@X11BASE@;${X11BASE};g" -e "s;@PREFIX@;${PREFIX};g" \
+    -e "s;@EXECDIR@;${PREFIX}/bin;g" \
+	${FILESDIR}/netscape.sh >${WRKSRC}/netscape3
+chmod +x ${WRKSRC}/netscape3
+sed -e "s;@X11BASE@;${X11BASE};g" -e "s;@PREFIX@;${PREFIX};g" \
+    -e "s;@EXECDIR@;${PREFIX}/bin;g" \
 	${FILESDIR}/movemail.sh >${WRKSRC}/movemail
 chmod +x ${WRKSRC}/movemail