summaryrefslogtreecommitdiff
path: root/www/mozilla
diff options
context:
space:
mode:
authormarkd <markd>2003-05-13 10:23:18 +0000
committermarkd <markd>2003-05-13 10:23:18 +0000
commit935aec68df29a2266284dbf11c440f7380a9128c (patch)
treebda36779a69d49ecbea52fec96cfa19088e47549 /www/mozilla
parentf222eb1cb47455b157e2800a31b96fe4463b63e3 (diff)
downloadpkgsrc-935aec68df29a2266284dbf11c440f7380a9128c.tar.gz
The Mozilla build on Solaris creates two additional shared libraries that
are needed for SSL to work on that platform so install them. Fixes PR 20075.
Diffstat (limited to 'www/mozilla')
-rw-r--r--www/mozilla/Makefile.common10
-rw-r--r--www/mozilla/PLIST4
-rwxr-xr-xwww/mozilla/files/moz-install4
3 files changed, 14 insertions, 4 deletions
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index d801f281a4e..037c7a5f2e5 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2003/03/29 12:42:51 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.14 2003/05/13 10:23:18 markd Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-source-${MOZ_DIST_VER}
@@ -71,6 +71,13 @@ SO_SUFFIX= so.1.0
.endif
PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX}
+.if ${OPSYS} == "SunOS"
+SUNOSLIB=
+.else
+SUNOSLIB= @comment\
+.endif
+PLIST_SUBST+= SUNOSLIB=${SUNOSLIB}
+
SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q}
SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q}
SCRIPTS_ENV+= SED=${SED:Q}
@@ -86,6 +93,7 @@ SCRIPTS_ENV+= SETENV=${SETENV:Q}
SCRIPTS_ENV+= MOZILLA=${MOZILLA:Q}
SCRIPTS_ENV+= MOZILLA_BIN=${MOZILLA_BIN:Q}
SCRIPTS_ENV+= SO_SUFFIX=${SO_SUFFIX:Q}
+SCRIPTS_ENV+= SUNOSLIB=${SUNOSLIB:Q}
PTHREAD_OPTS+= native optional
diff --git a/www/mozilla/PLIST b/www/mozilla/PLIST
index 76def45039e..977b8dfc42f 100644
--- a/www/mozilla/PLIST
+++ b/www/mozilla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2003/03/17 16:07:32 taya Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/05/13 10:23:18 markd Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -93,6 +93,8 @@ lib/${MOZILLA}/components/libxpical.${SO_SUFFIX}
lib/${MOZILLA}/components/libxpinstall.${SO_SUFFIX}
lib/${MOZILLA}/components/libxremote_client.${SO_SUFFIX}
lib/${MOZILLA}/components/libxremoteservice.${SO_SUFFIX}
+${SUNOSLIB}lib/${MOZILLA}/libfreebl_hybrid_3.${SO_SUFFIX}
+${SUNOSLIB}lib/${MOZILLA}/libfreebl_pure32_3.${SO_SUFFIX}
lib/${MOZILLA}/libgkgfx.${SO_SUFFIX}
lib/${MOZILLA}/libgtkembedmoz.${SO_SUFFIX}
lib/${MOZILLA}/libgtksuperwin.${SO_SUFFIX}
diff --git a/www/mozilla/files/moz-install b/www/mozilla/files/moz-install
index 1fcd69a3712..8b9a853c5ac 100755
--- a/www/mozilla/files/moz-install
+++ b/www/mozilla/files/moz-install
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: moz-install,v 1.6 2003/03/10 23:41:55 taya Exp $
+# $NetBSD: moz-install,v 1.7 2003/05/13 10:23:19 markd Exp $
${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${PREFIX}/bin/${MOZILLA}
${CHOWN} ${BINOWN} ${PREFIX}/bin/${MOZILLA}
@@ -13,7 +13,7 @@ ${CHMOD} ${BINMODE} ${PREFIX}/bin/${MOZILLA}
TMP_PLIST=${WRKDIR}/TMP_PLIST.$$
trap "${RM} -f ${TMP_PLIST}" 1 2 15
-${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/\${MOZILLA_BIN}/${MOZILLA_BIN}/g" < ${PLIST_SRC} > ${TMP_PLIST}
+${SED} -e "s/\${MOZILLA}/${MOZILLA}/g" -e "s/\${SO_SUFFIX}/${SO_SUFFIX}/" -e "s/\${MOZILLA_BIN}/${MOZILLA_BIN}/g" -e "s/\${SUNOSLIB}/${SUNOSLIB}/" < ${PLIST_SRC} > ${TMP_PLIST}
# make directories
for i in `${SED} -n -e '/^@comment begin DIRS$/,/^@comment end DIRS$/p' ${TMP_PLIST} | ${EGREP} ^@dirrm | ${SED} -e 's/^@dirrm//'` ; do