Tue Aug 23 18:04:17 2011 UTC ()
Add missing nanojit conditionals to PLIST. Should fix PR pkg/45282.


(tnn)
diff -r1.33 -r1.34 pkgsrc/mail/thunderbird/PLIST
diff -r1.7 -r1.8 pkgsrc/mail/thunderbird/options.mk
cvs diff -r1.33 -r1.34 pkgsrc/mail/thunderbird/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/PLIST 2011/08/19 14:39:09 1.33
+++ pkgsrc/mail/thunderbird/PLIST 2011/08/23 18:04:17 1.34
@@ -1,69 +1,69 @@ @@ -1,69 +1,69 @@
1@comment $NetBSD: PLIST,v 1.33 2011/08/19 14:39:09 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.34 2011/08/23 18:04:17 tnn Exp $
2bin/thunderbird 2bin/thunderbird
3include/thunderbird/Allocator.h 3${PLIST.jit}include/thunderbird/Allocator.h
4include/thunderbird/Assembler.h 4${PLIST.jit}include/thunderbird/Assembler.h
5include/thunderbird/AtkSocketAccessible.h 5include/thunderbird/AtkSocketAccessible.h
6include/thunderbird/BasicLayers.h 6include/thunderbird/BasicLayers.h
7include/thunderbird/CheckedInt.h 7include/thunderbird/CheckedInt.h
8include/thunderbird/CodeAlloc.h 8${PLIST.jit}include/thunderbird/CodeAlloc.h
9include/thunderbird/Containers.h 9${PLIST.jit}include/thunderbird/Containers.h
10include/thunderbird/CustomQS_Canvas2D.h 10include/thunderbird/CustomQS_Canvas2D.h
11include/thunderbird/CustomQS_WebGL.h 11include/thunderbird/CustomQS_WebGL.h
12include/thunderbird/EGLUtils.h 12include/thunderbird/EGLUtils.h
13include/thunderbird/Fragmento.h 13${PLIST.jit}include/thunderbird/Fragmento.h
14include/thunderbird/FrameLayerBuilder.h 14include/thunderbird/FrameLayerBuilder.h
15include/thunderbird/FramePropertyTable.h 15include/thunderbird/FramePropertyTable.h
16include/thunderbird/GLContext.h 16include/thunderbird/GLContext.h
17include/thunderbird/GLContextProvider.h 17include/thunderbird/GLContextProvider.h
18include/thunderbird/GLContextProviderImpl.h 18include/thunderbird/GLContextProviderImpl.h
19include/thunderbird/GLContextSymbols.h 19include/thunderbird/GLContextSymbols.h
20include/thunderbird/GLDefs.h 20include/thunderbird/GLDefs.h
21include/thunderbird/GLXLibrary.h 21include/thunderbird/GLXLibrary.h
22include/thunderbird/IPC/IPCMessageUtils.h 22include/thunderbird/IPC/IPCMessageUtils.h
23include/thunderbird/IPC/ShadowLayerUtils.h 23include/thunderbird/IPC/ShadowLayerUtils.h
24include/thunderbird/IPC/nsGUIEventIPC.h 24include/thunderbird/IPC/nsGUIEventIPC.h
25include/thunderbird/ImageErrors.h 25include/thunderbird/ImageErrors.h
26include/thunderbird/ImageLayers.h 26include/thunderbird/ImageLayers.h
27include/thunderbird/ImageLogging.h 27include/thunderbird/ImageLogging.h
28include/thunderbird/LIR.h 28${PLIST.jit}include/thunderbird/LIR.h
29include/thunderbird/LIRopcode.tbl 29${PLIST.jit}include/thunderbird/LIRopcode.tbl
30include/thunderbird/LayerManagerOGL.h 30include/thunderbird/LayerManagerOGL.h
31include/thunderbird/LayerManagerOGLProgram.h 31include/thunderbird/LayerManagerOGLProgram.h
32include/thunderbird/Layers.h 32include/thunderbird/Layers.h
33include/thunderbird/MailNewsTypes.h 33include/thunderbird/MailNewsTypes.h
34include/thunderbird/MailNewsTypes2.h 34include/thunderbird/MailNewsTypes2.h
35include/thunderbird/NSReg.h 35include/thunderbird/NSReg.h
36include/thunderbird/Native.h 36${PLIST.jit}include/thunderbird/Native.h
37include/thunderbird/NativeCommon.h 37${PLIST.jit}include/thunderbird/NativeCommon.h
38include/thunderbird/NativeX64.h 38${PLIST.jit}include/thunderbird/Native${NANOJIT_ARCH}.h
39include/thunderbird/PCOMContentPermissionRequestChild.h 39include/thunderbird/PCOMContentPermissionRequestChild.h
40include/thunderbird/PPrefTuple.h 40include/thunderbird/PPrefTuple.h
41include/thunderbird/PrefTuple.h 41include/thunderbird/PrefTuple.h
42include/thunderbird/ReadbackLayer.h 42include/thunderbird/ReadbackLayer.h
43include/thunderbird/RegAlloc.h 43${PLIST.jit}include/thunderbird/RegAlloc.h
44include/thunderbird/TabMessageUtils.h 44include/thunderbird/TabMessageUtils.h
45include/thunderbird/VMPI.h 45${PLIST.jit}include/thunderbird/VMPI.h
46include/thunderbird/VerReg.h 46include/thunderbird/VerReg.h
47include/thunderbird/VideoUtils.h 47include/thunderbird/VideoUtils.h
48include/thunderbird/Writer.h 48${PLIST.jit}include/thunderbird/Writer.h
49include/thunderbird/XPCIDispatch.h 49include/thunderbird/XPCIDispatch.h
50include/thunderbird/a11yGeneric.h 50include/thunderbird/a11yGeneric.h
51include/thunderbird/amIInstallTrigger.h 51include/thunderbird/amIInstallTrigger.h
52include/thunderbird/amIWebInstallListener.h 52include/thunderbird/amIWebInstallListener.h
53include/thunderbird/amIWebInstaller.h 53include/thunderbird/amIWebInstaller.h
54include/thunderbird/angle/ResourceLimits.h 54include/thunderbird/angle/ResourceLimits.h
55include/thunderbird/angle/ShaderLang.h 55include/thunderbird/angle/ShaderLang.h
56include/thunderbird/avmplus.h 56${PLIST.jit}include/thunderbird/avmplus.h
57include/thunderbird/base64.h 57include/thunderbird/base64.h
58include/thunderbird/blapit.h 58include/thunderbird/blapit.h
59include/thunderbird/cairo/cairo-deprecated.h 59include/thunderbird/cairo/cairo-deprecated.h
60include/thunderbird/cairo/cairo-features.h 60include/thunderbird/cairo/cairo-features.h
61include/thunderbird/cairo/cairo-ft.h 61include/thunderbird/cairo/cairo-ft.h
62include/thunderbird/cairo/cairo-pdf.h 62include/thunderbird/cairo/cairo-pdf.h
63include/thunderbird/cairo/cairo-platform.h 63include/thunderbird/cairo/cairo-platform.h
64include/thunderbird/cairo/cairo-ps.h 64include/thunderbird/cairo/cairo-ps.h
65include/thunderbird/cairo/cairo-rename.h 65include/thunderbird/cairo/cairo-rename.h
66include/thunderbird/cairo/cairo-version.h 66include/thunderbird/cairo/cairo-version.h
67include/thunderbird/cairo/cairo-xlib-xrender.h 67include/thunderbird/cairo/cairo-xlib-xrender.h
68include/thunderbird/cairo/cairo-xlib.h 68include/thunderbird/cairo/cairo-xlib.h
69include/thunderbird/cairo/cairo.h 69include/thunderbird/cairo/cairo.h
@@ -165,27 +165,27 @@ include/thunderbird/jar.h @@ -165,27 +165,27 @@ include/thunderbird/jar.h
165include/thunderbird/jarfile.h 165include/thunderbird/jarfile.h
166include/thunderbird/js-config.h 166include/thunderbird/js-config.h
167include/thunderbird/js.msg 167include/thunderbird/js.msg
168include/thunderbird/jsalloc.h 168include/thunderbird/jsalloc.h
169include/thunderbird/jsanalyze.h 169include/thunderbird/jsanalyze.h
170include/thunderbird/jsapi.h 170include/thunderbird/jsapi.h
171include/thunderbird/jsarena.h 171include/thunderbird/jsarena.h
172include/thunderbird/jsarray.h 172include/thunderbird/jsarray.h
173include/thunderbird/jsatom.h 173include/thunderbird/jsatom.h
174include/thunderbird/jsautocfg.h 174include/thunderbird/jsautocfg.h
175include/thunderbird/jsautokw.h 175include/thunderbird/jsautokw.h
176include/thunderbird/jsbit.h 176include/thunderbird/jsbit.h
177include/thunderbird/jsbool.h 177include/thunderbird/jsbool.h
178include/thunderbird/jsbuiltins.h 178${PLIST.jit}include/thunderbird/jsbuiltins.h
179include/thunderbird/jscell.h 179include/thunderbird/jscell.h
180include/thunderbird/jsclist.h 180include/thunderbird/jsclist.h
181include/thunderbird/jsclone.h 181include/thunderbird/jsclone.h
182include/thunderbird/jscntxt.h 182include/thunderbird/jscntxt.h
183include/thunderbird/jscompartment.h 183include/thunderbird/jscompartment.h
184include/thunderbird/jscompat.h 184include/thunderbird/jscompat.h
185include/thunderbird/jsdIDebuggerService.h 185include/thunderbird/jsdIDebuggerService.h
186include/thunderbird/jsdate.h 186include/thunderbird/jsdate.h
187include/thunderbird/jsdbgapi.h 187include/thunderbird/jsdbgapi.h
188include/thunderbird/jsdebug.h 188include/thunderbird/jsdebug.h
189include/thunderbird/jsdhash.h 189include/thunderbird/jsdhash.h
190include/thunderbird/jsdtoa.h 190include/thunderbird/jsdtoa.h
191include/thunderbird/jsemit.h 191include/thunderbird/jsemit.h
@@ -499,33 +499,33 @@ include/thunderbird/mozilla/plugins/Plug @@ -499,33 +499,33 @@ include/thunderbird/mozilla/plugins/Plug
499include/thunderbird/mozilla/plugins/StreamNotifyChild.h 499include/thunderbird/mozilla/plugins/StreamNotifyChild.h
500include/thunderbird/mozilla/plugins/StreamNotifyParent.h 500include/thunderbird/mozilla/plugins/StreamNotifyParent.h
501include/thunderbird/mozilla/scache/StartupCache.h 501include/thunderbird/mozilla/scache/StartupCache.h
502include/thunderbird/mozilla/scache/StartupCacheUtils.h 502include/thunderbird/mozilla/scache/StartupCacheUtils.h
503include/thunderbird/mozilla/storage.h 503include/thunderbird/mozilla/storage.h
504include/thunderbird/mozilla/storage/StatementCache.h 504include/thunderbird/mozilla/storage/StatementCache.h
505include/thunderbird/mozilla/storage/Variant.h 505include/thunderbird/mozilla/storage/Variant.h
506include/thunderbird/mozilla/storage/Variant_inl.h 506include/thunderbird/mozilla/storage/Variant_inl.h
507include/thunderbird/mozilla/threads/nsThreadIDs.h 507include/thunderbird/mozilla/threads/nsThreadIDs.h
508include/thunderbird/mozilla/throw_gcc.h 508include/thunderbird/mozilla/throw_gcc.h
509include/thunderbird/mozilla/unused.h 509include/thunderbird/mozilla/unused.h
510include/thunderbird/mozpngconf.h 510include/thunderbird/mozpngconf.h
511include/thunderbird/msgCore.h 511include/thunderbird/msgCore.h
512include/thunderbird/nanojit.h 512${PLIST.jit}include/thunderbird/nanojit.h
513include/thunderbird/necko-config.h 513include/thunderbird/necko-config.h
514include/thunderbird/nestegg/nestegg-stdint.h 514include/thunderbird/nestegg/nestegg-stdint.h
515include/thunderbird/nestegg/nestegg.h 515include/thunderbird/nestegg/nestegg.h
516include/thunderbird/netCore.h 516include/thunderbird/netCore.h
517include/thunderbird/njconfig.h 517${PLIST.jit}include/thunderbird/njconfig.h
518include/thunderbird/njcpudetect.h 518${PLIST.jit}include/thunderbird/njcpudetect.h
519include/thunderbird/npapi.h 519include/thunderbird/npapi.h
520include/thunderbird/npfunctions.h 520include/thunderbird/npfunctions.h
521include/thunderbird/npruntime.h 521include/thunderbird/npruntime.h
522include/thunderbird/nptypes.h 522include/thunderbird/nptypes.h
523include/thunderbird/nsAHtml5FragmentParser.h 523include/thunderbird/nsAHtml5FragmentParser.h
524include/thunderbird/nsARIAGridAccessibleWrap.h 524include/thunderbird/nsARIAGridAccessibleWrap.h
525include/thunderbird/nsARIAMap.h 525include/thunderbird/nsARIAMap.h
526include/thunderbird/nsASocketHandler.h 526include/thunderbird/nsASocketHandler.h
527include/thunderbird/nsAString.h 527include/thunderbird/nsAString.h
528include/thunderbird/nsAXPCNativeCallContext.h 528include/thunderbird/nsAXPCNativeCallContext.h
529include/thunderbird/nsAbBaseCID.h 529include/thunderbird/nsAbBaseCID.h
530include/thunderbird/nsAboutProtocolUtils.h 530include/thunderbird/nsAboutProtocolUtils.h
531include/thunderbird/nsAccDocManager.h 531include/thunderbird/nsAccDocManager.h
cvs diff -r1.7 -r1.8 pkgsrc/mail/thunderbird/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/options.mk 2011/08/19 14:39:09 1.7
+++ pkgsrc/mail/thunderbird/options.mk 2011/08/23 18:04:17 1.8
@@ -1,29 +1,33 @@ @@ -1,29 +1,33 @@
1# $NetBSD: options.mk,v 1.7 2011/08/19 14:39:09 tnn Exp $ 1# $NetBSD: options.mk,v 1.8 2011/08/23 18:04:17 tnn 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 7PLIST_VARS+= branding nobranding debug gnome jit
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) || \ 13.if !empty(MACHINE_ARCH:Mi386) || !empty(MACHINE_ARCH:Msparc) || \
14 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64) 14 !empty(MACHINE_ARCH:Marm) || !empty(MACHINE_ARCH:Mx86_64)
15PKG_SUPPORTED_OPTIONS+= mozilla-jit 15PKG_SUPPORTED_OPTIONS+= mozilla-jit
16PKG_SUGGESTED_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
17.endif 21.endif
18 22
19.include "../../mk/bsd.options.mk" 23.include "../../mk/bsd.options.mk"
20 24
21.if !empty(PKG_OPTIONS:Mgnome) 25.if !empty(PKG_OPTIONS:Mgnome)
22.include "../../devel/libgnomeui/buildlink3.mk" 26.include "../../devel/libgnomeui/buildlink3.mk"
23.include "../../sysutils/gnome-vfs/buildlink3.mk" 27.include "../../sysutils/gnome-vfs/buildlink3.mk"
24CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui 28CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui
25PLIST.gnome= yes 29PLIST.gnome= yes
26.else 30.else
27CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui 31CONFIGURE_ARGS+= --disable-gnomevfs --disable-dbus --disable-gnomeui
28.endif 32.endif
29 33
@@ -31,29 +35,31 @@ CONFIGURE_ARGS+= --disable-gnomevfs --di @@ -31,29 +35,31 @@ CONFIGURE_ARGS+= --disable-gnomevfs --di
31CONFIGURE_ARGS+= --enable-jemalloc 35CONFIGURE_ARGS+= --enable-jemalloc
32.else 36.else
33CONFIGURE_ARGS+= --disable-jemalloc 37CONFIGURE_ARGS+= --disable-jemalloc
34.endif 38.endif
35 39
36.if !empty(PKG_OPTIONS:Mdebug) 40.if !empty(PKG_OPTIONS:Mdebug)
37CONFIGURE_ARGS+= --enable-debug 41CONFIGURE_ARGS+= --enable-debug
38PLIST.debug= yes 42PLIST.debug= yes
39.else 43.else
40CONFIGURE_ARGS+= --disable-debug 44CONFIGURE_ARGS+= --disable-debug
41.endif 45.endif
42 46
43.if !empty(PKG_OPTIONS:Mmozilla-jit) 47.if !empty(PKG_OPTIONS:Mmozilla-jit)
44CONFIGURE_ARGS+= --enable-jit 48PLIST.jit= yes
 49PLIST_SUBST+= NANOJIT_ARCH=${NANOJIT_ARCH.${MACHINE_ARCH}}
 50CONFIGURE_ARGS+= --enable-tracejit
45.else 51.else
46CONFIGURE_ARGS+= --disable-jit 52CONFIGURE_ARGS+= --disable-tracejit
47.endif 53.endif
48 54
49.if !empty(PKG_OPTIONS:Mmozilla-lightning) 55.if !empty(PKG_OPTIONS:Mmozilla-lightning)
50CONFIGURE_ARGS+= --enable-calendar 56CONFIGURE_ARGS+= --enable-calendar
51PLIST_SRC+= PLIST.lightning 57PLIST_SRC+= PLIST.lightning
52XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/calendar-timezones.xpi 58XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/calendar-timezones.xpi
53XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/gdata-provider.xpi 59XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/gdata-provider.xpi
54XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/lightning.xpi 60XPI_FILES+= ${WRKSRC}/mozilla/dist/xpi-stage/lightning.xpi
55.else 61.else
56CONFIGURE_ARGS+= --disable-calendar 62CONFIGURE_ARGS+= --disable-calendar
57.endif 63.endif
58 64
59.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo) 65.if !empty(PKG_OPTIONS:Mmozilla-enigmail) || make(distinfo)