4 files changed, 53 insertions, 73 deletions

diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index 598860d6467d..c62b179454cf 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -5,45 +5,27 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	0
+PORTNAME=	dbus
+PORTVERSION=	0.71
 CATEGORIES=	devel gnome python
+MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-python-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Python interface to the D-BUS messaging system
+COMMENT=	Python bindings for the D-BUS messaging system
 
 BUILD_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex
-LIB_DEPENDS=	dbus-1.2:${PORTSDIR}/devel/dbus
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	pyrexc:${PORTSDIR}/devel/pyrex \
-		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
+    		${PYTHON_SITELIBDIR}/libxml2.py:${PORTSDIR}/textproc/py-libxml2
 
-MASTERDIR=	${.CURDIR}/../dbus
-BUILD_WRKSRC=	${WRKSRC}/python
-INSTALL_WRKSRC=	${BUILD_WRKSRC}
-DESCR=		${.CURDIR}/pkg-descr
-PLIST=		${.CURDIR}/pkg-plist
-
-NOT_FOR_ARCHS=	ia64
-
-DBUS_SLAVE=	yes
-
-USE_GNOME=	gnomehack gnometarget
 USE_PYTHON=	yes
-CONFIGURE_ARGS=	--enable-python \
-		--disable-gcj \
-		--disable-mono \
-		--disable-mono-docs \
-		--disable-gtk \
-		--disable-qt3 \
-		--localstatedir=/var \
-		--with-system-pid-file=/var/run/dbus/dbus.pid \
-		--with-system-socket=/var/run/dbus/dbus.pipe \
-		--with-session-socket-dir=/var/tmp \
-		--disable-doxygen-docs \
-		--disable-xml-docs
+USE_GMAKE=	yes
+USE_PYDISTUTILS=yes
 
 post-install:
-	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
-	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHON_SITELIBDIR}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -l ${PYTHONPREFIX_SITELIBDIR}/dbus
 
-.include "${MASTERDIR}/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo
new file mode 100644
index 000000000000..3a92835e9d7e
--- /dev/null
+++ b/devel/py-dbus/distinfo
@@ -0,0 +1,3 @@
+MD5 (dbus-python-0.71.tar.gz) = ee893bc87b784a8c2285f5041b5e7033
+SHA256 (dbus-python-0.71.tar.gz) = 4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
+SIZE (dbus-python-0.71.tar.gz) = 137613
diff --git a/devel/py-dbus/pkg-descr b/devel/py-dbus/pkg-descr
index 059c9a3ed457..3c46c16da394 100644
--- a/devel/py-dbus/pkg-descr
+++ b/devel/py-dbus/pkg-descr
@@ -1,3 +1,3 @@
-Python interface to the D-BUS messaging system.
+Python bindings for the D-BUS interprocess messaging system.
 
-WWW: http://www.freedesktop.org/Software/dbus
+WWW: http://www.freedesktop.org/wiki/Software_2fDBusBindings
diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
index 1df8e680a782..76158ca386fa 100644
--- a/devel/py-dbus/pkg-plist
+++ b/devel/py-dbus/pkg-plist
@@ -1,41 +1,36 @@
-lib/%%PYTHON_VERSION%%/site-packages/dbus.pth
-lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/__init__.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_dbus.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/_util.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.a
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.la
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_bindings.so
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.a
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.la
-lib/%%PYTHON_VERSION%%/site-packages/dbus/dbus_glib_bindings.so
-lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/decorators.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/exceptions.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/glib.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/introspect_parser.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/matchrules.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/proxies.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/service.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/service.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/service.pyo
-lib/%%PYTHON_VERSION%%/site-packages/dbus/types.py
-lib/%%PYTHON_VERSION%%/site-packages/dbus/types.pyc
-lib/%%PYTHON_VERSION%%/site-packages/dbus/types.pyo
-@dirrm lib/%%PYTHON_VERSION%%/site-packages/dbus
+%%PYTHON_SITELIBDIR%%/dbus/__init__.py
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
+%%PYTHON_SITELIBDIR%%/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.py
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_util.py
+%%PYTHON_SITELIBDIR%%/dbus/_util.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_util.pyo
+%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/dbus_glib_bindings.so
+%%PYTHON_SITELIBDIR%%/dbus/decorators.py
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyc
+%%PYTHON_SITELIBDIR%%/dbus/decorators.pyo
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.py
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/dbus/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/dbus/glib.py
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyc
+%%PYTHON_SITELIBDIR%%/dbus/glib.pyo
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.py
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyc
+%%PYTHON_SITELIBDIR%%/dbus/introspect_parser.pyo
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.py
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyc
+%%PYTHON_SITELIBDIR%%/dbus/matchrules.pyo
+%%PYTHON_SITELIBDIR%%/dbus/proxies.py
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc
+%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo
+%%PYTHON_SITELIBDIR%%/dbus/service.py
+%%PYTHON_SITELIBDIR%%/dbus/service.pyc
+%%PYTHON_SITELIBDIR%%/dbus/service.pyo
+%%PYTHON_SITELIBDIR%%/dbus/types.py
+%%PYTHON_SITELIBDIR%%/dbus/types.pyc
+%%PYTHON_SITELIBDIR%%/dbus/types.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/dbus