From owner-svn-ports-head@FreeBSD.ORG Wed Jul 31 19:00:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id C3492C34; Wed, 31 Jul 2013 19:00:08 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B04E922D7; Wed, 31 Jul 2013 19:00:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r6VJ086E070713; Wed, 31 Jul 2013 19:00:08 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r6VJ08ro070711; Wed, 31 Jul 2013 19:00:08 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201307311900.r6VJ08ro070711@svn.freebsd.org> From: Antoine Brodin Date: Wed, 31 Jul 2013 19:00:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324066 - in head/net-p2p: libtorrent-rasterbar-16 libtorrent-rasterbar-16-python X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 31 Jul 2013 19:00:08 -0000 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 # $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 -## # 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 +.include .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|/usr/local/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 +.include