diff options
| author | grant <grant> | 2003-07-18 07:31:13 +0000 |
|---|---|---|
| committer | grant <grant> | 2003-07-18 07:31:13 +0000 |
| commit | 2bd1ce0772a0f0bf03b4dfbc7a25cbb13d927d78 (patch) | |
| tree | 5b49950275d954598e177667f73bac78908ee5b7 /www/mozilla-bin | |
| parent | 3d13a20af544e689cad903829521eb8cdd426b09 (diff) | |
| download | pkgsrc-2bd1ce0772a0f0bf03b4dfbc7a25cbb13d927d78.tar.gz | |
allow these to work with -current glib/gtk on Solaris, add links for
libgmodule and handle symlinked libraries more cleanly.
Diffstat (limited to 'www/mozilla-bin')
| -rw-r--r-- | www/mozilla-bin/Makefile | 23 | ||||
| -rw-r--r-- | www/mozilla-bin/files/mozilla.sh | 6 |
2 files changed, 17 insertions, 12 deletions
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 "$@" |