update to 1.1.1

supports Python3x

5 files changed, 43 insertions, 37 deletions

diff --git a/sysutils/py-dbus/Makefile b/sysutils/py-dbus/Makefile
index 79562296aa2..d8d5367ce9a 100644
--- a/sysutils/py-dbus/Makefile
+++ b/sysutils/py-dbus/Makefile
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.22 2012/03/03 00:12:08 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2012/08/01 18:04:26 drochner Exp $
 #
 
-DISTNAME=	dbus-python-0.83.1
+DISTNAME=	dbus-python-1.1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python//}
-PKGREVISION=	3
 CATEGORIES=	sysutils
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
 
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0:../../textproc/py-docutils
-DEPENDS+=	${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.freedesktop.org/Software/dbus
 COMMENT=	Python bindings for the D-BUS message bus system
@@ -17,11 +13,17 @@ LICENSE=	mit
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
+PYTHON_VERSIONS_INCLUDE_3X= yes
+
 USE_TOOLS+=	pkg-config gmake
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+= --disable-html-docs --disable-api-docs
 
 PY_PATCHPLIST=			YES
 
+# py-expat is only needed at runtime
+DEPENDS+= ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "SunOS"
 BUILDLINK_TRANSFORM+=	rm:-std=c9x
@@ -32,6 +34,5 @@ BUILDLINK_TRANSFORM+=	rm:-std=c9x
 BUILDLINK_API_DEPENDS.dbus+=	dbus>=1.0
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-# py-libxml2 is only needed at runtime
-.include "../../textproc/py-libxml2/buildlink3.mk"
+.include "../../sysutils/dbus-python-common/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-dbus/PLIST b/sysutils/py-dbus/PLIST
index ac81eb94555..f6c9f3a1e1e 100644
--- a/sysutils/py-dbus/PLIST
+++ b/sysutils/py-dbus/PLIST
@@ -1,11 +1,12 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:16:12 joerg Exp $
-include/dbus-1.0/dbus/dbus-python.h
-lib/pkgconfig/dbus-python.pc
+@comment $NetBSD: PLIST,v 1.8 2012/08/01 18:04:26 drochner Exp $
 ${PYSITELIB}/_dbus_bindings.la
 ${PYSITELIB}/_dbus_glib_bindings.la
 ${PYSITELIB}/dbus/__init__.py
 ${PYSITELIB}/dbus/__init__.pyc
 ${PYSITELIB}/dbus/__init__.pyo
+${PYSITELIB}/dbus/_compat.py
+${PYSITELIB}/dbus/_compat.pyc
+${PYSITELIB}/dbus/_compat.pyo
 ${PYSITELIB}/dbus/_dbus.py
 ${PYSITELIB}/dbus/_dbus.pyc
 ${PYSITELIB}/dbus/_dbus.pyo
@@ -21,21 +22,21 @@ ${PYSITELIB}/dbus/bus.pyo
 ${PYSITELIB}/dbus/connection.py
 ${PYSITELIB}/dbus/connection.pyc
 ${PYSITELIB}/dbus/connection.pyo
-${PYSITELIB}/dbus/dbus_bindings.py
-${PYSITELIB}/dbus/dbus_bindings.pyc
-${PYSITELIB}/dbus/dbus_bindings.pyo
 ${PYSITELIB}/dbus/decorators.py
 ${PYSITELIB}/dbus/decorators.pyc
 ${PYSITELIB}/dbus/decorators.pyo
 ${PYSITELIB}/dbus/exceptions.py
 ${PYSITELIB}/dbus/exceptions.pyc
 ${PYSITELIB}/dbus/exceptions.pyo
+${PYSITELIB}/dbus/gi_service.py
+${PYSITELIB}/dbus/gi_service.pyc
+${PYSITELIB}/dbus/gi_service.pyo
 ${PYSITELIB}/dbus/glib.py
 ${PYSITELIB}/dbus/glib.pyc
 ${PYSITELIB}/dbus/glib.pyo
-${PYSITELIB}/dbus/gobject_service.py
-${PYSITELIB}/dbus/gobject_service.pyc
-${PYSITELIB}/dbus/gobject_service.pyo
+${PLIST.py2x}${PYSITELIB}/dbus/gobject_service.py
+${PLIST.py2x}${PYSITELIB}/dbus/gobject_service.pyc
+${PLIST.py2x}${PYSITELIB}/dbus/gobject_service.pyo
 ${PYSITELIB}/dbus/lowlevel.py
 ${PYSITELIB}/dbus/lowlevel.pyc
 ${PYSITELIB}/dbus/lowlevel.pyo
@@ -57,18 +58,3 @@ ${PYSITELIB}/dbus/service.pyo
 ${PYSITELIB}/dbus/types.py
 ${PYSITELIB}/dbus/types.pyc
 ${PYSITELIB}/dbus/types.pyo
-${PYSITELIB}/dbus_bindings.py
-${PYSITELIB}/dbus_bindings.pyc
-${PYSITELIB}/dbus_bindings.pyo
-share/doc/dbus-python/API_CHANGES.html
-share/doc/dbus-python/API_CHANGES.txt
-share/doc/dbus-python/HACKING.html
-share/doc/dbus-python/HACKING.txt
-share/doc/dbus-python/NEWS
-share/doc/dbus-python/NEWS.html
-share/doc/dbus-python/README
-share/doc/dbus-python/README.html
-share/doc/dbus-python/TODO
-share/doc/dbus-python/TODO.html
-share/doc/dbus-python/tutorial.html
-share/doc/dbus-python/tutorial.txt
diff --git a/sysutils/py-dbus/buildlink3.mk b/sysutils/py-dbus/buildlink3.mk
index dd22d9112c6..4ce196cdfda 100644
--- a/sysutils/py-dbus/buildlink3.mk
+++ b/sysutils/py-dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2012/05/07 01:54:00 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2012/08/01 18:04:26 drochner Exp $
 
 BUILDLINK_TREE+=	py-dbus
 
@@ -13,6 +13,8 @@ BUILDLINK_PKGSRCDIR.py-dbus?=	../../sysutils/py-dbus
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
+.include "../../sysutils/dbus-glib/buildlink3.mk"
+.include "../../sysutils/dbus-python-common/buildlink3.mk"
 .endif # PY_DBUS_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-py-dbus
diff --git a/sysutils/py-dbus/distinfo b/sysutils/py-dbus/distinfo
index 45024acdd26..5a08b7c91c4 100644
--- a/sysutils/py-dbus/distinfo
+++ b/sysutils/py-dbus/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2011/01/04 09:55:49 drochner Exp $
+$NetBSD: distinfo,v 1.9 2012/08/01 18:04:26 drochner Exp $
 
-SHA1 (dbus-python-0.83.1.tar.gz) = a209de26ade2546251e5877f3b650789870755a4
-RMD160 (dbus-python-0.83.1.tar.gz) = d549fb52b52c960dc5aa646e809906142dcb067b
-Size (dbus-python-0.83.1.tar.gz) = 533391 bytes
+SHA1 (dbus-python-1.1.1.tar.gz) = 3c15438a7ec1f0698d50557e3421564564d0e097
+RMD160 (dbus-python-1.1.1.tar.gz) = 8e810a15c417541744df68cb01e5d707488bd6e8
+Size (dbus-python-1.1.1.tar.gz) = 596476 bytes
+SHA1 (patch-aa) = ca721c56463a5180e6a33e5a3d6135660e93c38f
diff --git a/sysutils/py-dbus/patches/patch-aa b/sysutils/py-dbus/patches/patch-aa
new file mode 100644
index 00000000000..4c514db7c01
--- /dev/null
+++ b/sysutils/py-dbus/patches/patch-aa
@@ -0,0 +1,16 @@
+$NetBSD: patch-aa,v 1.1 2012/08/01 18:04:26 drochner Exp $
+
+--- Makefile.in.orig	2012-07-31 22:25:22.000000000 +0000
++++ Makefile.in
+@@ -956,9 +956,8 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-dbusincludeHEADERS install-dist_docDATA \
+-	install-nobase_pythonPYTHON install-nodist_docDATA \
+-	install-pkgconfigDATA
++install-data-am: \
++	install-nobase_pythonPYTHON
+ 
+ install-dvi: install-dvi-recursive
+