Update to 1.1.1.

Obtained from:	GNOME dev repo

3 files changed, 23 insertions, 23 deletions

diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index b435444ae439..04486bb0043f 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   py-dbus
-# Date Created:			25 July 2004
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/py-dbus/Makefile,v 1.14 2011/08/11 19:48:46 kwm Exp $
-#
+#   $MCom: ports/trunk/devel/py-dbus/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	dbus
-PORTVERSION=	0.84.0
+PORTVERSION=	1.1.1
 CATEGORIES=	devel gnome python
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus-python/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,9 +12,9 @@ DISTNAME=	${PORTNAME}-python-${PORTVERSION}
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python bindings for the D-BUS messaging system
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-glib-1:${PORTSDIR}/devel/dbus-glib
 
-USES=	pathfix gettext
+USES=		gettext pathfix pkgconfig
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
@@ -29,9 +25,13 @@ CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 EXAMPLESDIR=	${PREFIX}/share/examples/py-${PORTNAME}
 
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=HTMLDOCS
+HTMLDOCS_DESC=	build html documentation
 
-.if exists(${LOCALBASE}/bin/rst2html) && !defined(NOPORTDOCS)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MHTMLDOCS}
+BUILD_DEPENDS+=	rst2html:${PORTSDIR}/textproc/py-docutils
 PLIST_SUB+=	HTML=""
 .else
 CONFIGURE_ARGS+=--disable-html-docs
@@ -39,16 +39,16 @@ PLIST_SUB+=	HTML="@comment "
 .endif
 
 post-patch:
-.if defined(NOPORTDOCS)
+.if ! ${PORT_OPTIONS:MHTMLDOCS}
 	@${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
 		s|PYTHON install-nodist_docDATA|PYTHON|g' \
 			${WRKSRC}/Makefile.in
 .endif
 
 post-install:
-.if !defined(NOPORTEXAMPLES)
+.if ${PORT_OPTIONS:MEXAMPLES}
 	${MKDIR} ${EXAMPLESDIR} && \
 		${INSTALL_DATA} ${WRKSRC}/examples/*.py ${EXAMPLESDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/py-dbus/distinfo b/devel/py-dbus/distinfo
index c6a850a1b02c..30a68e423361 100644
--- a/devel/py-dbus/distinfo
+++ b/devel/py-dbus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dbus-python-0.84.0.tar.gz) = b85bc7aaf1a976627ca461b1ca7b0c4ddddff709f52fe44c9b2d1d7d8fac5906
-SIZE (dbus-python-0.84.0.tar.gz) = 563906
+SHA256 (dbus-python-1.1.1.tar.gz) = 8917ca4fb8f4d693aee18d200cbad166b2c938dfb88c03bb4ab3d90a7c915e88
+SIZE (dbus-python-1.1.1.tar.gz) = 596476
diff --git a/devel/py-dbus/pkg-plist b/devel/py-dbus/pkg-plist
index ffb5f1929a39..bad475c45cf2 100644
--- a/devel/py-dbus/pkg-plist
+++ b/devel/py-dbus/pkg-plist
@@ -8,6 +8,9 @@ include/dbus-1.0/dbus/dbus-python.h
 %%PYTHON_SITELIBDIR%%/dbus/__init__.py
 %%PYTHON_SITELIBDIR%%/dbus/__init__.pyc
 %%PYTHON_SITELIBDIR%%/dbus/__init__.pyo
+%%PYTHON_SITELIBDIR%%/dbus/_compat.py
+%%PYTHON_SITELIBDIR%%/dbus/_compat.pyc
+%%PYTHON_SITELIBDIR%%/dbus/_compat.pyo
 %%PYTHON_SITELIBDIR%%/dbus/_dbus.py
 %%PYTHON_SITELIBDIR%%/dbus/_dbus.pyc
 %%PYTHON_SITELIBDIR%%/dbus/_dbus.pyo
@@ -23,15 +26,15 @@ include/dbus-1.0/dbus/dbus-python.h
 %%PYTHON_SITELIBDIR%%/dbus/connection.py
 %%PYTHON_SITELIBDIR%%/dbus/connection.pyc
 %%PYTHON_SITELIBDIR%%/dbus/connection.pyo
-%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.py
-%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.pyc
-%%PYTHON_SITELIBDIR%%/dbus/dbus_bindings.pyo
 %%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/gi_service.py
+%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyc
+%%PYTHON_SITELIBDIR%%/dbus/gi_service.pyo
 %%PYTHON_SITELIBDIR%%/dbus/glib.py
 %%PYTHON_SITELIBDIR%%/dbus/glib.pyc
 %%PYTHON_SITELIBDIR%%/dbus/glib.pyo
@@ -59,9 +62,6 @@ include/dbus-1.0/dbus/dbus-python.h
 %%PYTHON_SITELIBDIR%%/dbus/types.py
 %%PYTHON_SITELIBDIR%%/dbus/types.pyc
 %%PYTHON_SITELIBDIR%%/dbus/types.pyo
-%%PYTHON_SITELIBDIR%%/dbus_bindings.py
-%%PYTHON_SITELIBDIR%%/dbus_bindings.pyc
-%%PYTHON_SITELIBDIR%%/dbus_bindings.pyo
 libdata/pkgconfig/dbus-python.pc
 %%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html
@@ -69,9 +69,9 @@ libdata/pkgconfig/dbus-python.pc
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html
+%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/README.html
-%%PORTDOCS%%%%DOCSDIR%%/TODO
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/TODO.html
 %%PORTDOCS%%%%DOCSDIR%%/tutorial.txt
 %%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html