Fri Jun 4 10:52:21 2010 UTC ()
Add pkgconfig file for xkeyboard-config.  Bump x11-links version to 0.50.


(ghen)
diff -r1.114 -r1.115 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.26 -r1.27 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.15 -r1.16 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.xkeyboard-config
cvs diff -r1.114 -r1.115 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2010/05/31 21:21:28 1.114
+++ pkgsrc/pkgtools/x11-links/Makefile 2010/06/04 10:52:21 1.115
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.114 2010/05/31 21:21:28 wiz Exp $ 1# $NetBSD: Makefile,v 1.115 2010/06/04 10:52:21 ghen Exp $
2# 2#
3# NOTE: If you update this package, then you'll likely need to also update 3# NOTE: If you update this package, then you'll likely need to also update
4# the x11-links dependency in buildlink3.mk to the correct version, 4# the x11-links dependency in buildlink3.mk to the correct version,
5# usually the most recent. 5# usually the most recent.
6 6
7DISTNAME= x11-links-0.49 7DISTNAME= x11-links-0.50
8CATEGORIES= pkgtools x11 8CATEGORIES= pkgtools x11
9MASTER_SITES= # empty 9MASTER_SITES= # empty
10DISTFILES= # empty 10DISTFILES= # empty
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html 13HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
14COMMENT= Shadow tree of links to native X11 headers and libraries 14COMMENT= Shadow tree of links to native X11 headers and libraries
15LICENSE= original-bsd 15LICENSE= original-bsd
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18PKG_INSTALLATION_TYPES= overwrite pkgviews 18PKG_INSTALLATION_TYPES= overwrite pkgviews
19 19
20WRKSRC= ${WRKDIR} 20WRKSRC= ${WRKDIR}
cvs diff -r1.26 -r1.27 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/05/31 21:20:02 1.26
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/06/04 10:52:21 1.27
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.26 2010/05/31 21:20:02 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.27 2010/06/04 10:52:21 ghen Exp $
2# 2#
3# Don't include this file manually! It will be included as necessary 3# Don't include this file manually! It will be included as necessary
4# by bsd.buildlink3.mk. 4# by bsd.buildlink3.mk.
5 5
6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk, 6# x11-links is sorted first in mk/buildlink3/bsd.buildlink3.mk,
7# so that symlinks created from it can be overriden by other packages. 7# so that symlinks created from it can be overriden by other packages.
8# 8#
9 9
10BUILDLINK_TREE+= x11-links 10BUILDLINK_TREE+= x11-links
11 11
12.if !defined(X11_LINKS_BUILDLINK3_MK) 12.if !defined(X11_LINKS_BUILDLINK3_MK)
13X11_LINKS_BUILDLINK3_MK:= 13X11_LINKS_BUILDLINK3_MK:=
14 14
15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.49 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.50
16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links 16BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links
17BUILDLINK_DEPMETHOD.x11-links?= build 17BUILDLINK_DEPMETHOD.x11-links?= build
18 18
19# Force all of the headers and libraries to be symlinked into 19# Force all of the headers and libraries to be symlinked into
20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case. 20# ${BUILDLINK_X11_DIR}, even in the "pkgviews" case.
21# 21#
22BUILDLINK_CONTENTS_FILTER.x11-links= \ 22BUILDLINK_CONTENTS_FILTER.x11-links= \
23 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)' 23 ${EGREP} '(include.*/|\.h$$|\.pc$$|/lib[^/]*$$)'
24 24
25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include 25# Rename the symlinks so that they appear in ${BUILDLINK_X11_DIR}/include
26# and ${BUILDLINK_X11_DIR}/lib. 26# and ${BUILDLINK_X11_DIR}/lib.
27# 27#
28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|" 28BUILDLINK_FNAME_TRANSFORM.x11-links+= -e "s|/share/x11-links/|/|"
cvs diff -r1.15 -r1.16 pkgsrc/pkgtools/x11-links/xorg.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2009/03/20 19:25:13 1.15
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2010/06/04 10:52:21 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: xorg.mk,v 1.15 2009/03/20 19:25:13 joerg Exp $ 1# $NetBSD: xorg.mk,v 1.16 2010/06/04 10:52:21 ghen Exp $
2# 2#
3# This is for X.org, but use "xfree" files also. 3# This is for X.org, but use "xfree" files also.
4 4
5FILES_LIST= ${FILESDIR}/xorg 5FILES_LIST= ${FILESDIR}/xorg
6 6
7# XXX: what about xaw? 7# XXX: what about xaw?
8 8
9.include "../../fonts/fontconfig/buildlink3.mk" 9.include "../../fonts/fontconfig/buildlink3.mk"
10.include "../../fonts/libfontenc/buildlink3.mk" 10.include "../../fonts/libfontenc/buildlink3.mk"
11.include "../../graphics/MesaLib/buildlink3.mk" 11.include "../../graphics/MesaLib/buildlink3.mk"
12.include "../../graphics/freetype2/buildlink3.mk" 12.include "../../graphics/freetype2/buildlink3.mk"
13.include "../../graphics/glu/buildlink3.mk" 13.include "../../graphics/glu/buildlink3.mk"
14.include "../../graphics/glut/buildlink3.mk" 14.include "../../graphics/glut/buildlink3.mk"
@@ -56,26 +56,27 @@ FILES_LIST= ${FILESDIR}/xorg @@ -56,26 +56,27 @@ FILES_LIST= ${FILESDIR}/xorg
56.include "../../x11/recordproto/buildlink3.mk" 56.include "../../x11/recordproto/buildlink3.mk"
57.include "../../x11/renderproto/buildlink3.mk" 57.include "../../x11/renderproto/buildlink3.mk"
58.include "../../x11/resourceproto/buildlink3.mk" 58.include "../../x11/resourceproto/buildlink3.mk"
59.include "../../x11/scrnsaverproto/buildlink3.mk" 59.include "../../x11/scrnsaverproto/buildlink3.mk"
60.include "../../x11/trapproto/buildlink3.mk" 60.include "../../x11/trapproto/buildlink3.mk"
61.include "../../x11/videoproto/buildlink3.mk" 61.include "../../x11/videoproto/buildlink3.mk"
62.include "../../x11/xcmiscproto/buildlink3.mk" 62.include "../../x11/xcmiscproto/buildlink3.mk"
63.include "../../x11/xextproto/buildlink3.mk" 63.include "../../x11/xextproto/buildlink3.mk"
64.include "../../x11/xf86bigfontproto/buildlink3.mk" 64.include "../../x11/xf86bigfontproto/buildlink3.mk"
65.include "../../x11/xf86dgaproto/buildlink3.mk" 65.include "../../x11/xf86dgaproto/buildlink3.mk"
66.include "../../x11/xf86driproto/buildlink3.mk" 66.include "../../x11/xf86driproto/buildlink3.mk"
67.include "../../x11/xf86miscproto/buildlink3.mk" 67.include "../../x11/xf86miscproto/buildlink3.mk"
68.include "../../x11/xf86vidmodeproto/buildlink3.mk" 68.include "../../x11/xf86vidmodeproto/buildlink3.mk"
 69.include "../../x11/xkeyboard-config/buildlink3.mk"
69.include "../../x11/xproto/buildlink3.mk" 70.include "../../x11/xproto/buildlink3.mk"
70.include "../../x11/xproxymanagementprotocol/buildlink3.mk" 71.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
71.include "../../x11/xtrans/buildlink3.mk" 72.include "../../x11/xtrans/buildlink3.mk"
72 73
73# XXX what is ${X11_MODULES} ? 74# XXX what is ${X11_MODULES} ?
74 75
75# Check if any headers and libraries for ${X11_MODULES} found in 76# Check if any headers and libraries for ${X11_MODULES} found in
76# ${X11BASE} actually belong to the base Xorg or not. 77# ${X11BASE} actually belong to the base Xorg or not.
77# 78#
78# XXX: maybe skip iconv and zlib too? 79# XXX: maybe skip iconv and zlib too?
79.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} 80.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
80CHECK_BUILTIN.${_pkg_}:= yes 81CHECK_BUILTIN.${_pkg_}:= yes
81USE_BUILTIN.${_pkg_}= yes 82USE_BUILTIN.${_pkg_}= yes
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xkeyboard-config
# $NetBSD: xorg.xkeyboard-config,v 1.1 2010/06/04 10:52:21 ghen Exp $
#
lib/pkgconfig/xkeyboard-config.pc