Wed Jun 15 11:15:36 2011 UTC ()
Back to original code, use cElementTree.


(obache)
diff -r1.13 -r1.14 pkgsrc/x11/libxcb/Makefile
diff -r1.7 -r1.8 pkgsrc/x11/libxcb/distinfo
diff -r1.1.1.1 -r0 pkgsrc/x11/libxcb/patches/patch-aj
cvs diff -r1.13 -r1.14 pkgsrc/x11/libxcb/Makefile (switch to unified diff)

--- pkgsrc/x11/libxcb/Makefile 2011/02/25 09:47:30 1.13
+++ pkgsrc/x11/libxcb/Makefile 2011/06/15 11:15:35 1.14
@@ -1,92 +1,92 @@ @@ -1,92 +1,92 @@
1# $NetBSD: Makefile,v 1.13 2011/02/25 09:47:30 wiz Exp $ 1# $NetBSD: Makefile,v 1.14 2011/06/15 11:15:35 obache Exp $
2# 2#
3 3
4DISTNAME= libxcb-1.7 4DISTNAME= libxcb-1.7
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= http://xcb.freedesktop.org/dist/ 6MASTER_SITES= http://xcb.freedesktop.org/dist/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= reed@reedmedia.net 9MAINTAINER= reed@reedmedia.net
10HOMEPAGE= http://xcb.freedesktop.org/ 10HOMEPAGE= http://xcb.freedesktop.org/
11COMMENT= X protocol C-language Binding 11COMMENT= X protocol C-language Binding
12LICENSE= mit # with no-advertising clause 12LICENSE= mit # with no-advertising clause
13 13
14BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt 14BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt
15BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.6nb1:../../x11/py-xcbgen 15BUILD_DEPENDS+= ${PYPKGPREFIX}-xcbgen>=1.6nb2:../../x11/py-xcbgen
16 16
17PKG_DESTDIR_SUPPORT= user-destdir 17PKG_DESTDIR_SUPPORT= user-destdir
18 18
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20USE_LIBTOOL= yes 20USE_LIBTOOL= yes
21USE_TOOLS+= pkg-config 21USE_TOOLS+= pkg-config
22 22
23CONFIGURE_ARGS+= --disable-build-docs # or needs doxygen 23CONFIGURE_ARGS+= --disable-build-docs # or needs doxygen
24CONFIGURE_ARGS+= --disable-doxygen 24CONFIGURE_ARGS+= --disable-doxygen
25 25
26# Adds -Wl,-R to pkgconfig files automatically 26# Adds -Wl,-R to pkgconfig files automatically
27PKGCONFIG_OVERRIDE+= xcb-composite.pc.in 27PKGCONFIG_OVERRIDE+= xcb-composite.pc.in
28PKGCONFIG_OVERRIDE+= xcb-damage.pc.in 28PKGCONFIG_OVERRIDE+= xcb-damage.pc.in
29PKGCONFIG_OVERRIDE+= xcb-dpms.pc.in 29PKGCONFIG_OVERRIDE+= xcb-dpms.pc.in
30PKGCONFIG_OVERRIDE+= xcb-glx.pc.in 30PKGCONFIG_OVERRIDE+= xcb-glx.pc.in
31PKGCONFIG_OVERRIDE+= xcb-randr.pc.in 31PKGCONFIG_OVERRIDE+= xcb-randr.pc.in
32PKGCONFIG_OVERRIDE+= xcb-record.pc.in 32PKGCONFIG_OVERRIDE+= xcb-record.pc.in
33PKGCONFIG_OVERRIDE+= xcb-render.pc.in 33PKGCONFIG_OVERRIDE+= xcb-render.pc.in
34PKGCONFIG_OVERRIDE+= xcb-res.pc.in 34PKGCONFIG_OVERRIDE+= xcb-res.pc.in
35PKGCONFIG_OVERRIDE+= xcb-screensaver.pc.in 35PKGCONFIG_OVERRIDE+= xcb-screensaver.pc.in
36PKGCONFIG_OVERRIDE+= xcb-shape.pc.in 36PKGCONFIG_OVERRIDE+= xcb-shape.pc.in
37PKGCONFIG_OVERRIDE+= xcb-shm.pc.in 37PKGCONFIG_OVERRIDE+= xcb-shm.pc.in
38PKGCONFIG_OVERRIDE+= xcb-sync.pc.in 38PKGCONFIG_OVERRIDE+= xcb-sync.pc.in
39PKGCONFIG_OVERRIDE+= xcb-xevie.pc.in 39PKGCONFIG_OVERRIDE+= xcb-xevie.pc.in
40PKGCONFIG_OVERRIDE+= xcb-xf86dri.pc.in 40PKGCONFIG_OVERRIDE+= xcb-xf86dri.pc.in
41PKGCONFIG_OVERRIDE+= xcb-xfixes.pc.in 41PKGCONFIG_OVERRIDE+= xcb-xfixes.pc.in
42PKGCONFIG_OVERRIDE+= xcb-xinerama.pc.in 42PKGCONFIG_OVERRIDE+= xcb-xinerama.pc.in
43PKGCONFIG_OVERRIDE+= xcb-xprint.pc.in 43PKGCONFIG_OVERRIDE+= xcb-xprint.pc.in
44PKGCONFIG_OVERRIDE+= xcb-xtest.pc.in 44PKGCONFIG_OVERRIDE+= xcb-xtest.pc.in
45PKGCONFIG_OVERRIDE+= xcb-xv.pc.in 45PKGCONFIG_OVERRIDE+= xcb-xv.pc.in
46PKGCONFIG_OVERRIDE+= xcb-xvmc.pc.in 46PKGCONFIG_OVERRIDE+= xcb-xvmc.pc.in
47PKGCONFIG_OVERRIDE+= xcb.pc.in 47PKGCONFIG_OVERRIDE+= xcb.pc.in
48 48
49# libXdmcp is optional; adds support for XDM-AUTHORIZATION-1 in 49# libXdmcp is optional; adds support for XDM-AUTHORIZATION-1 in
50# addition to MIT-MAGIC-COOKIE-1. 50# addition to MIT-MAGIC-COOKIE-1.
51 51
52.include "../../mk/pthread.buildlink3.mk" 52.include "../../mk/pthread.buildlink3.mk"
53 53
54### 54###
55### XXX Adding this here for redundancy--it very well may not be necessary. 55### XXX Adding this here for redundancy--it very well may not be necessary.
56### However, I don't think it could hurt much. We don't include 56### However, I don't think it could hurt much. We don't include
57### PTHREAD_CFLAGS because it could be -pthread. My intention here 57### PTHREAD_CFLAGS because it could be -pthread. My intention here
58### is mainly to pass down the appropriate flags should something 58### is mainly to pass down the appropriate flags should something
59### go awry. 59### go awry.
60### 60###
61XTHREADLIB=${${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}:L:M*} 61XTHREADLIB=${${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}:L:M*}
62 62
63.if empty(PTHREAD_CPPFLAGS) 63.if empty(PTHREAD_CPPFLAGS)
64XTHREAD_CFLAGS= -D_REENTRANT # XXX Is this OK? 64XTHREAD_CFLAGS= -D_REENTRANT # XXX Is this OK?
65.else 65.else
66XTHREAD_CPPFLAGS= ${PTHREAD_CPPFLAGS} 66XTHREAD_CPPFLAGS= ${PTHREAD_CPPFLAGS}
67.endif 67.endif
68 68
69SUBST_CLASSES+= pc 69SUBST_CLASSES+= pc
70SUBST_FILES.pc= xcb.pc.in 70SUBST_FILES.pc= xcb.pc.in
71SUBST_MESSAGE.pc= Configuring threading in xcb.pc.in. 71SUBST_MESSAGE.pc= Configuring threading in xcb.pc.in.
72SUBST_STAGE.pc= pre-configure 72SUBST_STAGE.pc= pre-configure
73SUBST_VARS.pc= XTHREADLIB XTHREAD_CPPFLAGS 73SUBST_VARS.pc= XTHREADLIB XTHREAD_CPPFLAGS
74 74
75PYTHON_VERSIONS_ACCEPTED= 27 26 25 75PYTHON_VERSIONS_ACCEPTED= 27 26 25
76 76
77post-extract: 77post-extract:
78 ${CHMOD} -R go-w ${WRKSRC} 78 ${CHMOD} -R go-w ${WRKSRC}
79 79
80### 80###
81### XXX needed to build from scratch, but we're patching right now 81### XXX needed to build from scratch, but we're patching right now
82### so it's not needed (nor should it ever be, really). 82### so it's not needed (nor should it ever be, really).
83### 83###
84#.include "../../devel/gperf/buildlink3.mk" 84#.include "../../devel/gperf/buildlink3.mk"
85PYTHON_FOR_BUILD_ONLY= yes 85PYTHON_FOR_BUILD_ONLY= yes
86.include "../../lang/python/application.mk" 86.include "../../lang/python/application.mk"
87BUILDLINK_API_DEPENDS.xcb-proto?= xcb-proto>=1.6 87BUILDLINK_API_DEPENDS.xcb-proto?= xcb-proto>=1.6
88.include "../../x11/xcb-proto/buildlink3.mk" 88.include "../../x11/xcb-proto/buildlink3.mk"
89.include "../../x11/libXdmcp/buildlink3.mk" 89.include "../../x11/libXdmcp/buildlink3.mk"
90.include "../../x11/libXau/buildlink3.mk" 90.include "../../x11/libXau/buildlink3.mk"
91 91
92.include "../../mk/bsd.pkg.mk" 92.include "../../mk/bsd.pkg.mk"
cvs diff -r1.7 -r1.8 pkgsrc/x11/libxcb/distinfo (switch to unified diff)

--- pkgsrc/x11/libxcb/distinfo 2010/09/10 19:12:13 1.7
+++ pkgsrc/x11/libxcb/distinfo 2011/06/15 11:15:35 1.8
@@ -1,9 +1,8 @@ @@ -1,9 +1,8 @@
1$NetBSD: distinfo,v 1.7 2010/09/10 19:12:13 joerg Exp $ 1$NetBSD: distinfo,v 1.8 2011/06/15 11:15:35 obache Exp $
2 2
3SHA1 (libxcb-1.7.tar.bz2) = 7540f0587907bce421914f0ddb813810cb2f36f8 3SHA1 (libxcb-1.7.tar.bz2) = 7540f0587907bce421914f0ddb813810cb2f36f8
4RMD160 (libxcb-1.7.tar.bz2) = f6748b9751e339c2669a6b9322b421abbbff7afb 4RMD160 (libxcb-1.7.tar.bz2) = f6748b9751e339c2669a6b9322b421abbbff7afb
5Size (libxcb-1.7.tar.bz2) = 318619 bytes 5Size (libxcb-1.7.tar.bz2) = 318619 bytes
6SHA1 (patch-aa) = f099c6a56e965950e38cd451595a8c897fd824d1 6SHA1 (patch-aa) = f099c6a56e965950e38cd451595a8c897fd824d1
7SHA1 (patch-ab) = 5c3600ef18cbe53a766c020d3dd6db5880a1921c 7SHA1 (patch-ab) = 5c3600ef18cbe53a766c020d3dd6db5880a1921c
8SHA1 (patch-ai) = 637affb3aa2f7d40e0aada4dadab8c695ea74b6f 8SHA1 (patch-ai) = 637affb3aa2f7d40e0aada4dadab8c695ea74b6f
9SHA1 (patch-aj) = 558465dbda40e05f9e76767ddd9d242ad1762719 
File Deleted: pkgsrc/x11/libxcb/patches/Attic/patch-aj