Sun Nov 24 12:37:40 2013 UTC ()
fix solaris build and add dtrace option to firefox24


(richard)
diff -r1.6 -r1.7 pkgsrc/www/firefox24/Makefile
diff -r1.1 -r1.2 pkgsrc/www/firefox24/PLIST
diff -r1.3 -r1.4 pkgsrc/www/firefox24/mozilla-common.mk
diff -r1.2 -r1.3 pkgsrc/www/firefox24/options.mk
cvs diff -r1.6 -r1.7 pkgsrc/www/firefox24/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/Makefile 2013/11/21 15:25:49 1.6
+++ pkgsrc/www/firefox24/Attic/Makefile 2013/11/24 12:37:40 1.7
@@ -1,21 +1,22 @@ @@ -1,21 +1,22 @@
1# $NetBSD: Makefile,v 1.6 2013/11/21 15:25:49 ryoon Exp $ 1# $NetBSD: Makefile,v 1.7 2013/11/24 12:37:40 richard Exp $
2 2
3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 3FIREFOX_VER= ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
4MOZ_BRANCH= 24.1.1 4MOZ_BRANCH= 24.1.1
5MOZ_BRANCH_MINOR= esr 5MOZ_BRANCH_MINOR= esr
6 6
7DISTNAME= firefox-${FIREFOX_VER}.source 7DISTNAME= firefox-${FIREFOX_VER}.source
8PKGNAME= firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//} 8PKGNAME= firefox24-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 9PKGREVISION= 1
9CATEGORIES= www 10CATEGORIES= www
10#MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 11#MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
11MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/} 12MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
12EXTRACT_SUFX= .tar.bz2 13EXTRACT_SUFX= .tar.bz2
13 14
14WRKSRC= ${WRKDIR}/mozilla-esr24 15WRKSRC= ${WRKDIR}/mozilla-esr24
15 16
16MAINTAINER= ryoon@NetBSD.org 17MAINTAINER= ryoon@NetBSD.org
17HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 18HOMEPAGE= http://www.mozilla.com/en-US/firefox/
18COMMENT= Web browser with support for extensions 19COMMENT= Web browser with support for extensions
19LICENSE= mpl-1.1 20LICENSE= mpl-1.1
20 21
21MOZILLA_DIR= # empty 22MOZILLA_DIR= # empty
cvs diff -r1.1 -r1.2 pkgsrc/www/firefox24/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/PLIST 2013/11/03 04:51:59 1.1
+++ pkgsrc/www/firefox24/Attic/PLIST 2013/11/24 12:37:40 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2013/11/03 04:51:59 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.2 2013/11/24 12:37:40 richard Exp $
2bin/firefox24 2bin/firefox24
3include/firefox24/AbstractMediaDecoder.h 3include/firefox24/AbstractMediaDecoder.h
4include/firefox24/AccEvent.h 4include/firefox24/AccEvent.h
5include/firefox24/AnimationCommon.h 5include/firefox24/AnimationCommon.h
6include/firefox24/AudioAvailableEventManager.h 6include/firefox24/AudioAvailableEventManager.h
7include/firefox24/AudioChannelAgent.h 7include/firefox24/AudioChannelAgent.h
8include/firefox24/AudioChannelCommon.h 8include/firefox24/AudioChannelCommon.h
9include/firefox24/AudioChannelFormat.h 9include/firefox24/AudioChannelFormat.h
10include/firefox24/AudioChannelService.h 10include/firefox24/AudioChannelService.h
11include/firefox24/AudioChannelServiceChild.h 11include/firefox24/AudioChannelServiceChild.h
12include/firefox24/AudioEventTimeline.h 12include/firefox24/AudioEventTimeline.h
13include/firefox24/AudioNodeEngine.h 13include/firefox24/AudioNodeEngine.h
14include/firefox24/AudioNodeStream.h 14include/firefox24/AudioNodeStream.h
@@ -250,26 +250,27 @@ include/firefox24/imgIScriptedNotificati @@ -250,26 +250,27 @@ include/firefox24/imgIScriptedNotificati
250include/firefox24/imgITools.h 250include/firefox24/imgITools.h
251include/firefox24/imgLoader.h 251include/firefox24/imgLoader.h
252include/firefox24/imgRequest.h 252include/firefox24/imgRequest.h
253include/firefox24/imgRequestProxy.h 253include/firefox24/imgRequestProxy.h
254include/firefox24/inICSSValueSearch.h 254include/firefox24/inICSSValueSearch.h
255include/firefox24/inIDOMUtils.h 255include/firefox24/inIDOMUtils.h
256include/firefox24/inIDOMView.h 256include/firefox24/inIDOMView.h
257include/firefox24/inIDeepTreeWalker.h 257include/firefox24/inIDeepTreeWalker.h
258include/firefox24/inIFlasher.h 258include/firefox24/inIFlasher.h
259include/firefox24/inISearchObserver.h 259include/firefox24/inISearchObserver.h
260include/firefox24/inISearchProcess.h 260include/firefox24/inISearchProcess.h
261include/firefox24/ipc/IPCMessageUtils.h 261include/firefox24/ipc/IPCMessageUtils.h
262include/firefox24/jArray.h 262include/firefox24/jArray.h
 263${PLIST.dtrace}include/firefox24/javascript-trace.h
263include/firefox24/js-config.h 264include/firefox24/js-config.h
264include/firefox24/js.msg 265include/firefox24/js.msg
265include/firefox24/js/Anchor.h 266include/firefox24/js/Anchor.h
266include/firefox24/js/CallArgs.h 267include/firefox24/js/CallArgs.h
267include/firefox24/js/CharacterEncoding.h 268include/firefox24/js/CharacterEncoding.h
268include/firefox24/js/Date.h 269include/firefox24/js/Date.h
269include/firefox24/js/GCAPI.h 270include/firefox24/js/GCAPI.h
270include/firefox24/js/HashTable.h 271include/firefox24/js/HashTable.h
271include/firefox24/js/HeapAPI.h 272include/firefox24/js/HeapAPI.h
272include/firefox24/js/LegacyIntTypes.h 273include/firefox24/js/LegacyIntTypes.h
273include/firefox24/js/MemoryMetrics.h 274include/firefox24/js/MemoryMetrics.h
274include/firefox24/js/PropertyKey.h 275include/firefox24/js/PropertyKey.h
275include/firefox24/js/RequiredDefines.h 276include/firefox24/js/RequiredDefines.h
@@ -332,26 +333,27 @@ include/firefox24/mozIStorageRow.h @@ -332,26 +333,27 @@ include/firefox24/mozIStorageRow.h
332include/firefox24/mozIStorageService.h 333include/firefox24/mozIStorageService.h
333include/firefox24/mozIStorageStatement.h 334include/firefox24/mozIStorageStatement.h
334include/firefox24/mozIStorageStatementCallback.h 335include/firefox24/mozIStorageStatementCallback.h
335include/firefox24/mozIStorageStatementParams.h 336include/firefox24/mozIStorageStatementParams.h
336include/firefox24/mozIStorageStatementRow.h 337include/firefox24/mozIStorageStatementRow.h
337include/firefox24/mozIStorageVacuumParticipant.h 338include/firefox24/mozIStorageVacuumParticipant.h
338include/firefox24/mozIStorageValueArray.h 339include/firefox24/mozIStorageValueArray.h
339include/firefox24/mozITXTToHTMLConv.h 340include/firefox24/mozITXTToHTMLConv.h
340include/firefox24/mozIThirdPartyUtil.h 341include/firefox24/mozIThirdPartyUtil.h
341include/firefox24/mozStorageCID.h 342include/firefox24/mozStorageCID.h
342include/firefox24/mozStorageHelper.h 343include/firefox24/mozStorageHelper.h
343include/firefox24/mozcontainer.h 344include/firefox24/mozcontainer.h
344include/firefox24/mozilla-config.h 345include/firefox24/mozilla-config.h
 346${PLIST.dtrace}include/firefox24/mozilla-trace.h
345include/firefox24/mozilla/AppData.h 347include/firefox24/mozilla/AppData.h
346include/firefox24/mozilla/AppProcessChecker.h 348include/firefox24/mozilla/AppProcessChecker.h
347include/firefox24/mozilla/Assertions.h 349include/firefox24/mozilla/Assertions.h
348include/firefox24/mozilla/Atomics.h 350include/firefox24/mozilla/Atomics.h
349include/firefox24/mozilla/Attributes.h 351include/firefox24/mozilla/Attributes.h
350include/firefox24/mozilla/AutoRestore.h 352include/firefox24/mozilla/AutoRestore.h
351include/firefox24/mozilla/AvailableMemoryTracker.h 353include/firefox24/mozilla/AvailableMemoryTracker.h
352include/firefox24/mozilla/Base64.h 354include/firefox24/mozilla/Base64.h
353include/firefox24/mozilla/BlockingResourceBase.h 355include/firefox24/mozilla/BlockingResourceBase.h
354include/firefox24/mozilla/BloomFilter.h 356include/firefox24/mozilla/BloomFilter.h
355include/firefox24/mozilla/BrowserElementParent.h 357include/firefox24/mozilla/BrowserElementParent.h
356include/firefox24/mozilla/CORSMode.h 358include/firefox24/mozilla/CORSMode.h
357include/firefox24/mozilla/Casting.h 359include/firefox24/mozilla/Casting.h
cvs diff -r1.3 -r1.4 pkgsrc/www/firefox24/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/mozilla-common.mk 2013/11/21 15:25:17 1.3
+++ pkgsrc/www/firefox24/Attic/mozilla-common.mk 2013/11/24 12:37:40 1.4
@@ -1,38 +1,40 @@ @@ -1,38 +1,40 @@
1# $NetBSD: mozilla-common.mk,v 1.3 2013/11/21 15:25:17 ryoon Exp $ 1# $NetBSD: mozilla-common.mk,v 1.4 2013/11/24 12:37:40 richard 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 mail/thunderbird/Makefile 5# used by mail/thunderbird/Makefile
6# used by www/firefox24/Makefile 6# used by www/firefox24/Makefile
7 7
8GNU_CONFIGURE= yes 8GNU_CONFIGURE= yes
9USE_TOOLS+= pkg-config perl gmake autoconf213 unzip zip 9USE_TOOLS+= pkg-config perl gmake autoconf213 readelf unzip zip
10USE_LANGUAGES+= c99 c++ 10USE_LANGUAGES+= c99 c++
11UNLIMIT_RESOURCES+= datasize 11UNLIMIT_RESOURCES+= datasize
12 12
13.include "../../mk/bsd.prefs.mk" 13.include "../../mk/bsd.prefs.mk"
14# gcc45-4.5.3 of lang/gcc45 does not generate proper binary, 14# gcc45-4.5.3 of lang/gcc45 does not generate proper binary,
15# but gcc 4.5.4 of NetBSD 7 generates working binary. 15# but gcc 4.5.4 of NetBSD 7 generates working binary.
16.if !empty(MACHINE_PLATFORM:MNetBSD-5.*) 16.if !empty(MACHINE_PLATFORM:MNetBSD-5.*)
17GCC_REQD+= 4.6 17GCC_REQD+= 4.6
18. if ${MACHINE_ARCH} == "i386" 18. if ${MACHINE_ARCH} == "i386"
19# Fix for PR pkg/48152. 19# Fix for PR pkg/48152.
20CPPFLAGS+= -march=i486 20CPPFLAGS+= -march=i486
21. endif 21. endif
22.else 22.else
23GCC_REQD+= 4.5 23GCC_REQD+= 4.5
24.endif 24.endif
25 25
 26CPPFLAGS.SunOS+= -D__EXTENSIONS__
 27
26CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh 28CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/libpkix/libpkix.sh
27CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh 29CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}security/nss/tests/multinit/multinit.sh
28CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh 30CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}js/src/tests/update-test262.sh
29 31
30CONFIGURE_ARGS+= --disable-tests 32CONFIGURE_ARGS+= --disable-tests
31CONFIGURE_ARGS+= --disable-pedantic 33CONFIGURE_ARGS+= --disable-pedantic
32CONFIGURE_ARGS+= --enable-crypto 34CONFIGURE_ARGS+= --enable-crypto
33CONFIGURE_ARGS+= --with-pthreads 35CONFIGURE_ARGS+= --with-pthreads
34CONFIGURE_ARGS+= --disable-javaxpcom 36CONFIGURE_ARGS+= --disable-javaxpcom
35CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2 37CONFIGURE_ARGS+= --enable-default-toolkit=cairo-gtk2
36CONFIGURE_ARGS+= --enable-svg 38CONFIGURE_ARGS+= --enable-svg
37CONFIGURE_ARGS+= --enable-mathml 39CONFIGURE_ARGS+= --enable-mathml
38CONFIGURE_ARGS+= --enable-pango 40CONFIGURE_ARGS+= --enable-pango
cvs diff -r1.2 -r1.3 pkgsrc/www/firefox24/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox24/Attic/options.mk 2013/11/16 02:01:46 1.2
+++ pkgsrc/www/firefox24/Attic/options.mk 2013/11/24 12:37:40 1.3
@@ -1,18 +1,19 @@ @@ -1,18 +1,19 @@
1# $NetBSD: options.mk,v 1.2 2013/11/16 02:01:46 ryoon Exp $ 1# $NetBSD: options.mk,v 1.3 2013/11/24 12:37:40 richard Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox24 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox24
4PKG_SUPPORTED_OPTIONS= official-mozilla-branding 4PKG_SUPPORTED_OPTIONS= official-mozilla-branding
5PKG_SUPPORTED_OPTIONS+= alsa debug mozilla-jemalloc gnome pulseaudio webrtc 5PKG_SUPPORTED_OPTIONS+= alsa debug mozilla-jemalloc gnome pulseaudio webrtc
 6PKG_SUPPORTED_OPTIONS+= dtrace
6PLIST_VARS+= gnome jemalloc debug 7PLIST_VARS+= gnome jemalloc debug
7 8
8.if ${OPSYS} == "Linux" 9.if ${OPSYS} == "Linux"
9PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc 10PKG_SUGGESTED_OPTIONS+= alsa mozilla-jemalloc
10.else 11.else
11PKG_SUGGESTED_OPTIONS+= pulseaudio 12PKG_SUGGESTED_OPTIONS+= pulseaudio
12.endif 13.endif
13 14
14# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set. 15# On NetBSD/amd64 6.99.21 libxul.so is invalid when --enable-webrtc is set.
15.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "Linux") || (${OPSYS} == "OpenBSD") 16.if (${OPSYS} == "FreeBSD") || (${OPSYS} == "Linux") || (${OPSYS} == "OpenBSD")
16PKG_SUGGESTED_OPTIONS+= webrtc 17PKG_SUGGESTED_OPTIONS+= webrtc
17.endif 18.endif
18 19
@@ -70,13 +71,21 @@ NO_BIN_ON_CDROM= ${RESTRICTED} @@ -70,13 +71,21 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
70NO_BIN_ON_FTP= ${RESTRICTED} 71NO_BIN_ON_FTP= ${RESTRICTED}
71PLIST.branding= yes 72PLIST.branding= yes
72.else 73.else
73PLIST.nobranding= yes 74PLIST.nobranding= yes
74.endif 75.endif
75 76
76PLIST_VARS+= webrtc 77PLIST_VARS+= webrtc
77.if !empty(PKG_OPTIONS:Mwebrtc) 78.if !empty(PKG_OPTIONS:Mwebrtc)
78.include "../../graphics/libv4l/buildlink3.mk" 79.include "../../graphics/libv4l/buildlink3.mk"
79CONFIGURE_ARGS+= --enable-webrtc 80CONFIGURE_ARGS+= --enable-webrtc
80.else 81.else
81CONFIGURE_ARGS+= --disable-webrtc 82CONFIGURE_ARGS+= --disable-webrtc
82.endif 83.endif
 84
 85PLIST_VARS+= dtrace
 86.if !empty(PKG_OPTIONS:Mdtrace)
 87CONFIGURE_ARGS+= --enable-dtrace
 88PLIST.dtrace= yes
 89.else
 90CONFIGURE_ARGS+= --disable-dtrace
 91.endif