Sat Sep 11 19:47:31 2010 UTC ()
Update "x11-links" package to version 0.52:
- Add support for "xcb-proto".


(tron)
diff -r1.116 -r1.117 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.28 -r1.29 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.17 -r1.18 pkgsrc/pkgtools/x11-links/xorg.mk
diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.libxcb
diff -r0 -r1.1 pkgsrc/pkgtools/x11-links/files/xorg.xcb-proto
cvs diff -r1.116 -r1.117 pkgsrc/pkgtools/x11-links/Makefile (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2010/09/11 19:11:47 1.116
+++ pkgsrc/pkgtools/x11-links/Makefile 2010/09/11 19:47:31 1.117
@@ -1,103 +1,103 @@ @@ -1,103 +1,103 @@
1# $NetBSD: Makefile,v 1.116 2010/09/11 19:11:47 tron Exp $ 1# $NetBSD: Makefile,v 1.117 2010/09/11 19:47:31 tron 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.51 7DISTNAME= x11-links-0.52
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}
21USE_LANGUAGES= # empty 21USE_LANGUAGES= # empty
22USE_TOOLS+= pax 22USE_TOOLS+= pax
23 23
24PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files 24PLIST_SRC.files= ${WRKDIR}/.PLIST_SRC.files
25PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files} 25PLIST_SRC= ${.CURDIR}/PLIST ${PLIST_SRC.files}
26 26
27OSVERSION_SPECIFIC= yes 27OSVERSION_SPECIFIC= yes
28 28
29.include "../../mk/bsd.prefs.mk" 29.include "../../mk/bsd.prefs.mk"
30 30
31.if ${X11_TYPE} == "modular" 31.if ${X11_TYPE} == "modular"
32PKG_FAIL_REASON+= "${PKGNAME} should only be used with X11_TYPE=native." 32PKG_FAIL_REASON+= "${PKGNAME} should only be used with X11_TYPE=native."
33.elif !exists(${X11BASE}/include/X11/X.h) 33.elif !exists(${X11BASE}/include/X11/X.h)
34PKG_FAIL_REASON+= "pkgsrc has been configured to use a system provided X11 installation" 34PKG_FAIL_REASON+= "pkgsrc has been configured to use a system provided X11 installation"
35PKG_FAIL_REASON+= "but one could not be found. Possible solutions:" 35PKG_FAIL_REASON+= "but one could not be found. Possible solutions:"
36PKG_FAIL_REASON+= "" 36PKG_FAIL_REASON+= ""
37PKG_FAIL_REASON+= " *) install X headers and libraries in X11BASE (currently ${X11BASE})" 37PKG_FAIL_REASON+= " *) install X headers and libraries in X11BASE (currently ${X11BASE})"
38PKG_FAIL_REASON+= " *) set X11_TYPE=modular in mk.conf to use X11 from pkgsrc" 38PKG_FAIL_REASON+= " *) set X11_TYPE=modular in mk.conf to use X11 from pkgsrc"
39PKG_FAIL_REASON+= "" 39PKG_FAIL_REASON+= ""
40PKG_FAIL_REASON+= "Please note that changing the value of X11_TYPE in existing" 40PKG_FAIL_REASON+= "Please note that changing the value of X11_TYPE in existing"
41PKG_FAIL_REASON+= "pkgsrc installations is not supported!" 41PKG_FAIL_REASON+= "pkgsrc installations is not supported!"
42.endif 42.endif
43 43
44.if ${OPSYS} == "IRIX" 44.if ${OPSYS} == "IRIX"
45. include "xsgi.mk" 45. include "xsgi.mk"
46.elif ${OPSYS} == "OSF1" 46.elif ${OPSYS} == "OSF1"
47. include "xdec.mk" 47. include "xdec.mk"
48.elif !empty(X11BASE:M*openwin) 48.elif !empty(X11BASE:M*openwin)
49. include "openwin.mk" 49. include "openwin.mk"
50.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \ 50.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \
51 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) 51 exists(${X11BASE}/lib/pkgconfig/xorg-server.pc)
52. include "xorg.mk" 52. include "xorg.mk"
53.else 53.else
54. include "xfree.mk" 54. include "xfree.mk"
55.endif 55.endif
56 56
57X11_LINKS_SUBDIR= share/x11-links 57X11_LINKS_SUBDIR= share/x11-links
58X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR} 58X11_LINKS_BUILD_DIR= ${WRKSRC}/${X11_LINKS_SUBDIR}
59X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR} 59X11_LINKS_DIR= ${PREFIX}/${X11_LINKS_SUBDIR}
60 60
61FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#" 61FILES_LIST_CMD= ${SED} -e "s/@ABI@/${ABI}/" ${FILES_LIST} | ${GREP} -v "^\#"
62 62
63CREATE_X11LINK?= ${LN} -fs $$src $$dest 63CREATE_X11LINK?= ${LN} -fs $$src $$dest
64 64
65.include "../../mk/x11.buildlink3.mk" 65.include "../../mk/x11.buildlink3.mk"
66 66
67do-build: 67do-build:
68 ${MKDIR} ${X11_LINKS_BUILD_DIR} 68 ${MKDIR} ${X11_LINKS_BUILD_DIR}
69 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR} 69 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}
70 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \ 70 ${FILES_LIST_CMD} | ${SED} -e "s,/[^/]*$$,," | ${SORT} -u | \
71 while read dir; do \ 71 while read dir; do \
72 if [ -d ${X11BASE}/$$dir ]; then \ 72 if [ -d ${X11BASE}/$$dir ]; then \
73 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ 73 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
74 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ 74 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \
75 elif [ -d /usr/$$dir ]; then \ 75 elif [ -d /usr/$$dir ]; then \
76 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \ 76 ${MKDIR} ${X11_LINKS_BUILD_DIR}/$$dir; \
77 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \ 77 ${CHMOD} ${PKGDIRMODE} ${X11_LINKS_BUILD_DIR}/$$dir; \
78 fi; \ 78 fi; \
79 done 79 done
80 ${RM} -f ${PLIST_SRC.files} 80 ${RM} -f ${PLIST_SRC.files}
81 ${FILES_LIST_CMD} | ${SORT} -u | \ 81 ${FILES_LIST_CMD} | ${SORT} -u | \
82 while read file; do \ 82 while read file; do \
83 if ${TEST} -r ${X11BASE}/$$file; then \ 83 if ${TEST} -r ${X11BASE}/$$file; then \
84 src="${X11BASE}/$$file"; \ 84 src="${X11BASE}/$$file"; \
85 dest="${X11_LINKS_BUILD_DIR}/$$file"; \ 85 dest="${X11_LINKS_BUILD_DIR}/$$file"; \
86 ${CREATE_X11LINK}; \ 86 ${CREATE_X11LINK}; \
87 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ 87 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \
88 >> ${PLIST_SRC.files}; \ 88 >> ${PLIST_SRC.files}; \
89 elif ${TEST} -r /usr/$$file; then \ 89 elif ${TEST} -r /usr/$$file; then \
90 src="/usr/$$file"; \ 90 src="/usr/$$file"; \
91 dest="${X11_LINKS_BUILD_DIR}/$$file"; \ 91 dest="${X11_LINKS_BUILD_DIR}/$$file"; \
92 ${CREATE_X11LINK}; \ 92 ${CREATE_X11LINK}; \
93 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \ 93 ${ECHO} "${X11_LINKS_SUBDIR}/$$file" \
94 >> ${PLIST_SRC.files}; \ 94 >> ${PLIST_SRC.files}; \
95 fi; \ 95 fi; \
96 done 96 done
97 97
98do-install: 98do-install:
99 ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q} 99 ${INSTALL_DATA_DIR} ${DESTDIR:Q}${X11_LINKS_DIR:Q}
100 cd ${X11_LINKS_BUILD_DIR} && \ 100 cd ${X11_LINKS_BUILD_DIR} && \
101 pax -rw . ${DESTDIR:Q}${X11_LINKS_DIR:Q} 101 pax -rw . ${DESTDIR:Q}${X11_LINKS_DIR:Q}
102 102
103.include "../../mk/bsd.pkg.mk" 103.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/pkgtools/x11-links/buildlink3.mk (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/09/11 19:11:47 1.28
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/09/11 19:47:31 1.29
@@ -1,31 +1,31 @@ @@ -1,31 +1,31 @@
1# $NetBSD: buildlink3.mk,v 1.28 2010/09/11 19:11:47 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.29 2010/09/11 19:47:31 tron 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.51 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.52
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/|/|"
29.endif # X11_LINKS_BUILDLINK3_MK 29.endif # X11_LINKS_BUILDLINK3_MK
30 30
31BUILDLINK_TREE+= -x11-links 31BUILDLINK_TREE+= -x11-links
cvs diff -r1.17 -r1.18 pkgsrc/pkgtools/x11-links/xorg.mk (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/xorg.mk 2010/09/11 19:11:47 1.17
+++ pkgsrc/pkgtools/x11-links/xorg.mk 2010/09/11 19:47:31 1.18
@@ -1,97 +1,98 @@ @@ -1,97 +1,98 @@
1# $NetBSD: xorg.mk,v 1.17 2010/09/11 19:11:47 tron Exp $ 1# $NetBSD: xorg.mk,v 1.18 2010/09/11 19:47:31 tron 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"
15.include "../../textproc/expat/buildlink3.mk" 15.include "../../textproc/expat/buildlink3.mk"
16.include "../../x11/bigreqsproto/buildlink3.mk" 16.include "../../x11/bigreqsproto/buildlink3.mk"
17.include "../../x11/compositeproto/buildlink3.mk" 17.include "../../x11/compositeproto/buildlink3.mk"
18.include "../../x11/damageproto/buildlink3.mk" 18.include "../../x11/damageproto/buildlink3.mk"
19.include "../../x11/evieext/buildlink3.mk" 19.include "../../x11/evieext/buildlink3.mk"
20.include "../../x11/fixesproto/buildlink3.mk" 20.include "../../x11/fixesproto/buildlink3.mk"
21.include "../../x11/fontcacheproto/buildlink3.mk" 21.include "../../x11/fontcacheproto/buildlink3.mk"
22.include "../../x11/fontsproto/buildlink3.mk" 22.include "../../x11/fontsproto/buildlink3.mk"
23.include "../../x11/glproto/buildlink3.mk" 23.include "../../x11/glproto/buildlink3.mk"
24.include "../../x11/inputproto/buildlink3.mk" 24.include "../../x11/inputproto/buildlink3.mk"
25.include "../../x11/libFS/buildlink3.mk" 25.include "../../x11/libFS/buildlink3.mk"
26.include "../../x11/libICE/buildlink3.mk" 26.include "../../x11/libICE/buildlink3.mk"
27.include "../../x11/libSM/buildlink3.mk" 27.include "../../x11/libSM/buildlink3.mk"
28.include "../../x11/libX11/buildlink3.mk" 28.include "../../x11/libX11/buildlink3.mk"
29.include "../../x11/libXScrnSaver/buildlink3.mk" 29.include "../../x11/libXScrnSaver/buildlink3.mk"
30.include "../../x11/libXTrap/buildlink3.mk" 30.include "../../x11/libXTrap/buildlink3.mk"
31.include "../../x11/libXau/buildlink3.mk" 31.include "../../x11/libXau/buildlink3.mk"
32.include "../../x11/libXcomposite/buildlink3.mk" 32.include "../../x11/libXcomposite/buildlink3.mk"
33.include "../../x11/libXcursor/buildlink3.mk" 33.include "../../x11/libXcursor/buildlink3.mk"
34.include "../../x11/libXdamage/buildlink3.mk" 34.include "../../x11/libXdamage/buildlink3.mk"
35.include "../../x11/libXdmcp/buildlink3.mk" 35.include "../../x11/libXdmcp/buildlink3.mk"
36.include "../../x11/libXevie/buildlink3.mk" 36.include "../../x11/libXevie/buildlink3.mk"
37.include "../../x11/libXext/buildlink3.mk" 37.include "../../x11/libXext/buildlink3.mk"
38.include "../../x11/libXfixes/buildlink3.mk" 38.include "../../x11/libXfixes/buildlink3.mk"
39.include "../../x11/libXfont/buildlink3.mk" 39.include "../../x11/libXfont/buildlink3.mk"
40.include "../../x11/libXft/buildlink3.mk" 40.include "../../x11/libXft/buildlink3.mk"
41.include "../../x11/libXinerama/buildlink3.mk" 41.include "../../x11/libXinerama/buildlink3.mk"
42.include "../../x11/libXmu/buildlink3.mk" 42.include "../../x11/libXmu/buildlink3.mk"
43.include "../../x11/libXpm/buildlink3.mk" 43.include "../../x11/libXpm/buildlink3.mk"
44.include "../../x11/libXprintUtil/buildlink3.mk" 44.include "../../x11/libXprintUtil/buildlink3.mk"
45.include "../../x11/libXrandr/buildlink3.mk" 45.include "../../x11/libXrandr/buildlink3.mk"
46.include "../../x11/libXrender/buildlink3.mk" 46.include "../../x11/libXrender/buildlink3.mk"
47.include "../../x11/libXres/buildlink3.mk" 47.include "../../x11/libXres/buildlink3.mk"
48.include "../../x11/libXt/buildlink3.mk" 48.include "../../x11/libXt/buildlink3.mk"
49.include "../../x11/libXtst/buildlink3.mk" 49.include "../../x11/libXtst/buildlink3.mk"
50.include "../../x11/libXv/buildlink3.mk" 50.include "../../x11/libXv/buildlink3.mk"
51.include "../../x11/libdrm/buildlink3.mk" 51.include "../../x11/libdrm/buildlink3.mk"
52.include "../../x11/liblbxutil/buildlink3.mk" 52.include "../../x11/liblbxutil/buildlink3.mk"
53.include "../../x11/libxcb/buildlink3.mk" 53.include "../../x11/libxcb/buildlink3.mk"
54.include "../../x11/pixman/buildlink3.mk" 54.include "../../x11/pixman/buildlink3.mk"
55.include "../../x11/printproto/buildlink3.mk" 55.include "../../x11/printproto/buildlink3.mk"
56.include "../../x11/randrproto/buildlink3.mk" 56.include "../../x11/randrproto/buildlink3.mk"
57.include "../../x11/recordproto/buildlink3.mk" 57.include "../../x11/recordproto/buildlink3.mk"
58.include "../../x11/renderproto/buildlink3.mk" 58.include "../../x11/renderproto/buildlink3.mk"
59.include "../../x11/resourceproto/buildlink3.mk" 59.include "../../x11/resourceproto/buildlink3.mk"
60.include "../../x11/scrnsaverproto/buildlink3.mk" 60.include "../../x11/scrnsaverproto/buildlink3.mk"
61.include "../../x11/trapproto/buildlink3.mk" 61.include "../../x11/trapproto/buildlink3.mk"
62.include "../../x11/videoproto/buildlink3.mk" 62.include "../../x11/videoproto/buildlink3.mk"
63.include "../../x11/xcmiscproto/buildlink3.mk" 63.include "../../x11/xcmiscproto/buildlink3.mk"
 64.include "../../x11/xcb-proto/buildlink3.mk"
64.include "../../x11/xextproto/buildlink3.mk" 65.include "../../x11/xextproto/buildlink3.mk"
65.include "../../x11/xf86bigfontproto/buildlink3.mk" 66.include "../../x11/xf86bigfontproto/buildlink3.mk"
66.include "../../x11/xf86dgaproto/buildlink3.mk" 67.include "../../x11/xf86dgaproto/buildlink3.mk"
67.include "../../x11/xf86driproto/buildlink3.mk" 68.include "../../x11/xf86driproto/buildlink3.mk"
68.include "../../x11/xf86miscproto/buildlink3.mk" 69.include "../../x11/xf86miscproto/buildlink3.mk"
69.include "../../x11/xf86vidmodeproto/buildlink3.mk" 70.include "../../x11/xf86vidmodeproto/buildlink3.mk"
70.include "../../x11/xkeyboard-config/buildlink3.mk" 71.include "../../x11/xkeyboard-config/buildlink3.mk"
71.include "../../x11/xproto/buildlink3.mk" 72.include "../../x11/xproto/buildlink3.mk"
72.include "../../x11/xproxymanagementprotocol/buildlink3.mk" 73.include "../../x11/xproxymanagementprotocol/buildlink3.mk"
73.include "../../x11/xtrans/buildlink3.mk" 74.include "../../x11/xtrans/buildlink3.mk"
74 75
75# XXX what is ${X11_MODULES} ? 76# XXX what is ${X11_MODULES} ?
76 77
77# Check if any headers and libraries for ${X11_MODULES} found in 78# Check if any headers and libraries for ${X11_MODULES} found in
78# ${X11BASE} actually belong to the base Xorg or not. 79# ${X11BASE} actually belong to the base Xorg or not.
79# 80#
80# XXX: maybe skip iconv and zlib too? 81# XXX: maybe skip iconv and zlib too?
81.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} 82.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
82CHECK_BUILTIN.${_pkg_}:= yes 83CHECK_BUILTIN.${_pkg_}:= yes
83USE_BUILTIN.${_pkg_}= yes 84USE_BUILTIN.${_pkg_}= yes
84. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk" 85. sinclude "${BUILDLINK_PKGSRCDIR.${_pkg_}}/builtin.mk"
85CHECK_BUILTIN.${_pkg_}:= no 86CHECK_BUILTIN.${_pkg_}:= no
86.endfor 87.endfor
87 88
88.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u} 89.for _pkg_ in ${BUILDLINK_TREE:N-*:Nx11-links:O:u}
89IGNORE_PKG.${_pkg_}= yes 90IGNORE_PKG.${_pkg_}= yes
90. if defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS]) 91. if defined(IS_BUILTIN.${_pkg_}) && !empty(IS_BUILTIN.${_pkg_}:M[yY][eE][sS])
91. if exists(${FILESDIR}/xorg.${_pkg_}) 92. if exists(${FILESDIR}/xorg.${_pkg_})
92FILES_LIST+= ${FILESDIR}/xorg.${_pkg_} 93FILES_LIST+= ${FILESDIR}/xorg.${_pkg_}
93. elif exists(${FILESDIR}/xfree.${_pkg_}) 94. elif exists(${FILESDIR}/xfree.${_pkg_})
94FILES_LIST+= ${FILESDIR}/xfree.${_pkg_} 95FILES_LIST+= ${FILESDIR}/xfree.${_pkg_}
95. endif 96. endif
96. endif 97. endif
97.endfor 98.endfor
cvs diff -r1.1 -r1.2 pkgsrc/pkgtools/x11-links/files/xorg.libxcb (switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.libxcb 2010/09/11 19:11:47 1.1
+++ pkgsrc/pkgtools/x11-links/files/xorg.libxcb 2010/09/11 19:47:31 1.2
@@ -1,190 +1,189 @@ @@ -1,190 +1,189 @@
1# $NetBSD: xorg.libxcb,v 1.1 2010/09/11 19:11:47 tron Exp $ 1# $NetBSD: xorg.libxcb,v 1.2 2010/09/11 19:47:31 tron Exp $
2# 2#
3include/xcb/bigreq.h 3include/xcb/bigreq.h
4include/xcb/composite.h 4include/xcb/composite.h
5include/xcb/damage.h 5include/xcb/damage.h
6include/xcb/dpms.h 6include/xcb/dpms.h
7include/xcb/dri2.h 7include/xcb/dri2.h
8include/xcb/glx.h 8include/xcb/glx.h
9include/xcb/randr.h 9include/xcb/randr.h
10include/xcb/record.h 10include/xcb/record.h
11include/xcb/render.h 11include/xcb/render.h
12include/xcb/res.h 12include/xcb/res.h
13include/xcb/screensaver.h 13include/xcb/screensaver.h
14include/xcb/shape.h 14include/xcb/shape.h
15include/xcb/shm.h 15include/xcb/shm.h
16include/xcb/sync.h 16include/xcb/sync.h
17include/xcb/xc_misc.h 17include/xcb/xc_misc.h
18include/xcb/xcb.h 18include/xcb/xcb.h
19include/xcb/xcb_atom.h 19include/xcb/xcb_atom.h
20include/xcb/xcb_aux.h 20include/xcb/xcb_aux.h
21include/xcb/xcb_bitops.h 21include/xcb/xcb_bitops.h
22include/xcb/xcb_event.h 22include/xcb/xcb_event.h
23include/xcb/xcb_icccm.h 23include/xcb/xcb_icccm.h
24include/xcb/xcb_image.h 24include/xcb/xcb_image.h
25include/xcb/xcb_keysyms.h 25include/xcb/xcb_keysyms.h
26include/xcb/xcb_pixel.h 26include/xcb/xcb_pixel.h
27include/xcb/xcb_property.h 27include/xcb/xcb_property.h
28include/xcb/xcb_renderutil.h 28include/xcb/xcb_renderutil.h
29include/xcb/xcb_reply.h 29include/xcb/xcb_reply.h
30include/xcb/xcb_wm.h 30include/xcb/xcb_wm.h
31include/xcb/xcbext.h 31include/xcb/xcbext.h
32include/xcb/xevie.h 32include/xcb/xevie.h
33include/xcb/xf86dri.h 33include/xcb/xf86dri.h
34include/xcb/xfixes.h 34include/xcb/xfixes.h
35include/xcb/xinerama.h 35include/xcb/xinerama.h
36include/xcb/xinput.h 36include/xcb/xinput.h
37include/xcb/xprint.h 37include/xcb/xprint.h
38include/xcb/xproto.h 38include/xcb/xproto.h
39include/xcb/xselinux.h 39include/xcb/xselinux.h
40include/xcb/xtest.h 40include/xcb/xtest.h
41include/xcb/xv.h 41include/xcb/xv.h
42include/xcb/xvmc.h 42include/xcb/xvmc.h
43lib/libxcb-atom.1.0.0.dylib 43lib/libxcb-atom.1.0.0.dylib
44lib/libxcb-atom.1.dylib 44lib/libxcb-atom.1.dylib
45lib/libxcb-atom.dylib 45lib/libxcb-atom.dylib
46lib/libxcb-aux.0.0.0.dylib 46lib/libxcb-aux.0.0.0.dylib
47lib/libxcb-aux.0.dylib 47lib/libxcb-aux.0.dylib
48lib/libxcb-aux.dylib 48lib/libxcb-aux.dylib
49lib/libxcb-composite.0.0.0.dylib 49lib/libxcb-composite.0.0.0.dylib
50lib/libxcb-composite.0.dylib 50lib/libxcb-composite.0.dylib
51lib/libxcb-composite.dylib 51lib/libxcb-composite.dylib
52lib/libxcb-composite.la 52lib/libxcb-composite.la
53lib/libxcb-damage.0.0.0.dylib 53lib/libxcb-damage.0.0.0.dylib
54lib/libxcb-damage.0.dylib 54lib/libxcb-damage.0.dylib
55lib/libxcb-damage.dylib 55lib/libxcb-damage.dylib
56lib/libxcb-damage.la 56lib/libxcb-damage.la
57lib/libxcb-dpms.0.0.0.dylib 57lib/libxcb-dpms.0.0.0.dylib
58lib/libxcb-dpms.0.dylib 58lib/libxcb-dpms.0.dylib
59lib/libxcb-dpms.dylib 59lib/libxcb-dpms.dylib
60lib/libxcb-dpms.la 60lib/libxcb-dpms.la
61lib/libxcb-dri2.la 61lib/libxcb-dri2.la
62lib/libxcb-event.1.0.0.dylib 62lib/libxcb-event.1.0.0.dylib
63lib/libxcb-event.1.dylib 63lib/libxcb-event.1.dylib
64lib/libxcb-event.dylib 64lib/libxcb-event.dylib
65lib/libxcb-glx.0.0.0.dylib 65lib/libxcb-glx.0.0.0.dylib
66lib/libxcb-glx.0.dylib 66lib/libxcb-glx.0.dylib
67lib/libxcb-glx.dylib 67lib/libxcb-glx.dylib
68lib/libxcb-glx.la 68lib/libxcb-glx.la
69lib/libxcb-icccm.1.0.0.dylib 69lib/libxcb-icccm.1.0.0.dylib
70lib/libxcb-icccm.1.dylib 70lib/libxcb-icccm.1.dylib
71lib/libxcb-icccm.dylib 71lib/libxcb-icccm.dylib
72lib/libxcb-image.0.0.0.dylib 72lib/libxcb-image.0.0.0.dylib
73lib/libxcb-image.0.dylib 73lib/libxcb-image.0.dylib
74lib/libxcb-image.dylib 74lib/libxcb-image.dylib
75lib/libxcb-keysyms.0.0.0.dylib 75lib/libxcb-keysyms.0.0.0.dylib
76lib/libxcb-keysyms.0.dylib 76lib/libxcb-keysyms.0.dylib
77lib/libxcb-keysyms.dylib 77lib/libxcb-keysyms.dylib
78lib/libxcb-property.1.0.0.dylib 78lib/libxcb-property.1.0.0.dylib
79lib/libxcb-property.1.dylib 79lib/libxcb-property.1.dylib
80lib/libxcb-property.dylib 80lib/libxcb-property.dylib
81lib/libxcb-randr.0.0.0.dylib 81lib/libxcb-randr.0.0.0.dylib
82lib/libxcb-randr.0.dylib 82lib/libxcb-randr.0.dylib
83lib/libxcb-randr.dylib 83lib/libxcb-randr.dylib
84lib/libxcb-randr.la 84lib/libxcb-randr.la
85lib/libxcb-record.0.0.0.dylib 85lib/libxcb-record.0.0.0.dylib
86lib/libxcb-record.0.dylib 86lib/libxcb-record.0.dylib
87lib/libxcb-record.dylib 87lib/libxcb-record.dylib
88lib/libxcb-record.la 88lib/libxcb-record.la
89lib/libxcb-render-util.0.0.0.dylib 89lib/libxcb-render-util.0.0.0.dylib
90lib/libxcb-render-util.0.dylib 90lib/libxcb-render-util.0.dylib
91lib/libxcb-render-util.dylib 91lib/libxcb-render-util.dylib
92lib/libxcb-render.0.0.0.dylib 92lib/libxcb-render.0.0.0.dylib
93lib/libxcb-render.0.dylib 93lib/libxcb-render.0.dylib
94lib/libxcb-render.dylib 94lib/libxcb-render.dylib
95lib/libxcb-render.la 95lib/libxcb-render.la
96lib/libxcb-reply.1.0.0.dylib 96lib/libxcb-reply.1.0.0.dylib
97lib/libxcb-reply.1.dylib 97lib/libxcb-reply.1.dylib
98lib/libxcb-reply.dylib 98lib/libxcb-reply.dylib
99lib/libxcb-res.0.0.0.dylib 99lib/libxcb-res.0.0.0.dylib
100lib/libxcb-res.0.dylib 100lib/libxcb-res.0.dylib
101lib/libxcb-res.dylib 101lib/libxcb-res.dylib
102lib/libxcb-res.la 102lib/libxcb-res.la
103lib/libxcb-screensaver.0.0.0.dylib 103lib/libxcb-screensaver.0.0.0.dylib
104lib/libxcb-screensaver.0.dylib 104lib/libxcb-screensaver.0.dylib
105lib/libxcb-screensaver.dylib 105lib/libxcb-screensaver.dylib
106lib/libxcb-screensaver.la 106lib/libxcb-screensaver.la
107lib/libxcb-shape.0.0.0.dylib 107lib/libxcb-shape.0.0.0.dylib
108lib/libxcb-shape.0.dylib 108lib/libxcb-shape.0.dylib
109lib/libxcb-shape.dylib 109lib/libxcb-shape.dylib
110lib/libxcb-shape.la 110lib/libxcb-shape.la
111lib/libxcb-shm.0.0.0.dylib 111lib/libxcb-shm.0.0.0.dylib
112lib/libxcb-shm.0.dylib 112lib/libxcb-shm.0.dylib
113lib/libxcb-shm.dylib 113lib/libxcb-shm.dylib
114lib/libxcb-shm.la 114lib/libxcb-shm.la
115lib/libxcb-sync.0.0.0.dylib 115lib/libxcb-sync.0.0.0.dylib
116lib/libxcb-sync.0.dylib 116lib/libxcb-sync.0.dylib
117lib/libxcb-sync.dylib 117lib/libxcb-sync.dylib
118lib/libxcb-sync.la 118lib/libxcb-sync.la
119lib/libxcb-wm.0.0.0.dylib 119lib/libxcb-wm.0.0.0.dylib
120lib/libxcb-wm.0.dylib 120lib/libxcb-wm.0.dylib
121lib/libxcb-wm.dylib 121lib/libxcb-wm.dylib
122lib/libxcb-xevie.0.0.0.dylib 122lib/libxcb-xevie.0.0.0.dylib
123lib/libxcb-xevie.0.dylib 123lib/libxcb-xevie.0.dylib
124lib/libxcb-xevie.dylib 124lib/libxcb-xevie.dylib
125lib/libxcb-xevie.la 125lib/libxcb-xevie.la
126lib/libxcb-xf86dri.0.0.0.dylib 126lib/libxcb-xf86dri.0.0.0.dylib
127lib/libxcb-xf86dri.0.dylib 127lib/libxcb-xf86dri.0.dylib
128lib/libxcb-xf86dri.dylib 128lib/libxcb-xf86dri.dylib
129lib/libxcb-xf86dri.la 129lib/libxcb-xf86dri.la
130lib/libxcb-xfixes.0.0.0.dylib 130lib/libxcb-xfixes.0.0.0.dylib
131lib/libxcb-xfixes.0.dylib 131lib/libxcb-xfixes.0.dylib
132lib/libxcb-xfixes.dylib 132lib/libxcb-xfixes.dylib
133lib/libxcb-xfixes.la 133lib/libxcb-xfixes.la
134lib/libxcb-xinerama.0.0.0.dylib 134lib/libxcb-xinerama.0.0.0.dylib
135lib/libxcb-xinerama.0.dylib 135lib/libxcb-xinerama.0.dylib
136lib/libxcb-xinerama.dylib 136lib/libxcb-xinerama.dylib
137lib/libxcb-xinerama.la 137lib/libxcb-xinerama.la
138lib/libxcb-xprint.0.0.0.dylib 138lib/libxcb-xprint.0.0.0.dylib
139lib/libxcb-xprint.0.dylib 139lib/libxcb-xprint.0.dylib
140lib/libxcb-xprint.dylib 140lib/libxcb-xprint.dylib
141lib/libxcb-xprint.la 141lib/libxcb-xprint.la
142lib/libxcb-xtest.0.0.0.dylib 142lib/libxcb-xtest.0.0.0.dylib
143lib/libxcb-xtest.0.dylib 143lib/libxcb-xtest.0.dylib
144lib/libxcb-xtest.dylib 144lib/libxcb-xtest.dylib
145lib/libxcb-xtest.la 145lib/libxcb-xtest.la
146lib/libxcb-xv.0.0.0.dylib 146lib/libxcb-xv.0.0.0.dylib
147lib/libxcb-xv.0.dylib 147lib/libxcb-xv.0.dylib
148lib/libxcb-xv.dylib 148lib/libxcb-xv.dylib
149lib/libxcb-xv.la 149lib/libxcb-xv.la
150lib/libxcb-xvmc.0.0.0.dylib 150lib/libxcb-xvmc.0.0.0.dylib
151lib/libxcb-xvmc.0.dylib 151lib/libxcb-xvmc.0.dylib
152lib/libxcb-xvmc.dylib 152lib/libxcb-xvmc.dylib
153lib/libxcb-xvmc.la 153lib/libxcb-xvmc.la
154lib/libxcb.1.1.0.dylib 154lib/libxcb.1.1.0.dylib
155lib/libxcb.1.dylib 155lib/libxcb.1.dylib
156lib/libxcb.dylib 156lib/libxcb.dylib
157lib/libxcb.la 157lib/libxcb.la
158lib/pkgconfig/xcb-atom.pc 158lib/pkgconfig/xcb-atom.pc
159lib/pkgconfig/xcb-aux.pc 159lib/pkgconfig/xcb-aux.pc
160lib/pkgconfig/xcb-composite.pc 160lib/pkgconfig/xcb-composite.pc
161lib/pkgconfig/xcb-damage.pc 161lib/pkgconfig/xcb-damage.pc
162lib/pkgconfig/xcb-dpms.pc 162lib/pkgconfig/xcb-dpms.pc
163lib/pkgconfig/xcb-dri2.pc 163lib/pkgconfig/xcb-dri2.pc
164lib/pkgconfig/xcb-event.pc 164lib/pkgconfig/xcb-event.pc
165lib/pkgconfig/xcb-glx.pc 165lib/pkgconfig/xcb-glx.pc
166lib/pkgconfig/xcb-icccm.pc 166lib/pkgconfig/xcb-icccm.pc
167lib/pkgconfig/xcb-image.pc 167lib/pkgconfig/xcb-image.pc
168lib/pkgconfig/xcb-keysyms.pc 168lib/pkgconfig/xcb-keysyms.pc
169lib/pkgconfig/xcb-property.pc 169lib/pkgconfig/xcb-property.pc
170lib/pkgconfig/xcb-proto.pc 
171lib/pkgconfig/xcb-randr.pc 170lib/pkgconfig/xcb-randr.pc
172lib/pkgconfig/xcb-record.pc 171lib/pkgconfig/xcb-record.pc
173lib/pkgconfig/xcb-render.pc 172lib/pkgconfig/xcb-render.pc
174lib/pkgconfig/xcb-renderutil.pc 173lib/pkgconfig/xcb-renderutil.pc
175lib/pkgconfig/xcb-reply.pc 174lib/pkgconfig/xcb-reply.pc
176lib/pkgconfig/xcb-res.pc 175lib/pkgconfig/xcb-res.pc
177lib/pkgconfig/xcb-screensaver.pc 176lib/pkgconfig/xcb-screensaver.pc
178lib/pkgconfig/xcb-shape.pc 177lib/pkgconfig/xcb-shape.pc
179lib/pkgconfig/xcb-shm.pc 178lib/pkgconfig/xcb-shm.pc
180lib/pkgconfig/xcb-sync.pc 179lib/pkgconfig/xcb-sync.pc
181lib/pkgconfig/xcb-wm.pc 180lib/pkgconfig/xcb-wm.pc
182lib/pkgconfig/xcb-xevie.pc 181lib/pkgconfig/xcb-xevie.pc
183lib/pkgconfig/xcb-xf86dri.pc 182lib/pkgconfig/xcb-xf86dri.pc
184lib/pkgconfig/xcb-xfixes.pc 183lib/pkgconfig/xcb-xfixes.pc
185lib/pkgconfig/xcb-xinerama.pc 184lib/pkgconfig/xcb-xinerama.pc
186lib/pkgconfig/xcb-xprint.pc 185lib/pkgconfig/xcb-xprint.pc
187lib/pkgconfig/xcb-xtest.pc 186lib/pkgconfig/xcb-xtest.pc
188lib/pkgconfig/xcb-xv.pc 187lib/pkgconfig/xcb-xv.pc
189lib/pkgconfig/xcb-xvmc.pc 188lib/pkgconfig/xcb-xvmc.pc
190lib/pkgconfig/xcb.pc 189lib/pkgconfig/xcb.pc
File Added: pkgsrc/pkgtools/x11-links/files/xorg.xcb-proto
# $NetBSD: xorg.xcb-proto,v 1.1 2010/09/11 19:47:31 tron Exp $
#
lib/pkgconfig/xcb-proto.pc
share/xcb/bigreq.xml
share/xcb/composite.xml
share/xcb/damage.xml
share/xcb/dpms.xml
share/xcb/dri2.xml
share/xcb/glx.xml
share/xcb/randr.xml
share/xcb/record.xml
share/xcb/render.xml
share/xcb/res.xml
share/xcb/screensaver.xml
share/xcb/shape.xml
share/xcb/shm.xml
share/xcb/sync.xml
share/xcb/xc_misc.xml
share/xcb/xcb.xsd
share/xcb/xevie.xml
share/xcb/xf86dri.xml
share/xcb/xfixes.xml
share/xcb/xinerama.xml
share/xcb/xinput.xml
share/xcb/xprint.xml
share/xcb/xproto.xml
share/xcb/xselinux.xml
share/xcb/xtest.xml
share/xcb/xv.xml
share/xcb/xvmc.xml