Sat Sep 11 20:15:20 2010 UTC ()
Update to 0.53:
Remove xcb-utils files from xorg.libxcb and add symlinks for
NetBSD-current's libxcb.


(wiz)
diff -r1.117 -r1.118 pkgsrc/pkgtools/x11-links/Makefile
diff -r1.29 -r1.30 pkgsrc/pkgtools/x11-links/buildlink3.mk
diff -r1.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.libxcb
cvs diff -r1.117 -r1.118 pkgsrc/pkgtools/x11-links/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/Makefile 2010/09/11 19:47:31 1.117
+++ pkgsrc/pkgtools/x11-links/Makefile 2010/09/11 20:15:20 1.118
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.117 2010/09/11 19:47:31 tron Exp $ 1# $NetBSD: Makefile,v 1.118 2010/09/11 20:15:20 wiz 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.52 7DISTNAME= x11-links-0.53
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.29 -r1.30 pkgsrc/pkgtools/x11-links/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/09/11 19:47:31 1.29
+++ pkgsrc/pkgtools/x11-links/buildlink3.mk 2010/09/11 20:15:20 1.30
@@ -1,28 +1,28 @@ @@ -1,28 +1,28 @@
1# $NetBSD: buildlink3.mk,v 1.29 2010/09/11 19:47:31 tron Exp $ 1# $NetBSD: buildlink3.mk,v 1.30 2010/09/11 20:15:20 wiz 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.52 15BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.53
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.2 -r1.3 pkgsrc/pkgtools/x11-links/files/xorg.libxcb (expand / switch to unified diff)

--- pkgsrc/pkgtools/x11-links/files/xorg.libxcb 2010/09/11 19:47:31 1.2
+++ pkgsrc/pkgtools/x11-links/files/xorg.libxcb 2010/09/11 20:15:20 1.3
@@ -1,187 +1,224 @@ @@ -1,187 +1,224 @@
1# $NetBSD: xorg.libxcb,v 1.2 2010/09/11 19:47:31 tron Exp $ 1# $NetBSD: xorg.libxcb,v 1.3 2010/09/11 20:15:20 wiz 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 
20include/xcb/xcb_aux.h 
21include/xcb/xcb_bitops.h 
22include/xcb/xcb_event.h 
23include/xcb/xcb_icccm.h 
24include/xcb/xcb_image.h 
25include/xcb/xcb_keysyms.h 
26include/xcb/xcb_pixel.h 
27include/xcb/xcb_property.h 
28include/xcb/xcb_renderutil.h 
29include/xcb/xcb_reply.h 
30include/xcb/xcb_wm.h 19include/xcb/xcb_wm.h
31include/xcb/xcbext.h 20include/xcb/xcbext.h
32include/xcb/xevie.h 21include/xcb/xevie.h
33include/xcb/xf86dri.h 22include/xcb/xf86dri.h
34include/xcb/xfixes.h 23include/xcb/xfixes.h
35include/xcb/xinerama.h 24include/xcb/xinerama.h
36include/xcb/xinput.h 25include/xcb/xinput.h
37include/xcb/xprint.h 26include/xcb/xprint.h
38include/xcb/xproto.h 27include/xcb/xproto.h
39include/xcb/xselinux.h 28include/xcb/xselinux.h
40include/xcb/xtest.h 29include/xcb/xtest.h
41include/xcb/xv.h 30include/xcb/xv.h
42include/xcb/xvmc.h 31include/xcb/xvmc.h
43lib/libxcb-atom.1.0.0.dylib 
44lib/libxcb-atom.1.dylib 
45lib/libxcb-atom.dylib 
46lib/libxcb-aux.0.0.0.dylib 
47lib/libxcb-aux.0.dylib 
48lib/libxcb-aux.dylib 
49lib/libxcb-composite.0.0.0.dylib 32lib/libxcb-composite.0.0.0.dylib
50lib/libxcb-composite.0.dylib 33lib/libxcb-composite.0.dylib
 34lib/libxcb-composite.a
51lib/libxcb-composite.dylib 35lib/libxcb-composite.dylib
52lib/libxcb-composite.la 36lib/libxcb-composite.la
 37lib/libxcb-composite.so
 38lib/libxcb-composite.so.0
 39lib/libxcb-composite.so.0.0
53lib/libxcb-damage.0.0.0.dylib 40lib/libxcb-damage.0.0.0.dylib
54lib/libxcb-damage.0.dylib 41lib/libxcb-damage.0.dylib
 42lib/libxcb-damage.a
55lib/libxcb-damage.dylib 43lib/libxcb-damage.dylib
56lib/libxcb-damage.la 44lib/libxcb-damage.la
 45lib/libxcb-damage.so
 46lib/libxcb-damage.so.0
 47lib/libxcb-damage.so.0.0
57lib/libxcb-dpms.0.0.0.dylib 48lib/libxcb-dpms.0.0.0.dylib
58lib/libxcb-dpms.0.dylib 49lib/libxcb-dpms.0.dylib
 50lib/libxcb-dpms.a
59lib/libxcb-dpms.dylib 51lib/libxcb-dpms.dylib
60lib/libxcb-dpms.la 52lib/libxcb-dpms.la
 53lib/libxcb-dpms.so
 54lib/libxcb-dpms.so.0
 55lib/libxcb-dpms.so.0.0
 56lib/libxcb-dri2.a
61lib/libxcb-dri2.la 57lib/libxcb-dri2.la
62lib/libxcb-event.1.0.0.dylib 58lib/libxcb-dri2.so
63lib/libxcb-event.1.dylib 59lib/libxcb-dri2.so.0
64lib/libxcb-event.dylib 60lib/libxcb-dri2.so.0.0
65lib/libxcb-glx.0.0.0.dylib 61lib/libxcb-glx.0.0.0.dylib
66lib/libxcb-glx.0.dylib 62lib/libxcb-glx.0.dylib
 63lib/libxcb-glx.a
67lib/libxcb-glx.dylib 64lib/libxcb-glx.dylib
68lib/libxcb-glx.la 65lib/libxcb-glx.la
69lib/libxcb-icccm.1.0.0.dylib 66lib/libxcb-glx.so
70lib/libxcb-icccm.1.dylib 67lib/libxcb-glx.so.0
71lib/libxcb-icccm.dylib 68lib/libxcb-glx.so.0.0
72lib/libxcb-image.0.0.0.dylib 
73lib/libxcb-image.0.dylib 
74lib/libxcb-image.dylib 
75lib/libxcb-keysyms.0.0.0.dylib 
76lib/libxcb-keysyms.0.dylib 
77lib/libxcb-keysyms.dylib 
78lib/libxcb-property.1.0.0.dylib 
79lib/libxcb-property.1.dylib 
80lib/libxcb-property.dylib 
81lib/libxcb-randr.0.0.0.dylib 69lib/libxcb-randr.0.0.0.dylib
82lib/libxcb-randr.0.dylib 70lib/libxcb-randr.0.dylib
 71lib/libxcb-randr.a
83lib/libxcb-randr.dylib 72lib/libxcb-randr.dylib
84lib/libxcb-randr.la 73lib/libxcb-randr.la
 74lib/libxcb-randr.so
 75lib/libxcb-randr.so.0
 76lib/libxcb-randr.so.0.0
85lib/libxcb-record.0.0.0.dylib 77lib/libxcb-record.0.0.0.dylib
86lib/libxcb-record.0.dylib 78lib/libxcb-record.0.dylib
 79lib/libxcb-record.a
87lib/libxcb-record.dylib 80lib/libxcb-record.dylib
88lib/libxcb-record.la 81lib/libxcb-record.la
89lib/libxcb-render-util.0.0.0.dylib 82lib/libxcb-record.so
90lib/libxcb-render-util.0.dylib 83lib/libxcb-record.so.0
91lib/libxcb-render-util.dylib 84lib/libxcb-record.so.0.0
92lib/libxcb-render.0.0.0.dylib 85lib/libxcb-render.0.0.0.dylib
93lib/libxcb-render.0.dylib 86lib/libxcb-render.0.dylib
 87lib/libxcb-render.a
94lib/libxcb-render.dylib 88lib/libxcb-render.dylib
95lib/libxcb-render.la 89lib/libxcb-render.la
96lib/libxcb-reply.1.0.0.dylib 90lib/libxcb-render.so
97lib/libxcb-reply.1.dylib 91lib/libxcb-render.so.0
98lib/libxcb-reply.dylib 92lib/libxcb-render.so.0.0
99lib/libxcb-res.0.0.0.dylib 93lib/libxcb-res.0.0.0.dylib
100lib/libxcb-res.0.dylib 94lib/libxcb-res.0.dylib
 95lib/libxcb-res.a
101lib/libxcb-res.dylib 96lib/libxcb-res.dylib
102lib/libxcb-res.la 97lib/libxcb-res.la
 98lib/libxcb-res.so
 99lib/libxcb-res.so.0
 100lib/libxcb-res.so.0.0
103lib/libxcb-screensaver.0.0.0.dylib 101lib/libxcb-screensaver.0.0.0.dylib
104lib/libxcb-screensaver.0.dylib 102lib/libxcb-screensaver.0.dylib
 103lib/libxcb-screensaver.a
105lib/libxcb-screensaver.dylib 104lib/libxcb-screensaver.dylib
106lib/libxcb-screensaver.la 105lib/libxcb-screensaver.la
 106lib/libxcb-screensaver.so
 107lib/libxcb-screensaver.so.0
 108lib/libxcb-screensaver.so.0.0
107lib/libxcb-shape.0.0.0.dylib 109lib/libxcb-shape.0.0.0.dylib
108lib/libxcb-shape.0.dylib 110lib/libxcb-shape.0.dylib
 111lib/libxcb-shape.a
109lib/libxcb-shape.dylib 112lib/libxcb-shape.dylib
110lib/libxcb-shape.la 113lib/libxcb-shape.la
 114lib/libxcb-shape.so
 115lib/libxcb-shape.so.0
 116lib/libxcb-shape.so.0.0
111lib/libxcb-shm.0.0.0.dylib 117lib/libxcb-shm.0.0.0.dylib
112lib/libxcb-shm.0.dylib 118lib/libxcb-shm.0.dylib
 119lib/libxcb-shm.a
113lib/libxcb-shm.dylib 120lib/libxcb-shm.dylib
114lib/libxcb-shm.la 121lib/libxcb-shm.la
 122lib/libxcb-shm.so
 123lib/libxcb-shm.so.0
 124lib/libxcb-shm.so.0.0
115lib/libxcb-sync.0.0.0.dylib 125lib/libxcb-sync.0.0.0.dylib
116lib/libxcb-sync.0.dylib 126lib/libxcb-sync.0.dylib
 127lib/libxcb-sync.a
117lib/libxcb-sync.dylib 128lib/libxcb-sync.dylib
118lib/libxcb-sync.la 129lib/libxcb-sync.la
 130lib/libxcb-sync.so
 131lib/libxcb-sync.so.0
 132lib/libxcb-sync.so.0.0
119lib/libxcb-wm.0.0.0.dylib 133lib/libxcb-wm.0.0.0.dylib
120lib/libxcb-wm.0.dylib 134lib/libxcb-wm.0.dylib
121lib/libxcb-wm.dylib 135lib/libxcb-wm.dylib
122lib/libxcb-xevie.0.0.0.dylib 136lib/libxcb-xevie.0.0.0.dylib
123lib/libxcb-xevie.0.dylib 137lib/libxcb-xevie.0.dylib
 138lib/libxcb-xevie.a
124lib/libxcb-xevie.dylib 139lib/libxcb-xevie.dylib
125lib/libxcb-xevie.la 140lib/libxcb-xevie.la
 141lib/libxcb-xevie.so
 142lib/libxcb-xevie.so.0
 143lib/libxcb-xevie.so.0.0
126lib/libxcb-xf86dri.0.0.0.dylib 144lib/libxcb-xf86dri.0.0.0.dylib
127lib/libxcb-xf86dri.0.dylib 145lib/libxcb-xf86dri.0.dylib
 146lib/libxcb-xf86dri.a
128lib/libxcb-xf86dri.dylib 147lib/libxcb-xf86dri.dylib
129lib/libxcb-xf86dri.la 148lib/libxcb-xf86dri.la
 149lib/libxcb-xf86dri.so
 150lib/libxcb-xf86dri.so.0
 151lib/libxcb-xf86dri.so.0.0
130lib/libxcb-xfixes.0.0.0.dylib 152lib/libxcb-xfixes.0.0.0.dylib
131lib/libxcb-xfixes.0.dylib 153lib/libxcb-xfixes.0.dylib
 154lib/libxcb-xfixes.a
132lib/libxcb-xfixes.dylib 155lib/libxcb-xfixes.dylib
133lib/libxcb-xfixes.la 156lib/libxcb-xfixes.la
 157lib/libxcb-xfixes.so
 158lib/libxcb-xfixes.so.0
 159lib/libxcb-xfixes.so.0.0
134lib/libxcb-xinerama.0.0.0.dylib 160lib/libxcb-xinerama.0.0.0.dylib
135lib/libxcb-xinerama.0.dylib 161lib/libxcb-xinerama.0.dylib
 162lib/libxcb-xinerama.a
136lib/libxcb-xinerama.dylib 163lib/libxcb-xinerama.dylib
137lib/libxcb-xinerama.la 164lib/libxcb-xinerama.la
 165lib/libxcb-xinerama.so
 166lib/libxcb-xinerama.so.0
 167lib/libxcb-xinerama.so.0.0
138lib/libxcb-xprint.0.0.0.dylib 168lib/libxcb-xprint.0.0.0.dylib
139lib/libxcb-xprint.0.dylib 169lib/libxcb-xprint.0.dylib
140lib/libxcb-xprint.dylib 170lib/libxcb-xprint.dylib
141lib/libxcb-xprint.la 171lib/libxcb-xprint.la
142lib/libxcb-xtest.0.0.0.dylib 172lib/libxcb-xtest.0.0.0.dylib
143lib/libxcb-xtest.0.dylib 173lib/libxcb-xtest.0.dylib
 174lib/libxcb-xtest.a
144lib/libxcb-xtest.dylib 175lib/libxcb-xtest.dylib
145lib/libxcb-xtest.la 176lib/libxcb-xtest.la
 177lib/libxcb-xtest.so
 178lib/libxcb-xtest.so.0
 179lib/libxcb-xtest.so.0.0
146lib/libxcb-xv.0.0.0.dylib 180lib/libxcb-xv.0.0.0.dylib
147lib/libxcb-xv.0.dylib 181lib/libxcb-xv.0.dylib
 182lib/libxcb-xv.a
148lib/libxcb-xv.dylib 183lib/libxcb-xv.dylib
149lib/libxcb-xv.la 184lib/libxcb-xv.la
 185lib/libxcb-xv.so
 186lib/libxcb-xv.so.0
 187lib/libxcb-xv.so.0.0
150lib/libxcb-xvmc.0.0.0.dylib 188lib/libxcb-xvmc.0.0.0.dylib
151lib/libxcb-xvmc.0.dylib 189lib/libxcb-xvmc.0.dylib
 190lib/libxcb-xvmc.a
152lib/libxcb-xvmc.dylib 191lib/libxcb-xvmc.dylib
153lib/libxcb-xvmc.la 192lib/libxcb-xvmc.la
 193lib/libxcb-xvmc.so
 194lib/libxcb-xvmc.so.0
 195lib/libxcb-xvmc.so.0.0
154lib/libxcb.1.1.0.dylib 196lib/libxcb.1.1.0.dylib
155lib/libxcb.1.dylib 197lib/libxcb.1.dylib
 198lib/libxcb.a
156lib/libxcb.dylib 199lib/libxcb.dylib
157lib/libxcb.la 200lib/libxcb.la
158lib/pkgconfig/xcb-atom.pc 201lib/libxcb.so
159lib/pkgconfig/xcb-aux.pc 202lib/libxcb.so.1
 203lib/libxcb.so.1.1
160lib/pkgconfig/xcb-composite.pc 204lib/pkgconfig/xcb-composite.pc
161lib/pkgconfig/xcb-damage.pc 205lib/pkgconfig/xcb-damage.pc
162lib/pkgconfig/xcb-dpms.pc 206lib/pkgconfig/xcb-dpms.pc
163lib/pkgconfig/xcb-dri2.pc 207lib/pkgconfig/xcb-dri2.pc
164lib/pkgconfig/xcb-event.pc 
165lib/pkgconfig/xcb-glx.pc 208lib/pkgconfig/xcb-glx.pc
166lib/pkgconfig/xcb-icccm.pc 
167lib/pkgconfig/xcb-image.pc 
168lib/pkgconfig/xcb-keysyms.pc 
169lib/pkgconfig/xcb-property.pc 
170lib/pkgconfig/xcb-randr.pc 209lib/pkgconfig/xcb-randr.pc
171lib/pkgconfig/xcb-record.pc 210lib/pkgconfig/xcb-record.pc
172lib/pkgconfig/xcb-render.pc 211lib/pkgconfig/xcb-render.pc
173lib/pkgconfig/xcb-renderutil.pc 
174lib/pkgconfig/xcb-reply.pc 
175lib/pkgconfig/xcb-res.pc 212lib/pkgconfig/xcb-res.pc
176lib/pkgconfig/xcb-screensaver.pc 213lib/pkgconfig/xcb-screensaver.pc
177lib/pkgconfig/xcb-shape.pc 214lib/pkgconfig/xcb-shape.pc
178lib/pkgconfig/xcb-shm.pc 215lib/pkgconfig/xcb-shm.pc
179lib/pkgconfig/xcb-sync.pc 216lib/pkgconfig/xcb-sync.pc
180lib/pkgconfig/xcb-wm.pc 217lib/pkgconfig/xcb-wm.pc
181lib/pkgconfig/xcb-xevie.pc 218lib/pkgconfig/xcb-xevie.pc
182lib/pkgconfig/xcb-xf86dri.pc 219lib/pkgconfig/xcb-xf86dri.pc
183lib/pkgconfig/xcb-xfixes.pc 220lib/pkgconfig/xcb-xfixes.pc
184lib/pkgconfig/xcb-xinerama.pc 221lib/pkgconfig/xcb-xinerama.pc
185lib/pkgconfig/xcb-xprint.pc 222lib/pkgconfig/xcb-xprint.pc
186lib/pkgconfig/xcb-xtest.pc 223lib/pkgconfig/xcb-xtest.pc
187lib/pkgconfig/xcb-xv.pc 224lib/pkgconfig/xcb-xv.pc