Index: head/devel/py-dbus/Makefile =================================================================== --- head/devel/py-dbus/Makefile +++ head/devel/py-dbus/Makefile @@ -1,20 +1,15 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -PORTREVISION= 1 - PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= -COMMENT= Python2 bindings for the D-BUS messaging system +COMMENT= Python bindings for the D-BUS messaging system -SLAVE_PORT= python2 +SLAVE_PORT= python MASTERDIR= ${.CURDIR}/../../devel/pydbus-common -.if ${FLAVOR:U:Mpy3*} -PLIST= ${.CURDIR}/pkg-plist-py3 -.else + PLIST= ${.CURDIR}/pkg-plist -.endif .include "${MASTERDIR}/Makefile" Index: head/devel/py-dbus/pkg-plist =================================================================== --- head/devel/py-dbus/pkg-plist +++ head/devel/py-dbus/pkg-plist @@ -12,9 +12,6 @@ %%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py %%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc %%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo -%%PYTHON_SITELIBDIR%%/dbus/_version.py -%%PYTHON_SITELIBDIR%%/dbus/_version.pyc -%%PYTHON_SITELIBDIR%%/dbus/_version.pyo %%PYTHON_SITELIBDIR%%/dbus/bus.py %%PYTHON_SITELIBDIR%%/dbus/bus.pyc %%PYTHON_SITELIBDIR%%/dbus/bus.pyo @@ -33,9 +30,9 @@ %%PYTHON_SITELIBDIR%%/dbus/glib.py %%PYTHON_SITELIBDIR%%/dbus/glib.pyc %%PYTHON_SITELIBDIR%%/dbus/glib.pyo -%%PYTHON_SITELIBDIR%%/dbus/gobject_service.py -%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyc -%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyo +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.py +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyc +%%PYTHON2%%%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyo %%PYTHON_SITELIBDIR%%/dbus/lowlevel.py %%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc %%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo Index: head/devel/py-dbus/pkg-plist-py3 =================================================================== --- head/devel/py-dbus/pkg-plist-py3 +++ head/devel/py-dbus/pkg-plist-py3 @@ -1,56 +0,0 @@ -%%PYTHON_SITELIBDIR%%/_dbus_bindings.so -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so -%%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 -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.py -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyc -%%PYTHON_SITELIBDIR%%/dbus/_expat_introspect_parser.pyo -%%PYTHON_SITELIBDIR%%/dbus/_version.py -%%PYTHON_SITELIBDIR%%/dbus/_version.pyc -%%PYTHON_SITELIBDIR%%/dbus/_version.pyo -%%PYTHON_SITELIBDIR%%/dbus/bus.py -%%PYTHON_SITELIBDIR%%/dbus/bus.pyc -%%PYTHON_SITELIBDIR%%/dbus/bus.pyo -%%PYTHON_SITELIBDIR%%/dbus/connection.py -%%PYTHON_SITELIBDIR%%/dbus/connection.pyc -%%PYTHON_SITELIBDIR%%/dbus/connection.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 -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyo -%%PYTHON_SITELIBDIR%%/dbus/proxies.py -%%PYTHON_SITELIBDIR%%/dbus/proxies.pyc -%%PYTHON_SITELIBDIR%%/dbus/proxies.pyo -%%PYTHON_SITELIBDIR%%/dbus/server.py -%%PYTHON_SITELIBDIR%%/dbus/server.pyc -%%PYTHON_SITELIBDIR%%/dbus/server.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 -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.py -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyc -%%PYTHON_SITELIBDIR%%/dbus/mainloop/__init__.pyo -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.py -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyc -%%PYTHON_SITELIBDIR%%/dbus/mainloop/glib.pyo Index: head/devel/pydbus-common/Makefile =================================================================== --- head/devel/pydbus-common/Makefile +++ head/devel/pydbus-common/Makefile @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= dbus -PORTVERSION= 1.2.0 -PORTREVISION?= 2 +PORTVERSION= 1.2.8 +PORTREVISION?= 0 CATEGORIES= devel gnome python MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ PKGNAMEPREFIX?= py @@ -34,21 +34,17 @@ OPTIONS_DEFINE= HTMLDOCS DOCS EXAMPLES HTMLDOCS_DESC= build html documentation HTMLDOCS_IMPLIES= DOCS -HTMLDOCS_CONFIGURE_OFF= --disable-html-docs -HTMLDOCS_BUILD_DEPENDS= rst2html:textproc/py-docutils +HTMLDOCS_CONFIGURE_ENABLE= documentation +HTMLDOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx -.include - -post-patch: -.if ! ${PORT_OPTIONS:MDOCS} +post-patch-DOCS-on: @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \ s|PYTHON install-nodist_docDATA|PYTHON|g' \ ${WRKSRC}/Makefile.in -.endif do-install: ${MKDIR} ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/ - ${INSTALL_DATA} ${WRKSRC}/include/dbus-python.h \ + ${INSTALL_DATA} ${WRKSRC}/include/dbus/dbus-python.h \ ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h ${INSTALL_DATA} ${WRKSRC}/dbus-python.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc @@ -61,16 +57,15 @@ ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} && \ ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR} -.if ${PORT_OPTIONS:MHTMLDOCS} - ${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} && \ - ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} -.endif +do-install-HTMLDOCS-on: + ${INSTALL_DATA} ${WRKSRC}/doc/_build/*.html ${STAGEDIR}${DOCSDIR} + .else # slave is defined LIB_DEPENDS+= libdbus-glib-1.so:devel/dbus-glib RUN_DEPENDS+= pydbus-common>=0:devel/pydbus-common USE_LDCONFIG= yes USES+= python -USE_PYTHON= flavors +USE_PYTHON= flavors py3kplist post-install: @${RM} -r ${STAGEDIR}${PREFIX}/include/dbus-1.0 \ Index: head/devel/pydbus-common/distinfo =================================================================== --- head/devel/pydbus-common/distinfo +++ head/devel/pydbus-common/distinfo @@ -1,2 +1,3 @@ -SHA256 (dbus-python-1.2.0.tar.gz) = e12c6c8b2bf3a9302f75166952cbe41d6b38c3441bbc6767dbd498942316c6df -SIZE (dbus-python-1.2.0.tar.gz) = 602426 +TIMESTAMP = 1529840338 +SHA256 (dbus-python-1.2.8.tar.gz) = abf12bbb765e300bf8e2a1b2f32f85949eab06998dbda127952c31cb63957b6f +SIZE (dbus-python-1.2.8.tar.gz) = 787426 Index: head/devel/pydbus-common/pkg-plist =================================================================== --- head/devel/pydbus-common/pkg-plist +++ head/devel/pydbus-common/pkg-plist @@ -1,20 +1,41 @@ include/dbus-1.0/dbus/dbus-python.h libdata/pkgconfig/dbus-python.pc -%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt %%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html -%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt +%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt %%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html +%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt %%PORTDOCS%%%%DOCSDIR%%/NEWS -%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html -%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt %%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html +%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt %%PORTDOCS%%%%DOCSDIR%%/README -%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.bus.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.connection.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.decorators.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.exceptions.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.gi_service.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.glib.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.gobject_service.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.lowlevel.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.mainloop.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.proxies.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.server.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.service.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/dbus.types.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/genindex.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/index.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/news.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/py-modindex.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/search.html %%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html +%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-client.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-service.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-emitter.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-signal-recipient.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf-proxy-client.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gconf-proxy-service2.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/list-system-services.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unix-fd-client.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/unix-fd-service.py