Enabled it to build with python24 & sync with dbus-glib.

3 files changed, 45 insertions, 13 deletions

diff --git a/sysutils/py-dbus/Makefile b/sysutils/py-dbus/Makefile
index bcfb0043d31..1d9992e9916 100644
--- a/sysutils/py-dbus/Makefile
+++ b/sysutils/py-dbus/Makefile
@@ -1,15 +1,14 @@
-# $NetBSD: Makefile,v 1.2 2006/04/01 05:24:10 rxg Exp $
+# $NetBSD: Makefile,v 1.3 2006/04/02 15:04:20 rxg Exp $
 #
 
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 
-DBUS_INTERFACE=	python
-DBUS_DIRS=	dbus glib python tools
+DBUS_INTERFACE=	glib python
+DBUS_DIRS=	dbus bus glib python tools
 
 .include "../../sysutils/dbus/Makefile.common"
-
 DEPENDS+=	${PYPKGPREFIX}-pyrex>=0.9.3:../../lang/py-pyrex
-
+CONFIGURE_ARGS+=--enable-tests
 # We can't install from within the 'dbus' nor 'tools' directory automatically
 # because we'd get a lot of other stuff installed (overriding files in the
 # dbus package).
@@ -17,6 +16,6 @@ INSTALL_DIRS=	python
 
 PY_PATCHPLIST=	YES
 
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/python/extension.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/py-dbus/PLIST b/sysutils/py-dbus/PLIST
index 075f1f1c19c..3ce0f968cbe 100644
--- a/sysutils/py-dbus/PLIST
+++ b/sysutils/py-dbus/PLIST
@@ -1,5 +1,38 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/11 14:55:51 rxg Exp $
-${PYSITELIB}/dbus.py
-${PYSITELIB}/dbus.pyc
-${PYSITELIB}/dbus.pyo
-${PYSITELIB}/dbus_bindings.la
+@comment $NetBSD: PLIST,v 1.2 2006/04/02 15:04:20 rxg Exp $
+${PYSITELIB}/dbus.pth
+${PYSITELIB}/dbus/__init__.py
+${PYSITELIB}/dbus/__init__.pyc
+${PYSITELIB}/dbus/__init__.pyo
+${PYSITELIB}/dbus/_dbus.py
+${PYSITELIB}/dbus/_dbus.pyc
+${PYSITELIB}/dbus/_dbus.pyo
+${PYSITELIB}/dbus/_util.py
+${PYSITELIB}/dbus/_util.pyc
+${PYSITELIB}/dbus/_util.pyo
+${PYSITELIB}/dbus/dbus_bindings.la
+${PYSITELIB}/dbus/dbus_glib_bindings.la
+${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/glib.py
+${PYSITELIB}/dbus/glib.pyc
+${PYSITELIB}/dbus/glib.pyo
+${PYSITELIB}/dbus/introspect_parser.py
+${PYSITELIB}/dbus/introspect_parser.pyc
+${PYSITELIB}/dbus/introspect_parser.pyo
+${PYSITELIB}/dbus/matchrules.py
+${PYSITELIB}/dbus/matchrules.pyc
+${PYSITELIB}/dbus/matchrules.pyo
+${PYSITELIB}/dbus/proxies.py
+${PYSITELIB}/dbus/proxies.pyc
+${PYSITELIB}/dbus/proxies.pyo
+${PYSITELIB}/dbus/service.py
+${PYSITELIB}/dbus/service.pyc
+${PYSITELIB}/dbus/service.pyo
+${PYSITELIB}/dbus/types.py
+${PYSITELIB}/dbus/types.pyc
+${PYSITELIB}/dbus/types.pyo
+@dirrm ${PYSITELIB}/dbus
diff --git a/sysutils/py-dbus/buildlink3.mk b/sysutils/py-dbus/buildlink3.mk
index f76c623e153..9106ac740ec 100644
--- a/sysutils/py-dbus/buildlink3.mk
+++ b/sysutils/py-dbus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2006/02/22 21:01:00 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2006/04/02 15:04:20 rxg Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 PY_DBUS_BUILDLINK3_MK:=		${PY_DBUS_BUILDLINK3_MK}+
@@ -16,9 +16,9 @@ BUILDLINK_RECOMMENDED.py-dbus?=	${PYPKGPREFIX}-dbus>=0.23.4nb2
 BUILDLINK_PKGSRCDIR.py-dbus?=	../../sysutils/py-dbus
 .endif	# PY_DBUS_BUILDLINK3_MK
 
+.include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/python/pyversion.mk"
 .include "../../sysutils/dbus/buildlink3.mk"
-.include "../../sysutils/dbus-glib/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}