Index: UPDATING =================================================================== --- UPDATING (revision 354882) +++ UPDATING (working copy) @@ -5,6 +5,25 @@ You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20140522: + AFFECTS: users of devel/py-gobject3 and devel/py-dbus + AUTHOR: gnome@FreeBSD.org + + py-gobject3 and py-dbus where split up in a common port (*-common), + python2 port (py-*) and python3 port (py3-*) port. + + For port builds systems please follow the next following instructions: + Please delete the existing version to avoid conflicts. + + # pkg delete -f py27-gobject3 py27-dbus + or + # pkg_delete devel/py-gobject3 devel/py-dbus + + followed by: + # portmaster devel/py-gobject3 devel/py-dbus + or + # portinstall devel/py-gobject3 devel/py-dbus + 20140521: AFFECTS: users of databases/mariadb55* AUTHOR: grembo@FreeBSD.org Index: devel/Makefile =================================================================== --- devel/Makefile (revision 354655) +++ devel/Makefile (working copy) @@ -3990,10 +3990,14 @@ SUBDIR += py-zope.traversing SUBDIR += py-zope.viewlet SUBDIR += py_static_check + SUBDIR += py3-dbus + SUBDIR += py3-gobject3 SUBDIR += pybaz SUBDIR += pybugz SUBDIR += pychecker SUBDIR += pycount + SUBDIR += pydbus-common + SUBDIR += pygobject3-common SUBDIR += pylint SUBDIR += pymacs SUBDIR += pyobfuscate Index: devel/pydbus-common/Makefile =================================================================== --- devel/pydbus-common/Makefile (revision 352996) +++ devel/pydbus-common/Makefile (working copy) @@ -1,42 +1,44 @@ -# Created by: Joe Marcus Clarke +# Created by: Gustau Perez i Querol # $FreeBSD$ -# $MCom: ports/trunk/devel/py-dbus/Makefile 17268 2013-04-01 05:13:11Z marcus $ +# $MCom: ports-experimental/trunk/devel/pydbus-common/Makefile 19541 2014-04-16 10:23:02Z gusi $ PORTNAME= dbus PORTVERSION= 1.1.1 +PORTREVISION= 4 CATEGORIES= devel gnome python MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME}-python-${PORTVERSION} +PKGNAMEPREFIX?= py +PKGNAMESUFFIX?= -common +DISTNAME= dbus-python-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for the D-BUS messaging system +COMMENT?= Common files for the Python bindings for the D-BUS messaging system -LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib +BUILD_DEPENDS= dbus-glib>=0:${PORTSDIR}/devel/dbus-glib -USES= gettext pathfix pkgconfig gmake -USE_PYTHON= 2 -USE_AUTOTOOLS= libtool +SLAVE_PORT?= no + +USES= gettext gmake libtool pathfix pkgconfig +GNU_CONFIGURE= yes CPPFLAGS+= -I${PYTHON_INCLUDEDIR} CONFIGURE_ARGS= --docdir=${DOCSDIR} \ --disable-api-docs +INSTALL_TARGET= install-strip +.if ${SLAVE_PORT} == no +USE_PYTHON_BUILD= 2 + DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} -OPTIONS_DEFINE=HTMLDOCS +OPTIONS_SUB= yes +OPTIONS_DEFINE= HTMLDOCS HTMLDOCS_DESC= build html documentation +HTMLDOCS_CONFIGURE_OFF= --disable-html-docs +HTMLDOCS_BUILD_DEPENDS= rst2html:${PORTSDIR}/textproc/py-docutils .include -.if ${PORT_OPTIONS:MHTMLDOCS} -BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils -PLIST_SUB+= HTML="" -.else -CONFIGURE_ARGS+=--disable-html-docs -PLIST_SUB+= HTML="@comment " -.endif - post-patch: .if ! ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \ @@ -44,8 +46,40 @@ ${WRKSRC}/Makefile.in .endif -post-install: +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/ + ${INSTALL_DATA} ${WRKSRC}/include/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 + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \ ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} && \ + ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${STAGEDIR}${DOCSDIR} && \ + ${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 +.else # slave is defined +LIB_DEPENDS+= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib +RUN_DEPENDS+= pydbus-common>=0:${PORTSDIR}/devel/pydbus-common +USE_LDCONFIG= yes +.if ${SLAVE_PORT} == python2 +USE_PYTHON= 2 +.endif +.if ${SLAVE_PORT} == python3 +USE_PYTHON= 3 +.endif + +post-install: + @${RM} -rf ${STAGEDIR}${PREFIX}/include/dbus-1.0 \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc + @${RM} -fr ${STAGEDIR}/${DOCSDIR} +.endif # end of slaving block + .include Index: devel/pydbus-common/pkg-plist =================================================================== --- devel/pydbus-common/pkg-plist (revision 352996) +++ devel/pydbus-common/pkg-plist (working copy) @@ -1,80 +1,17 @@ include/dbus-1.0/dbus/dbus-python.h -%%PYTHON_SITELIBDIR%%/_dbus_bindings.a -%%PYTHON_SITELIBDIR%%/_dbus_bindings.la -%%PYTHON_SITELIBDIR%%/_dbus_bindings.so -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.a -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.la -%%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/gobject_service.py -%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyc -%%PYTHON_SITELIBDIR%%/dbus/gobject_service.pyo -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.py -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc -%%PYTHON_SITELIBDIR%%/dbus/lowlevel.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 -%%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 libdata/pkgconfig/dbus-python.pc %%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html %%PORTDOCS%%%%DOCSDIR%%/HACKING.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/HACKING.html %%PORTDOCS%%%%DOCSDIR%%/NEWS -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/NEWS.html %%PORTDOCS%%%%DOCSDIR%%/PY3PORT.txt +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html %%PORTDOCS%%%%DOCSDIR%%/README -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/README.html -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/TODO.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/README.html %%PORTDOCS%%%%DOCSDIR%%/tutorial.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-async-client.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-client.py %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example-service.py @@ -83,5 +20,5 @@ %%PORTEXAMPLES%%%%EXAMPLESDIR%%/list-system-services.py %%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm %%PYTHON_SITELIBDIR%%/dbus/mainloop -@dirrm %%PYTHON_SITELIBDIR%%/dbus +@dirrmtry include/dbus-1.0/dbus +@dirrmtry include/dbus-1.0 Index: devel/py-dbus/Makefile =================================================================== --- devel/py-dbus/Makefile (revision 354652) +++ devel/py-dbus/Makefile (working copy) @@ -1,51 +1,17 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/trunk/devel/py-dbus/Makefile 17268 2013-04-01 05:13:11Z marcus $ +# $MCom: ports-experimental/trunk/devel/py-dbus/Makefile 19557 2014-04-22 07:44:25Z kwm $ -PORTNAME= dbus -PORTVERSION= 1.1.1 -CATEGORIES= devel gnome python -MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ +PORTREVISION= 1 + PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME}-python-${PORTVERSION} +PKGNAMESUFFIX= -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for the D-BUS messaging system +COMMENT= Python2 bindings for the D-BUS messaging system -LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib +SLAVE_PORT= python2 -USES= gettext pathfix pkgconfig gmake -USE_PYTHON= 2 -USE_AUTOTOOLS= libtool -CPPFLAGS+= -I${PYTHON_INCLUDEDIR} -CONFIGURE_ARGS= --docdir=${DOCSDIR} \ - --disable-api-docs +MASTERDIR= ${.CURDIR}/../../devel/pydbus-common +PLIST= ${.CURDIR}/pkg-plist -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} - -OPTIONS_DEFINE=HTMLDOCS -HTMLDOCS_DESC= build html documentation - -.include - -.if ${PORT_OPTIONS:MHTMLDOCS} -BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils -PLIST_SUB+= HTML="" -.else -CONFIGURE_ARGS+=--disable-html-docs -PLIST_SUB+= HTML="@comment " -.endif - -post-patch: -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \ - s|PYTHON install-nodist_docDATA|PYTHON|g' \ - ${WRKSRC}/Makefile.in -.endif - -post-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \ - ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR} - -.include +.include "${MASTERDIR}/Makefile" Index: devel/py-dbus/pkg-plist =================================================================== --- devel/py-dbus/pkg-plist (revision 354652) +++ devel/py-dbus/pkg-plist (working copy) @@ -1,9 +1,4 @@ -include/dbus-1.0/dbus/dbus-python.h -%%PYTHON_SITELIBDIR%%/_dbus_bindings.a -%%PYTHON_SITELIBDIR%%/_dbus_bindings.la %%PYTHON_SITELIBDIR%%/_dbus_bindings.so -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.a -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.la %%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so %%PYTHON_SITELIBDIR%%/dbus/__init__.py %%PYTHON_SITELIBDIR%%/dbus/__init__.pyc @@ -62,26 +57,5 @@ %%PYTHON_SITELIBDIR%%/dbus/types.py %%PYTHON_SITELIBDIR%%/dbus/types.pyc %%PYTHON_SITELIBDIR%%/dbus/types.pyo -libdata/pkgconfig/dbus-python.pc -%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html -%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt -%%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 -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/TODO.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html -%%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%%/list-system-services.py -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%PYTHON_SITELIBDIR%%/dbus/mainloop @dirrm %%PYTHON_SITELIBDIR%%/dbus Index: devel/py3-dbus/Makefile =================================================================== --- devel/py3-dbus/Makefile (revision 352996) +++ devel/py3-dbus/Makefile (working copy) @@ -1,51 +1,17 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/trunk/devel/py-dbus/Makefile 17268 2013-04-01 05:13:11Z marcus $ +# $MCom: ports-experimental/trunk/devel/py3-dbus/Makefile 19541 2014-04-16 10:23:02Z gusi $ -PORTNAME= dbus -PORTVERSION= 1.1.1 -CATEGORIES= devel gnome python -MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/ +PORTREVISION= 0 + PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTNAME= ${PORTNAME}-python-${PORTVERSION} +PKGNAMESUFFIX= -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for the D-BUS messaging system +COMMENT= Python3 bindings for the D-BUS messaging system -LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib +SLAVE_PORT= python3 -USES= gettext pathfix pkgconfig gmake -USE_PYTHON= 2 -USE_AUTOTOOLS= libtool -CPPFLAGS+= -I${PYTHON_INCLUDEDIR} -CONFIGURE_ARGS= --docdir=${DOCSDIR} \ - --disable-api-docs +MASTERDIR= ${.CURDIR}/../../devel/pydbus-common +PLIST= ${.CURDIR}/pkg-plist -DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} - -OPTIONS_DEFINE=HTMLDOCS -HTMLDOCS_DESC= build html documentation - -.include - -.if ${PORT_OPTIONS:MHTMLDOCS} -BUILD_DEPENDS+= rst2html:${PORTSDIR}/textproc/py-docutils -PLIST_SUB+= HTML="" -.else -CONFIGURE_ARGS+=--disable-html-docs -PLIST_SUB+= HTML="@comment " -.endif - -post-patch: -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \ - s|PYTHON install-nodist_docDATA|PYTHON|g' \ - ${WRKSRC}/Makefile.in -.endif - -post-install: - ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} && \ - ${INSTALL_DATA} ${WRKSRC}/examples/*.py ${STAGEDIR}${EXAMPLESDIR} - -.include +.include "${MASTERDIR}/Makefile" Index: devel/py3-dbus/pkg-plist =================================================================== --- devel/py3-dbus/pkg-plist (revision 352996) +++ devel/py3-dbus/pkg-plist (working copy) @@ -1,9 +1,4 @@ -include/dbus-1.0/dbus/dbus-python.h -%%PYTHON_SITELIBDIR%%/_dbus_bindings.a -%%PYTHON_SITELIBDIR%%/_dbus_bindings.la %%PYTHON_SITELIBDIR%%/_dbus_bindings.so -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.a -%%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.la %%PYTHON_SITELIBDIR%%/_dbus_glib_bindings.so %%PYTHON_SITELIBDIR%%/dbus/__init__.py %%PYTHON_SITELIBDIR%%/dbus/__init__.pyc @@ -38,18 +33,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 %%PYTHON_SITELIBDIR%%/dbus/lowlevel.py %%PYTHON_SITELIBDIR%%/dbus/lowlevel.pyc %%PYTHON_SITELIBDIR%%/dbus/lowlevel.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 %%PYTHON_SITELIBDIR%%/dbus/proxies.py %%PYTHON_SITELIBDIR%%/dbus/proxies.pyc %%PYTHON_SITELIBDIR%%/dbus/proxies.pyo @@ -62,26 +48,11 @@ %%PYTHON_SITELIBDIR%%/dbus/types.py %%PYTHON_SITELIBDIR%%/dbus/types.pyc %%PYTHON_SITELIBDIR%%/dbus/types.pyo -libdata/pkgconfig/dbus-python.pc -%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/API_CHANGES.html -%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt -%%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 -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/TODO.html -%%PORTDOCS%%%%DOCSDIR%%/tutorial.txt -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/tutorial.html -%%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%%/list-system-services.py -%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%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 @dirrm %%PYTHON_SITELIBDIR%%/dbus/mainloop @dirrm %%PYTHON_SITELIBDIR%%/dbus Index: devel/pygobject3-common/Makefile =================================================================== --- devel/pygobject3-common/Makefile (revision 352996) +++ devel/pygobject3-common/Makefile (working copy) @@ -1,47 +1,73 @@ -# Created by: Joe Marcus Clarke +# Created by: Gustau Perez i Querol # $FreeBSD$ -# $MCom: ports/trunk/devel/py-gobject3/Makefile 17268 2013-04-01 05:13:11Z marcus $ +# $MCom: ports-experimental/trunk/devel/pygobject3-common/Makefile 19555 2014-04-20 11:39:57Z kwm $ PORTNAME= gobject PORTVERSION= 3.8.1 +PORTREVISION?= 0 CATEGORIES= devel python MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} -PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -PKGNAMESUFFIX= 3 +PKGNAMEPREFIX?= py +PKGNAMESUFFIX?= 3-common DISTNAME= pygobject-${PORTVERSION} DIST_SUBDIR= gnome3 MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for GObject +COMMENT= Common files for the Python bindings for GObject LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo -LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo +SLAVE_PORT?= no -USE_XZ= yes -USES= gmake pathfix pkgconfig -USE_GNOME= glib20 introspection -USE_PYTHON= 2 +USES= gmake pathfix pkgconfig tar:xz GNU_CONFIGURE= yes -USE_LDCONFIG= yes +INSTALL_TARGET= install-strip # this port doesn't work with py-gobject < 2.28.6_2, clungle below CONFLICTS= py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \ py*-gobject-2.*.6_1 -PLIST_SUB= PYTHON_VER="${PYTHON_VER}" ARCH=${ARCH} UNAME_R=${UNAME_R} \ - VERSION=${PORTVERSION} +PLIST_SUB= ARCH=${ARCH} UNAME_R=${UNAME_R} VERSION=${PORTVERSION} +.if ${SLAVE_PORT} == no +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo +USE_PYTHON_BUILD= 2 +USE_GNOME+= glib20:build introspection:build +NO_BUILD= yes + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/include/pygobject-3.0/ + ${INSTALL_DATA} ${WRKSRC}/gi/_gobject/pygobject.h \ + ${STAGEDIR}${PREFIX}/include/pygobject-3.0/pygobject.h + ${INSTALL_DATA} ${WRKSRC}/pygobject-3.0.pc \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc +.else +USE_GNOME+= glib20 introspection +LIB_DEPENDS+= libffi.so:${PORTSDIR}/devel/libffi +RUN_DEPENDS+= pygobject3-common>=0:${PORTSDIR}/devel/pygobject3-common + +.if ${SLAVE_PORT} == python2 +USE_PYTHON= 2 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo +.endif + +.if ${SLAVE_PORT} == python3 +USE_PYTHON= 3 +BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo +RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/py3cairo.pc:${PORTSDIR}/graphics/py3-cairo +.endif + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/gi/*.so + @${RM} -rf ${STAGEDIR}${PREFIX}/include/pygobject-3.0 \ + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/pygobject-3.0.pc +.endif + .include UNAME_R!= ${UNAME} -r -post-patch: - @${REINPLACE_CMD} -e 's|SUBDIRS = examples gi tests|SUBDIRS = examples gi|g' \ - ${WRKSRC}/Makefile.in - .include Index: devel/pygobject3-common/pkg-plist =================================================================== --- devel/pygobject3-common/pkg-plist (revision 352996) +++ devel/pygobject3-common/pkg-plist (working copy) @@ -1,93 +1,3 @@ include/pygobject-3.0/pygobject.h -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.la -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0 -%%PYTHON_SITELIBDIR%%/gi/__init__.py -%%PYTHON_SITELIBDIR%%/gi/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/_gi.la -%%PYTHON_SITELIBDIR%%/gi/_gi.so -%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.la -%%PYTHON_SITELIBDIR%%/gi/_gi_cairo.so -%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.py -%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/_glib/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/_glib/_glib.la -%%PYTHON_SITELIBDIR%%/gi/_glib/_glib.so -%%PYTHON_SITELIBDIR%%/gi/_glib/option.py -%%PYTHON_SITELIBDIR%%/gi/_glib/option.pyc -%%PYTHON_SITELIBDIR%%/gi/_glib/option.pyo -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/_gobject/_gobject.la -%%PYTHON_SITELIBDIR%%/gi/_gobject/_gobject.so -%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/constants.pyo -%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/propertyhelper.pyo -%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.py -%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.pyc -%%PYTHON_SITELIBDIR%%/gi/_gobject/signalhelper.pyo -%%PYTHON_SITELIBDIR%%/gi/importer.py -%%PYTHON_SITELIBDIR%%/gi/importer.pyc -%%PYTHON_SITELIBDIR%%/gi/importer.pyo -%%PYTHON_SITELIBDIR%%/gi/module.py -%%PYTHON_SITELIBDIR%%/gi/module.pyc -%%PYTHON_SITELIBDIR%%/gi/module.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GIMarshallingTests.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GLib.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.py -%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/GObject.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gdk.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gio.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Gtk.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.py -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/Pango.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.py -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.py -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyc -%%PYTHON_SITELIBDIR%%/gi/overrides/keysyms.pyo -%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.py -%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyc -%%PYTHON_SITELIBDIR%%/gi/pygtkcompat.pyo -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.py -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyc -%%PYTHON_SITELIBDIR%%/gi/repository/__init__.pyo -%%PYTHON_SITELIBDIR%%/gi/types.py -%%PYTHON_SITELIBDIR%%/gi/types.pyc -%%PYTHON_SITELIBDIR%%/gi/types.pyo -%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-pypython%%PYTHON_VER%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info -%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo -%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/generictreemodel.pyo -%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py -%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc -%%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo libdata/pkgconfig/pygobject-3.0.pc -@dirrm %%PYTHON_SITELIBDIR%%/pygtkcompat -@dirrm %%PYTHON_SITELIBDIR%%/gi/repository -@dirrm %%PYTHON_SITELIBDIR%%/gi/overrides -@dirrm %%PYTHON_SITELIBDIR%%/gi/_gobject -@dirrm %%PYTHON_SITELIBDIR%%/gi/_glib -@dirrm %%PYTHON_SITELIBDIR%%/gi -@dirrmtry include/pygobject-3.0 +@dirrm include/pygobject-3.0 Index: devel/py-gobject3/Makefile =================================================================== --- devel/py-gobject3/Makefile (revision 354652) +++ devel/py-gobject3/Makefile (working copy) @@ -1,47 +1,17 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/trunk/devel/py-gobject3/Makefile 17268 2013-04-01 05:13:11Z marcus $ +# $MCom: ports-experimental/trunk/devel/py-gobject3/Makefile 19555 2014-04-20 11:39:57Z kwm $ -PORTNAME= gobject -PORTVERSION= 3.8.1 -CATEGORIES= devel python -MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +PORTREVISION= 1 + PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= 3 -DISTNAME= pygobject-${PORTVERSION} -DIST_SUBDIR= gnome3 -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for GObject +COMMENT= Python 2 bindings for GObject -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING +SLAVE_PORT= python2 -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo -LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo +MASTERDIR= ${.CURDIR}/../../devel/pygobject3-common +PLIST= ${.CURDIR}/pkg-plist -USE_XZ= yes -USES= gmake pathfix pkgconfig -USE_GNOME= glib20 introspection -USE_PYTHON= 2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -# this port doesn't work with py-gobject < 2.28.6_2, clungle below -CONFLICTS= py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \ - py*-gobject-2.*.6_1 - -PLIST_SUB= PYTHON_VER="${PYTHON_VER}" ARCH=${ARCH} UNAME_R=${UNAME_R} \ - VERSION=${PORTVERSION} - -.include - -UNAME_R!= ${UNAME} -r - -post-patch: - @${REINPLACE_CMD} -e 's|SUBDIRS = examples gi tests|SUBDIRS = examples gi|g' \ - ${WRKSRC}/Makefile.in - -.include +.include "${MASTERDIR}/Makefile" Index: devel/py-gobject3/distinfo =================================================================== --- devel/py-gobject3/distinfo (revision 354652) +++ devel/py-gobject3/distinfo (working copy) @@ -1,2 +0,0 @@ -SHA256 (gnome3/pygobject-3.8.1.tar.xz) = e85c8ec64238ce88ec1e905497f5a2eaa947a7f4050e338d21ec510d8a50eacb -SIZE (gnome3/pygobject-3.8.1.tar.xz) = 652864 Index: devel/py-gobject3/pkg-descr =================================================================== --- devel/py-gobject3/pkg-descr (revision 354652) +++ devel/py-gobject3/pkg-descr (working copy) @@ -1,4 +0,0 @@ -PyGObject provides a convenient wrapper for the GObject+ library for use -in Python programs, and takes care of many of the boring details such as -managing memory and type casting. When combined with PyGTK, PyORBit and -gnome-python, it can be used to write full featured Gnome applications. Index: devel/py-gobject3/pkg-plist =================================================================== --- devel/py-gobject3/pkg-plist (revision 354652) +++ devel/py-gobject3/pkg-plist (working copy) @@ -1,7 +1,6 @@ -include/pygobject-3.0/pygobject.h -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.la -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0 +lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.la +lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so +lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so.0 %%PYTHON_SITELIBDIR%%/gi/__init__.py %%PYTHON_SITELIBDIR%%/gi/__init__.pyc %%PYTHON_SITELIBDIR%%/gi/__init__.pyo @@ -73,7 +72,7 @@ %%PYTHON_SITELIBDIR%%/gi/types.py %%PYTHON_SITELIBDIR%%/gi/types.pyc %%PYTHON_SITELIBDIR%%/gi/types.pyo -%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-pypython%%PYTHON_VER%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info +%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VERSION%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo @@ -83,7 +82,6 @@ %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo -libdata/pkgconfig/pygobject-3.0.pc @dirrm %%PYTHON_SITELIBDIR%%/pygtkcompat @dirrm %%PYTHON_SITELIBDIR%%/gi/repository @dirrm %%PYTHON_SITELIBDIR%%/gi/overrides @@ -90,4 +88,3 @@ @dirrm %%PYTHON_SITELIBDIR%%/gi/_gobject @dirrm %%PYTHON_SITELIBDIR%%/gi/_glib @dirrm %%PYTHON_SITELIBDIR%%/gi -@dirrmtry include/pygobject-3.0 Index: devel/py3-gobject3/Makefile =================================================================== --- devel/py3-gobject3/Makefile (revision 352996) +++ devel/py3-gobject3/Makefile (working copy) @@ -1,47 +1,17 @@ # Created by: Joe Marcus Clarke # $FreeBSD$ -# $MCom: ports/trunk/devel/py-gobject3/Makefile 17268 2013-04-01 05:13:11Z marcus $ +# $MCom: ports-experimental/trunk/devel/py3-gobject3/Makefile 19555 2014-04-20 11:39:57Z kwm $ -PORTNAME= gobject -PORTVERSION= 3.8.1 -CATEGORIES= devel python -MASTER_SITES= GNOME -MASTER_SITE_SUBDIR= sources/pygobject/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} +PORTREVISION= 0 + PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} PKGNAMESUFFIX= 3 -DISTNAME= pygobject-${PORTVERSION} -DIST_SUBDIR= gnome3 -MAINTAINER= gnome@FreeBSD.org -COMMENT= Python bindings for GObject +COMMENT= Python 3 bindings for GObject -LICENSE= LGPL21 -LICENSE_FILE= ${WRKSRC}/COPYING +SLAVE_PORT= python3 -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo -LIB_DEPENDS= libffi.so:${PORTSDIR}/devel/libffi -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pycairo.pc:${PORTSDIR}/graphics/py-cairo +MASTERDIR= ${.CURDIR}/../../devel/pygobject3-common +PLIST= ${.CURDIR}/pkg-plist -USE_XZ= yes -USES= gmake pathfix pkgconfig -USE_GNOME= glib20 introspection -USE_PYTHON= 2 -GNU_CONFIGURE= yes -USE_LDCONFIG= yes - -# this port doesn't work with py-gobject < 2.28.6_2, clungle below -CONFLICTS= py*-gtk-0* py*-gobject-2.*.[0-6] py*-gobject-2.*.[7-9] \ - py*-gobject-2.*.6_1 - -PLIST_SUB= PYTHON_VER="${PYTHON_VER}" ARCH=${ARCH} UNAME_R=${UNAME_R} \ - VERSION=${PORTVERSION} - -.include - -UNAME_R!= ${UNAME} -r - -post-patch: - @${REINPLACE_CMD} -e 's|SUBDIRS = examples gi tests|SUBDIRS = examples gi|g' \ - ${WRKSRC}/Makefile.in - -.include +.include "${MASTERDIR}/Makefile" Index: devel/py3-gobject3/pkg-plist =================================================================== --- devel/py3-gobject3/pkg-plist (revision 352996) +++ devel/py3-gobject3/pkg-plist (working copy) @@ -1,7 +1,6 @@ -include/pygobject-3.0/pygobject.h -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.la -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so -lib/libpyglib-gi-2.0-python%%PYTHON_VER%%.so.0 +lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.la +lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so +lib/libpyglib-gi-2.0-%%PYTHON_VERSION%%.so.0 %%PYTHON_SITELIBDIR%%/gi/__init__.py %%PYTHON_SITELIBDIR%%/gi/__init__.pyc %%PYTHON_SITELIBDIR%%/gi/__init__.pyo @@ -73,7 +72,7 @@ %%PYTHON_SITELIBDIR%%/gi/types.py %%PYTHON_SITELIBDIR%%/gi/types.pyc %%PYTHON_SITELIBDIR%%/gi/types.pyo -%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-pypython%%PYTHON_VER%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info +%%PYTHON_SITELIBDIR%%/pygobject-%%VERSION%%-py%%PYTHON_VERSION%%-freebsd-%%UNAME_R%%-%%ARCH%%.egg-info %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.py %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/__init__.pyo @@ -83,7 +82,6 @@ %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.py %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyc %%PYTHON_SITELIBDIR%%/pygtkcompat/pygtkcompat.pyo -libdata/pkgconfig/pygobject-3.0.pc @dirrm %%PYTHON_SITELIBDIR%%/pygtkcompat @dirrm %%PYTHON_SITELIBDIR%%/gi/repository @dirrm %%PYTHON_SITELIBDIR%%/gi/overrides @@ -90,4 +88,3 @@ @dirrm %%PYTHON_SITELIBDIR%%/gi/_gobject @dirrm %%PYTHON_SITELIBDIR%%/gi/_glib @dirrm %%PYTHON_SITELIBDIR%%/gi -@dirrmtry include/pygobject-3.0