pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/firefox3 - Fix PLIST for mozilla-jemalloc option
details: https://anonhg.NetBSD.org/pkgsrc/rev/26ce7a3a138b
branches: trunk
changeset: 551566:26ce7a3a138b
user: tnn <tnn%pkgsrc.org@localhost>
date: Wed Dec 17 19:50:42 2008 +0000
description:
- Fix PLIST for mozilla-jemalloc option
- eliminate some duplicate files (reachover to www/seamonkey/files again)
diffstat:
www/firefox3/Makefile | 14 ++++--
www/firefox3/PLIST | 3 +-
www/firefox3/PLIST.Linux | 2 -
www/firefox3/files/moz-install | 77 ------------------------------------
www/firefox3/files/mozilla-ELF.in | 6 --
www/firefox3/files/mozilla-Mach-O.in | 4 -
www/firefox3/files/mozilla-a.out.in | 6 --
7 files changed, 11 insertions(+), 101 deletions(-)
diffs (171 lines):
diff -r 822d95f0f946 -r 26ce7a3a138b www/firefox3/Makefile
--- a/www/firefox3/Makefile Wed Dec 17 19:37:40 2008 +0000
+++ b/www/firefox3/Makefile Wed Dec 17 19:50:42 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2008/12/17 15:43:01 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2008/12/17 19:50:42 tnn Exp $
MOZILLA= firefox3 # allow coexisting with firefox2
COMMENT= Lightweight gecko-based web browser
@@ -24,7 +24,7 @@
MAINTAINER= tnn%NetBSD.org@localhost
MOZ_VER= 3.0.5
-FILESDIR= ${.CURDIR}/files
+XPTCFILES:= ${XPTCFILES:C,^,../../firefox3/files/,}
DESCR_SRC= ${.CURDIR}/../../www/firefox/DESCR
DISTINFO_FILE= ${.CURDIR}/../../www/firefox3/distinfo
@@ -65,13 +65,17 @@
cp ${WRKSRC}/dist/firefox/components/browser.xpt \
${WRKSRC}/dist/bin/components/browser.xpt
-# Install libjemalloc.so which is needed on Linux.
-.if ${OPSYS} == "Linux"
+.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
+PLIST_SUBST+= JEMALLOC=
+SCRIPTS_ENV+= JEMALLOC=
post-install: install-libjemalloc
.PHONY: install-libjemalloc
install-libjemalloc:
- ${INSTALL_LIB} ${WRKSRC}/dist/lib/libjemalloc.so \
+ ${INSTALL_LIB} ${WRKSRC}/dist/lib/libjemalloc.${SO_SUFFIX} \
${DESTDIR}${PREFIX}/lib/${MOZILLA}/libjemalloc.${SO_SUFFIX}
+.else
+PLIST_SUBST+= JEMALLOC="@comment "
+SCRIPTS_ENV+= JEMALLOC="@comment "
.endif
INSTALLATION_DIRS+= lib/${MOZILLA}/modules
diff -r 822d95f0f946 -r 26ce7a3a138b www/firefox3/PLIST
--- a/www/firefox3/PLIST Wed Dec 17 19:37:40 2008 +0000
+++ b/www/firefox3/PLIST Wed Dec 17 19:50:42 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/12/17 15:51:14 tnn Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/12/17 19:50:42 tnn Exp $
bin/${MOZILLA}
@comment begin PROGRAMS
lib/${MOZILLA}/${MOZILLA_BIN}
@@ -21,6 +21,7 @@
lib/${MOZILLA}/components/libbrowserdirprovider.${SO_SUFFIX}
lib/${MOZILLA}/components/libimgicon.${SO_SUFFIX}
@comment libfreebl
+${JEMALLOC}lib/${MOZILLA}/libjemalloc.${SO_SUFFIX}
lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
lib/${MOZILLA}/libnss3.${SO_SUFFIX}
diff -r 822d95f0f946 -r 26ce7a3a138b www/firefox3/PLIST.Linux
--- a/www/firefox3/PLIST.Linux Wed Dec 17 19:37:40 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Linux,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
-lib/${MOZILLA}/libjemalloc.${SO_SUFFIX}
diff -r 822d95f0f946 -r 26ce7a3a138b www/firefox3/files/moz-install
--- a/www/firefox3/files/moz-install Wed Dec 17 19:37:40 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: moz-install,v 1.1 2008/12/13 00:42:26 martin Exp $
-
-${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
-${CHOWN} ${BINOWN} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
-${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
-${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
-
-#
-# Substitute variables
-#
-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}
-
-# make directories
-for i in `${SED} -n -e '/^@comment begin DIRS$/,/^@comment end DIRS$/p' ${TMP_PLIST} | ${EGREP} ^@dirrm | ${SED} -e 's/^@dirrm//'` ; do
- ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/$i
-done
-
-# install programs
-for i in `${SED} -n -e '/^@comment begin PROGRAMS$/,/^@comment end PROGRAMS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
- ${BSD_INSTALL_PROGRAM} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-# install scripts
-for i in `${SED} -n -e '/^@comment begin SCRIPTS$/,/^@comment end SCRIPTS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
- ${BSD_INSTALL_SCRIPT} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-# install DSO
-for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
- ${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-# install PKGCONFIG
-for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`;
- ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-# install DATA
-for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
- ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-# install INCLUDE
-for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/include@"`;
- ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-# install INCLUDE-PUBLIC
-for i in `${SED} -n -e '/^@comment begin INCLUDE-PUBLIC$/,/^@comment end INCLUDE-PUBLIC$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/public@"`;
- ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-# install INCLUDE-SDK
-for i in `${SED} -n -e '/^@comment begin INCLUDE-SDK$/,/^@comment end INCLUDE-SDK$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
- src=`echo $i | ${SED} -e "s@include/${MOZILLA}@dist/sdk/include@"`;
- ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
-done
-
-${RM} -f ${TMP_PLIST}
-
-#
-# remove generated user conf directory ${WRKDIR}/.mozilla
-#
-${RM} -rf ${WRKDIR}/.mozilla
diff -r 822d95f0f946 -r 26ce7a3a138b www/firefox3/files/mozilla-ELF.in
--- a/www/firefox3/files/mozilla-ELF.in Wed Dec 17 19:37:40 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/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@ "$@"
diff -r 822d95f0f946 -r 26ce7a3a138b www/firefox3/files/mozilla-Mach-O.in
--- a/www/firefox3/files/mozilla-Mach-O.in Wed Dec 17 19:37:40 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#!/bin/sh
-MOZILLA_FIVE_HOME=@PREFIX@/lib/@MOZILLA@
-export MOZILLA_FIVE_HOME
-exec @PREFIX@/lib/@MOZILLA@/@MOZILLA_BIN@ "$@"
diff -r 822d95f0f946 -r 26ce7a3a138b www/firefox3/files/mozilla-a.out.in
--- a/www/firefox3/files/mozilla-a.out.in Wed Dec 17 19:37:40 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-#!/bin/sh
-MOZILLA_FIVE_HOME=@PREFIX@/lib/@MOZILLA@
-LD_LIBRARY_PATH=@PREFIX@/lib/@MOZILLA@
-export MOZILLA_FIVE_HOME
-export LD_LIBRARY_PATH
-exec @PREFIX@/lib/@MOZILLA@/@MOZILLA_BIN@ "$@"
Home |
Main Index |
Thread Index |
Old Index