diff options
author | richard <richard@pkgsrc.org> | 2013-11-24 12:37:40 +0000 |
---|---|---|
committer | richard <richard@pkgsrc.org> | 2013-11-24 12:37:40 +0000 |
commit | 3316722145646ca796aefea3d668d40279846f9d (patch) | |
tree | c1928c5eb20d6d9799cbcdccfdde3faf96c38f45 /www/firefox24 | |
parent | 58ef8a309854561a1cf4d498509116fd80b3a610 (diff) | |
download | pkgsrc-3316722145646ca796aefea3d668d40279846f9d.tar.gz |
fix solaris build and add dtrace option to firefox24
Diffstat (limited to 'www/firefox24')
-rw-r--r-- | www/firefox24/Makefile | 3 | ||||
-rw-r--r-- | www/firefox24/PLIST | 4 | ||||
-rw-r--r-- | www/firefox24/mozilla-common.mk | 6 | ||||
-rw-r--r-- | www/firefox24/options.mk | 11 |
4 files changed, 19 insertions, 5 deletions
diff --git a/www/firefox24/Makefile b/www/firefox24/Makefile index 364131e3528..f33e679aa8c 100644 --- a/www/firefox24/Makefile +++ b/www/firefox24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/11/21 15:25:49 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2013/11/24 12:37:40 richard Exp $ FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} MOZ_BRANCH= 24.1.1 @@ -6,6 +6,7 @@ MOZ_BRANCH_MINOR= esr DISTNAME= firefox-${FIREFOX_VER}.source PKGNAME= firefox24-${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/firefox24/PLIST b/www/firefox24/PLIST index 16b8a5aa47e..6df5c7bd75a 100644 --- a/www/firefox24/PLIST +++ b/www/firefox24/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2013/11/03 04:51:59 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/11/24 12:37:40 richard Exp $ bin/firefox24 include/firefox24/AbstractMediaDecoder.h include/firefox24/AccEvent.h @@ -260,6 +260,7 @@ include/firefox24/inISearchObserver.h include/firefox24/inISearchProcess.h include/firefox24/ipc/IPCMessageUtils.h include/firefox24/jArray.h +${PLIST.dtrace}include/firefox24/javascript-trace.h include/firefox24/js-config.h include/firefox24/js.msg include/firefox24/js/Anchor.h @@ -342,6 +343,7 @@ include/firefox24/mozStorageCID.h include/firefox24/mozStorageHelper.h include/firefox24/mozcontainer.h include/firefox24/mozilla-config.h +${PLIST.dtrace}include/firefox24/mozilla-trace.h include/firefox24/mozilla/AppData.h include/firefox24/mozilla/AppProcessChecker.h include/firefox24/mozilla/Assertions.h diff --git a/www/firefox24/mozilla-common.mk b/www/firefox24/mozilla-common.mk index de31300717c..d3527634e2d 100644 --- a/www/firefox24/mozilla-common.mk +++ b/www/firefox24/mozilla-common.mk @@ -1,4 +1,4 @@ -# $NetBSD: mozilla-common.mk,v 1.3 2013/11/21 15:25:17 ryoon Exp $ +# $NetBSD: mozilla-common.mk,v 1.4 2013/11/24 12:37:40 richard Exp $ # # common Makefile fragment for mozilla packages based on gecko 2.0. # @@ -6,7 +6,7 @@ # used by www/firefox24/Makefile GNU_CONFIGURE= yes -USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip +USE_TOOLS+= pkg-config perl gmake autoconf213 readelf unzip zip USE_LANGUAGES+= c99 c++ UNLIMIT_RESOURCES+= datasize @@ -23,6 +23,8 @@ CPPFLAGS+= -march=i486 GCC_REQD+= 4.5 .endif +CPPFLAGS.SunOS+= -D__EXTENSIONS__ + CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh diff --git a/www/firefox24/options.mk b/www/firefox24/options.mk index 4d65cc08410..ee40f1f600b 100644 --- a/www/firefox24/options.mk +++ b/www/firefox24/options.mk @@ -1,8 +1,9 @@ -# $NetBSD: options.mk,v 1.2 2013/11/16 02:01:46 ryoon Exp $ +# $NetBSD: options.mk,v 1.3 2013/11/24 12:37:40 richard Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.firefox24 PKG_SUPPORTED_OPTIONS= official-mozilla-branding PKG_SUPPORTED_OPTIONS+= alsa debug mozilla-jemalloc gnome pulseaudio webrtc +PKG_SUPPORTED_OPTIONS+= dtrace PLIST_VARS+= gnome jemalloc debug .if ${OPSYS} == "Linux" @@ -80,3 +81,11 @@ CONFIGURE_ARGS+= --enable-webrtc .else CONFIGURE_ARGS+= --disable-webrtc .endif + +PLIST_VARS+= dtrace +.if !empty(PKG_OPTIONS:Mdtrace) +CONFIGURE_ARGS+= --enable-dtrace +PLIST.dtrace= yes +.else +CONFIGURE_ARGS+= --disable-dtrace +.endif |