Sun Jul 31 18:00:05 2011 UTC ()
The file throw_gcc.h gets installed when building with some GCC versions.
Instead of dealing with conditional PLIST logic, create an empty file.


(tnn)
diff -r1.51 -r1.52 pkgsrc/devel/xulrunner/Makefile
diff -r1.31 -r1.32 pkgsrc/devel/xulrunner/PLIST
cvs diff -r1.51 -r1.52 pkgsrc/devel/xulrunner/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/Makefile 2011/07/21 13:05:51 1.51
+++ pkgsrc/devel/xulrunner/Attic/Makefile 2011/07/31 18:00:05 1.52
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.51 2011/07/21 13:05:51 obache Exp $ 1# $NetBSD: Makefile,v 1.52 2011/07/31 18:00:05 tnn Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR} 4PKGNAME= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= devel www 6CATEGORIES= devel www
7 7
8MAINTAINER= tnn@NetBSD.org 8MAINTAINER= tnn@NetBSD.org
9HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner 9HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner
10COMMENT= XML User Interface Language runtime environment 10COMMENT= XML User Interface Language runtime environment
11LICENSE= mpl-1.1 11LICENSE= mpl-1.1
12 12
13MOZILLA_DIR= # empty 13MOZILLA_DIR= # empty
14 14
@@ -37,15 +37,16 @@ pre-configure: @@ -37,15 +37,16 @@ pre-configure:
37 cd ${WRKSRC}/nsprpub && autoconf 37 cd ${WRKSRC}/nsprpub && autoconf
38 38
39post-install: 39post-install:
40 # XXX fix the pkg-config files instead 40 # XXX fix the pkg-config files instead
41 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 41 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
42 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \ 42 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \
43 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 43 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
44 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a 44 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
45 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a \ 45 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a \
46 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a 46 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
47 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libunicharutil_external_s.a 47 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libunicharutil_external_s.a
48 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a \ 48 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libunicharutil_external_s.a \
49 ${DESTDIR}${PREFIX}/lib/xulrunner/libunicharutil_external_s.a 49 ${DESTDIR}${PREFIX}/lib/xulrunner/libunicharutil_external_s.a
 50 ${TOUCH} ${TOUCH_FLAGS} ${DESTDIR}${PREFIX}/include/xulrunner/mozilla/throw_gcc.h
50 51
51.include "../../mk/bsd.pkg.mk" 52.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/devel/xulrunner/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/PLIST 2011/07/13 12:04:06 1.31
+++ pkgsrc/devel/xulrunner/Attic/PLIST 2011/07/31 18:00:05 1.32
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.31 2011/07/13 12:04:06 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.32 2011/07/31 18:00:05 tnn Exp $
2bin/xulrunner 2bin/xulrunner
3${PLIST.jit}include/xulrunner/Allocator.h 3${PLIST.jit}include/xulrunner/Allocator.h
4${PLIST.jit}include/xulrunner/Assembler.h 4${PLIST.jit}include/xulrunner/Assembler.h
5include/xulrunner/BasicLayers.h 5include/xulrunner/BasicLayers.h
6include/xulrunner/CheckedInt.h 6include/xulrunner/CheckedInt.h
7${PLIST.jit}include/xulrunner/CodeAlloc.h 7${PLIST.jit}include/xulrunner/CodeAlloc.h
8${PLIST.jit}include/xulrunner/Containers.h 8${PLIST.jit}include/xulrunner/Containers.h
9include/xulrunner/CustomQS_Canvas2D.h 9include/xulrunner/CustomQS_Canvas2D.h
10include/xulrunner/CustomQS_WebGL.h 10include/xulrunner/CustomQS_WebGL.h
11include/xulrunner/EGLUtils.h 11include/xulrunner/EGLUtils.h
12${PLIST.jit}include/xulrunner/Fragmento.h 12${PLIST.jit}include/xulrunner/Fragmento.h
13include/xulrunner/FrameLayerBuilder.h 13include/xulrunner/FrameLayerBuilder.h
14include/xulrunner/FramePropertyTable.h 14include/xulrunner/FramePropertyTable.h
@@ -463,26 +463,27 @@ include/xulrunner/mozilla/plugins/Plugin @@ -463,26 +463,27 @@ include/xulrunner/mozilla/plugins/Plugin
463include/xulrunner/mozilla/plugins/PluginScriptableObjectUtils-inl.h 463include/xulrunner/mozilla/plugins/PluginScriptableObjectUtils-inl.h
464include/xulrunner/mozilla/plugins/PluginScriptableObjectUtils.h 464include/xulrunner/mozilla/plugins/PluginScriptableObjectUtils.h
465include/xulrunner/mozilla/plugins/PluginStreamChild.h 465include/xulrunner/mozilla/plugins/PluginStreamChild.h
466include/xulrunner/mozilla/plugins/PluginStreamParent.h 466include/xulrunner/mozilla/plugins/PluginStreamParent.h
467include/xulrunner/mozilla/plugins/StreamNotifyChild.h 467include/xulrunner/mozilla/plugins/StreamNotifyChild.h
468include/xulrunner/mozilla/plugins/StreamNotifyParent.h 468include/xulrunner/mozilla/plugins/StreamNotifyParent.h
469include/xulrunner/mozilla/scache/StartupCache.h 469include/xulrunner/mozilla/scache/StartupCache.h
470include/xulrunner/mozilla/scache/StartupCacheUtils.h 470include/xulrunner/mozilla/scache/StartupCacheUtils.h
471include/xulrunner/mozilla/storage.h 471include/xulrunner/mozilla/storage.h
472include/xulrunner/mozilla/storage/StatementCache.h 472include/xulrunner/mozilla/storage/StatementCache.h
473include/xulrunner/mozilla/storage/Variant.h 473include/xulrunner/mozilla/storage/Variant.h
474include/xulrunner/mozilla/storage/Variant_inl.h 474include/xulrunner/mozilla/storage/Variant_inl.h
475include/xulrunner/mozilla/threads/nsThreadIDs.h 475include/xulrunner/mozilla/threads/nsThreadIDs.h
 476include/xulrunner/mozilla/throw_gcc.h
476include/xulrunner/mozilla/unused.h 477include/xulrunner/mozilla/unused.h
477include/xulrunner/mozpngconf.h 478include/xulrunner/mozpngconf.h
478${PLIST.jit}include/xulrunner/nanojit.h 479${PLIST.jit}include/xulrunner/nanojit.h
479include/xulrunner/necko-config.h 480include/xulrunner/necko-config.h
480include/xulrunner/nestegg/nestegg-stdint.h 481include/xulrunner/nestegg/nestegg-stdint.h
481include/xulrunner/nestegg/nestegg.h 482include/xulrunner/nestegg/nestegg.h
482include/xulrunner/netCore.h 483include/xulrunner/netCore.h
483${PLIST.jit}include/xulrunner/njconfig.h 484${PLIST.jit}include/xulrunner/njconfig.h
484${PLIST.jit}include/xulrunner/njcpudetect.h 485${PLIST.jit}include/xulrunner/njcpudetect.h
485include/xulrunner/npapi.h 486include/xulrunner/npapi.h
486include/xulrunner/npfunctions.h 487include/xulrunner/npfunctions.h
487include/xulrunner/npruntime.h 488include/xulrunner/npruntime.h
488include/xulrunner/nptypes.h 489include/xulrunner/nptypes.h