split the "xcbgen" Python extension which comes with xcb-proto

into its own pkg and pull it in the common Python way so that
we ensure matching Python versions

7 files changed, 20 insertions, 95 deletions

diff --git a/x11/xcb-proto/Makefile b/x11/xcb-proto/Makefile
index 8d5c252b09d..b30ff818173 100644
--- a/x11/xcb-proto/Makefile
+++ b/x11/xcb-proto/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.2 2009/04/08 09:58:20 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2009/04/08 13:06:22 drochner Exp $
 #
 
 DISTNAME=	xcb-proto-1.4
+PKGREVISION=	1
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -19,10 +20,10 @@ USE_LANGUAGES=	# none
 PKGCONFIG_OVERRIDE+=	xcb-proto.pc.in
 
 CONFIGURE_ENV+=		XMLLLINT=${BUILDLINK_PREFIX.libxml}/bin/xmllint
-PY_PATCHPLIST=		yes
 
+# XXX just for the "configure" check
+PYTHON_FOR_BUILD_ONLY=	yes
 .include "../../lang/python/application.mk"
-.include "../../lang/python/extension.mk"
 BUILDLINK_DEPMETHOD.libxml2?=	build
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xcb-proto/PLIST b/x11/xcb-proto/PLIST
index e4e99593f2f..fc6fc8d41fe 100644
--- a/x11/xcb-proto/PLIST
+++ b/x11/xcb-proto/PLIST
@@ -1,23 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/04/06 10:22:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/04/08 13:06:22 drochner Exp $
 lib/pkgconfig/xcb-proto.pc
-${PYSITELIB}/xcbgen/__init__.py
-${PYSITELIB}/xcbgen/__init__.pyc
-${PYSITELIB}/xcbgen/__init__.pyo
-${PYSITELIB}/xcbgen/error.py
-${PYSITELIB}/xcbgen/error.pyc
-${PYSITELIB}/xcbgen/error.pyo
-${PYSITELIB}/xcbgen/expr.py
-${PYSITELIB}/xcbgen/expr.pyc
-${PYSITELIB}/xcbgen/expr.pyo
-${PYSITELIB}/xcbgen/matcher.py
-${PYSITELIB}/xcbgen/matcher.pyc
-${PYSITELIB}/xcbgen/matcher.pyo
-${PYSITELIB}/xcbgen/state.py
-${PYSITELIB}/xcbgen/state.pyc
-${PYSITELIB}/xcbgen/state.pyo
-${PYSITELIB}/xcbgen/xtypes.py
-${PYSITELIB}/xcbgen/xtypes.pyc
-${PYSITELIB}/xcbgen/xtypes.pyo
 share/xcb/bigreq.xml
 share/xcb/composite.xml
 share/xcb/damage.xml
@@ -45,4 +27,3 @@ share/xcb/xtest.xml
 share/xcb/xv.xml
 share/xcb/xvmc.xml
 @dirrm share/xcb
-@dirrm ${PYSITELIB}/xcbgen
diff --git a/x11/xcb-proto/distinfo b/x11/xcb-proto/distinfo
index 9b886d30b10..abae261d9e4 100644
--- a/x11/xcb-proto/distinfo
+++ b/x11/xcb-proto/distinfo
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/04/06 10:22:12 drochner Exp $
+$NetBSD: distinfo,v 1.2 2009/04/08 13:06:22 drochner Exp $
 
 SHA1 (xcb-proto-1.4.tar.bz2) = ab9bb7c875558a3324673bb749e0502046f31083
 RMD160 (xcb-proto-1.4.tar.bz2) = a344ca302a1cbefd98dcd289abf8704667a4b536
 Size (xcb-proto-1.4.tar.bz2) = 87093 bytes
 SHA1 (patch-aa) = a04e2b8bb3fa6630d47d3febd7d676717ac15907
-SHA1 (patch-ab) = c61982389c86d2a61136aba67ea2a0647cc68da5
-SHA1 (patch-ac) = 39539e6d45e4994df0c291f6c05382c5c00a6aee
-SHA1 (patch-ad) = bb86c889e0520aa98761b01d71d438ca4e71fc6b
+SHA1 (patch-ae) = 58631ece73de8568e2edfa97dbbb4011a9ba00f0
diff --git a/x11/xcb-proto/patches/patch-ab b/x11/xcb-proto/patches/patch-ab
deleted file mode 100644
index a2390ebed2f..00000000000
--- a/x11/xcb-proto/patches/patch-ab
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2009/04/06 10:22:12 drochner Exp $
-
---- xcbgen/xtypes.py.orig	2008-09-05 00:49:13.000000000 +0200
-+++ xcbgen/xtypes.py
-@@ -160,12 +160,22 @@ class ListType(Type):
- 
-         if elt.tag == 'list':
-             elts = list(elt)
--            self.expr = Expression(elts[0] if len(elts) else elt, self)
-+	    if len(elts):
-+                self.expr = Expression(elts[0], self)
-+            else:
-+                self.expr = Expression(elt, self)
-         elif elt.tag == 'valueparam':
-             self.expr = Expression(elt, self)
- 
--        self.size = member.size if member.fixed_size() else None
--        self.nmemb = self.expr.nmemb if self.expr.fixed_size() else None
-+        if member.fixed_size():
-+            self.size = member.size
-+        else:
-+            self.size = None
-+
-+        if self.expr.fixed_size():
-+            self.nmemb = self.expr.nmemb
-+        else:
-+            self.nmemb = None
- 
-     def make_member_of(self, module, complex_type, field_type, field_name, visible, wire, auto):
-         if not self.fixed_size():
-@@ -256,7 +266,10 @@ class PadType(SizedPadType):
-     Derived class which represents a padding field of given type.
-     '''
-     def __init__(self, elt):
--        self.nmemb = "1" if (elt == None) else elt.get('bytes')
-+        if (elt == None):
-+            self.nmemb = "1"
-+        else:
-+            self.nmemb = elt.get('bytes')
-         SizedPadType.__init__(self, self.nmemb)
-     
- class ComplexType(Type):
diff --git a/x11/xcb-proto/patches/patch-ac b/x11/xcb-proto/patches/patch-ac
deleted file mode 100644
index 2210ef7d77f..00000000000
--- a/x11/xcb-proto/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2009/04/06 10:22:12 drochner Exp $
-
---- xcbgen/state.py.orig	2009-04-01 16:05:28.000000000 +0200
-+++ xcbgen/state.py
-@@ -2,7 +2,7 @@
- This module contains the namespace class and the singleton module class.
- '''
- from os.path import dirname, basename
--from xml.etree.cElementTree import parse
-+from xml.etree.ElementTree import parse
- 
- import matcher
- from error import *
diff --git a/x11/xcb-proto/patches/patch-ad b/x11/xcb-proto/patches/patch-ad
deleted file mode 100644
index 6b16b431a3b..00000000000
--- a/x11/xcb-proto/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/04/06 10:22:12 drochner Exp $
-
---- xcbgen/matcher.py.orig	2009-04-01 16:06:02.000000000 +0200
-+++ xcbgen/matcher.py
-@@ -7,7 +7,7 @@ we do not create a new type object, we j
- '''
- 
- from os.path import join
--from xml.etree.cElementTree import parse
-+from xml.etree.ElementTree import parse
- 
- import state
- from xtypes import *
diff --git a/x11/xcb-proto/patches/patch-ae b/x11/xcb-proto/patches/patch-ae
new file mode 100644
index 00000000000..e2929685199
--- /dev/null
+++ b/x11/xcb-proto/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2009/04/08 13:06:22 drochner Exp $
+
+--- Makefile.in.orig	2009-04-08 13:05:03.000000000 +0200
++++ Makefile.in
+@@ -158,7 +158,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ xcbincludedir = @xcbincludedir@
+-SUBDIRS = src xcbgen
++SUBDIRS = src
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = xcb-proto.pc
+ EXTRA_DIST = doc xcb-proto.pc.in