back to use default code, use cElementTree.

Bump PKGREVISION.

4 files changed, 4 insertions, 32 deletions

diff --git a/x11/py-xcbgen/Makefile b/x11/py-xcbgen/Makefile
index 49080c1a911..ccf98d4fad4 100644
--- a/x11/py-xcbgen/Makefile
+++ b/x11/py-xcbgen/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2011/02/25 09:47:31 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2011/06/15 11:13:17 obache Exp $
 #
 
 DISTNAME=	xcb-proto-1.6
 PKGNAME=	${PYPKGPREFIX}-xcbgen-1.6
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	http://xcb.freedesktop.org/dist/
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +13,7 @@ HOMEPAGE=	http://xcb.freedesktop.org/
 COMMENT=	XCB protocol descriptions (in XML)
 LICENSE=	mit # with no-advertising clause
 
-DEPENDS+=	${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+DEPENDS+=	${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
 
 CONFLICTS+=	xcb-proto<1.4nb1
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/x11/py-xcbgen/distinfo b/x11/py-xcbgen/distinfo
index 5d1ed352a63..4983caa99ae 100644
--- a/x11/py-xcbgen/distinfo
+++ b/x11/py-xcbgen/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2009/12/15 12:24:02 wiz Exp $
+$NetBSD: distinfo,v 1.5 2011/06/15 11:13:17 obache Exp $
 
 SHA1 (xcb-proto-1.6.tar.bz2) = e82418557c7f59f29da9ec18e0906d6d78e3a164
 RMD160 (xcb-proto-1.6.tar.bz2) = 61ffea8c3ab4b745f04eccc10c64f7f1c356692c
 Size (xcb-proto-1.6.tar.bz2) = 92829 bytes
-SHA1 (patch-ac) = 39539e6d45e4994df0c291f6c05382c5c00a6aee
-SHA1 (patch-ad) = bb86c889e0520aa98761b01d71d438ca4e71fc6b
 SHA1 (patch-ae) = dc24bb927986f7112367836e6520c30059891686
diff --git a/x11/py-xcbgen/patches/patch-ac b/x11/py-xcbgen/patches/patch-ac
deleted file mode 100644
index 3839ee75088..00000000000
--- a/x11/py-xcbgen/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/04/08 13:06:22 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/py-xcbgen/patches/patch-ad b/x11/py-xcbgen/patches/patch-ad
deleted file mode 100644
index c841f17a6d9..00000000000
--- a/x11/py-xcbgen/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2009/04/08 13:06:22 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 *