Sat Mar 10 03:08:25 2012 UTC ()
* Fix Firefox's official branding bug by upstream.
* Fix for inclusion from mail/thunderbird and www/seamonkey (mozilla-common.mk).

No functional change for devel/xulrunner.


(ryoon)
diff -r1.66 -r1.67 pkgsrc/devel/xulrunner/Makefile
diff -r1.59 -r1.60 pkgsrc/devel/xulrunner/distinfo
diff -r1.30 -r1.31 pkgsrc/devel/xulrunner/mozilla-common.mk
diff -r0 -r1.1 pkgsrc/devel/xulrunner/patches/patch-browser_confvars.sh
cvs diff -r1.66 -r1.67 pkgsrc/devel/xulrunner/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/Makefile 2012/03/06 12:34:08 1.66
+++ pkgsrc/devel/xulrunner/Attic/Makefile 2012/03/10 03:08:24 1.67
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.66 2012/03/06 12:34:08 ryoon Exp $ 1# $NetBSD: Makefile,v 1.67 2012/03/10 03:08:24 ryoon Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
5CATEGORIES= devel www 5CATEGORIES= devel www
6 6
7MAINTAINER= tnn@NetBSD.org 7MAINTAINER= tnn@NetBSD.org
8HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner 8HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner
9COMMENT= XML User Interface Language runtime environment 9COMMENT= XML User Interface Language runtime environment
10LICENSE= mpl-1.1 10LICENSE= mpl-1.1
11 11
12MOZILLA_DIR= # empty 12MOZILLA_DIR= # empty
13 13
14PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in 14PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in
@@ -17,26 +17,29 @@ PKGCONFIG_OVERRIDE+= xulrunner/installer @@ -17,26 +17,29 @@ PKGCONFIG_OVERRIDE+= xulrunner/installer
17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in 17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in
18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-js.pc.in 18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-js.pc.in
19PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nspr.pc.in 19PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nspr.pc.in
20PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nss.pc.in 20PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nss.pc.in
21PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-plugin.pc.in 21PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-plugin.pc.in
22 22
23CONFIGURE_ARGS+= --enable-application=xulrunner 23CONFIGURE_ARGS+= --enable-application=xulrunner
24CONFIGURE_ARGS+= --enable-libxul 24CONFIGURE_ARGS+= --enable-libxul
25 25
26ALL_ENV+= MOZILLA_PKG_NAME=xulrunner 26ALL_ENV+= MOZILLA_PKG_NAME=xulrunner
27 27
28MAKE_ENV+= FREEBL_NO_DEPEND=0 28MAKE_ENV+= FREEBL_NO_DEPEND=0
29 29
 30# workround for link of xulrunner-bin etc.
 31LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner
 32
30.include "mozilla-common.mk" 33.include "mozilla-common.mk"
31.include "options.mk" 34.include "options.mk"
32 35
33pre-configure: 36pre-configure:
34 cd ${WRKSRC} && autoconf 37 cd ${WRKSRC} && autoconf
35 cd ${WRKSRC}/js/src && autoconf 38 cd ${WRKSRC}/js/src && autoconf
36 cd ${WRKSRC}/nsprpub && autoconf 39 cd ${WRKSRC}/nsprpub && autoconf
37 40
38post-install: 41post-install:
39 # XXX fix the pkg-config files instead 42 # XXX fix the pkg-config files instead
40 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 43 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
41 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \ 44 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \
42 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 45 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
cvs diff -r1.59 -r1.60 pkgsrc/devel/xulrunner/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2012/03/06 12:34:08 1.59
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2012/03/10 03:08:25 1.60
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.59 2012/03/06 12:34:08 ryoon Exp $ 1$NetBSD: distinfo,v 1.60 2012/03/10 03:08:25 ryoon Exp $
2 2
3SHA1 (firefox-10.0.2.source.tar.bz2) = d9b459d915d4638a48b3e249fcbaf7cafc27e834 3SHA1 (firefox-10.0.2.source.tar.bz2) = d9b459d915d4638a48b3e249fcbaf7cafc27e834
4RMD160 (firefox-10.0.2.source.tar.bz2) = 50c45cf2d561290ecfdfeea3fefae22cbae9ce85 4RMD160 (firefox-10.0.2.source.tar.bz2) = 50c45cf2d561290ecfdfeea3fefae22cbae9ce85
5Size (firefox-10.0.2.source.tar.bz2) = 75540089 bytes 5Size (firefox-10.0.2.source.tar.bz2) = 75540089 bytes
6SHA1 (patch-aa) = 93efde3dab747f80a575cd7c10c045967531bb53 6SHA1 (patch-aa) = 93efde3dab747f80a575cd7c10c045967531bb53
7SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997 7SHA1 (patch-ab) = 5d4b7512f8bbdc9e2e05709cec5b36dc12c25997
8SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129 8SHA1 (patch-ac) = 6aa120769b63efa5869029655f50af901edb9129
9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
10SHA1 (patch-ae) = 470d64f32fe1e619a101486a4bec45d2a06b6cab 10SHA1 (patch-ae) = 470d64f32fe1e619a101486a4bec45d2a06b6cab
11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df 11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df
12SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0 12SHA1 (patch-ag) = a924296e6a569eba4229d661fbe5290eeeb999e0
13SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 13SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
14SHA1 (patch-aj) = 78803641532203f878fc99ead9a440b8bf425aeb 14SHA1 (patch-aj) = 78803641532203f878fc99ead9a440b8bf425aeb
@@ -20,26 +20,27 @@ SHA1 (patch-ao) = 353d2098564c7b29849b6f @@ -20,26 +20,27 @@ SHA1 (patch-ao) = 353d2098564c7b29849b6f
20SHA1 (patch-as) = 3f51422d828d0ec6e280381a831d8603b88508c7 20SHA1 (patch-as) = 3f51422d828d0ec6e280381a831d8603b88508c7
21SHA1 (patch-at) = d5e820c9ad87feb1827c948a1471127bc21fbd1b 21SHA1 (patch-at) = d5e820c9ad87feb1827c948a1471127bc21fbd1b
22SHA1 (patch-au) = e59d5c28c676e03fb8bb38e28c06a4fd4d44ab55 22SHA1 (patch-au) = e59d5c28c676e03fb8bb38e28c06a4fd4d44ab55
23SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771 23SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
24SHA1 (patch-aw) = 0772c244636f7973171c274c126fa8bfbbcf1acb 24SHA1 (patch-aw) = 0772c244636f7973171c274c126fa8bfbbcf1acb
25SHA1 (patch-ax) = 777ed7921d939e6f7a4a3c23cb92e5489e454601 25SHA1 (patch-ax) = 777ed7921d939e6f7a4a3c23cb92e5489e454601
26SHA1 (patch-ay) = 81c3de4bee86ceab7927a49bcd79d980b06ad6f0 26SHA1 (patch-ay) = 81c3de4bee86ceab7927a49bcd79d980b06ad6f0
27SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 27SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
28SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d 28SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
29SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30 29SHA1 (patch-bd) = e09718d6492739a66dc5e21d3ed2cc1a404acd30
30SHA1 (patch-bf) = ef6d6ccbbfee2c72aef76c70695b202e346c5038 30SHA1 (patch-bf) = ef6d6ccbbfee2c72aef76c70695b202e346c5038
31SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759 31SHA1 (patch-bg) = 85d82348c43257eded6426ac84af9815619eb759
32SHA1 (patch-bi) = b190a1c338550b70b65c02f29639338708295075 32SHA1 (patch-bi) = b190a1c338550b70b65c02f29639338708295075
 33SHA1 (patch-browser_confvars.sh) = 32dfbd761946779105eda40b748a6a7f77f3f673
33SHA1 (patch-build_autoconf_gcc-pr49911.m4) = 252dbdf1c319e17455b5225254281b656dbb397b 34SHA1 (patch-build_autoconf_gcc-pr49911.m4) = 252dbdf1c319e17455b5225254281b656dbb397b
34SHA1 (patch-build_autoconf_nss.m4) = 2cd3f2d824273fe58c1a1f0a4b05605430ed3471 35SHA1 (patch-build_autoconf_nss.m4) = 2cd3f2d824273fe58c1a1f0a4b05605430ed3471
35SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = b4ce48ef10635feef8ac48017e03737f4a259d95 36SHA1 (patch-dom_plugins_ipc_PluginModuleChild.cpp) = b4ce48ef10635feef8ac48017e03737f4a259d95
36SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = b036f543f2e8502c216164e80aafe7844ae4de54 37SHA1 (patch-dom_plugins_ipc_PluginModuleChild.h) = b036f543f2e8502c216164e80aafe7844ae4de54
37SHA1 (patch-ipc_chromium_Makefile.in) = 050bfd7911f72b677c12e6f51ba0783a3356a367 38SHA1 (patch-ipc_chromium_Makefile.in) = 050bfd7911f72b677c12e6f51ba0783a3356a367
38SHA1 (patch-ipc_chromium_chromium-config.mk) = 00810dd00ebaf4a36448b84559035d6990a1514f 39SHA1 (patch-ipc_chromium_chromium-config.mk) = 00810dd00ebaf4a36448b84559035d6990a1514f
39SHA1 (patch-ipc_chromium_src_base_base__paths.h) = de42f64a1484ab6570637643ee79ec2e60d9ea01 40SHA1 (patch-ipc_chromium_src_base_base__paths.h) = de42f64a1484ab6570637643ee79ec2e60d9ea01
40SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 4707d1753f5c951efa1d0ecb3e6e17dd200745aa 41SHA1 (patch-ipc_chromium_src_base_debug__util__posic.cc) = 4707d1753f5c951efa1d0ecb3e6e17dd200745aa
41SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9cdf3cad35412a65bc1f8ebbfb7d27ad2e8f6c49 42SHA1 (patch-ipc_chromium_src_base_file__util.h) = 9cdf3cad35412a65bc1f8ebbfb7d27ad2e8f6c49
42SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = e512d59c6cf9947532317678d009d03c575473bf 43SHA1 (patch-ipc_chromium_src_base_file__util__bsd.cc) = e512d59c6cf9947532317678d009d03c575473bf
43SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 73768c9d4fa0729c92d9a4d3f835f89852065359 44SHA1 (patch-ipc_chromium_src_base_file__util__posix.cc) = 73768c9d4fa0729c92d9a4d3f835f89852065359
44SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 43c2c98273ebab9417e3101069cc567234dfd3b9 45SHA1 (patch-ipc_chromium_src_base_message__loop.cc) = 43c2c98273ebab9417e3101069cc567234dfd3b9
45SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = eb6c8003375c047602fbe5d52497257f0bcdaa4d 46SHA1 (patch-ipc_chromium_src_base_platform__file__posix.cc) = eb6c8003375c047602fbe5d52497257f0bcdaa4d
cvs diff -r1.30 -r1.31 pkgsrc/devel/xulrunner/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/mozilla-common.mk 2012/03/06 12:34:08 1.30
+++ pkgsrc/devel/xulrunner/Attic/mozilla-common.mk 2012/03/10 03:08:25 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.30 2012/03/06 12:34:08 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.31 2012/03/10 03:08:25 ryoon Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by devel/xulrunner/Makefile 5# used by devel/xulrunner/Makefile
6# used by mail/thunderbird/Makefile 6# used by mail/thunderbird/Makefile
7# used by www/firefox/Makefile 7# used by www/firefox/Makefile
8# used by www/seamonkey/Makefile 8# used by www/seamonkey/Makefile
9 9
10GNU_CONFIGURE= yes 10GNU_CONFIGURE= yes
11USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 11USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip
12USE_LANGUAGES+= c99 c++ 12USE_LANGUAGES+= c99 c++
13UNLIMIT_RESOURCES+= datasize 13UNLIMIT_RESOURCES+= datasize
14 14
@@ -45,29 +45,26 @@ SUBST_MESSAGE.fix-paths= Fixing absolute @@ -45,29 +45,26 @@ SUBST_MESSAGE.fix-paths= Fixing absolute
45SUBST_FILES.fix-paths= ${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h 45SUBST_FILES.fix-paths= ${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h
46SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp 46SUBST_FILES.fix-paths+= ${MOZILLA_DIR}xpcom/io/nsAppFileLocationProvider.cpp
47SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g' 47SUBST_SED.fix-paths+= -e 's,/usr/lib/mozilla/plugins,${PREFIX}/lib/netscape/plugins,g'
48 48
49CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess 49CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.guess
50CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess 50CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.guess
51CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess 51CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.guess
52CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess 52CONFIG_GUESS_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.guess
53CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub 53CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}build/autoconf/config.sub
54CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub 54CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}js/src/build/autoconf/config.sub
55CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub 55CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}nsprpub/build/autoconf/config.sub
56CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub 56CONFIG_SUB_OVERRIDE+= ${MOZILLA_DIR}/js/ctypes/libffi/config.sub
57 57
58# workround for link of xulrunner-bin etc. 
59LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner 
60 
61PYTHON_FOR_BUILD_ONLY= yes 58PYTHON_FOR_BUILD_ONLY= yes
62.include "../../lang/python/application.mk" 59.include "../../lang/python/application.mk"
63CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} 60CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q}
64 61
65# Makefiles sometimes call "rm -f" without more arguments. Kludge around ... 62# Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
66.PHONY: create-rm-wrapper 63.PHONY: create-rm-wrapper
67pre-configure: create-rm-wrapper 64pre-configure: create-rm-wrapper
68create-rm-wrapper: 65create-rm-wrapper:
69 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \ 66 printf '#!/bin/sh\n[ "$$*" = "-f" ] && exit 0\nexec /bin/rm $$@\n' > \
70 ${WRAPPER_DIR}/bin/rm 67 ${WRAPPER_DIR}/bin/rm
71 chmod +x ${WRAPPER_DIR}/bin/rm 68 chmod +x ${WRAPPER_DIR}/bin/rm
72 69
73.include "../../mk/bsd.prefs.mk" 70.include "../../mk/bsd.prefs.mk"
File Added: pkgsrc/devel/xulrunner/patches/Attic/patch-browser_confvars.sh
$NetBSD: patch-browser_confvars.sh,v 1.1 2012/03/10 03:08:25 ryoon Exp $

--- browser/confvars.sh.orig	2012-02-16 06:40:24.000000000 +0000
+++ browser/confvars.sh
@@ -49,5 +49,5 @@ MOZ_EXTENSIONS_DEFAULT=" gnomevfs"
 # MOZ_APP_DISPLAYNAME will be set by branding/configure.sh
 # Changing either of these values requires a clobber to ensure correct results,
 # because branding dependencies are broken.
-MOZ_BRANDING_DIRECTORY=browser/branding/official
+MOZ_BRANDING_DIRECTORY=browser/branding/aurora
 MOZ_OFFICIAL_BRANDING_DIRECTORY=browser/branding/official