Sat May 25 11:08:21 2013 UTC ()
Bump PKGREVISION.

* Fix buldlinking pathes.
* Put pkg-config files to standard place.


(ryoon)
diff -r1.6 -r1.7 pkgsrc/devel/xulrunner17/Makefile
diff -r1.3 -r1.4 pkgsrc/devel/xulrunner17/PLIST
diff -r1.5 -r1.6 pkgsrc/devel/xulrunner17/buildlink3.mk
cvs diff -r1.6 -r1.7 pkgsrc/devel/xulrunner17/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner17/Attic/Makefile 2013/02/24 14:18:00 1.6
+++ pkgsrc/devel/xulrunner17/Attic/Makefile 2013/05/25 11:08:21 1.7
@@ -1,42 +1,45 @@ @@ -1,42 +1,45 @@
1# $NetBSD: Makefile,v 1.6 2013/02/24 14:18:00 ryoon Exp $ 1# $NetBSD: Makefile,v 1.7 2013/05/25 11:08:21 ryoon Exp $
2 2
3.include "dist.mk" 3.include "dist.mk"
4PKGNAME= xulrunner17-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//} 4PKGNAME= xulrunner17-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//}
 5PKGREVISION= 1
5CATEGORIES= devel www 6CATEGORIES= devel www
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner 9HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner
9COMMENT= XML User Interface Language runtime environment 10COMMENT= XML User Interface Language runtime environment
10LICENSE= mpl-1.1 11LICENSE= mpl-1.1
11 12
12MOZILLA_DIR= # empty 13MOZILLA_DIR= # empty
13 14
14PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in 15PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul-embedding.pc.in
15PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in 16PKGCONFIG_OVERRIDE+= xulrunner/installer/libxul.pc.in
16PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in 17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
17PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in 18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-gtkmozembed.pc.in
18PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-js.pc.in 19PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-js.pc.in
19PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nspr.pc.in 20PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nspr.pc.in
20PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nss.pc.in 21PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-nss.pc.in
21PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-plugin.pc.in 22PKGCONFIG_OVERRIDE+= xulrunner/installer/mozilla-plugin.pc.in
22 23
23CONFIGURE_ARGS+= --enable-application=xulrunner 24CONFIGURE_ARGS+= --enable-application=xulrunner
24CONFIGURE_ARGS+= --enable-libxul 25CONFIGURE_ARGS+= --enable-libxul
25 26
26ALL_ENV+= MOZILLA_PKG_NAME=xulrunner17 27ALL_ENV+= MOZILLA_PKG_NAME=xulrunner17
27 28
28MAKE_ENV+= FREEBL_NO_DEPEND=0 29MAKE_ENV+= FREEBL_NO_DEPEND=0
29 30
 31INSTALLATION_DIRS= lib/pkgconfig
 32
30# workround for link of xulrunner-bin etc. 33# workround for link of xulrunner-bin etc.
31LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner17 ${COMPILER_RPATH_FLAG}${PREFIX}/lib 34LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner17 ${COMPILER_RPATH_FLAG}${PREFIX}/lib
32 35
33.include "mozilla-common.mk" 36.include "mozilla-common.mk"
34.include "options.mk" 37.include "options.mk"
35 38
36PLIST_VARS+= sps webrtc vorbis tremor 39PLIST_VARS+= sps webrtc vorbis tremor
37 40
38.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) || ${OPSYS} == "Darwin" 41.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*) || ${OPSYS} == "Darwin"
39PLIST.sps= yes 42PLIST.sps= yes
40.endif 43.endif
41.if ${OPSYS} == "Linux" || ${OPSYS} == "Darwin" 44.if ${OPSYS} == "Linux" || ${OPSYS} == "Darwin"
42PLIST.webrtc= yes 45PLIST.webrtc= yes
@@ -65,15 +68,17 @@ post-install: @@ -65,15 +68,17 @@ post-install:
65 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner17/libunicharutil_external_s.a 68 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner17/libunicharutil_external_s.a
66 ln -s ${PREFIX}/lib/xulrunner17-sdk/sdk/lib/libunicharutil_external_s.a \ 69 ln -s ${PREFIX}/lib/xulrunner17-sdk/sdk/lib/libunicharutil_external_s.a \
67 ${DESTDIR}${PREFIX}/lib/xulrunner17/libunicharutil_external_s.a 70 ${DESTDIR}${PREFIX}/lib/xulrunner17/libunicharutil_external_s.a
68 ${TOUCH} ${TOUCH_FLAGS} ${DESTDIR}${PREFIX}/include/xulrunner17/mozilla/throw_gcc.h 71 ${TOUCH} ${TOUCH_FLAGS} ${DESTDIR}${PREFIX}/include/xulrunner17/mozilla/throw_gcc.h
69 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/bin 72 ${INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/bin
70 ${INSTALL_SCRIPT} ${WRKSRC}/dist/sdk/bin/xpt.py \ 73 ${INSTALL_SCRIPT} ${WRKSRC}/dist/sdk/bin/xpt.py \
71 ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/bin 74 ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/bin
72 ${INSTALL_LIB} ${WRKSRC}/mozglue/build/libmozglue.a \ 75 ${INSTALL_LIB} ${WRKSRC}/mozglue/build/libmozglue.a \
73 ${DESTDIR}${PREFIX}/lib/xulrunner17 76 ${DESTDIR}${PREFIX}/lib/xulrunner17
74 ${INSTALL_LIB} ${WRKSRC}/mozglue/build/libmozglue.a \ 77 ${INSTALL_LIB} ${WRKSRC}/mozglue/build/libmozglue.a \
75 ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/lib 78 ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/lib
76 ln -s ${PREFIX}/lib/xulrunner17/lib \ 79 ln -s ${PREFIX}/lib/xulrunner17/lib \
77 ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/lib 80 ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/lib
 81 ${INSTALL_DATA} ${WRKSRC}/xulrunner/installer/*pc \
 82 ${DESTDIR}${PREFIX}/lib/pkgconfig
78 83
79.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/devel/xulrunner17/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner17/Attic/PLIST 2013/05/20 00:17:42 1.3
+++ pkgsrc/devel/xulrunner17/Attic/PLIST 2013/05/25 11:08:21 1.4
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.3 2013/05/20 00:17:42 ryoon Exp $ 1@comment $NetBSD: PLIST,v 1.4 2013/05/25 11:08:21 ryoon Exp $
2bin/xulrunner17 2bin/xulrunner17
3include/xulrunner17/.mkdir.done 3include/xulrunner17/.mkdir.done
4include/xulrunner17/AccEvent.h 4include/xulrunner17/AccEvent.h
5include/xulrunner17/AnimationCommon.h 5include/xulrunner17/AnimationCommon.h
6include/xulrunner17/AudioSegment.h 6include/xulrunner17/AudioSegment.h
7include/xulrunner17/BasicImplData.h 7include/xulrunner17/BasicImplData.h
8include/xulrunner17/BasicLayers.h 8include/xulrunner17/BasicLayers.h
9include/xulrunner17/BasicTiledThebesLayer.h 9include/xulrunner17/BasicTiledThebesLayer.h
10include/xulrunner17/CompositorChild.h 10include/xulrunner17/CompositorChild.h
11include/xulrunner17/CompositorParent.h 11include/xulrunner17/CompositorParent.h
12include/xulrunner17/CustomQS_Canvas.h 12include/xulrunner17/CustomQS_Canvas.h
13include/xulrunner17/CustomQS_Canvas2D.h 13include/xulrunner17/CustomQS_Canvas2D.h
14include/xulrunner17/CustomQS_WebGL.h 14include/xulrunner17/CustomQS_WebGL.h
@@ -2528,26 +2528,30 @@ include/xulrunner17/xpcom-config.h @@ -2528,26 +2528,30 @@ include/xulrunner17/xpcom-config.h
2528include/xulrunner17/xpcpublic.h 2528include/xulrunner17/xpcpublic.h
2529include/xulrunner17/xpt_arena.h 2529include/xulrunner17/xpt_arena.h
2530include/xulrunner17/xpt_struct.h 2530include/xulrunner17/xpt_struct.h
2531include/xulrunner17/xpt_xdr.h 2531include/xulrunner17/xpt_xdr.h
2532include/xulrunner17/xptcall.h 2532include/xulrunner17/xptcall.h
2533include/xulrunner17/xptcstubsdecl.inc 2533include/xulrunner17/xptcstubsdecl.inc
2534include/xulrunner17/xptcstubsdef.inc 2534include/xulrunner17/xptcstubsdef.inc
2535include/xulrunner17/xptinfo.h 2535include/xulrunner17/xptinfo.h
2536include/xulrunner17/xrecore.h 2536include/xulrunner17/xrecore.h
2537include/xulrunner17/ycbcr_to_rgb565.h 2537include/xulrunner17/ycbcr_to_rgb565.h
2538include/xulrunner17/yuv_convert.h 2538include/xulrunner17/yuv_convert.h
2539include/xulrunner17/yuv_row.h 2539include/xulrunner17/yuv_row.h
2540include/xulrunner17/zipstruct.h 2540include/xulrunner17/zipstruct.h
 2541lib/pkgconfig/libxul-embedding.pc
 2542lib/pkgconfig/libxul.pc
 2543lib/pkgconfig/mozilla-js.pc
 2544lib/pkgconfig/mozilla-plugin.pc
2541lib/xulrunner17/pkgconfig/libxul-embedding.pc 2545lib/xulrunner17/pkgconfig/libxul-embedding.pc
2542lib/xulrunner17/pkgconfig/libxul.pc 2546lib/xulrunner17/pkgconfig/libxul.pc
2543lib/xulrunner17/pkgconfig/mozilla-js.pc 2547lib/xulrunner17/pkgconfig/mozilla-js.pc
2544lib/xulrunner17/pkgconfig/mozilla-plugin.pc 2548lib/xulrunner17/pkgconfig/mozilla-plugin.pc
2545lib/xulrunner17-sdk/lib 2549lib/xulrunner17-sdk/lib
2546lib/xulrunner17-sdk/sdk/bin/xpt.py 2550lib/xulrunner17-sdk/sdk/bin/xpt.py
2547lib/xulrunner17-sdk/sdk/lib/libmozglue.a 2551lib/xulrunner17-sdk/sdk/lib/libmozglue.a
2548lib/xulrunner17/LICENSE 2552lib/xulrunner17/LICENSE
2549lib/xulrunner17/README.xulrunner 2553lib/xulrunner17/README.xulrunner
2550lib/xulrunner17/bin 2554lib/xulrunner17/bin
2551lib/xulrunner17/chrome.manifest 2555lib/xulrunner17/chrome.manifest
2552lib/xulrunner17/chrome/.mkdir.done 2556lib/xulrunner17/chrome/.mkdir.done
2553lib/xulrunner17/chrome/en-US.manifest 2557lib/xulrunner17/chrome/en-US.manifest
cvs diff -r1.5 -r1.6 pkgsrc/devel/xulrunner17/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner17/Attic/buildlink3.mk 2013/02/16 11:19:09 1.5
+++ pkgsrc/devel/xulrunner17/Attic/buildlink3.mk 2013/05/25 11:08:21 1.6
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.5 2013/02/16 11:19:09 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.6 2013/05/25 11:08:21 ryoon Exp $
2 2
3BUILDLINK_TREE+= xulrunner17 3BUILDLINK_TREE+= xulrunner17
4 4
5.if !defined(XULRUNNER17_BUILDLINK3_MK) 5.if !defined(XULRUNNER17_BUILDLINK3_MK)
6XULRUNNER17_BUILDLINK3_MK:= 6XULRUNNER17_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.xulrunner17+= xulrunner17>=17.0.2 8BUILDLINK_API_DEPENDS.xulrunner17+= xulrunner17>=17.0.2
9BUILDLINK_ABI_DEPENDS.xulrunner17+= xulrunner17>=17.0.2nb3 9BUILDLINK_ABI_DEPENDS.xulrunner17+= xulrunner17>=17.0.2nb3
10BUILDLINK_PKGSRCDIR.xulrunner17?= ../../devel/xulrunner17 10BUILDLINK_PKGSRCDIR.xulrunner17?= ../../devel/xulrunner17
11 11
12BUILDLINK_INCDIRS.xulrunner17+= lib/xulrunner17-sdk/include 12BUILDLINK_INCDIRS.xulrunner17+= lib/xulrunner17/include
13BUILDLINK_INCDIRS.xulrunner17+= include/xulrunner17 13BUILDLINK_INCDIRS.xulrunner17+= include/xulrunner17
14BUILDLINK_FILES.xulrunner17+= lib/xulrunner17-sdk/include/*.h 14BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/include/*.h
15 15
16BUILDLINK_LIBDIRS.xulrunner17+= lib/xulrunner17-sdk/lib 16BUILDLINK_LIBDIRS.xulrunner17+= lib/xulrunner17/lib
17BUILDLINK_FILES.xulrunner17+= lib/xulrunner17-sdk/lib/*.so 17BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/lib/*.so
18 18
19pkgbase := xulrunner17 19pkgbase := xulrunner17
20.include "../../mk/pkg-build-options.mk" 20.include "../../mk/pkg-build-options.mk"
21.if !empty(PKG_BUILD_OPTIONS.xulrunner17:Mgnome) 21.if !empty(PKG_BUILD_OPTIONS.xulrunner17:Mgnome)
22. include "../../devel/libgnomeui/buildlink3.mk" 22. include "../../devel/libgnomeui/buildlink3.mk"
23. include "../../sysutils/gnome-vfs/buildlink3.mk" 23. include "../../sysutils/gnome-vfs/buildlink3.mk"
24.endif 24.endif
25.include "../../devel/nspr/buildlink3.mk" 25.include "../../devel/nspr/buildlink3.mk"
26.endif # XULRUNNER17_BUILDLINK3_MK 26.endif # XULRUNNER17_BUILDLINK3_MK
27 27
28BUILDLINK_TREE+= -xulrunner17 28BUILDLINK_TREE+= -xulrunner17