set LD_LIBRARY_PATH in the environment before calling

netscape-installer, eliminating the patch and some linux tweaks.

symlink libgdk and libgtk into ${WRKDIR} so the installer can run.

5 files changed, 23 insertions, 36 deletions

diff --git a/www/netscape7/Makefile b/www/netscape7/Makefile
index bc2ecba2fc3..af6dcd2a361 100644
--- a/www/netscape7/Makefile
+++ b/www/netscape7/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/01/20 22:21:09 snj Exp $
+# $NetBSD: Makefile,v 1.25 2004/06/26 10:42:42 grant Exp $
 #
 
 DISTNAME=		netscape-i686-pc-linux-gnu-sea
@@ -41,7 +41,7 @@ pre-fetch:
 	@${CAT} ${FILESDIR}/fetch-message
 
 pre-build:
-	${SED} -e "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/netscape.sh > 	\
+	@${SED} -e "s|@PREFIX@|${PREFIX}|g" ${FILESDIR}/netscape.sh > 	\
 		${WRKDIR}/netscape7
 	@delay=10;							\
 	${SED} -e "s|@WRKSRC@|${WRKSRC}|g" -e "s|@delay@|$${delay}|g"	\
@@ -50,11 +50,11 @@ pre-build:
 	${MKDIR} ${WRKSRC}/dest
 	${SED} -e "s|/usr/local/netscape|${WRKSRC}/dest|g" 		\
 		${WRKSRC}/config.ini > ${WRKSRC}/config.ini.new;	\
-       ${MV} ${WRKSRC}/config.ini.new ${WRKSRC}/config.ini
+	${MV} ${WRKSRC}/config.ini.new ${WRKSRC}/config.ini
 
 # we must wait for netscape to start up after build!
 do-build:
-	cd ${WRKSRC} && ${SH} netscape-installer
+	@cd ${WRKSRC} && ${SETENV} ${INST_ENV} ${SH} netscape-installer
 	@sleep 10
 
 # dynamic PLIST generation
diff --git a/www/netscape7/Makefile.Linux.i386 b/www/netscape7/Makefile.Linux.i386
index 352640f06a5..010893792e6 100644
--- a/www/netscape7/Makefile.Linux.i386
+++ b/www/netscape7/Makefile.Linux.i386
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.Linux.i386,v 1.9 2003/07/01 16:19:13 jschauma Exp $
+# $NetBSD: Makefile.Linux.i386,v 1.10 2004/06/26 10:42:42 grant Exp $
 #
 
 DIST_DIR_NAME=		linux22
@@ -7,16 +7,19 @@ DEPENDS+=		gtk+>=1.2.10:../../x11/gtk
 INSTDIR=		${WRKSRC}/dest
 FIND_ARG=		. -depth
 
+INST_ENV+=		LD_LIBRARY_PATH="${X11BASE}/lib:${PREFIX}/lib:${LD_LIBRARY_PATH}"
+
 post-extract:
 	${MKDIR} ${WRKSRC}/dest
 	${SED} -e "s|@PREFIX@|${PREFIX}|g" -e "s|@X11BASE@|${X11BASE}|g" \
 		-e "s|@WRKSRC@|${WRKSRC}|g" -e "s|@X11PREFIX@|${X11PREFIX}|g" \
 			${FILESDIR}/linux_notes
 	@${SH} -c "read"
+	${LN} -s ${PREFIX}/lib/libgdk.so ${WRKSRC}/libgdk-1.2.so.0
 	${LN} -s ${PREFIX}/lib/libglib.so ${WRKSRC}/libglib-1.2.so.0
 	${LN} -s ${PREFIX}/lib/libgmodule.so ${WRKSRC}/libgmodule-1.2.so.0
-	${SED} -e 's|LD_LIBRARY_PATH=.:|LD_LIBRARY_PATH=.:${X11BASE}/lib:${PREFIX}/lib:|' \
-		${WRKSRC}/netscape-installer > ${WRKSRC}/netscape-installer.tmp
-	${MV} ${WRKSRC}/netscape-installer.tmp ${WRKSRC}/netscape-installer
+	${LN} -s ${PREFIX}/lib/libgtk.so ${WRKSRC}/libgtk-1.2.so.0
+	${LN} -s ${PREFIX}/lib/libgdk.so ${WRKSRC}/dest/libgdk-1.2.so.0
 	${LN} -s ${PREFIX}/lib/libglib.so ${WRKSRC}/dest/libglib-1.2.so.0
 	${LN} -s ${PREFIX}/lib/libgmodule.so ${WRKSRC}/dest/libgmodule-1.2.so.0
+	${LN} -s ${PREFIX}/lib/libgtk.so ${WRKSRC}/dest/libgtk-1.2.so.0
diff --git a/www/netscape7/distinfo b/www/netscape7/distinfo
index 5e340abe9b7..87e312a1f05 100644
--- a/www/netscape7/distinfo
+++ b/www/netscape7/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/06/26 10:25:18 grant Exp $
+$NetBSD: distinfo,v 1.9 2004/06/26 10:42:42 grant Exp $
 
 SHA1 (netscape/7.1/english/netscape-i686-pc-linux-gnu-sea.tar.gz) = 11e95b3c53fb92dd936ab1b07fd50c66a0d59c38
 Size (netscape/7.1/english/netscape-i686-pc-linux-gnu-sea.tar.gz) = 17228433 bytes
-SHA1 (patch-aa) = 3105637b55b45326fcfa2ba1f2f3bade343e38b1
diff --git a/www/netscape7/files/linux_notes b/www/netscape7/files/linux_notes
index 7063795649f..de8d8db8a05 100644
--- a/www/netscape7/files/linux_notes
+++ b/www/netscape7/files/linux_notes
@@ -1,25 +1,23 @@
 ===========================================================================
-$NetBSD: linux_notes,v 1.3 2003/07/01 16:19:14 jschauma Exp $
+$NetBSD: linux_notes,v 1.4 2004/06/26 10:42:42 grant Exp $
 
-    Using this package on Linux is a bit hairy and will require some
-    interaction on your part.  The netscape binary expects a number of
-    shared libraries to be installed -- you may have different, newer
-    versions of these libraries.  Please do the following, filling
-    in the version of the library you have below:
+  Using this package on Linux is a bit hairy and will require some
+  interaction on your part.  The netscape binary expects a number of
+  shared libraries to be installed -- you may have different, newer
+  versions of these libraries.  Please do the following, filling
+  in the version of the library you have below:
 
-    For the installation:
+  For the installation:
 
-    $> ln -s /usr/lib/libstdc++-libc6<yourversion> @WRKSRC@/libstdc++-libc6.1-1.so.2
-    $> ln -s /usr/lib/libstdc++-libc6<yourversion> @WRKSRC@/dest/libstdc++-libc6.1-1.so.2
-    $> ln -s @X11PREFIX@/lib/libgtk.so  @WRKSRC@/libgtk-1.2.so.0
-    $> ln -s @X11PREFIX@/lib/libgtk.so  @WRKSRC@/dest/libgtk-1.2.so.0
+  $> ln -s /usr/lib/libstdc++-libc6<yourversion> @WRKSRC@/libstdc++-libc6.1-1.so.2
+  $> ln -s /usr/lib/libstdc++-libc6<yourversion> @WRKSRC@/dest/libstdc++-libc6.1-1.so.2
 
-    Also, if you haven't done so already, you will want to add
+  Also, depending on your system, you may need to add:
 
     @PREFIX@/lib
     @X11BASE@/lib
 
-    to your /etc/ld.so.conf and run 'ldconfig'.
+  to your /etc/ld.so.conf and run 'ldconfig'.
 
 ===========================================================================
 
diff --git a/www/netscape7/patches/patch-aa b/www/netscape7/patches/patch-aa
deleted file mode 100644
index 4a4051b50c0..00000000000
--- a/www/netscape7/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2004/06/26 10:25:18 grant Exp $
-
---- netscape-installer.orig	2003-06-25 02:04:39.000000000 +1000
-+++ netscape-installer
-@@ -38,7 +38,7 @@
- 
- LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH
- export LD_LIBRARY_PATH
--export -n MOZILLA_FIVE_HOME
-+unset MOZILLA_FIVE_HOME
- 
- PATH=.:$PATH
- export PATH