allow these to work with -current glib/gtk on Solaris, add links for

libgmodule and handle symlinked libraries more cleanly.

8 files changed, 62 insertions, 50 deletions

diff --git a/www/mozilla-bin-nightly/Makefile b/www/mozilla-bin-nightly/Makefile
index 110d2171ad7..ae472efa801 100644
--- a/www/mozilla-bin-nightly/Makefile
+++ b/www/mozilla-bin-nightly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/06/11 17:43:15 grant Exp $
+# $NetBSD: Makefile,v 1.4 2003/07/18 07:31:17 grant Exp $
 #
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
@@ -41,21 +41,22 @@ do-install:
 		| ${XARGS} ${CHMOD} a+rx
 
 post-install:
+# this build for Solaris wants exactly 'libgtk-1.2.so.0', etc.
+.if ${OPSYS} == "SunOS"
+	@cd ${MOZILLA_LIB} && \
+	${LN} -s ${LOCALBASE}/lib/libglib.*so* .;			\
+	${LN} -s ${LOCALBASE}/lib/libgmodule.*so* .;			\
+	${LN} -s ${X11BASE}/lib/libgdk.*so* .;				\
+	${LN} -s ${X11BASE}/lib/libgtk.*so* .;				\
+	${LN} -s libgtk.so libgtk-1.2.so.0;				\
+	${LN} -s libgdk.so libgdk-1.2.so.0;				\
+	${LN} -s libglib.so libglib-1.2.so.0
+.endif
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/mozilla-${PLATFORM} >> ${PLIST_SRC}
 	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
-# this build for Solaris wants exactly 'libgtk-1.2.so.0'
-.if ${OPSYS} == "SunOS"
-	@cd ${MOZILLA_LIB} && \
-	${LN} -s ${LOCALBASE}/lib/libglib.so libglib-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgdk.so libgdk-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgtk.so libgtk-1.2.so.0
-.  for _lib_ in glib gdk gtk
-	@${ECHO} lib/mozilla-${PLATFORM}/lib${_lib_}-1.2.so.0 >> ${PLIST_SRC}
-.  endfor
-.endif
 	@${FIND} ${MOZILLA_LIB} -type d -print				\
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
diff --git a/www/mozilla-bin-nightly/files/mozilla.sh b/www/mozilla-bin-nightly/files/mozilla.sh
index 781012ba4c4..42c1cf7f5ee 100644
--- a/www/mozilla-bin-nightly/files/mozilla.sh
+++ b/www/mozilla-bin-nightly/files/mozilla.sh
@@ -1,7 +1,7 @@
 #!@SH@
-# $NetBSD: mozilla.sh,v 1.2 2003/06/11 17:43:16 grant Exp $
+# $NetBSD: mozilla.sh,v 1.3 2003/07/18 07:31:17 grant Exp $
 
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/mozilla-@PLATFORM@"
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/mozilla-@PLATFORM@:@PREFIX@/lib"
 export LD_LIBRARY_PATH
 
 exec @PREFIX@/lib/mozilla-@PLATFORM@/mozilla "$@"
diff --git a/www/mozilla-bin/Makefile b/www/mozilla-bin/Makefile
index b5906f7434d..b271a4973ce 100644
--- a/www/mozilla-bin/Makefile
+++ b/www/mozilla-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:43 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/18 07:31:16 grant Exp $
 #
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
@@ -41,21 +41,22 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/mozilla.sh ${PREFIX}/bin/mozilla-${PLATFORM}
 
 post-install:
+# this build for Solaris wants exactly 'libgtk-1.2.so.0', etc.
+.if ${OPSYS} == "SunOS"
+	@cd ${MOZILLA_LIB} && \
+	${LN} -s ${LOCALBASE}/lib/libglib.*so* .;			\
+	${LN} -s ${LOCALBASE}/lib/libgmodule.*so* .;			\
+	${LN} -s ${X11BASE}/lib/libgdk.*so* .;				\
+	${LN} -s ${X11BASE}/lib/libgtk.*so* .;				\
+	${LN} -s libgtk.so libgtk-1.2.so.0;				\
+	${LN} -s libgdk.so libgdk-1.2.so.0;				\
+	${LN} -s libglib.so libglib-1.2.so.0
+.endif
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/mozilla-${PLATFORM} >> ${PLIST_SRC}
 	@${FIND} ${MOZILLA_LIB} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
-# this build for Solaris wants exactly 'libgtk-1.2.so.0'
-.if ${OPSYS} == "SunOS"
-	@cd ${MOZILLA_LIB} && \
-	${LN} -s ${LOCALBASE}/lib/libglib.so libglib-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgdk.so libgdk-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgtk.so libgtk-1.2.so.0
-.  for _lib_ in glib gdk gtk
-	@${ECHO} lib/mozilla-${PLATFORM}/lib${_lib_}-1.2.so.0 >> ${PLIST_SRC}
-.  endfor
-.endif
 	@${FIND} ${MOZILLA_LIB} -type d -print				\
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
diff --git a/www/mozilla-bin/files/mozilla.sh b/www/mozilla-bin/files/mozilla.sh
index 8cab235d9b0..5c108800dd3 100644
--- a/www/mozilla-bin/files/mozilla.sh
+++ b/www/mozilla-bin/files/mozilla.sh
@@ -1,3 +1,7 @@
 #!@SH@
-# $NetBSD: mozilla.sh,v 1.2 2003/04/14 22:50:19 grant Exp $
+# $NetBSD: mozilla.sh,v 1.3 2003/07/18 07:31:16 grant Exp $
+
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/mozilla-@PLATFORM@:@PREFIX@/lib"
+export LD_LIBRARY_PATH
+
 exec @PREFIX@/lib/mozilla-@PLATFORM@/mozilla "$@"
diff --git a/www/phoenix-bin-nightly/Makefile b/www/phoenix-bin-nightly/Makefile
index ffa6bace3de..b11aede9f98 100644
--- a/www/phoenix-bin-nightly/Makefile
+++ b/www/phoenix-bin-nightly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/06/25 14:13:00 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/18 07:31:15 grant Exp $
 #
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
@@ -43,21 +43,22 @@ do-install:
 	@${RM} -f ${PHOENIX_LIB}/plugins/libnullplugin.so
 
 post-install:
+# this build for Solaris wants exactly 'libgtk-1.2.so.0', etc.
+.if ${OPSYS} == "SunOS"
+	@cd ${PHOENIX_LIB} && \
+	${LN} -s ${LOCALBASE}/lib/libglib.*so* .;			\
+	${LN} -s ${LOCALBASE}/lib/libgmodule.*so* .;			\
+	${LN} -s ${X11BASE}/lib/libgdk.*so* .;				\
+	${LN} -s ${X11BASE}/lib/libgtk.*so* .;				\
+	${LN} -s libgtk.so libgtk-1.2.so.0;				\
+	${LN} -s libgdk.so libgdk-1.2.so.0;				\
+	${LN} -s libglib.so libglib-1.2.so.0
+.endif
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/phoenix-${PLATFORM} >> ${PLIST_SRC}
 	@${FIND} ${PHOENIX_LIB} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
-# this build for Solaris wants exactly 'libgtk-1.2.so.0'
-.if ${OPSYS} == "SunOS"
-	@cd ${PHOENIX_LIB} && \
-	${LN} -s ${LOCALBASE}/lib/libglib.so libglib-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgdk.so libgdk-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgtk.so libgtk-1.2.so.0
-.  for _lib_ in glib gdk gtk
-	@${ECHO} lib/MozillaFirebird-${PLATFORM}/lib${_lib_}-1.2.so.0 >> ${PLIST_SRC}
-.  endfor
-.endif
 	@${FIND} ${PHOENIX_LIB} -type d -print				\
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
diff --git a/www/phoenix-bin-nightly/files/phoenix.sh b/www/phoenix-bin-nightly/files/phoenix.sh
index 34ab41e4a1c..9de6488c9ff 100644
--- a/www/phoenix-bin-nightly/files/phoenix.sh
+++ b/www/phoenix-bin-nightly/files/phoenix.sh
@@ -1,7 +1,7 @@
 #!@SH@
-# $NetBSD: phoenix.sh,v 1.3 2003/05/25 06:52:53 grant Exp $
+# $NetBSD: phoenix.sh,v 1.4 2003/07/18 07:31:15 grant Exp $
 
-LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@"
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@:@PREFIX@/lib"
 export LD_LIBRARY_PATH
 
 exec @PREFIX@/lib/MozillaFirebird-@PLATFORM@/MozillaFirebird "$@"
diff --git a/www/phoenix-bin/Makefile b/www/phoenix-bin/Makefile
index 075373545fc..c69b260e9ac 100644
--- a/www/phoenix-bin/Makefile
+++ b/www/phoenix-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/06/25 14:14:36 salo Exp $
+# $NetBSD: Makefile,v 1.8 2003/07/18 07:31:13 grant Exp $
 #
 
 DISTNAME=		# see Makefile.${OPSYS}.${ARCH}
@@ -35,21 +35,22 @@ do-install:
 	@${RM} -f ${PHOENIX_LIB}/plugins/libnullplugin.so
 
 post-install:
+# this build for Solaris wants exactly 'libgtk-1.2.so.0', etc.
+.if ${OPSYS} == "SunOS"
+	@cd ${PHOENIX_LIB} && \
+	${LN} -s ${LOCALBASE}/lib/libglib.*so* .;			\
+	${LN} -s ${LOCALBASE}/lib/libgmodule.*so* .;			\
+	${LN} -s ${X11BASE}/lib/libgdk.*so* .;				\
+	${LN} -s ${X11BASE}/lib/libgtk.*so* .;				\
+	${LN} -s libgtk.so libgtk-1.2.so.0;				\
+	${LN} -s libgdk.so libgdk-1.2.so.0;				\
+	${LN} -s libglib.so libglib-1.2.so.0
+.endif
 	@${CP} -f ${PKGDIR}/PLIST ${PLIST_SRC}
 	@${ECHO} bin/phoenix-${PLATFORM} >> ${PLIST_SRC}
 	@${FIND} ${PHOENIX_LIB} \( -type f -o -type l \) -print		\
 		| ${SORT} | ${SED} -e "s,${PREFIX}/,,g"			\
 		>> ${PLIST_SRC}
-# this build for Solaris wants exactly 'libgtk-1.2.so.0'
-.if ${OPSYS} == "SunOS"
-	@cd ${PHOENIX_LIB} && \
-	${LN} -s ${LOCALBASE}/lib/libglib.so libglib-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgdk.so libgdk-1.2.so.0; \
-	${LN} -s ${X11BASE}/lib/libgtk.so libgtk-1.2.so.0
-.  for _lib_ in glib gdk gtk
-	@${ECHO} lib/MozillaFirebird-${PLATFORM}/lib${_lib_}-1.2.so.0 >> ${PLIST_SRC}
-.  endfor
-.endif
 	@${FIND} ${PHOENIX_LIB} -type d -print				\
 		| ${SORT} -r | ${SED} -e "s,${PREFIX}/,@dirrm ,g"	\
 		>> ${PLIST_SRC}
diff --git a/www/phoenix-bin/files/phoenix.sh b/www/phoenix-bin/files/phoenix.sh
index 916c0e9f6a5..bc5ee964338 100644
--- a/www/phoenix-bin/files/phoenix.sh
+++ b/www/phoenix-bin/files/phoenix.sh
@@ -1,3 +1,7 @@
 #!@SH@
-# $NetBSD: phoenix.sh,v 1.3 2003/05/18 03:43:02 grant Exp $
+# $NetBSD: phoenix.sh,v 1.4 2003/07/18 07:31:14 grant Exp $
+
+LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:@PREFIX@/lib/MozillaFirebird-@PLATFORM@:@PREFIX@/lib"
+export LD_LIBRARY_PATH
+
 exec @PREFIX@/lib/MozillaFirebird-@PLATFORM@/MozillaFirebird "$@"