summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mail/thunderbird/Makefile4
-rw-r--r--mail/thunderbird/Makefile-thunderbird.common4
-rw-r--r--mail/thunderbird/PLIST8
-rw-r--r--www/firefox/INSTALL4
-rw-r--r--www/firefox/Makefile4
-rw-r--r--www/firefox/PLIST8
-rw-r--r--www/seamonkey/INSTALL4
-rw-r--r--www/seamonkey/Makefile4
-rw-r--r--www/seamonkey/PLIST6
-rw-r--r--www/seamonkey/files/mozilla-ELF.in2
10 files changed, 29 insertions, 19 deletions
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index 7d0dd939790..8c4ede19dd0 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2006/11/08 13:15:40 ghen Exp $
+# $NetBSD: Makefile,v 1.23 2007/02/04 00:15:48 dmcmahill Exp $
MOZILLA= thunderbird
-
+PKGREVISION= 1
COMMENT= Mozilla mail client
MOZILLA_USE_GTK2= # yes
diff --git a/mail/thunderbird/Makefile-thunderbird.common b/mail/thunderbird/Makefile-thunderbird.common
index fb7a936b343..d1f4ecaad61 100644
--- a/mail/thunderbird/Makefile-thunderbird.common
+++ b/mail/thunderbird/Makefile-thunderbird.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile-thunderbird.common,v 1.21 2006/12/20 12:53:32 ghen Exp $
+# $NetBSD: Makefile-thunderbird.common,v 1.22 2007/02/04 00:15:48 dmcmahill Exp $
MOZILLA_BIN= thunderbird-bin
MOZ_VER= 1.5.0.9
@@ -27,7 +27,7 @@ CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
post-install:
cd ${PREFIX}/lib/${MOZILLA} && \
- ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC:Q} \
+ ${SETENV} LD_LIBRARY_PATH=.:${PREFIX}/lib MOZILLA_FIVE_HOME=. HOME=${WRKSRC:Q} \
./${MOZILLA_BIN} -register
.include "../../www/seamonkey/Makefile.common"
diff --git a/mail/thunderbird/PLIST b/mail/thunderbird/PLIST
index b76a839cb3e..7649b1d8db5 100644
--- a/mail/thunderbird/PLIST
+++ b/mail/thunderbird/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2006/11/08 13:15:40 ghen Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/02/04 00:15:49 dmcmahill Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -90,6 +90,8 @@ lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
lib/${MOZILLA}/libxpcom_compat.${SO_SUFFIX}
lib/${MOZILLA}/libxpcom_core.${SO_SUFFIX}
lib/${MOZILLA}/libxpistub.${SO_SUFFIX}
+${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
+${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX}
@comment end DSO
@comment begin DATA
lib/${MOZILLA}/LICENSE.txt
@@ -316,6 +318,8 @@ lib/${MOZILLA}/greprefs/xpinstall.js
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
@@ -2736,7 +2740,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} -f %D/lib/${MOZILLA}/chrome/app-chrome.manifest
@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
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
diff --git a/www/seamonkey/INSTALL b/www/seamonkey/INSTALL
index 928812afc4c..54b44defc31 100644
--- a/www/seamonkey/INSTALL
+++ b/www/seamonkey/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.2 2006/10/08 13:10:30 ghen Exp $
+# $NetBSD: INSTALL,v 1.3 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}/regxpcom
if ${TEST} -x ${MOZILLA_FIVE_HOME}/regchrome; then
LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}" \
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 3ddec0e5a35..af70dcb08dc 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2007/01/30 14:34:34 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/02/04 00:15:49 dmcmahill Exp $
MOZILLA= seamonkey
-PKGREVISION= 1
+PKGREVISION= 2
COMMENT= Full featured gecko-based browser
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index 5c7b1f30cd4..7034ea3f3db 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2007/01/20 10:54:44 ghen Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/02/04 00:15:49 dmcmahill Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -3050,8 +3050,8 @@ include/${MOZILLA}/nss/sslproto.h
include/${MOZILLA}/nss/sslt.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} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
+@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib 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}/regchrome
@unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlays.rdf
@unexec ${RM} %D/lib/${MOZILLA}/chrome/stylesheets.rdf
diff --git a/www/seamonkey/files/mozilla-ELF.in b/www/seamonkey/files/mozilla-ELF.in
index 99470536423..9523d1269e4 100644
--- a/www/seamonkey/files/mozilla-ELF.in
+++ b/www/seamonkey/files/mozilla-ELF.in
@@ -1,4 +1,6 @@
#!/bin/sh
MOZILLA_FIVE_HOME=@PREFIX@/lib/@MOZILLA@
export MOZILLA_FIVE_HOME
+LD_LIBRARY_PATH=@PREFIX@/lib/@MOZILLA@:@PREFIX@/lib:${LD_LIBRARY_PATH}
+export LD_LIBRARY_PATH
exec @PREFIX@/lib/@MOZILLA@/@MOZILLA_BIN@ "$@"
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-13 22:40:58 +0000