Wed Dec 17 19:50:42 2008 UTC ()
- Fix PLIST for mozilla-jemalloc option
- eliminate some duplicate files (reachover to www/seamonkey/files again)


(tnn)
diff -r1.10 -r1.11 pkgsrc/www/firefox3/Makefile
diff -r1.4 -r1.5 pkgsrc/www/firefox3/PLIST
diff -r1.1.1.1 -r0 pkgsrc/www/firefox3/PLIST.Linux
diff -r1.1 -r0 pkgsrc/www/firefox3/files/moz-install
diff -r1.1 -r0 pkgsrc/www/firefox3/files/mozilla-ELF.in
diff -r1.1 -r0 pkgsrc/www/firefox3/files/mozilla-Mach-O.in
diff -r1.1 -r0 pkgsrc/www/firefox3/files/mozilla-a.out.in
cvs diff -r1.10 -r1.11 pkgsrc/www/firefox3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox3/Attic/Makefile 2008/12/17 15:43:01 1.10
+++ pkgsrc/www/firefox3/Attic/Makefile 2008/12/17 19:50:42 1.11
@@ -1,40 +1,40 @@ @@ -1,40 +1,40 @@
1# $NetBSD: Makefile,v 1.10 2008/12/17 15:43:01 tnn Exp $ 1# $NetBSD: Makefile,v 1.11 2008/12/17 19:50:42 tnn Exp $
2 2
3MOZILLA= firefox3 # allow coexisting with firefox2 3MOZILLA= firefox3 # allow coexisting with firefox2
4COMMENT= Lightweight gecko-based web browser 4COMMENT= Lightweight gecko-based web browser
5 5
6PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
7 7
8MOZILLA_USE_GTK2= # yes 8MOZILLA_USE_GTK2= # yes
9MOZILLA_USE_XFT= YES 9MOZILLA_USE_XFT= YES
10 10
11INSTALLATION_DIRS= lib/pkgconfig 11INSTALLATION_DIRS= lib/pkgconfig
12 12
13CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh 13CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh
14 14
15BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.4 15BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.4
16 16
17PYTHON_FOR_BUILD_ONLY= yes 17PYTHON_FOR_BUILD_ONLY= yes
18.include "../../lang/python/application.mk" 18.include "../../lang/python/application.mk"
19CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 19CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
20 20
21# Pull in standard firefox build framework, and override some things below 21# Pull in standard firefox build framework, and override some things below
22.include "../../www/firefox/Makefile-firefox.common" 22.include "../../www/firefox/Makefile-firefox.common"
23 23
24MAINTAINER= tnn@NetBSD.org 24MAINTAINER= tnn@NetBSD.org
25MOZ_VER= 3.0.5 25MOZ_VER= 3.0.5
26 26
27FILESDIR= ${.CURDIR}/files 27XPTCFILES:= ${XPTCFILES:C,^,../../firefox3/files/,}
28DESCR_SRC= ${.CURDIR}/../../www/firefox/DESCR 28DESCR_SRC= ${.CURDIR}/../../www/firefox/DESCR
29 29
30DISTINFO_FILE= ${.CURDIR}/../../www/firefox3/distinfo 30DISTINFO_FILE= ${.CURDIR}/../../www/firefox3/distinfo
31PATCHDIR= ${.CURDIR}/../../www/firefox3/patches 31PATCHDIR= ${.CURDIR}/../../www/firefox3/patches
32 32
33post-extract: copy-pkgconfig 33post-extract: copy-pkgconfig
34.PHONY: copy-pkgconfig 34.PHONY: copy-pkgconfig
35copy-pkgconfig: 35copy-pkgconfig:
36 cp ${.CURDIR}/../../www/firefox3/files/*.pc ${WRKSRC:Q}/build/unix 36 cp ${.CURDIR}/../../www/firefox3/files/*.pc ${WRKSRC:Q}/build/unix
37 37
38SUBST_CLASSES+= fix-pc 38SUBST_CLASSES+= fix-pc
39SUBST_STAGE.fix-pc= pre-configure 39SUBST_STAGE.fix-pc= pre-configure
40SUBST_MESSAGE.fix-pc= Substituting prefix in pkg-config files. 40SUBST_MESSAGE.fix-pc= Substituting prefix in pkg-config files.
@@ -55,33 +55,37 @@ ye-olde-rm-hack: @@ -55,33 +55,37 @@ ye-olde-rm-hack:
55 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ 55 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
56 ${WRAPPER_DIR}/bin/rm 56 ${WRAPPER_DIR}/bin/rm
57 chmod +x ${WRAPPER_DIR}/bin/rm 57 chmod +x ${WRAPPER_DIR}/bin/rm
58 58
59# Link browser.xpt 59# Link browser.xpt
60post-build: stage-package 60post-build: stage-package
61.PHONY: stage-package 61.PHONY: stage-package
62stage-package: 62stage-package:
63 cd ${WRKSRC}/browser/installer && \ 63 cd ${WRKSRC}/browser/installer && \
64 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} stage-package 64 ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} stage-package
65 cp ${WRKSRC}/dist/firefox/components/browser.xpt \ 65 cp ${WRKSRC}/dist/firefox/components/browser.xpt \
66 ${WRKSRC}/dist/bin/components/browser.xpt 66 ${WRKSRC}/dist/bin/components/browser.xpt
67 67
68# Install libjemalloc.so which is needed on Linux. 68.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
69.if ${OPSYS} == "Linux" 69PLIST_SUBST+= JEMALLOC=
 70SCRIPTS_ENV+= JEMALLOC=
70post-install: install-libjemalloc 71post-install: install-libjemalloc
71.PHONY: install-libjemalloc 72.PHONY: install-libjemalloc
72install-libjemalloc: 73install-libjemalloc:
73 ${INSTALL_LIB} ${WRKSRC}/dist/lib/libjemalloc.so \ 74 ${INSTALL_LIB} ${WRKSRC}/dist/lib/libjemalloc.${SO_SUFFIX} \
74 ${DESTDIR}${PREFIX}/lib/${MOZILLA}/libjemalloc.${SO_SUFFIX} 75 ${DESTDIR}${PREFIX}/lib/${MOZILLA}/libjemalloc.${SO_SUFFIX}
 76.else
 77PLIST_SUBST+= JEMALLOC="@comment "
 78SCRIPTS_ENV+= JEMALLOC="@comment "
75.endif 79.endif
76 80
77INSTALLATION_DIRS+= lib/${MOZILLA}/modules 81INSTALLATION_DIRS+= lib/${MOZILLA}/modules
78 82
79# Can't use system PNG because it doesn't have APNG support? 83# Can't use system PNG because it doesn't have APNG support?
80CONFIGURE_ARGS+= --without-system-png 84CONFIGURE_ARGS+= --without-system-png
81# Override www/firefox's idea of toolkit 85# Override www/firefox's idea of toolkit
82CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 86CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
83# Is dbus support useful for anything? 87# Is dbus support useful for anything?
84CONFIGURE_ARGS+= --disable-dbus 88CONFIGURE_ARGS+= --disable-dbus
85# Avoids needing curl on Linux 89# Avoids needing curl on Linux
86CONFIGURE_ARGS+= --disable-crashreporter 90CONFIGURE_ARGS+= --disable-crashreporter
87CONFIGURE_ARGS+= --disable-system-sqlite  91CONFIGURE_ARGS+= --disable-system-sqlite
cvs diff -r1.4 -r1.5 pkgsrc/www/firefox3/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/firefox3/Attic/PLIST 2008/12/17 15:51:14 1.4
+++ pkgsrc/www/firefox3/Attic/PLIST 2008/12/17 19:50:42 1.5
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1@comment $NetBSD: PLIST,v 1.4 2008/12/17 15:51:14 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.5 2008/12/17 19:50:42 tnn Exp $
2bin/${MOZILLA} 2bin/${MOZILLA}
3@comment begin PROGRAMS 3@comment begin PROGRAMS
4lib/${MOZILLA}/${MOZILLA_BIN} 4lib/${MOZILLA}/${MOZILLA_BIN}
5lib/${MOZILLA}/mangle 5lib/${MOZILLA}/mangle
6lib/${MOZILLA}/mozilla-xremote-client 6lib/${MOZILLA}/mozilla-xremote-client
7lib/${MOZILLA}/nsinstall 7lib/${MOZILLA}/nsinstall
8lib/${MOZILLA}/regxpcom 8lib/${MOZILLA}/regxpcom
9lib/${MOZILLA}/shlibsign 9lib/${MOZILLA}/shlibsign
10lib/${MOZILLA}/xpcshell 10lib/${MOZILLA}/xpcshell
11@comment lib/${MOZILLA}/xpicleanup 11@comment lib/${MOZILLA}/xpicleanup
12lib/${MOZILLA}/xpidl 12lib/${MOZILLA}/xpidl
13lib/${MOZILLA}/xpt_dump 13lib/${MOZILLA}/xpt_dump
14lib/${MOZILLA}/xpt_link 14lib/${MOZILLA}/xpt_link
15@comment end PROGRAMS 15@comment end PROGRAMS
16@comment begin SCRIPTS 16@comment begin SCRIPTS
17@comment lib/${MOZILLA}/firefox-config 17@comment lib/${MOZILLA}/firefox-config
18@comment end SCRIPTS 18@comment end SCRIPTS
19@comment begin DSO 19@comment begin DSO
20lib/${MOZILLA}/components/libbrowsercomps.${SO_SUFFIX} 20lib/${MOZILLA}/components/libbrowsercomps.${SO_SUFFIX}
21lib/${MOZILLA}/components/libbrowserdirprovider.${SO_SUFFIX} 21lib/${MOZILLA}/components/libbrowserdirprovider.${SO_SUFFIX}
22lib/${MOZILLA}/components/libimgicon.${SO_SUFFIX} 22lib/${MOZILLA}/components/libimgicon.${SO_SUFFIX}
23@comment libfreebl 23@comment libfreebl
 24${JEMALLOC}lib/${MOZILLA}/libjemalloc.${SO_SUFFIX}
24lib/${MOZILLA}/libmozjs.${SO_SUFFIX} 25lib/${MOZILLA}/libmozjs.${SO_SUFFIX}
25lib/${MOZILLA}/libnspr4.${SO_SUFFIX} 26lib/${MOZILLA}/libnspr4.${SO_SUFFIX}
26lib/${MOZILLA}/libnss3.${SO_SUFFIX} 27lib/${MOZILLA}/libnss3.${SO_SUFFIX}
27lib/${MOZILLA}/libnssckbi.${SO_SUFFIX} 28lib/${MOZILLA}/libnssckbi.${SO_SUFFIX}
28lib/${MOZILLA}/libnssdbm3.${SO_SUFFIX} 29lib/${MOZILLA}/libnssdbm3.${SO_SUFFIX}
29lib/${MOZILLA}/libnssutil3.${SO_SUFFIX} 30lib/${MOZILLA}/libnssutil3.${SO_SUFFIX}
30lib/${MOZILLA}/libplc4.${SO_SUFFIX} 31lib/${MOZILLA}/libplc4.${SO_SUFFIX}
31lib/${MOZILLA}/libplds4.${SO_SUFFIX} 32lib/${MOZILLA}/libplds4.${SO_SUFFIX}
32lib/${MOZILLA}/libsmime3.${SO_SUFFIX} 33lib/${MOZILLA}/libsmime3.${SO_SUFFIX}
33lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX} 34lib/${MOZILLA}/libsoftokn3.${SO_SUFFIX}
34lib/${MOZILLA}/libsqlite3.${SO_SUFFIX} 35lib/${MOZILLA}/libsqlite3.${SO_SUFFIX}
35lib/${MOZILLA}/libssl3.${SO_SUFFIX} 36lib/${MOZILLA}/libssl3.${SO_SUFFIX}
36lib/${MOZILLA}/libxpcom.${SO_SUFFIX} 37lib/${MOZILLA}/libxpcom.${SO_SUFFIX}
File Deleted: pkgsrc/www/firefox3/Attic/PLIST.Linux
File Deleted: pkgsrc/www/firefox3/files/Attic/moz-install
File Deleted: pkgsrc/www/firefox3/files/Attic/mozilla-ELF.in
File Deleted: pkgsrc/www/firefox3/files/Attic/mozilla-Mach-O.in
File Deleted: pkgsrc/www/firefox3/files/Attic/mozilla-a.out.in