diff options
author | tnn <tnn@pkgsrc.org> | 2009-10-11 10:49:56 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2009-10-11 10:49:56 +0000 |
commit | 4d1ae4854f86653333d727d7719e2e5a28937199 (patch) | |
tree | a0d0712dc4e395f4baec4d686ea48b8a2942f53f /www/firefox | |
parent | b682c86f9626e2554dd5485d05f6780e3b31a0fe (diff) | |
download | pkgsrc-4d1ae4854f86653333d727d7719e2e5a28937199.tar.gz |
- allow firefox and xulrunner to share some infrastructure
- install headers for plugin and liveconnect (needed by openjdk7-icedtea-plugin)
- bump revision for both packages
Diffstat (limited to 'www/firefox')
-rw-r--r-- | www/firefox/Makefile | 52 | ||||
-rw-r--r-- | www/firefox/distinfo | 14 | ||||
-rw-r--r-- | www/firefox/patches/patch-aa | 78 | ||||
-rw-r--r-- | www/firefox/patches/patch-ao | 24 | ||||
-rw-r--r-- | www/firefox/patches/patch-ma | 23 | ||||
-rw-r--r-- | www/firefox/patches/patch-mi | 15 | ||||
-rw-r--r-- | www/firefox/patches/patch-mk | 19 | ||||
-rw-r--r-- | www/firefox/patches/patch-mm | 19 | ||||
-rw-r--r-- | www/firefox/patches/patch-ra | 9 | ||||
-rw-r--r-- | www/firefox/patches/patch-rb | 7 | ||||
-rw-r--r-- | www/firefox/patches/patch-rc | 12 |
11 files changed, 8 insertions, 264 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index 8a46c95ddf6..391dca7c68d 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.59 2009/10/09 19:41:46 tnn Exp $ +# $NetBSD: Makefile,v 1.60 2009/10/11 10:49:56 tnn Exp $ # DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${FIREFOX_VER} FIREFOX_VER= 3.5.3 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} EXTRACT_SUFX= .tar.bz2 @@ -14,42 +14,20 @@ HOMEPAGE= http://www.mozilla.com/en-US/firefox/ COMMENT= Web browser with support for extensions WRKSRC= ${WRKDIR}/mozilla-1.9.1 -GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config perl gmake autoconf213 -USE_LANGUAGES= c c++ - -BUILD_DEPENDS+= zip>=2.3:../../archivers/zip - -PKG_DESTDIR_SUPPORT= user-destdir -CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh - -PRIVILEGED_STAGES= clean - -CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess -CONFIG_SUB_OVERRIDE= build/autoconf/config.sub +MOZILLA_DIR= # empty CONFIGURE_ARGS+= --enable-application=browser -CONFIGURE_ARGS+= --disable-tests --disable-pedantic -CONFIGURE_ARGS+= --enable-crypto -CONFIGURE_ARGS+= --enable-optimize=-O2 --with-pthreads -CONFIGURE_ARGS+= --disable-javaxpcom -CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 -CONFIGURE_ARGS+= --enable-svg --enable-mathml -CONFIGURE_ARGS+= --enable-system-cairo -CONFIGURE_ARGS+= --with-system-jpeg -CONFIGURE_ARGS+= --with-system-zlib --with-system-bz2 -CONFIGURE_ARGS+= --enable-system-sqlite -CONFIGURE_ARGS+= --disable-crashreporter CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk +CONFIGURE_ARGS+= --with-system-libxul ALL_ENV+= MOZILLA_PKG_NAME=firefox -PYTHON_FOR_BUILD_ONLY= yes -.include "../../lang/python/application.mk" -CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} +DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo +PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches -.include "options.mk" .include "../../mk/bsd.prefs.mk" +.include "../../devel/xulrunner/mozilla-common.mk" +.include "options.mk" MOZILLA=firefox .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) @@ -62,10 +40,6 @@ MOZILLA_ICON= ${WRKSRC}/browser/branding/unofficial/default48.png pre-configure: cd ${WRKSRC} && autoconf -# Makefiles sometimes call "rm -f" without more arguments. Kludge around ... - printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ - ${WRAPPER_DIR}/bin/rm - chmod +x ${WRAPPER_DIR}/bin/rm post-install: ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/applications @@ -84,12 +58,6 @@ post-install: > ${WRKDIR}/firefox ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin -.if ${OPSYS} == "Linux" -# XXX check if this still applies after xulrunnerization -.include "../../audio/alsa-lib/buildlink3.mk" -.endif -.include "../../archivers/bzip2/buildlink3.mk" -.include "../../databases/sqlite3/buildlink3.mk" BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=1.9.1.3nb4 .include "../../devel/xulrunner/buildlink3.mk" PLIST_VARS+= gnome @@ -99,9 +67,5 @@ PLIST.gnome= yes .else CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui .endif -.include "../../devel/zlib/buildlink3.mk" -.include "../../net/libIDL/buildlink3.mk" -.include "../../x11/gtk2/buildlink3.mk" -.include "../../x11/libXt/buildlink3.mk" .include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/firefox/distinfo b/www/firefox/distinfo deleted file mode 100644 index d249c282f41..00000000000 --- a/www/firefox/distinfo +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: distinfo,v 1.98 2009/09/23 16:46:31 tnn Exp $ - -SHA1 (firefox-3.5.3.source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb -RMD160 (firefox-3.5.3.source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422 -Size (firefox-3.5.3.source.tar.bz2) = 46766383 bytes -SHA1 (patch-aa) = 64ebd1d94d69acdbf6d5a0c25fc3015d90d5540c -SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c -SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 -SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b -SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9 -SHA1 (patch-mm) = faabab8816522bd9a74c2e6e65b2ae3d791affe0 -SHA1 (patch-ra) = b215219b8429274ca3aa81790b62531aaf189127 -SHA1 (patch-rb) = 15970b5fe79621d47e573ddec074a6e67e8c5146 -SHA1 (patch-rc) = 890012b4fca22d965a40262830aabbb06a2da36e diff --git a/www/firefox/patches/patch-aa b/www/firefox/patches/patch-aa deleted file mode 100644 index b5eeabffc69..00000000000 --- a/www/firefox/patches/patch-aa +++ /dev/null @@ -1,78 +0,0 @@ -$NetBSD: patch-aa,v 1.8 2009/09/17 09:41:50 tnn Exp $ - ---- configure.in.orig 2009-08-24 17:52:36.000000000 +0200 -+++ configure.in -@@ -1799,7 +1799,7 @@ case "$target" in - fi - ;; - --*-freebsd*) -+*-freebsd* | *-dragonfly*) - if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then - DLL_SUFFIX=".so.1.0" - DSO_LDOPTS="-shared" -@@ -1813,6 +1813,9 @@ case "$target" in - # MKSHLIB_FORCE_ALL='-Wl,-Bforcearchive' - # MKSHLIB_UNFORCE_ALL='' - # fi -+ if test "$LIBRUNPATH"; then -+ DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" -+ fi - ;; - - *-hpux*) -@@ -2349,8 +2352,15 @@ case "$target" in - if test "$LIBRUNPATH"; then - DSO_LDOPTS="-R$LIBRUNPATH $DSO_LDOPTS" - fi -+ case "${target_cpu}" in -+ alpha*) -+ CFLAGS="$CFLAGS -mieee" -+ CXXFLAGS="$CXXFLAGS -mieee" -+ ;; -+ esac - ;; - -+ - *-openvms*) - AC_DEFINE(NO_PW_GECOS) - AC_DEFINE(NO_UDSOCK) -@@ -3043,6 +3053,9 @@ dnl ==================================== - case $target in - *-hpux11.*) - ;; -+*-dragonfly*) -+ AC_CHECK_LIB(c, gethostbyname_r) -+ ;; - *) - AC_CHECK_LIB(c_r, gethostbyname_r) - ;; -@@ -4117,8 +4130,8 @@ else - NSPR_LIBS="${LIBXUL_DIST}/lib/nspr${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plc${NSPR_VERSION}.lib ${LIBXUL_DIST}/lib/plds${NSPR_VERSION}.lib " - fi - else -- NSPR_CFLAGS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --includedir='${LIBXUL_DIST}'/include/nspr --cflags`' -- NSPR_LIBS='`$(LIBXUL_DIST)/bin/nspr-config --prefix='${LIBXUL_DIST}' --libdir='${LIBXUL_DIST}'/lib --libs`' -+ NSPR_CFLAGS="-I${prefix}/include/xulrunner/unstable `pkg-config --cflags mozilla-nspr`" -+ NSPR_LIBS="`pkg-config --libs mozilla-nspr`" - fi - fi - -@@ -4138,7 +4151,7 @@ fi - if test -n "$MOZ_NATIVE_NSS"; then - NSS_LIBS="$NSS_LIBS -lcrmf" - else -- NSS_CFLAGS='-I$(LIBXUL_DIST)/include/nss' -+ NSS_CFLAGS="`pkg-config --cflags mozilla-nss`" - NSS_DEP_LIBS="\ - \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)crmf.\$(LIB_SUFFIX) \ - \$(LIBXUL_DIST)/lib/\$(DLL_PREFIX)smime$NSS_VERSION\$(DLL_SUFFIX) \ -@@ -4156,7 +4169,7 @@ else - \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)nssutil$NSS_VERSION.\$(IMPORT_LIB_SUFFIX) \ - \$(LIBXUL_DIST)/lib/\$(LIB_PREFIX)softokn$NSS_VERSION.\$(IMPORT_LIB_SUFFIX)" - else -- NSS_LIBS='$(LIBS_DIR)'" -lcrmf -lsmime$NSS_VERSION -lssl$NSS_VERSION -lnss$NSS_VERSION -lnssutil$NSS_VERSION -lsoftokn$NSS_VERSION" -+ NSS_LIBS="`pkg-config --libs mozilla-nss`" - fi - fi - diff --git a/www/firefox/patches/patch-ao b/www/firefox/patches/patch-ao deleted file mode 100644 index b914996f2f2..00000000000 --- a/www/firefox/patches/patch-ao +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ao,v 1.7 2009/08/05 02:43:47 tnn Exp $ - ---- toolkit/mozapps/installer/packager.mk.orig 2009-06-29 18:15:27.000000000 +0200 -+++ toolkit/mozapps/installer/packager.mk -@@ -449,8 +449,8 @@ endif - (cd $(DIST)/$(MOZ_PKG_DIR) && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(installdir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(bindir) -- $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) -- ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) -+ $(RM) -f $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) -+ ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir)/$(MOZILLA_PKG_NAME) - ifdef INSTALL_SDK # Here comes the hard part - # include directory is stable (dist/sdk/include) and unstable (dist/include) - $(NSINSTALL) -D $(DESTDIR)$(includedir)/stable -@@ -458,7 +458,7 @@ ifdef INSTALL_SDK # Here comes the hard - (cd $(DIST)/sdk/include && tar $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(includedir)/stable && tar -xf -) - # The dist/include has module subdirectories that we need to flatten -- find $(DIST)/include -xtype f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \; -+ find $(DIST)/include -type f -exec $(SYSINSTALL) $(IFLAGS1) {} $(DESTDIR)$(includedir)/unstable \; - # IDL directory is stable (dist/sdk/idl) and unstable (dist/idl) - $(NSINSTALL) -D $(DESTDIR)$(idldir)/stable - $(NSINSTALL) -D $(DESTDIR)$(idldir)/unstable diff --git a/www/firefox/patches/patch-ma b/www/firefox/patches/patch-ma deleted file mode 100644 index c5b7cea6754..00000000000 --- a/www/firefox/patches/patch-ma +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ma,v 1.1.1.1 2009/08/05 02:37:11 tnn Exp $ - ---- config/autoconf.mk.in.orig 2009-06-29 18:14:41.000000000 +0200 -+++ config/autoconf.mk.in -@@ -57,14 +57,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - bindir = @bindir@ --includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+includedir = @includedir@/$(MOZILLA_PKG_NAME) - libdir = @libdir@ - datadir = @datadir@ - mandir = @mandir@ --idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) -+idldir = @datadir@/idl/$(MOZILLA_PKG_NAME) - --installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION) --sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION) -+installdir = $(libdir)/$(MOZILLA_PKG_NAME) -+sdkdir = $(libdir)/$(MOZILLA_PKG_NAME)-sdk - - DIST = $(DEPTH)/dist - LIBXUL_SDK = @LIBXUL_SDK@ diff --git a/www/firefox/patches/patch-mi b/www/firefox/patches/patch-mi deleted file mode 100644 index 72e98fcde73..00000000000 --- a/www/firefox/patches/patch-mi +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-mi,v 1.1.1.1 2009/08/05 02:37:11 tnn Exp $ - -Add DragonFly support. - ---- config/config.mk.orig 2009-06-29 18:14:41.000000000 +0200 -+++ config/config.mk -@@ -133,7 +133,7 @@ endif - # but save the version to allow multiple versions of the same base - # platform to be built in the same tree. - # --ifneq (,$(filter FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH))) -+ifneq (,$(filter DragonFly FreeBSD HP-UX IRIX Linux NetBSD OpenBSD OSF1 SunOS,$(OS_ARCH))) - OS_RELEASE := $(basename $(OS_RELEASE)) - - # Allow the user to ignore the OS_VERSION, which is usually irrelevant. diff --git a/www/firefox/patches/patch-mk b/www/firefox/patches/patch-mk deleted file mode 100644 index 4a0e99235df..00000000000 --- a/www/firefox/patches/patch-mk +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-mk,v 1.1.1.1 2009/08/05 02:37:11 tnn Exp $ - -Treat DragonFly like FreeBSD. - ---- config/rules.mk.orig 2009-06-29 18:14:41.000000000 +0200 -+++ config/rules.mk -@@ -592,6 +592,12 @@ EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic - endif - endif - -+ifeq ($(OS_ARCH),DragonFly) -+ifdef IS_COMPONENT -+EXTRA_DSO_LDOPTS += -Wl,-Bsymbolic -+endif -+endif -+ - ifeq ($(OS_ARCH),NetBSD) - ifneq (,$(filter arc cobalt hpcmips mipsco newsmips pmax sgimips,$(OS_TEST))) - ifeq ($(MODULE),layout) diff --git a/www/firefox/patches/patch-mm b/www/firefox/patches/patch-mm deleted file mode 100644 index 52240105496..00000000000 --- a/www/firefox/patches/patch-mm +++ /dev/null @@ -1,19 +0,0 @@ -$NetBSD: patch-mm,v 1.1.1.1 2009/08/05 02:37:11 tnn Exp $ - -Don't link with -lCstd on Solaris when using GCC. From Tim Zingelman. -part of PR pkg/39085 - ---- toolkit/library/Makefile.in.orig 2009-06-29 18:15:25.000000000 +0200 -+++ toolkit/library/Makefile.in -@@ -252,7 +252,10 @@ EXTRA_DSO_LDOPTS += -lbe -ltracker - endif - - ifeq ($(OS_ARCH),SunOS) --EXTRA_DSO_LDOPTS += -lelf -ldemangle -lCstd -+EXTRA_DSO_LDOPTS += -lelf -ldemangle -+ifndef GNU_CC -+EXTRA_DSO_LDOPTS += -lCstd -+endif - endif - - ifeq ($(OS_ARCH),WINNT) diff --git a/www/firefox/patches/patch-ra b/www/firefox/patches/patch-ra deleted file mode 100644 index bfa443c33ee..00000000000 --- a/www/firefox/patches/patch-ra +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: patch-ra,v 1.1 2009/09/23 16:46:32 tnn Exp $ - ---- browser/branding/unofficial/locales/browserconfig.properties.orig 2009-08-24 17:52:36.000000000 +0200 -+++ browser/branding/unofficial/locales/browserconfig.properties -@@ -1,3 +1,3 @@ - # Do NOT localize or otherwise change these values --browser.startup.homepage=http://www.mozilla.org/projects/shiretoko/ -+browser.startup.homepage=http://www.google.com/firefox - diff --git a/www/firefox/patches/patch-rb b/www/firefox/patches/patch-rb deleted file mode 100644 index 1b3aa9b603b..00000000000 --- a/www/firefox/patches/patch-rb +++ /dev/null @@ -1,7 +0,0 @@ -$NetBSD: patch-rb,v 1.1 2009/09/23 16:46:32 tnn Exp $ - ---- browser/branding/unofficial/configure.sh.orig 2009-08-24 17:52:35.000000000 +0200 -+++ browser/branding/unofficial/configure.sh -@@ -1 +1 @@ --MOZ_APP_DISPLAYNAME="Shiretoko" -+MOZ_APP_DISPLAYNAME="Browser" diff --git a/www/firefox/patches/patch-rc b/www/firefox/patches/patch-rc deleted file mode 100644 index b1b0654046e..00000000000 --- a/www/firefox/patches/patch-rc +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-rc,v 1.1 2009/09/23 16:46:32 tnn Exp $ - ---- browser/branding/unofficial/locales/en-US/brand.dtd.orig 2009-08-24 17:52:36.000000000 +0200 -+++ browser/branding/unofficial/locales/en-US/brand.dtd -@@ -1,5 +1,5 @@ --<!ENTITY brandShortName "Shiretoko"> --<!ENTITY brandFullName "Shiretoko"> -+<!ENTITY brandShortName "Browser"> -+<!ENTITY brandFullName "Browser"> - <!ENTITY vendorShortName "mozilla.org"> - <!ENTITY logoCopyright " "> - |