diff options
| author | ryoon <ryoon> | 2014-05-05 00:52:10 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2014-05-05 00:52:10 +0000 |
| commit | 5f5ba975c613539bc89b9376370801ad50dbc9e1 (patch) | |
| tree | 22e2549a8d6911d5fc9b621729a4491aef550f89 | |
| parent | ed37c793a389bd828f447312e82a36bcb8082685 (diff) | |
| download | pkgsrc-5f5ba975c613539bc89b9376370801ad50dbc9e1.tar.gz | |
Recursive revbump from pixman, fix PR pkg/48777
And bump library requirements
| -rw-r--r-- | www/firefox/Makefile | 3 | ||||
| -rw-r--r-- | www/firefox/mozilla-common.mk | 19 |
2 files changed, 15 insertions, 7 deletions
diff --git a/www/firefox/Makefile b/www/firefox/Makefile index f1d331b316b..95f6385ef02 100644 --- a/www/firefox/Makefile +++ b/www/firefox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.162 2014/04/30 15:07:17 ryoon Exp $ +# $NetBSD: Makefile,v 1.163 2014/05/05 00:52:10 ryoon Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 29.0 @@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR= DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} diff --git a/www/firefox/mozilla-common.mk b/www/firefox/mozilla-common.mk index bcb91af3b38..f1f15d0deb2 100644 --- a/www/firefox/mozilla-common.mk +++ b/www/firefox/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.29 2014/04/30 15:07:17 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.30 2014/05/05 00:52:10 ryoon Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -7,13 +7,18 @@ GNU_CONFIGURE= yes USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip +.if ${OPSYS} == "OpenBSD" +# tar(1) of OpenBSD 5.5 has no --exclude command line option. +USE_TOOLS+= bsdtar +.endif USE_LANGUAGES+= c99 c++ UNLIMIT_RESOURCES+= datasize .include "../../mk/bsd.prefs.mk" # gcc45-4.5.3 of lang/gcc45 does not generate proper binary, -# but gcc 4.5.4 of NetBSD 7 generates working binary. -.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) +# but gcc 4.5.4 of NetBSD 6.99 generates working binary. +# gcc45 has no OpenBSD support, and gcc46 has it. +.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) || !empty(MACHINE_PLATFORM:MOpenBSD*) GCC_REQD+= 4.6 . if ${MACHINE_ARCH} == "i386" # Fix for PR pkg/48152. @@ -178,16 +183,16 @@ PREFER.bzip2?= pkgsrc #.include "../../audio/libopus/buildlink3.mk" #.include "../../audio/tremor/buildlink3.mk" #.include "../../audio/libvorbis/buildlink3.mk" -BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.0.2 +BUILDLINK_API_DEPENDS.sqlite3+= sqlite3>=3.8.2 CONFIGURE_ENV+= ac_cv_sqlite_secure_delete=yes # c.f. patches/patch-al .include "../../databases/sqlite3/buildlink3.mk" BUILDLINK_API_DEPENDS.libevent+= libevent>=1.1 .include "../../devel/libevent/buildlink3.mk" .include "../../devel/libffi/buildlink3.mk" -BUILDLINK_API_DEPENDS.nspr+= nspr>=4.10.2 +BUILDLINK_API_DEPENDS.nspr+= nspr>=4.10.3 .include "../../devel/nspr/buildlink3.mk" .include "../../textproc/icu/buildlink3.mk" -BUILDLINK_API_DEPENDS.nss+= nss>=3.15.4 +BUILDLINK_API_DEPENDS.nss+= nss>=3.16 .include "../../devel/nss/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" @@ -205,3 +210,5 @@ BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.18.3nb1 .include "../../multimedia/gstreamer0.10/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" +BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 +.include "../../x11/pixman/buildlink3.mk" |