Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Index: pydbus-common/Makefile
- ===================================================================
- --- pydbus-common/Makefile (revision 19539)
- +++ pydbus-common/Makefile (working copy)
- @@ -4,41 +4,40 @@
- PORTNAME= dbus
- PORTVERSION= 1.1.1
- -PORTREVISION= 3
- +PORTREVISION= 4
- CATEGORIES= devel gnome python
- MASTER_SITES= http://dbus.freedesktop.org/releases/dbus-python/
- -PKGNAMEPREFIX= py
- -PKGNAMESUFFIX= -common
- +PKGNAMEPREFIX?= py
- +PKGNAMESUFFIX?= -common
- DISTNAME= dbus-python-${PORTVERSION}
- MAINTAINER= [email protected]
- -COMMENT= Common files for the Python bindings for the D-BUS messaging system
- +COMMENT?= Common files for the Python bindings for the D-BUS messaging system
- BUILD_DEPENDS= dbus-glib>=0:${PORTSDIR}/devel/dbus-glib
- +SLAVE_PORT?= no
- +
- USES= gettext pathfix pkgconfig gmake
- -USE_PYTHON_BUILD= 2
- USE_AUTOTOOLS= libtool
- CPPFLAGS+= -I${PYTHON_INCLUDEDIR}
- CONFIGURE_ARGS= --docdir=${DOCSDIR} \
- --disable-api-docs
- +.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_ON= rst2html:${PORTSDIR}/textproc/py-docutils
- .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
- -PLIST_SUB+= HTML="@comment "
- -.endif
- -
- post-patch:
- .if ! ${PORT_OPTIONS:MDOCS}
- @${REINPLACE_CMD} -e 's|HEADERS install-dist_docDATA|HEADERS|g ; \
- @@ -65,5 +64,23 @@
- ${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR} && \
- ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR}
- .endif
- +.else # slave is defined
- +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:
- + ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_dbus_*bindings.so
- +
- + @${RM} -f ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h \
- + ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
- + @${RM} -f ${STAGEDIR}${DOCSDIR}/*
- + @${RMDIR} ${STAGEDIR}/${DOCSDIR}
- +.endif # end of slaving block
- +
- .include <bsd.port.mk>
- Index: pydbus-common/pkg-plist
- ===================================================================
- --- pydbus-common/pkg-plist (revision 19539)
- +++ pydbus-common/pkg-plist (working copy)
- @@ -1,17 +1,17 @@
- include/dbus-1.0/dbus/dbus-python.h
- 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
- -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html
- +%%HTMLDOCS%%%%PORTDOCS%%%%DOCSDIR%%/PY3PORT.html
- %%PORTDOCS%%%%DOCSDIR%%/README
- -%%HTML%%%%PORTDOCS%%%%DOCSDIR%%/README.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
- Index: py-dbus/Makefile
- ===================================================================
- --- py-dbus/Makefile (revision 19539)
- +++ py-dbus/Makefile (working copy)
- @@ -2,33 +2,16 @@
- # $FreeBSD$
- # $MCom$
- -PORTNAME= dbus
- -PORTVERSION= 1.1.1
- -PORTREVISION= 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= [email protected]
- COMMENT= Python2 bindings for the D-BUS messaging system
- -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
- -RUN_DEPENDS= pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
- +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
- -post-install:
- - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_dbus_*bindings.so
- -
- - @${RM} -f ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h \
- - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
- - @${RM} -f ${STAGEDIR}${DOCSDIR}/*
- - @${RMDIR} ${STAGEDIR}/${DOCSDIR}
- -
- -.include <bsd.port.mk>
- +.include "${MASTERDIR}/Makefile"
- Index: py3-dbus/Makefile
- ===================================================================
- --- py3-dbus/Makefile (revision 19539)
- +++ py3-dbus/Makefile (working copy)
- @@ -2,32 +2,16 @@
- # $FreeBSD$
- # $MCom$
- -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= [email protected]
- COMMENT= Python3 bindings for the D-BUS messaging system
- -LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib
- -RUN_DEPENDS= pydbus-common>=0:${PORTSDIR}/devel/pydbus-common
- +SLAVE_PORT= python3
- -USES= gettext pathfix pkgconfig gmake
- -USE_PYTHON= 3
- -USE_AUTOTOOLS= libtool
- -CPPFLAGS+= -I${PYTHON_INCLUDEDIR}
- -CONFIGURE_ARGS= --docdir=${DOCSDIR} \
- - --disable-api-docs
- +MASTERDIR= ${.CURDIR}/../../devel/pydbus-common
- +PLIST= ${.CURDIR}/pkg-plist
- -post-install:
- - ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/_dbus_*bindings.so
- -
- - @${RM} -f ${STAGEDIR}${PREFIX}/include/dbus-1.0/dbus/dbus-python.h \
- - ${STAGEDIR}${PREFIX}/libdata/pkgconfig/dbus-python.pc
- - @${RM} -f ${STAGEDIR}${DOCSDIR}/*
- - @${RMDIR} ${STAGEDIR}/${DOCSDIR}
- -
- -.include <bsd.port.mk>
- +.include "${MASTERDIR}/Makefile"
Advertisement
Add Comment
Please, Sign In to add comment