Sat Aug 4 12:03:32 2012 UTC ()
Update to 10.0.6

* Remove obsolete mozilla-jit option

Changelog:
Fix the following security issues.

MFSA 2012-56 Code execution through javascript: URLs
MFSA 2012-54 Clickjacking of certificate warning page
MFSA 2012-53 Content Security Policy 1.0 implementation errors cause data leakage
MFSA 2012-52 JSDependentString::undepend string conversion results in memory corruption
MFSA 2012-51 X-Frame-Options header ignored when duplicated
MFSA 2012-49 Same-compartment Security Wrappers can be bypassed
MFSA 2012-48 use-after-free in nsGlobalWindow::PageHidden
MFSA 2012-47 Improper filtering of javascript in HTML feed-view
MFSA 2012-45 Spoofing issue with location
MFSA 2012-44 Gecko memory corruption
MFSA 2012-42 Miscellaneous memory safety hazards (rv:14.0/ rv:10.0.6)


(ryoon)
diff -r1.7 -r1.8 pkgsrc/mail/thunderbird10/Makefile
diff -r1.2 -r1.3 pkgsrc/mail/thunderbird10/PLIST
diff -r1.4 -r1.5 pkgsrc/mail/thunderbird10/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/mail/thunderbird10/options.mk
cvs diff -r1.7 -r1.8 pkgsrc/mail/thunderbird10/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird10/Attic/Makefile 2012/06/14 07:43:59 1.7
+++ pkgsrc/mail/thunderbird10/Attic/Makefile 2012/08/04 12:03:31 1.8
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.7 2012/06/14 07:43:59 sbd Exp $ 1# $NetBSD: Makefile,v 1.8 2012/08/04 12:03:31 ryoon Exp $
2# 2#
3 3
4DISTNAME= thunderbird-${TB_VER}esr.source 4DISTNAME= thunderbird-${TB_VER}esr.source
5PKGNAME= thunderbird10-${TB_VER} 5PKGNAME= thunderbird10-${TB_VER}
6TB_VER= 10.0.5 6TB_VER= 10.0.6
7PKGREVISION= 1 
8CATEGORIES= mail 7CATEGORIES= mail
9MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/} 8MASTER_SITES= ${MASTER_SITE_MOZILLA_ESR:=thunderbird/releases/${TB_VER}esr/source/}
10EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
11 10
12MAINTAINER= tnn@NetBSD.org 11MAINTAINER= tnn@NetBSD.org
13HOMEPAGE= http://www.mozilla.org/en-US/thunderbird/organizations/ 12HOMEPAGE= http://www.mozilla.org/en-US/thunderbird/organizations/
14COMMENT= Organize, secure and customize your mail 13COMMENT= Organize, secure and customize your mail
15 14
16PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
17 16
18USE_TOOLS+= unzip pax 17USE_TOOLS+= unzip pax
19WRKSRC= ${WRKDIR}/comm-esr10 18WRKSRC= ${WRKDIR}/comm-esr10
20MOZILLA_DIR= mozilla/ 19MOZILLA_DIR= mozilla/
cvs diff -r1.2 -r1.3 pkgsrc/mail/thunderbird10/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird10/Attic/PLIST 2012/04/29 20:36:30 1.2
+++ pkgsrc/mail/thunderbird10/Attic/PLIST 2012/08/04 12:03:31 1.3
@@ -1,69 +1,55 @@ @@ -1,69 +1,55 @@
1@comment $NetBSD: PLIST,v 1.2 2012/04/29 20:36:30 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.3 2012/08/04 12:03:31 ryoon Exp $
2bin/thunderbird10 2bin/thunderbird10
3${PLIST.jit}include/thunderbird10/Allocator.h 
4${PLIST.jit}include/thunderbird10/Assembler.h 
5include/thunderbird10/AtkSocketAccessible.h 3include/thunderbird10/AtkSocketAccessible.h
6include/thunderbird10/BasicLayers.h 4include/thunderbird10/BasicLayers.h
7include/thunderbird10/CheckedInt.h 5include/thunderbird10/CheckedInt.h
8${PLIST.jit}include/thunderbird10/CodeAlloc.h 
9${PLIST.jit}include/thunderbird10/Containers.h 
10include/thunderbird10/CustomQS_Canvas2D.h 6include/thunderbird10/CustomQS_Canvas2D.h
11include/thunderbird10/CustomQS_WebGL.h 7include/thunderbird10/CustomQS_WebGL.h
12include/thunderbird10/EGLUtils.h 8include/thunderbird10/EGLUtils.h
13include/thunderbird10/ForceDiscreteGPUHelperCGL.h 9include/thunderbird10/ForceDiscreteGPUHelperCGL.h
14${PLIST.jit}include/thunderbird10/Fragmento.h 
15include/thunderbird10/FrameLayerBuilder.h 10include/thunderbird10/FrameLayerBuilder.h
16include/thunderbird10/FramePropertyTable.h 11include/thunderbird10/FramePropertyTable.h
17include/thunderbird10/GLContext.h 12include/thunderbird10/GLContext.h
18include/thunderbird10/GLContextProvider.h 13include/thunderbird10/GLContextProvider.h
19include/thunderbird10/GLContextProviderImpl.h 14include/thunderbird10/GLContextProviderImpl.h
20include/thunderbird10/GLContextSymbols.h 15include/thunderbird10/GLContextSymbols.h
21include/thunderbird10/GLDefs.h 16include/thunderbird10/GLDefs.h
22include/thunderbird10/GLXLibrary.h 17include/thunderbird10/GLXLibrary.h
23include/thunderbird10/IPC/IPCMessageUtils.h 18include/thunderbird10/IPC/IPCMessageUtils.h
24include/thunderbird10/IPC/ShadowLayerUtils.h 19include/thunderbird10/IPC/ShadowLayerUtils.h
25include/thunderbird10/IPC/nsGUIEventIPC.h 20include/thunderbird10/IPC/nsGUIEventIPC.h
26include/thunderbird10/ImageErrors.h 21include/thunderbird10/ImageErrors.h
27include/thunderbird10/ImageLayers.h 22include/thunderbird10/ImageLayers.h
28include/thunderbird10/ImageLogging.h 23include/thunderbird10/ImageLogging.h
29${PLIST.jit}include/thunderbird10/LIR.h 
30${PLIST.jit}include/thunderbird10/LIRopcode.tbl 
31include/thunderbird10/LayerManagerOGL.h 24include/thunderbird10/LayerManagerOGL.h
32include/thunderbird10/LayerManagerOGLProgram.h 25include/thunderbird10/LayerManagerOGLProgram.h
33include/thunderbird10/Layers.h 26include/thunderbird10/Layers.h
34include/thunderbird10/MailNewsTypes.h 27include/thunderbird10/MailNewsTypes.h
35include/thunderbird10/MailNewsTypes2.h 28include/thunderbird10/MailNewsTypes2.h
36include/thunderbird10/NSReg.h 29include/thunderbird10/NSReg.h
37${PLIST.jit}include/thunderbird10/Native.h 
38${PLIST.jit}include/thunderbird10/NativeCommon.h 
39${PLIST.jit}include/thunderbird10/Native${NANOJIT_ARCH}.h 
40include/thunderbird10/PCOMContentPermissionRequestChild.h 30include/thunderbird10/PCOMContentPermissionRequestChild.h
41include/thunderbird10/PPrefTuple.h 31include/thunderbird10/PPrefTuple.h
42include/thunderbird10/PrefTuple.h 32include/thunderbird10/PrefTuple.h
43include/thunderbird10/ReadbackLayer.h 33include/thunderbird10/ReadbackLayer.h
44${PLIST.jit}include/thunderbird10/RegAlloc.h 
45include/thunderbird10/TabMessageUtils.h 34include/thunderbird10/TabMessageUtils.h
46${PLIST.jit}include/thunderbird10/VMPI.h 
47include/thunderbird10/VerReg.h 35include/thunderbird10/VerReg.h
48include/thunderbird10/VideoUtils.h 36include/thunderbird10/VideoUtils.h
49${PLIST.jit}include/thunderbird10/Writer.h 
50include/thunderbird10/a11yGeneric.h 37include/thunderbird10/a11yGeneric.h
51include/thunderbird10/amIInstallTrigger.h 38include/thunderbird10/amIInstallTrigger.h
52include/thunderbird10/amIWebInstallListener.h 39include/thunderbird10/amIWebInstallListener.h
53include/thunderbird10/amIWebInstaller.h 40include/thunderbird10/amIWebInstaller.h
54include/thunderbird10/angle/ResourceLimits.h 41include/thunderbird10/angle/ResourceLimits.h
55include/thunderbird10/angle/ShaderLang.h 42include/thunderbird10/angle/ShaderLang.h
56${PLIST.jit}include/thunderbird10/avmplus.h 
57include/thunderbird10/domstubs.h 43include/thunderbird10/domstubs.h
58include/thunderbird10/expat.h 44include/thunderbird10/expat.h
59include/thunderbird10/expat_config.h 45include/thunderbird10/expat_config.h
60include/thunderbird10/expat_external.h 46include/thunderbird10/expat_external.h
61include/thunderbird10/extIApplication.h 47include/thunderbird10/extIApplication.h
62include/thunderbird10/ftpCore.h 48include/thunderbird10/ftpCore.h
63include/thunderbird10/gfx2DGlue.h 49include/thunderbird10/gfx2DGlue.h
64include/thunderbird10/gfx3DMatrix.h 50include/thunderbird10/gfx3DMatrix.h
65include/thunderbird10/gfxASurface.h 51include/thunderbird10/gfxASurface.h
66include/thunderbird10/gfxAlphaRecovery.h 52include/thunderbird10/gfxAlphaRecovery.h
67include/thunderbird10/gfxBlur.h 53include/thunderbird10/gfxBlur.h
68include/thunderbird10/gfxCachedTempSurface.h 54include/thunderbird10/gfxCachedTempSurface.h
69include/thunderbird10/gfxColor.h 55include/thunderbird10/gfxColor.h
@@ -129,27 +115,26 @@ include/thunderbird10/inIDOMView.h @@ -129,27 +115,26 @@ include/thunderbird10/inIDOMView.h
129include/thunderbird10/inIDeepTreeWalker.h 115include/thunderbird10/inIDeepTreeWalker.h
130include/thunderbird10/inIFlasher.h 116include/thunderbird10/inIFlasher.h
131include/thunderbird10/inISearchObserver.h 117include/thunderbird10/inISearchObserver.h
132include/thunderbird10/inISearchProcess.h 118include/thunderbird10/inISearchProcess.h
133include/thunderbird10/jArray.h 119include/thunderbird10/jArray.h
134${PLIST.jemalloc}include/thunderbird10/jemalloc.h 120${PLIST.jemalloc}include/thunderbird10/jemalloc.h
135${PLIST.jemalloc}include/thunderbird10/jemalloc_types.h 121${PLIST.jemalloc}include/thunderbird10/jemalloc_types.h
136include/thunderbird10/js-config.h 122include/thunderbird10/js-config.h
137include/thunderbird10/js.msg 123include/thunderbird10/js.msg
138include/thunderbird10/jsalloc.h 124include/thunderbird10/jsalloc.h
139include/thunderbird10/jsapi.h 125include/thunderbird10/jsapi.h
140include/thunderbird10/jsatom.h 126include/thunderbird10/jsatom.h
141include/thunderbird10/jsautokw.h 127include/thunderbird10/jsautokw.h
142${PLIST.jit}include/thunderbird10/jsbuiltins.h 
143include/thunderbird10/jscell.h 128include/thunderbird10/jscell.h
144include/thunderbird10/jsclist.h 129include/thunderbird10/jsclist.h
145include/thunderbird10/jsclone.h 130include/thunderbird10/jsclone.h
146include/thunderbird10/jscntxt.h 131include/thunderbird10/jscntxt.h
147include/thunderbird10/jscompat.h 132include/thunderbird10/jscompat.h
148include/thunderbird10/jscrashreport.h 133include/thunderbird10/jscrashreport.h
149include/thunderbird10/jsdIDebuggerService.h 134include/thunderbird10/jsdIDebuggerService.h
150include/thunderbird10/jsdate.h 135include/thunderbird10/jsdate.h
151include/thunderbird10/jsdbgapi.h 136include/thunderbird10/jsdbgapi.h
152include/thunderbird10/jsdebug.h 137include/thunderbird10/jsdebug.h
153include/thunderbird10/jsdhash.h 138include/thunderbird10/jsdhash.h
154include/thunderbird10/jsfriendapi.h 139include/thunderbird10/jsfriendapi.h
155include/thunderbird10/jsgc.h 140include/thunderbird10/jsgc.h
@@ -418,33 +403,30 @@ include/thunderbird10/mozilla/plugins/Pl @@ -418,33 +403,30 @@ include/thunderbird10/mozilla/plugins/Pl
418include/thunderbird10/mozilla/plugins/StreamNotifyChild.h 403include/thunderbird10/mozilla/plugins/StreamNotifyChild.h
419include/thunderbird10/mozilla/plugins/StreamNotifyParent.h 404include/thunderbird10/mozilla/plugins/StreamNotifyParent.h
420include/thunderbird10/mozilla/scache/StartupCache.h 405include/thunderbird10/mozilla/scache/StartupCache.h
421include/thunderbird10/mozilla/scache/StartupCacheUtils.h 406include/thunderbird10/mozilla/scache/StartupCacheUtils.h
422include/thunderbird10/mozilla/storage.h 407include/thunderbird10/mozilla/storage.h
423include/thunderbird10/mozilla/storage/StatementCache.h 408include/thunderbird10/mozilla/storage/StatementCache.h
424include/thunderbird10/mozilla/storage/Variant.h 409include/thunderbird10/mozilla/storage/Variant.h
425include/thunderbird10/mozilla/storage/Variant_inl.h 410include/thunderbird10/mozilla/storage/Variant_inl.h
426include/thunderbird10/mozilla/threads/nsThreadIDs.h 411include/thunderbird10/mozilla/threads/nsThreadIDs.h
427include/thunderbird10/mozilla/throw_gcc.h 412include/thunderbird10/mozilla/throw_gcc.h
428include/thunderbird10/mozilla/unused.h 413include/thunderbird10/mozilla/unused.h
429include/thunderbird10/mozpngconf.h 414include/thunderbird10/mozpngconf.h
430include/thunderbird10/msgCore.h 415include/thunderbird10/msgCore.h
431${PLIST.jit}include/thunderbird10/nanojit.h 
432include/thunderbird10/necko-config.h 416include/thunderbird10/necko-config.h
433include/thunderbird10/nestegg/nestegg-stdint.h 417include/thunderbird10/nestegg/nestegg-stdint.h
434include/thunderbird10/nestegg/nestegg.h 418include/thunderbird10/nestegg/nestegg.h
435include/thunderbird10/netCore.h 419include/thunderbird10/netCore.h
436${PLIST.jit}include/thunderbird10/njconfig.h 
437${PLIST.jit}include/thunderbird10/njcpudetect.h 
438include/thunderbird10/npapi.h 420include/thunderbird10/npapi.h
439include/thunderbird10/npfunctions.h 421include/thunderbird10/npfunctions.h
440include/thunderbird10/npruntime.h 422include/thunderbird10/npruntime.h
441include/thunderbird10/nptypes.h 423include/thunderbird10/nptypes.h
442include/thunderbird10/nsAHtml5TreeBuilderState.h 424include/thunderbird10/nsAHtml5TreeBuilderState.h
443include/thunderbird10/nsAHtml5TreeOpSink.h 425include/thunderbird10/nsAHtml5TreeOpSink.h
444include/thunderbird10/nsARIAGridAccessibleWrap.h 426include/thunderbird10/nsARIAGridAccessibleWrap.h
445include/thunderbird10/nsARIAMap.h 427include/thunderbird10/nsARIAMap.h
446include/thunderbird10/nsASocketHandler.h 428include/thunderbird10/nsASocketHandler.h
447include/thunderbird10/nsAString.h 429include/thunderbird10/nsAString.h
448include/thunderbird10/nsAXPCNativeCallContext.h 430include/thunderbird10/nsAXPCNativeCallContext.h
449include/thunderbird10/nsAbBaseCID.h 431include/thunderbird10/nsAbBaseCID.h
450include/thunderbird10/nsAboutProtocolUtils.h 432include/thunderbird10/nsAboutProtocolUtils.h
cvs diff -r1.4 -r1.5 pkgsrc/mail/thunderbird10/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird10/Attic/distinfo 2012/06/08 11:08:22 1.4
+++ pkgsrc/mail/thunderbird10/Attic/distinfo 2012/08/04 12:03:32 1.5
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1$NetBSD: distinfo,v 1.4 2012/06/08 11:08:22 ryoon Exp $ 1$NetBSD: distinfo,v 1.5 2012/08/04 12:03:32 ryoon Exp $
2 2
3SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4 3SHA1 (enigmail-1.4.tar.gz) = 1ee4bcd8d38685af44c1aeeea4fbba7bf30513e4
4RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51 4RMD160 (enigmail-1.4.tar.gz) = b3c717e150c826faae1daa09806e07dd16619c51
5Size (enigmail-1.4.tar.gz) = 1323467 bytes 5Size (enigmail-1.4.tar.gz) = 1323467 bytes
6SHA1 (thunderbird-10.0.5esr.source.tar.bz2) = e7b084176bfa36480eb36f2c9c1f0bd205253f1e 6SHA1 (thunderbird-10.0.6esr.source.tar.bz2) = 95f33ea1f30018fa6213e1e9922e8346b52ec618
7RMD160 (thunderbird-10.0.5esr.source.tar.bz2) = d559619b22894593cd74e731347da6cc4358954c 7RMD160 (thunderbird-10.0.6esr.source.tar.bz2) = 25e568eb0ff8e9acc2da03b25139fe667a5b11ad
8Size (thunderbird-10.0.5esr.source.tar.bz2) = 97617123 bytes 8Size (thunderbird-10.0.6esr.source.tar.bz2) = 97779445 bytes
9SHA1 (patch-aa) = a6787e51004112a2056fd695c44c8610ffcc0d60 9SHA1 (patch-aa) = a6787e51004112a2056fd695c44c8610ffcc0d60
10SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1 10SHA1 (patch-aa-toplevel) = dfff316c77e468a3720f3d18e9edfc67059fc0e1
11SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5 11SHA1 (patch-ab) = 6e243fcf826226330d6b62548838393bb1cbafb5
12SHA1 (patch-ac) = ade505e90d9e7dd90dedb711011be22a2a5c67f4 12SHA1 (patch-ac) = ade505e90d9e7dd90dedb711011be22a2a5c67f4
13SHA1 (patch-ad) = d6bad741c4bdfdd0ee0ca8062c2121ce82eb7fb0 13SHA1 (patch-ad) = d6bad741c4bdfdd0ee0ca8062c2121ce82eb7fb0
14SHA1 (patch-ae) = 2627a9f9dfcbb03474c5e003cab9c8c6cc5dafa1 14SHA1 (patch-ae) = 2627a9f9dfcbb03474c5e003cab9c8c6cc5dafa1
15SHA1 (patch-af) = 5a7112ce46f9a3843a78ae0a234527080c04f529 15SHA1 (patch-af) = 5a7112ce46f9a3843a78ae0a234527080c04f529
16SHA1 (patch-ag) = 40e9b2f82d7267ab0822a5f3b5120a0ef6e977cf 16SHA1 (patch-ag) = 40e9b2f82d7267ab0822a5f3b5120a0ef6e977cf
17SHA1 (patch-ai) = f03ec2d47f1a4772ec567cd38a79b841a4c0022e 17SHA1 (patch-ai) = f03ec2d47f1a4772ec567cd38a79b841a4c0022e
18SHA1 (patch-aj) = 2a06c22133a05c51f56c4cf6650dcb6ae031ab06 18SHA1 (patch-aj) = 2a06c22133a05c51f56c4cf6650dcb6ae031ab06
19SHA1 (patch-ak) = 1b9038728e0e4d3cc23fd6a74d3d48759d77cbdd 19SHA1 (patch-ak) = 1b9038728e0e4d3cc23fd6a74d3d48759d77cbdd
20SHA1 (patch-al) = f12eb736f87a779becdd10631314ee5f8f88f080 20SHA1 (patch-al) = f12eb736f87a779becdd10631314ee5f8f88f080
21SHA1 (patch-am) = 108252ed517d9388f2a6c70ffa15782045ae23d5 21SHA1 (patch-am) = 108252ed517d9388f2a6c70ffa15782045ae23d5
cvs diff -r1.1.1.1 -r1.2 pkgsrc/mail/thunderbird10/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird10/Attic/options.mk 2012/03/15 09:45:29 1.1.1.1
+++ pkgsrc/mail/thunderbird10/Attic/options.mk 2012/08/04 12:03:32 1.2
@@ -1,35 +1,25 @@ @@ -1,35 +1,25 @@
1# $NetBSD: options.mk,v 1.1.1.1 2012/03/15 09:45:29 ryoon Exp $ 1# $NetBSD: options.mk,v 1.2 2012/08/04 12:03:32 ryoon Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.thunderbird 3PKG_OPTIONS_VAR= PKG_OPTIONS.thunderbird
4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail 4PKG_SUPPORTED_OPTIONS= debug mozilla-jemalloc gnome official-mozilla-branding mozilla-lightning mozilla-enigmail
5PKG_SUGGESTED_OPTIONS= mozilla-lightning 5PKG_SUGGESTED_OPTIONS= mozilla-lightning
6 6
7PLIST_VARS+= branding nobranding debug gnome jemalloc jit 7PLIST_VARS+= branding nobranding debug gnome jemalloc
8 8
9.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS" 9.if ${OPSYS} == "Linux" || ${OPSYS} == "SunOS"
10PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc 10PKG_SUGGESTED_OPTIONS+= mozilla-jemalloc
11.endif 11.endif
12 12
13.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \ 
14 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64) 
15PKG_SUPPORTED_OPTIONS+= mozilla-jit 
16PKG_SUGGESTED_OPTIONS+= mozilla-jit 
17NANOJIT_ARCH.i386= i386 
18NANOJIT_ARCH.arm= ARM 
19NANOJIT_ARCH.sparc= Sparc 
20NANOJIT_ARCH.x86_64= X64 
21.endif 
22 
23.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
24 14
25.if !empty(PKG_OPTIONS:Mgnome) 15.if !empty(PKG_OPTIONS:Mgnome)
26.include "../../devel/libgnomeui/buildlink3.mk" 16.include "../../devel/libgnomeui/buildlink3.mk"
27.include "../../sysutils/gnome-vfs/buildlink3.mk" 17.include "../../sysutils/gnome-vfs/buildlink3.mk"
28CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 18CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
29PLIST.gnome= yes 19PLIST.gnome= yes
30.else 20.else
31CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 21CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
32.endif 22.endif
33 23
34.if !empty(PKG_OPTIONS:Mmozilla-jemalloc) 24.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
35PLIST.jemalloc= yes 25PLIST.jemalloc= yes
@@ -37,34 +27,26 @@ CONFIGURE_ARGS+= --enable-jemalloc @@ -37,34 +27,26 @@ CONFIGURE_ARGS+= --enable-jemalloc
37.else 27.else
38CONFIGURE_ARGS+= --disable-jemalloc 28CONFIGURE_ARGS+= --disable-jemalloc
39.endif 29.endif
40 30
41.if !empty(PKG_OPTIONS:Mdebug) 31.if !empty(PKG_OPTIONS:Mdebug)
42CONFIGURE_ARGS+= --enable-debug --enable-debug-symbols 32CONFIGURE_ARGS+= --enable-debug --enable-debug-symbols
43CONFIGURE_ARGS+= --disable-install-strip 33CONFIGURE_ARGS+= --disable-install-strip
44PLIST.debug= yes 34PLIST.debug= yes
45.else 35.else
46CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols 36CONFIGURE_ARGS+= --disable-debug --disable-debug-symbols
47CONFIGURE_ARGS+= --enable-install-strip 37CONFIGURE_ARGS+= --enable-install-strip
48.endif 38.endif
49 39
50.if !empty(PKG_OPTIONS:Mmozilla-jit) 
51PLIST.jit= yes 
52PLIST_SUBST+= NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}} 
53CONFIGURE_ARGS+= --enable-tracejit 
54.else 
55CONFIGURE_ARGS+= --disable-tracejit 
56.endif 
57 
58.if !empty(PKG_OPTIONS:Mmozilla-lightning) 40.if !empty(PKG_OPTIONS:Mmozilla-lightning)
59CONFIGURE_ARGS+= --enable-calendar 41CONFIGURE_ARGS+= --enable-calendar
60PLIST_SRC+= PLIST.lightning 42PLIST_SRC+= PLIST.lightning
61XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/calendar-timezones.xpi 43XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/calendar-timezones.xpi
62XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/gdata-provider.xpi 44XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/gdata-provider.xpi
63XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/lightning.xpi 45XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/lightning.xpi
64.else 46.else
65CONFIGURE_ARGS+= --disable-calendar 47CONFIGURE_ARGS+= --disable-calendar
66.endif 48.endif
67 49
68.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo) 50.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo)
69.include "enigmail.mk" 51.include "enigmail.mk"
70.endif 52.endif