diff options
| author | ryoon <ryoon> | 2013-08-02 12:17:57 +0000 |
|---|---|---|
| committer | ryoon <ryoon> | 2013-08-02 12:17:57 +0000 |
| commit | 615bb2f9261ba2e9edfaaf5be422a00d534279cc (patch) | |
| tree | 968533584e077d639cc95b4e20affc593f72cd11 /devel | |
| parent | 7a93351bc9252e0ab70c6e54f51302f0223ebe68 (diff) | |
| download | pkgsrc-615bb2f9261ba2e9edfaaf5be422a00d534279cc.tar.gz | |
Remove pkg-config *.pc files from standard place.
* Avoid potential conflicts between xulrunners.
* Fix buildlink3.mk to handle pc files properly.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/xulrunner17/Makefile | 4 | ||||
| -rw-r--r-- | devel/xulrunner17/PLIST | 6 | ||||
| -rw-r--r-- | devel/xulrunner17/buildlink3.mk | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/devel/xulrunner17/Makefile b/devel/xulrunner17/Makefile index bf4bdc03ff8..82666056a8f 100644 --- a/devel/xulrunner17/Makefile +++ b/devel/xulrunner17/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2013/07/09 10:53:14 ryoon Exp $ +# $NetBSD: Makefile,v 1.13 2013/08/02 12:17:57 ryoon Exp $ .include "dist.mk" PKGNAME= xulrunner17-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//} @@ -77,7 +77,5 @@ post-install: ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/sdk/lib ln -s ${PREFIX}/lib/xulrunner17/lib \ ${DESTDIR}${PREFIX}/lib/xulrunner17-sdk/lib - ${INSTALL_DATA} ${WRKSRC}/xulrunner/installer/*pc \ - ${DESTDIR}${PREFIX}/lib/pkgconfig .include "../../mk/bsd.pkg.mk" diff --git a/devel/xulrunner17/PLIST b/devel/xulrunner17/PLIST index 0e66bcfd477..2791ae690d5 100644 --- a/devel/xulrunner17/PLIST +++ b/devel/xulrunner17/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2013/05/25 11:08:21 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.5 2013/08/02 12:17:57 ryoon Exp $ bin/xulrunner17 include/xulrunner17/.mkdir.done include/xulrunner17/AccEvent.h @@ -2538,10 +2538,6 @@ include/xulrunner17/ycbcr_to_rgb565.h include/xulrunner17/yuv_convert.h include/xulrunner17/yuv_row.h include/xulrunner17/zipstruct.h -lib/pkgconfig/libxul-embedding.pc -lib/pkgconfig/libxul.pc -lib/pkgconfig/mozilla-js.pc -lib/pkgconfig/mozilla-plugin.pc lib/xulrunner17/pkgconfig/libxul-embedding.pc lib/xulrunner17/pkgconfig/libxul.pc lib/xulrunner17/pkgconfig/mozilla-js.pc diff --git a/devel/xulrunner17/buildlink3.mk b/devel/xulrunner17/buildlink3.mk index a04ae7c59d1..1ad1137e2c0 100644 --- a/devel/xulrunner17/buildlink3.mk +++ b/devel/xulrunner17/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.9 2013/06/06 12:53:45 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.10 2013/08/02 12:17:57 ryoon Exp $ BUILDLINK_TREE+= xulrunner17 @@ -15,6 +15,8 @@ BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/include/*.h BUILDLINK_LIBDIRS.xulrunner17+= lib/xulrunner17/lib BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/lib/*.so +BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/pkgconfig/*pc +BUILDLINK_FNAME_TRANSFORM.xulrunner17+= -e "s|lib/xulrunner17/pkgconfig|lib/pkgconfig|" pkgbase := xulrunner17 .include "../../mk/pkg-build-options.mk" |