diff options
| author | xtraeme <xtraeme@pkgsrc.org> | 2004-10-09 09:32:19 +0000 |
|---|---|---|
| committer | xtraeme <xtraeme@pkgsrc.org> | 2004-10-09 09:32:19 +0000 |
| commit | 1aa56ef6ffb8ba6e81abc241fead47f8acb7b58f (patch) | |
| tree | 73a159dcc16d3d93c37e92331525d39ef1314a0e /x11/xorg-libs | |
| parent | 8a2238d62f7205b70805dc0a4e0314ae2aac61fe (diff) | |
| download | pkgsrc-1aa56ef6ffb8ba6e81abc241fead47f8acb7b58f.tar.gz | |
As jmmv@ suggested in: http://news.gw.com/netbsd.pkgsrc.changes/53743
install pkgconfig files for compositeext and fixesext, required to use
the builtin versions.
Bump PKGREVISION.
Thanks for the suggestion Julio! :)
Diffstat (limited to 'x11/xorg-libs')
| -rw-r--r-- | x11/xorg-libs/Makefile | 15 | ||||
| -rw-r--r-- | x11/xorg-libs/PLIST.common | 4 | ||||
| -rw-r--r-- | x11/xorg-libs/files/compositeext.pc | 9 | ||||
| -rw-r--r-- | x11/xorg-libs/files/fixesext.pc | 9 |
4 files changed, 34 insertions, 3 deletions
diff --git a/x11/xorg-libs/Makefile b/x11/xorg-libs/Makefile index 57d9ea6ab08..cbea9c16f70 100644 --- a/x11/xorg-libs/Makefile +++ b/x11/xorg-libs/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:40 tv Exp $ +# $NetBSD: Makefile,v 1.8 2004/10/09 09:32:19 xtraeme Exp $ DISTNAME= ${DISTFILES} PKGNAME= xorg-libs-${XORG_VER} -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG} DISTFILES= X11R${XORG_VER}-src1.tar.gz X11R${XORG_VER}-src2.tar.gz \ @@ -46,6 +46,17 @@ post-install: @${LDCONFIG} ${X11ROOT}/lib || ${TRUE} .endif +pre-install: +.if !exists(${X11ROOT}/lib/pkgconfig) + ${INSTALL_DATA_DIR} ${X11BASE}/lib/pkgconfig +.endif +.for f in fixesext.pc compositeext.pc + @${SED} -e "s,@X11BASE@,${X11BASE},g" \ + -e "s,@LOCALBASE@,${LOCALBASE},g" \ + ${FILESDIR}/${f} > ${WRKSRC}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${X11BASE}/lib/pkgconfig/${f} +.endfor + .include "../../fonts/fontconfig/buildlink3.mk" .include "../../graphics/freetype2/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/x11/xorg-libs/PLIST.common b/x11/xorg-libs/PLIST.common index d1e848cb926..6827daa21d9 100644 --- a/x11/xorg-libs/PLIST.common +++ b/x11/xorg-libs/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.4 2004/10/06 22:46:46 reed Exp $ +@comment $NetBSD: PLIST.common,v 1.5 2004/10/09 09:32:19 xtraeme Exp $ ${X11ROOT_PREFIX}/include/DPS/ColorSB.h ${X11ROOT_PREFIX}/include/DPS/ColorSBP.h ${X11ROOT_PREFIX}/include/DPS/DPSScrollW.h @@ -384,6 +384,8 @@ ${X11ROOT_PREFIX}/lib/pkgconfig/xcomposite.pc ${X11ROOT_PREFIX}/lib/pkgconfig/xdamage.pc ${X11ROOT_PREFIX}/lib/pkgconfig/xevie.pc ${X11ROOT_PREFIX}/lib/pkgconfig/xfixes.pc +${X11ROOT_PREFIX}/lib/pkgconfig/fixesext.pc +${X11ROOT_PREFIX}/lib/pkgconfig/compositeext.pc ${X11ROOT_PREFIX}/lib/X11/XErrorDB ${X11ROOT_PREFIX}/lib/X11/XKeysymDB ${X11ROOT_PREFIX}/lib/X11/Xcms.txt diff --git a/x11/xorg-libs/files/compositeext.pc b/x11/xorg-libs/files/compositeext.pc new file mode 100644 index 00000000000..5340543b28d --- /dev/null +++ b/x11/xorg-libs/files/compositeext.pc @@ -0,0 +1,9 @@ +prefix=@X11BASE@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: CompositeExt +Description: Composite extension headers +Version: 2.0 +Cflags: -I${includedir} -I@LOCALBASE@/include -I@LOCALBASE@/include/freetype2 diff --git a/x11/xorg-libs/files/fixesext.pc b/x11/xorg-libs/files/fixesext.pc new file mode 100644 index 00000000000..271fc6d711d --- /dev/null +++ b/x11/xorg-libs/files/fixesext.pc @@ -0,0 +1,9 @@ +prefix=@X11BASE@ +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: FixesExt +Description: X Fixes extension headers +Version: 2.0.1 +Cflags: -I${includedir} -I@LOCALBASE@/include -I@LOCALBASE@/include/freetype2 |