Wed Feb 17 22:24:32 2010 UTC ()
Pullup ticket 3009 - requested by tnn
security and bug fixes

Revisions pulled up:
- pkgsrc/devel/nspr/Makefile		by patch to equiv of 1.34
- pkgsrc/devel/xulrunner/dist.mk	by patch to equiv of 1.7
- pkgsrc/devel/xulrunner/distinfo	by patch to equiv of 1.24
- pkgsrc/www/firefox/Makefile		by patch to equiv of 1.70

   --------------------------------------------------------------------
   The attached diff against 2009Q4 updates firefox to 3.5.8.
   This is a security and bugfix update.


(spz)
diff -r1.32 -r1.32.2.1 pkgsrc/devel/nspr/Makefile
diff -r1.3 -r1.3.2.1 pkgsrc/devel/xulrunner/dist.mk
diff -r1.22 -r1.22.2.1 pkgsrc/devel/xulrunner/distinfo
diff -r1.65 -r1.65.2.1 pkgsrc/www/firefox/Makefile
cvs diff -r1.32 -r1.32.2.1 pkgsrc/devel/nspr/Makefile (switch to unified diff)

--- pkgsrc/devel/nspr/Makefile 2009/11/10 16:48:20 1.32
+++ pkgsrc/devel/nspr/Makefile 2010/02/17 22:24:32 1.32.2.1
@@ -1,96 +1,96 @@ @@ -1,96 +1,96 @@
1# $NetBSD: Makefile,v 1.32 2009/11/10 16:48:20 tnn Exp $ 1# $NetBSD: Makefile,v 1.32.2.1 2010/02/17 22:24:32 spz Exp $
2# 2#
3 3
4.include "../../devel/xulrunner/dist.mk" 4.include "../../devel/xulrunner/dist.mk"
5PKGNAME= ${DISTNAME:S/firefox/nspr/:S/3.5/${NSPR_RELEASE}/:S/.source//} 5PKGNAME= ${DISTNAME:S/firefox/nspr/:S/3.5/${NSPR_RELEASE}/:S/.source//}
6NSPR_RELEASE= 4.8.2 6NSPR_RELEASE= 4.8.3
7CATEGORIES= devel 7CATEGORIES= devel
8 8
9MAINTAINER= tnn@NetBSD.org 9MAINTAINER= tnn@NetBSD.org
10HOMEPAGE= http://www.mozilla.org/projects/nspr/index.html 10HOMEPAGE= http://www.mozilla.org/projects/nspr/index.html
11COMMENT= Platform-neutral API for system level and libc like functions 11COMMENT= Platform-neutral API for system level and libc like functions
12 12
13PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 14CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
15 15
16GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
17CONFIGURE_DIRS= nsprpub 17CONFIGURE_DIRS= nsprpub
18 18
19USE_TOOLS+= autoconf213 gmake perl 19USE_TOOLS+= autoconf213 gmake perl
20REPLACE_PERL+= nsprpub/pr/src/misc/compile-et.pl 20REPLACE_PERL+= nsprpub/pr/src/misc/compile-et.pl
21 21
22CONFIGURE_ARGS+= --disable-debug 22CONFIGURE_ARGS+= --disable-debug
23CONFIGURE_ARGS+= --with-pthreads 23CONFIGURE_ARGS+= --with-pthreads
24CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/nspr 24CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/nspr
25CONFIGURE_ENV+= LIBRUNPATH=${PREFIX:Q}/lib/nspr 25CONFIGURE_ENV+= LIBRUNPATH=${PREFIX:Q}/lib/nspr
26 26
27.include "../../mk/bsd.prefs.mk" 27.include "../../mk/bsd.prefs.mk"
28 28
29SUBST_CLASSES+= nspr-config 29SUBST_CLASSES+= nspr-config
30SUBST_STAGE.nspr-config= pre-configure 30SUBST_STAGE.nspr-config= pre-configure
31SUBST_MESSAGE.nspr-config= Fixing nspr-config run path 31SUBST_MESSAGE.nspr-config= Fixing nspr-config run path
32SUBST_FILES.nspr-config= nsprpub/config/nspr-config.in 32SUBST_FILES.nspr-config= nsprpub/config/nspr-config.in
33SUBST_SED.nspr-config= -e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$libdir"|g' 33SUBST_SED.nspr-config= -e 's|-L$$libdir|"${COMPILER_RPATH_FLAG}$$libdir -L$$libdir"|g'
34 34
35.if ${OBJECT_FMT} == "ELF" 35.if ${OBJECT_FMT} == "ELF"
36SO_SUFFIX= so 36SO_SUFFIX= so
37.elif ${OBJECT_FMT} == "Mach-O" 37.elif ${OBJECT_FMT} == "Mach-O"
38SO_SUFFIX= dylib 38SO_SUFFIX= dylib
39.else 39.else
40SO_SUFFIX= so.1.0 40SO_SUFFIX= so.1.0
41.endif 41.endif
42PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} 42PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q}
43 43
44PLIST_VARS+= sun4u_32 44PLIST_VARS+= sun4u_32
45# see nsprpub/pr/src/md/unix/Makefile.in 45# see nsprpub/pr/src/md/unix/Makefile.in
46# for the bit about 32-bit sun4u machines installing an extra file. 46# for the bit about 32-bit sun4u machines installing an extra file.
47# That is why we have this specific test and modify the PLIST 47# That is why we have this specific test and modify the PLIST
48.if ${OPSYS} == "SunOS" 48.if ${OPSYS} == "SunOS"
49. if defined(ABI) && ${ABI} == "64" 49. if defined(ABI) && ${ABI} == "64"
50CONFIGURE_ARGS+= --enable-64bit 50CONFIGURE_ARGS+= --enable-64bit
51. else 51. else
52HW_CLASS!= ${UNAME} -m 52HW_CLASS!= ${UNAME} -m
53. if ${HW_CLASS} == "sun4u" 53. if ${HW_CLASS} == "sun4u"
54PLIST.sun4u_32= yes 54PLIST.sun4u_32= yes
55. endif 55. endif
56. endif 56. endif
57.endif 57.endif
58 58
59.if ${OPSYS} == "Linux" 59.if ${OPSYS} == "Linux"
60. if defined(ABI) && ${ABI} == "64" 60. if defined(ABI) && ${ABI} == "64"
61CONFIGURE_ARGS+= --enable-64bit 61CONFIGURE_ARGS+= --enable-64bit
62. endif 62. endif
63.endif 63.endif
64 64
65.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon) 65.if ${OPSYS} == "Darwin" && exists(/Developer/Headers/FlatCarbon)
66BUILDLINK_PASSTHRU_DIRS+= Developer/Headers/FlatCarbon 66BUILDLINK_PASSTHRU_DIRS+= Developer/Headers/FlatCarbon
67.endif 67.endif
68 68
69pre-configure: 69pre-configure:
70# sanity check: make sure the nspr release is what we think it is. 70# sanity check: make sure the nspr release is what we think it is.
71 @set -e; if [ '"${NSPR_RELEASE}"' != \ 71 @set -e; if [ '"${NSPR_RELEASE}"' != \
72 "`${AWK} '/PR_VERSION/ {print $$3}' < \ 72 "`${AWK} '/PR_VERSION/ {print $$3}' < \
73 ${WRKSRC}/nsprpub/pr/include/prinit.h`" ]; then \ 73 ${WRKSRC}/nsprpub/pr/include/prinit.h`" ]; then \
74 ${ECHO} "package is out of date"; \ 74 ${ECHO} "package is out of date"; \
75 exit 1; \ 75 exit 1; \
76 fi 76 fi
77 cd ${WRKSRC}/nsprpub && autoconf 77 cd ${WRKSRC}/nsprpub && autoconf
78 78
79post-build: 79post-build:
80 set -e; ( \ 80 set -e; ( \
81 ${ECHO} "Name: NSPR"; \ 81 ${ECHO} "Name: NSPR"; \
82 ${ECHO} "Description: The Netscape Portable Runtime"; \ 82 ${ECHO} "Description: The Netscape Portable Runtime"; \
83 ${ECHO} "Version: ${NSPR_RELEASE}"; \ 83 ${ECHO} "Version: ${NSPR_RELEASE}"; \
84 ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \ 84 ${ECHO} "Cflags: -I${PREFIX}/include/nspr"; \
85 ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \ 85 ${ECHO} "Libs: -L${PREFIX}/lib/nspr" \
86 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \ 86 "${COMPILER_RPATH_FLAG}${PREFIX}/lib/nspr" \
87 "-lplds4 -lplc4 -lnspr4 -pthread" \ 87 "-lplds4 -lplc4 -lnspr4 -pthread" \
88 ) > ${WRKDIR}/nspr.pc 88 ) > ${WRKDIR}/nspr.pc
89 89
90INSTALLATION_DIRS+= lib/pkgconfig 90INSTALLATION_DIRS+= lib/pkgconfig
91 91
92post-install: 92post-install:
93 ${INSTALL_DATA} ${WRKDIR}/nspr.pc ${DESTDIR}${PREFIX}/lib/pkgconfig 93 ${INSTALL_DATA} ${WRKDIR}/nspr.pc ${DESTDIR}${PREFIX}/lib/pkgconfig
94 94
95.include "../../mk/pthread.buildlink3.mk" 95.include "../../mk/pthread.buildlink3.mk"
96.include "../../mk/bsd.pkg.mk" 96.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.3.2.1 pkgsrc/devel/xulrunner/Attic/dist.mk (switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/dist.mk 2009/12/16 08:18:32 1.3
+++ pkgsrc/devel/xulrunner/Attic/dist.mk 2010/02/17 22:24:32 1.3.2.1
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1# $NetBSD: dist.mk,v 1.3 2009/12/16 08:18:32 tnn Exp $ 1# $NetBSD: dist.mk,v 1.3.2.1 2010/02/17 22:24:32 spz Exp $
2# 2#
3# used by devel/nspr/Makefile 3# used by devel/nspr/Makefile
4# used by devel/xulrunner/Makefile 4# used by devel/xulrunner/Makefile
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8FIREFOX_VER= 3.5.6 8FIREFOX_VER= 3.5.8
9MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 9MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo 12DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo
13PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches 13PATCHDIR= ${.CURDIR}/../../devel/xulrunner/patches
14 14
15WRKSRC= ${WRKDIR}/mozilla-1.9.1 15WRKSRC= ${WRKDIR}/mozilla-1.9.1
cvs diff -r1.22 -r1.22.2.1 pkgsrc/devel/xulrunner/Attic/distinfo (switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/distinfo 2010/01/10 09:43:06 1.22
+++ pkgsrc/devel/xulrunner/Attic/distinfo 2010/02/17 22:24:32 1.22.2.1
@@ -1,70 +1,70 @@ @@ -1,70 +1,70 @@
1$NetBSD: distinfo,v 1.22 2010/01/10 09:43:06 tron Exp $ 1$NetBSD: distinfo,v 1.22.2.1 2010/02/17 22:24:32 spz Exp $
2 2
3SHA1 (firefox-3.5.6.source.tar.bz2) = fc1de4ddb9c20c7ba9e297737f926e9d8e32eed4 3SHA1 (firefox-3.5.8.source.tar.bz2) = 4bfb9a274113fb9ee590c00da69d995dc500d4cc
4RMD160 (firefox-3.5.6.source.tar.bz2) = 1002ff196eb8e281c06ef451154b64a903104664 4RMD160 (firefox-3.5.8.source.tar.bz2) = 97a4394d895fc0d8e7be34c090ebe75540108a90
5Size (firefox-3.5.6.source.tar.bz2) = 46914620 bytes 5Size (firefox-3.5.8.source.tar.bz2) = 46954234 bytes
6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a 6SHA1 (patch-aa) = d719f801f340688102e3b1c07b53655f4053180a
7SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe 7SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe
8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d 8SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d
9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1 9SHA1 (patch-ad) = 7afb960af4e4a311481e7a7b25008ca9b9f7fba1
10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351 10SHA1 (patch-ae) = 6679dd9c28f8029cc0ed2a32ae60da696099f351
11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df 11SHA1 (patch-af) = 13a9617cd2894cf342487d2a9cfe8cf3066ba0df
12SHA1 (patch-ag) = 62e55040130d5e6cfb10b839fce6abd40a902f08 12SHA1 (patch-ag) = 62e55040130d5e6cfb10b839fce6abd40a902f08
13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac 13SHA1 (patch-ah) = 5f8bf19d5ac5ea7e263366a56d10d2eeeee61bac
14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a 14SHA1 (patch-ai) = 3444882b0f7f4b63273d8888af88be35ae60933a
15SHA1 (patch-aj) = 0e357b477aef423e7688dfb0be93cc8abc35e6e0 15SHA1 (patch-aj) = 0e357b477aef423e7688dfb0be93cc8abc35e6e0
16SHA1 (patch-ak) = 635187f582c16f8f044ffbdd950ec5f996d53ca8 16SHA1 (patch-ak) = 635187f582c16f8f044ffbdd950ec5f996d53ca8
17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57 17SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57
18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 18SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220
19SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 19SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7
20SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c 20SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c
21SHA1 (patch-ap) = dbcf27b23fec35ea838d281a97c7aed94739c8b5 21SHA1 (patch-ap) = dbcf27b23fec35ea838d281a97c7aed94739c8b5
22SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55 22SHA1 (patch-aq) = ffb927e222f98c7288e37ddadf1b08a8126c6a55
23SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b 23SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b
24SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41 24SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41
25SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536 25SHA1 (patch-at) = 2d09714ba426632a5d67b1b100c2ac4d1e673536
26SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76 26SHA1 (patch-au) = f27b6c8b2c744da388e1d15d0776929e7165ee76
27SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771 27SHA1 (patch-av) = e22c544894123a6ab8fc428067716b9e68685771
28SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657 28SHA1 (patch-aw) = eed2f98b732fa776d2ca64d2b82e88677a207657
29SHA1 (patch-ax) = 579041ecba36dfa0d42d3ab576e79ecf2321749d 29SHA1 (patch-ax) = 579041ecba36dfa0d42d3ab576e79ecf2321749d
30SHA1 (patch-ay) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34 30SHA1 (patch-ay) = 6ddcbbd3f0197fb88622fc32d6d0fd602ec4ad34
31SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4 31SHA1 (patch-az) = 5a09ccfa14fab962c4e2916f00669a1fa4a8ade4
32SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d 32SHA1 (patch-ba) = 9d4058f2a3a290429b26cb8335dd5b188bccc96d
33SHA1 (patch-bb) = f0cbc3f029dab82f551c959a66f8a95ca9f1f265 33SHA1 (patch-bb) = f0cbc3f029dab82f551c959a66f8a95ca9f1f265
34SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524 34SHA1 (patch-ma) = a20b263ff14c841fd0ae1634962b90a41173b524
35SHA1 (patch-mb) = 05298c1ec02363ff0bada87337cf0ccb5b42c55b 35SHA1 (patch-mb) = 05298c1ec02363ff0bada87337cf0ccb5b42c55b
36SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393 36SHA1 (patch-md) = 6bf5242245b17fbd868a6a978eb5849726f81393
37SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2 37SHA1 (patch-me) = f5a8e29fc004ef7696b67d260384ab23fd1658c2
38SHA1 (patch-mf) = 33e30004d1b94668935274c05f4548d4804ac67a 38SHA1 (patch-mf) = 33e30004d1b94668935274c05f4548d4804ac67a
39SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8 39SHA1 (patch-mg) = 75ddcceaffae0bdb6ecb4efd1b5ffca68a8ae8a8
40SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b 40SHA1 (patch-mi) = 787cb043bb7e687936afaf8f0c67b6b3a7b03e5b
41SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f 41SHA1 (patch-mj) = 197fab0e00256dedc8a5f181ee0d0d6e42d8177f
42SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9 42SHA1 (patch-mk) = 793dfa16e19e213d78995c893a28bc0d514135d9
43SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00 43SHA1 (patch-ml) = 9003af056e5b671b2345d0a75e99836746369c00
44SHA1 (patch-mm) = 51d84cacbfa0430dad21f86f66979b6222299b31 44SHA1 (patch-mm) = 51d84cacbfa0430dad21f86f66979b6222299b31
45SHA1 (patch-mn) = 7d162a96959315a143c68b3ca2ca4dea6060f1f2 45SHA1 (patch-mn) = 7d162a96959315a143c68b3ca2ca4dea6060f1f2
46SHA1 (patch-mp) = 5edb7dbdde20f7aaf5c1bfa035f471ec6d871f95 46SHA1 (patch-mp) = 5edb7dbdde20f7aaf5c1bfa035f471ec6d871f95
47SHA1 (patch-na) = 10a09ddb5de67c3cc2f605c75de7ac2e30a92ae7 47SHA1 (patch-na) = 10a09ddb5de67c3cc2f605c75de7ac2e30a92ae7
48SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865 48SHA1 (patch-nd) = f5156ca4d1e61dd1b355bbaa5ebd9cc490d8d865
49SHA1 (patch-pa) = d03ef72ea7efceef5e2f12a245950b9a587ace82 49SHA1 (patch-pa) = d03ef72ea7efceef5e2f12a245950b9a587ace82
50SHA1 (patch-pb) = 33c70e16d489c6e6e660096e49b5f12b7a265328 50SHA1 (patch-pb) = 33c70e16d489c6e6e660096e49b5f12b7a265328
51SHA1 (patch-pc) = baa2c72df21c6ddda65bdb435561323f4ee008ff 51SHA1 (patch-pc) = baa2c72df21c6ddda65bdb435561323f4ee008ff
52SHA1 (patch-pd) = a8899862e36c05d43ee81265fa3a13bb5e3e4d10 52SHA1 (patch-pd) = a8899862e36c05d43ee81265fa3a13bb5e3e4d10
53SHA1 (patch-pe) = 3e4db1032a1e1f26f3a4e86653804b435aaf3ee8 53SHA1 (patch-pe) = 3e4db1032a1e1f26f3a4e86653804b435aaf3ee8
54SHA1 (patch-pf) = 95b3f07dfd0e3de9961181ec6e42f7174180942d 54SHA1 (patch-pf) = 95b3f07dfd0e3de9961181ec6e42f7174180942d
55SHA1 (patch-pg) = 33f0664512c94b1f1b7b65f43accc1dae457a2d0 55SHA1 (patch-pg) = 33f0664512c94b1f1b7b65f43accc1dae457a2d0
56SHA1 (patch-ra) = b215219b8429274ca3aa81790b62531aaf189127 56SHA1 (patch-ra) = b215219b8429274ca3aa81790b62531aaf189127
57SHA1 (patch-rc) = 890012b4fca22d965a40262830aabbb06a2da36e 57SHA1 (patch-rc) = 890012b4fca22d965a40262830aabbb06a2da36e
58SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72 58SHA1 (patch-xa) = ae5ed1f0fb9a0fd45242a94739853b199ed7da72
59SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201 59SHA1 (patch-xb) = c09bd676d21bef02e04c68c2362e32f408ea9201
60SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965 60SHA1 (patch-xc) = 6e1d6b21d7ded744b082173ea6f35b45999fa965
61SHA1 (patch-xd) = 2ddf436186ccebab28380b9e80f52f061ca3d73e 61SHA1 (patch-xd) = 2ddf436186ccebab28380b9e80f52f061ca3d73e
62SHA1 (patch-xe) = 1bcd9def6f9636fa9deb0edb994e5672529b615b 62SHA1 (patch-xe) = 1bcd9def6f9636fa9deb0edb994e5672529b615b
63SHA1 (patch-xf) = 5e68024f66e5ba9086ed6ec4a0cc562714e99219 63SHA1 (patch-xf) = 5e68024f66e5ba9086ed6ec4a0cc562714e99219
64SHA1 (patch-xg) = d8355840ee91dd64ff650a12be87f2c51d8df196 64SHA1 (patch-xg) = d8355840ee91dd64ff650a12be87f2c51d8df196
65SHA1 (patch-xh) = 1a2c7def490a7509ab63eb39bc5611178e8d6a7d 65SHA1 (patch-xh) = 1a2c7def490a7509ab63eb39bc5611178e8d6a7d
66SHA1 (patch-xi) = aed92831e4ef0f84619bf0ffe9aa404a74246613 66SHA1 (patch-xi) = aed92831e4ef0f84619bf0ffe9aa404a74246613
67SHA1 (patch-xj) = 7e237668aa4dfa55833d125d2a1464fb97ae3ada 67SHA1 (patch-xj) = 7e237668aa4dfa55833d125d2a1464fb97ae3ada
68SHA1 (patch-xk) = 16ac8dc3bb5c241452eae6833d40aaf876453761 68SHA1 (patch-xk) = 16ac8dc3bb5c241452eae6833d40aaf876453761
69SHA1 (patch-xl) = afd74085c01d207907d0b3bfc040bf92fd1ba8b1 69SHA1 (patch-xl) = afd74085c01d207907d0b3bfc040bf92fd1ba8b1
70SHA1 (patch-xm) = 072240b71e4738e96d258fcd481698464623735e 70SHA1 (patch-xm) = 072240b71e4738e96d258fcd481698464623735e
cvs diff -r1.65 -r1.65.2.1 pkgsrc/www/firefox/Makefile (switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2009/12/16 08:18:33 1.65
+++ pkgsrc/www/firefox/Makefile 2010/02/17 22:24:32 1.65.2.1
@@ -1,64 +1,64 @@ @@ -1,64 +1,64 @@
1# $NetBSD: Makefile,v 1.65 2009/12/16 08:18:33 tnn Exp $ 1# $NetBSD: Makefile,v 1.65.2.1 2010/02/17 22:24:32 spz Exp $
2# 2#
3 3
4.include "../../devel/xulrunner/dist.mk" 4.include "../../devel/xulrunner/dist.mk"
5PKGNAME= firefox-${FIREFOX_VER} 5PKGNAME= firefox-${FIREFOX_VER}
6CATEGORIES= www 6CATEGORIES= www
7 7
8MAINTAINER= tnn@NetBSD.org 8MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 9HOMEPAGE= http://www.mozilla.com/en-US/firefox/
10COMMENT= Web browser with support for extensions 10COMMENT= Web browser with support for extensions
11 11
12WRKSRC= ${WRKDIR}/mozilla-1.9.1 12WRKSRC= ${WRKDIR}/mozilla-1.9.1
13MOZILLA_DIR= # empty 13MOZILLA_DIR= # empty
14 14
15CONFIGURE_ARGS+= --enable-application=browser 15CONFIGURE_ARGS+= --enable-application=browser
16CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk 16CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk
17CONFIGURE_ARGS+= --with-system-libxul 17CONFIGURE_ARGS+= --with-system-libxul
18 18
19ALL_ENV+= MOZILLA_PKG_NAME=firefox 19ALL_ENV+= MOZILLA_PKG_NAME=firefox
20 20
21.include "../../devel/xulrunner/mozilla-common.mk" 21.include "../../devel/xulrunner/mozilla-common.mk"
22.include "options.mk" 22.include "options.mk"
23 23
24MOZILLA=firefox 24MOZILLA=firefox
25.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 25.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
26MOZILLA_NAME= Firefox 3.5 26MOZILLA_NAME= Firefox 3.5
27MOZILLA_ICON= ${WRKSRC}/other-licenses/branding/firefox/default48.png 27MOZILLA_ICON= ${WRKSRC}/other-licenses/branding/firefox/default48.png
28.else 28.else
29MOZILLA_NAME= Browser 3.5 29MOZILLA_NAME= Browser 3.5
30MOZILLA_ICON= ${WRKSRC}/browser/branding/unofficial/default48.png 30MOZILLA_ICON= ${WRKSRC}/browser/branding/unofficial/default48.png
31.endif 31.endif
32 32
33pre-configure: 33pre-configure:
34 cd ${WRKSRC} && autoconf 34 cd ${WRKSRC} && autoconf
35 35
36post-build: 36post-build:
37 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \ 37 ${SED} -e 's|@MOZILLA@|${MOZILLA}|g' \
38 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \ 38 -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g' \
39 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \ 39 -e 's|@FIREFOX_ICON@|${MOZILLA}.png|g' \
40 < ${FILESDIR}/desktop.in \ 40 < ${FILESDIR}/desktop.in \
41 > ${WRKDIR}/desktop 41 > ${WRKDIR}/desktop
42 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in \ 42 ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in \
43 > ${WRKDIR}/firefox 43 > ${WRKDIR}/firefox
44 44
45INSTALLATION_DIRS+= share/applications share/pixmaps 45INSTALLATION_DIRS+= share/applications share/pixmaps
46post-install: 46post-install:
47 ${INSTALL_DATA} ${WRKDIR}/desktop \ 47 ${INSTALL_DATA} ${WRKDIR}/desktop \
48 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop 48 ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop
49 ${INSTALL_DATA} ${MOZILLA_ICON} \ 49 ${INSTALL_DATA} ${MOZILLA_ICON} \
50 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png 50 ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png
51 rm -f ${DESTDIR}${PREFIX}/bin/firefox 51 rm -f ${DESTDIR}${PREFIX}/bin/firefox
52 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin 52 ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
53 53
54BUILDLINK_API_DEPENDS.xulrunner+= xulrunner-1.9.1.6{,nb*} 54BUILDLINK_API_DEPENDS.xulrunner+= xulrunner-1.9.1.8{,nb*}
55.include "../../devel/xulrunner/buildlink3.mk" 55.include "../../devel/xulrunner/buildlink3.mk"
56PLIST_VARS+= gnome 56PLIST_VARS+= gnome
57.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome) 57.if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
58CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 58CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
59PLIST.gnome= yes 59PLIST.gnome= yes
60.else 60.else
61CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 61CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
62.endif 62.endif
63.include "../../sysutils/desktop-file-utils/desktopdb.mk" 63.include "../../sysutils/desktop-file-utils/desktopdb.mk"
64.include "../../mk/bsd.pkg.mk" 64.include "../../mk/bsd.pkg.mk"