diff options
author | dmcmahill <dmcmahill@pkgsrc.org> | 2007-02-04 00:15:48 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill@pkgsrc.org> | 2007-02-04 00:15:48 +0000 |
commit | 8d3e192df1df51f7c4058277cf45d12f435eae89 (patch) | |
tree | 47e89063be3eba467767d9628fade23e7ed7f31a /www/firefox | |
parent | 404563535b80056002ac1f2e50468fd47778e714 (diff) | |
download | pkgsrc-8d3e192df1df51f7c4058277cf45d12f435eae89.tar.gz |
Get these mozilla clients to work on Solaris-2.9/sparc. There were
two issues. The PLIST was incorrect and since the PLIST is used by
the "moz-install" script, anything missing from the PLIST is never
installed even when building from source. When libfreebl* were not
installed it caused the clients to fail to load the security component
and fail with "The browser failed to load its security component".
The second issue is that many installations of solaris-2.9 include
various glib/gtk/gnome libraries in /usr/lib. This causes failures
because the pkgsrc ones were used at link time and the /usr/lib ones
at run time. Work around this by setting a LD_LIBRARY_PATH that includes
the pkgsrc lib directory first.
pkgrevision bumps all around.
Diffstat (limited to 'www/firefox')
-rw-r--r-- | www/firefox/INSTALL | 4 | ||||
-rw-r--r-- | www/firefox/Makefile | 4 | ||||
-rw-r--r-- | www/firefox/PLIST | 8 |
3 files changed, 10 insertions, 6 deletions
diff --git a/www/firefox/INSTALL b/www/firefox/INSTALL index b14d7a163a5..ffabf7c9412 100644 --- a/www/firefox/INSTALL +++ b/www/firefox/INSTALL @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.1 2005/09/17 02:35:19 jlam Exp $ +# $NetBSD: INSTALL,v 1.2 2007/02/04 00:15:49 dmcmahill Exp $ MOZILLA="@MOZILLA@" MOZILLA_BIN="@MOZILLA_BIN@" @@ -8,7 +8,7 @@ export MOZILLA_FIVE_HOME case ${STAGE} in POST-INSTALL) ${MKDIR} -p "./tmpdir-${PKGNAME}" - LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" HOME="./tmpdir-${PKGNAME}" \ + LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}:${PKG_PREFIX}/lib" HOME="./tmpdir-${PKGNAME}" \ ${MOZILLA_FIVE_HOME}/${MOZILLA_BIN} -register ${RM} -fr "./tmpdir-${PKGNAME}" ;; diff --git a/www/firefox/Makefile b/www/firefox/Makefile index b0a3e94fdee..6cbb314f404 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2006/11/08 09:50:15 ghen Exp $ +# $NetBSD: Makefile,v 1.40 2007/02/04 00:15:49 dmcmahill Exp $ MOZILLA= firefox - +PKGREVISION= 1 COMMENT= Lightweight gecko-based web browser MOZILLA_USE_GTK2= # yes diff --git a/www/firefox/PLIST b/www/firefox/PLIST index 149a6eceaae..2ea857e9d84 100644 --- a/www/firefox/PLIST +++ b/www/firefox/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.22 2006/06/07 15:23:21 ghen Exp $ +@comment $NetBSD: PLIST,v 1.23 2007/02/04 00:15:49 dmcmahill Exp $ bin/${MOZILLA} @comment begin PROGRAMS lib/${MOZILLA}/${MOZILLA_BIN} @@ -90,6 +90,8 @@ lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX} lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX} lib/${MOZILLA}/libxpistub.${SO_SUFFIX} lib/${MOZILLA}/plugins/libunixprintplugin.${SO_SUFFIX} +${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX} +${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX} @comment end DSO @comment begin PKGCONFIG lib/pkgconfig/firefox-gtkmozembed.pc @@ -296,6 +298,8 @@ lib/${MOZILLA}/icons/mozicon128.png lib/${MOZILLA}/icons/mozicon16.xpm lib/${MOZILLA}/icons/mozicon50.xpm lib/${MOZILLA}/init.d/README +${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.chk +${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.chk lib/${MOZILLA}/libsoftokn3.chk lib/${MOZILLA}/res/EditorOverride.css lib/${MOZILLA}/res/arrow.gif @@ -2449,7 +2453,7 @@ include/${MOZILLA}/nss/swfort.h include/${MOZILLA}/nss/swfortt.h include/${MOZILLA}/nss/watcomfx.h @comment end INCLUDE-PUBLIC -@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom +@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom @unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat @unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat @comment begin DIRS |