diff options
author | ryoon <ryoon@pkgsrc.org> | 2013-05-25 11:08:21 +0000 |
---|---|---|
committer | ryoon <ryoon@pkgsrc.org> | 2013-05-25 11:08:21 +0000 |
commit | 797b332df60a1b60bc867229c5f741f7c588b644 (patch) | |
tree | d00e23602033914ae71b9dc4ba2f3ad4d8450968 | |
parent | 9e9f137a8108a223a4cef15cb2e14f0504ecd9d1 (diff) | |
download | pkgsrc-797b332df60a1b60bc867229c5f741f7c588b644.tar.gz |
Bump PKGREVISION.
* Fix buldlinking pathes.
* Put pkg-config files to standard place.
-rw-r--r-- | devel/xulrunner17/Makefile | 7 | ||||
-rw-r--r-- | devel/xulrunner17/PLIST | 6 | ||||
-rw-r--r-- | devel/xulrunner17/buildlink3.mk | 10 |
3 files changed, 16 insertions, 7 deletions
diff --git a/devel/xulrunner17/Makefile b/devel/xulrunner17/Makefile index 1b33770dfaf..63050823d5e 100644 --- a/devel/xulrunner17/Makefile +++ b/devel/xulrunner17/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.6 2013/02/24 14:18:00 ryoon Exp $ +# $NetBSD: Makefile,v 1.7 2013/05/25 11:08:21 ryoon Exp $ .include "dist.mk" PKGNAME= xulrunner17-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//} +PKGREVISION= 1 CATEGORIES= devel www MAINTAINER= pkgsrc-users@NetBSD.org @@ -27,6 +28,8 @@ ALL_ENV+= MOZILLA_PKG_NAME=xulrunner17 MAKE_ENV+= FREEBL_NO_DEPEND=0 +INSTALLATION_DIRS= lib/pkgconfig + # workround for link of xulrunner-bin etc. LDFLAGS+= -Wl,-rpath,${PREFIX}/lib/xulrunner17 ${COMPILER_RPATH_FLAG}${PREFIX}/lib @@ -75,5 +78,7 @@ 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 ce79688c8bf..0e66bcfd477 100644 --- a/devel/xulrunner17/PLIST +++ b/devel/xulrunner17/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2013/05/20 00:17:42 ryoon Exp $ +@comment $NetBSD: PLIST,v 1.4 2013/05/25 11:08:21 ryoon Exp $ bin/xulrunner17 include/xulrunner17/.mkdir.done include/xulrunner17/AccEvent.h @@ -2538,6 +2538,10 @@ 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 c986b47f252..04a7c22deca 100644 --- a/devel/xulrunner17/buildlink3.mk +++ b/devel/xulrunner17/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.5 2013/02/16 11:19:09 wiz Exp $ +# $NetBSD: buildlink3.mk,v 1.6 2013/05/25 11:08:21 ryoon Exp $ BUILDLINK_TREE+= xulrunner17 @@ -9,12 +9,12 @@ BUILDLINK_API_DEPENDS.xulrunner17+= xulrunner17>=17.0.2 BUILDLINK_ABI_DEPENDS.xulrunner17+= xulrunner17>=17.0.2nb3 BUILDLINK_PKGSRCDIR.xulrunner17?= ../../devel/xulrunner17 -BUILDLINK_INCDIRS.xulrunner17+= lib/xulrunner17-sdk/include +BUILDLINK_INCDIRS.xulrunner17+= lib/xulrunner17/include BUILDLINK_INCDIRS.xulrunner17+= include/xulrunner17 -BUILDLINK_FILES.xulrunner17+= lib/xulrunner17-sdk/include/*.h +BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/include/*.h -BUILDLINK_LIBDIRS.xulrunner17+= lib/xulrunner17-sdk/lib -BUILDLINK_FILES.xulrunner17+= lib/xulrunner17-sdk/lib/*.so +BUILDLINK_LIBDIRS.xulrunner17+= lib/xulrunner17/lib +BUILDLINK_FILES.xulrunner17+= lib/xulrunner17/lib/*.so pkgbase := xulrunner17 .include "../../mk/pkg-build-options.mk" |