- Bump portrevision - Trim Makefile header - Trim dependency for net-p2p/libtorrent-rasterbar-16 - Trim install, USE_PYDISTUTILS - Remove not needed REINPLACE_CMD - Remove not needed change installation permission, 755 use mostly .so and .la - Use PLIST_FILES instead of pkg-plist - Fix conflict with net-p2p/libtorrent-rasterbar-16 (examples) - Remove pkg-plist - Cleanup Port Generated and tested manually, tested with port test and with RedPorts, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports) How-To-Repeat: Build log https://redports.org/buildarchive/20130724164701-22162/
Responsible Changed From-To: freebsd-ports-bugs->antoine Take it
Author: antoine Date: Wed Jul 31 19:00:08 2013 New Revision: 324066 URL: http://svnweb.freebsd.org/changeset/ports/324066 Log: Cleanup libtorrent-rasterbar-16 and unbreak libtorrent-rasterbar-16-python PR: 180809, 180813 Submitted by: nemysis (maintainer) Deleted: head/net-p2p/libtorrent-rasterbar-16-python/pkg-plist Modified: head/net-p2p/libtorrent-rasterbar-16-python/Makefile head/net-p2p/libtorrent-rasterbar-16/Makefile Modified: head/net-p2p/libtorrent-rasterbar-16-python/Makefile ============================================================================== --- head/net-p2p/libtorrent-rasterbar-16-python/Makefile Wed Jul 31 18:31:44 2013 (r324065) +++ head/net-p2p/libtorrent-rasterbar-16-python/Makefile Wed Jul 31 19:00:08 2013 (r324066) @@ -1,39 +1,31 @@ +# Created by: Doug Barton <dougb@FreeBSD.org> # $FreeBSD$ -PORTREVISION= 2 - +PORTREVISION= 3 +CATEGORIES= net-p2p python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} COMMENT= Python bindings for libtorrent-rasterbar-16 -CATEGORIES= net-p2p python -USE_PYTHON= yes +LIB_DEPENDS= torrent-rasterbar:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16 \ + boost_python:${PORTSDIR}/devel/boost-python-libs -LIB_DEPENDS+= boost_python:${PORTSDIR}/devel/boost-python-libs \ - torrent-rasterbar.7:${PORTSDIR}/net-p2p/libtorrent-rasterbar-16 +MASTERDIR= ${.CURDIR}/../libtorrent-rasterbar-16 BUILD_WRKSRC= ${WRKSRC}/bindings/python INSTALL_WRKSRC= ${BUILD_WRKSRC} -PLIST= ${.CURDIR}/pkg-plist -INSTALLS_EGGINFO= yes -PYDISTUTILS_PKGNAME= python_libtorrent -NOPORTDOCS= yes +USE_PYTHON= yes +USE_PYDISTUTILS= yes +PYDISTUTILS_PKGNAME= python_libtorrent -slave-post-patch: - @${REINPLACE_CMD} -E -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ - ${WRKSRC}/bindings/python/setup.py.in - -slave-post-install: -# fix installation permissions - @${CHMOD} ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/libtorrent.so +PLIST= ${NONEXISTENT} +PLIST_FILES= %%PYTHON_SITELIBDIR%%/libtorrent.so -MASTERDIR= ${.CURDIR}/../libtorrent-rasterbar-16 -.include "${MASTERDIR}/Makefile" +OPTIONS_EXCLUDE= DOCS EXAMPLES -## -# information available after <bsd.port.pre.mk> -## # insure python paths are correctly identified -CONFIGURE_ENV+= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \ +CONFIGURE_ENV= PYTHON_INCLUDEDIR="${PYTHON_INCLUDEDIR}" \ PYTHON_VERSION="${PYTHON_VERSION}" + +.include "${MASTERDIR}/Makefile" Modified: head/net-p2p/libtorrent-rasterbar-16/Makefile ============================================================================== --- head/net-p2p/libtorrent-rasterbar-16/Makefile Wed Jul 31 18:31:44 2013 (r324065) +++ head/net-p2p/libtorrent-rasterbar-16/Makefile Wed Jul 31 19:00:08 2013 (r324066) @@ -19,7 +19,6 @@ USES= pathfix pkgconfig iconv USE_OPENSSL= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -MAKE_JOBS_SAFE= yes CONFLICTS+= libtorrent-rasterbar-0.1[45789].* NO_LATEST_LINK= yes @@ -42,7 +41,7 @@ PORTDOCS= * DOCSRCDIR1= ${WRKSRC} DOC_FILES1= AUTHORS README -DOCSRCDIR2= ${WRKSRC}/docs +DOCSRCDIR2= ${WRKSRC}/docs DOCSDIR2= ${DOCSDIR}/docs DOC_FILES2= *.png *.jpg *.gif *.html *.rst *.css @@ -50,7 +49,7 @@ PORTEXAMPLES= *.cpp OPTIONS_DEFINE= DOCS EXAMPLES -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> .if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "yes" && defined(USE_PYTHON) CONFIGURE_ARGS+= --enable-python-binding \ @@ -59,20 +58,11 @@ CONFIGURE_ARGS+= --enable-python-binding CONFIGURE_ARGS+= --disable-python-binding .endif -.if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "yes" -post-patch: slave-post-patch -.else - post-patch: - @${REINPLACE_CMD} -e 's|<include>/usr/local/include|<include>${PREFIX}/include|' \ + @${REINPLACE_CMD} -e 's|/usr/local/include|${PREFIX}/include|' \ ${WRKSRC}/Jamfile -.endif -.if defined(SLAVE_PORT) && ${SLAVE_PORT:L} == "yes" -post-install: slave-post-install -.else post-install: -.endif .if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} @@ -84,4 +74,4 @@ post-install: ${INSTALL_DATA} ${PORTEXAMPLES:S|^|${WRKSRC}/examples/|} ${EXAMPLESDIR} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed patch committed, thanks!