From owner-svn-ports-all@FreeBSD.ORG Tue Jan 15 13:18:59 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 7D5A4845; Tue, 15 Jan 2013 13:18:59 +0000 (UTC) (envelope-from az@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 611347C2; Tue, 15 Jan 2013 13:18:59 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0FDIxCS034112; Tue, 15 Jan 2013 13:18:59 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0FDIwrH034102; Tue, 15 Jan 2013 13:18:58 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201301151318.r0FDIwrH034102@svn.freebsd.org> From: Andrej Zverev Date: Tue, 15 Jan 2013 13:18:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r310441 - in head/net-p2p: libtorrent libtorrent-devel rtorrent rtorrent-devel rtorrent-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2013 13:18:59 -0000 Author: az Date: Tue Jan 15 13:18:57 2013 New Revision: 310441 URL: http://svnweb.freebsd.org/changeset/ports/310441 Log: separate logic for these two group of ports. Added: head/net-p2p/libtorrent-devel/pkg-descr (contents, props changed) head/net-p2p/rtorrent-devel/files/pkg-message.in (contents, props changed) head/net-p2p/rtorrent-devel/pkg-descr (contents, props changed) Modified: head/net-p2p/libtorrent-devel/Makefile (contents, props changed) head/net-p2p/libtorrent/Makefile head/net-p2p/rtorrent-devel/Makefile (contents, props changed) head/net-p2p/rtorrent/Makefile Modified: head/net-p2p/libtorrent-devel/Makefile ============================================================================== --- head/net-p2p/libtorrent-devel/Makefile Tue Jan 15 13:07:54 2013 (r310440) +++ head/net-p2p/libtorrent-devel/Makefile Tue Jan 15 13:18:57 2013 (r310441) @@ -7,20 +7,51 @@ PORTNAME= libtorrent-devel PORTVERSION= 0.13.1 +PORTREVISION= 1 +CATEGORIES= net-p2p +MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ DISTNAME= ${PORTNAME:S/-devel//}-${PORTVERSION} MAINTAINER= az@FreeBSD.org COMMENT= BitTorrent Library written in C++ (development version) -MASTERDIR= ${.CURDIR}/../libtorrent -PATCHDIR= ${.CURDIR}/files/ -DISTINFO_FILE= ${.CURDIR}/distinfo -PLIST= ${.CURDIR}/pkg-plist -DESCR= ${MASTERDIR}/pkg-descr - +LIB_DEPENDS= sigc-2.0.0:${PORTSDIR}/devel/libsigc++20 CONFLICTS= libtorrent-[0-9]* \ rblibtorrent-[0-9]* \ rblibtorrent-devel-[0-9]* -.include "${MASTERDIR}/Makefile" +USE_AUTOTOOLS= libtool +USE_GNOME= gnomehack +USE_PKGCONFIG= build +USE_OPENSSL= yes +USE_LDCONFIG= yes +GNU_CONFIGURE= yes + +OPTIONS_DEFINE= KQUEUE IPV6 +OPTIONS_DEFAULT= KQUEUE +KQUEUE_DESC= Use kqueue(2) support + +.include + +.if defined(WITH_OPENSSL_BASE) +# The reason why I use this is cause openssl from base doesn't install a .pc file +# and configure will fail trying to find it. Setting both of those variables to +# a *non-empty* value by-passes the pkg-config check. +CONFIGURE_ENV= OPENSSL_LIBS="-L/usr/lib -ssl -crypto" OPENSSL_CFLAGS="-I/usr/include" +.endif + +CONFIGURE_ARGS+= --disable-debug --with-openssl=${OPENSSLBASE} + +post-patch: + @${REINPLACE_CMD} -e 's/-O3/${CFLAGS}/' ${WRKSRC}/configure + +.if ${PORT_OPTIONS:MKQUEUE} +CONFIGURE_ARGS+= --with-kqueue +.endif + +.if ${PORT_OPTIONS:MIPV6} +CONFIGURE_ARGS+= --enable-ipv6 +.endif + +.include Added: head/net-p2p/libtorrent-devel/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/libtorrent-devel/pkg-descr Tue Jan 15 13:18:57 2013 (r310441) @@ -0,0 +1,5 @@ +LibTorrent is a BitTorrent library written in C++ for *nix. It is +designed to avoid redundant copying and storing of data that other +clients and libraries suffer from. Licensed under the GPL. + +WWW: http://libtorrent.rakshasa.no/ Modified: head/net-p2p/libtorrent/Makefile ============================================================================== --- head/net-p2p/libtorrent/Makefile Tue Jan 15 13:07:54 2013 (r310440) +++ head/net-p2p/libtorrent/Makefile Tue Jan 15 13:18:57 2013 (r310441) @@ -1,7 +1,7 @@ # $FreeBSD$ -PORTNAME?= libtorrent -PORTVERSION?= 0.13.2 +PORTNAME= libtorrent +PORTVERSION= 0.13.2 PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ \ Modified: head/net-p2p/rtorrent-devel/Makefile ============================================================================== --- head/net-p2p/rtorrent-devel/Makefile Tue Jan 15 13:07:54 2013 (r310440) +++ head/net-p2p/rtorrent-devel/Makefile Tue Jan 15 13:18:57 2013 (r310441) @@ -8,6 +8,8 @@ PORTNAME= rtorrent-devel PORTVERSION= 0.9.1 PORTREVISION= 0 +CATEGORIES= net-p2p +MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ DISTNAME= ${PORTNAME:S/-devel//}-${PORTVERSION} MAINTAINER= az@FreeBSD.org @@ -15,15 +17,51 @@ COMMENT= BitTorrent Client written in C+ BUILD_DEPENDS= libtorrent-devel=0.13.1_1:${PORTSDIR}/net-p2p/libtorrent-devel RUN_DEPENDS= libtorrent-devel=0.13.1_1:${PORTSDIR}/net-p2p/libtorrent-devel - -MASTERDIR= ${.CURDIR}/../rtorrent -PATCHDIR= ${.CURDIR}/files/ -DISTINFO_FILE= ${.CURDIR}/distinfo -PLIST= ${.CURDIR}/pkg-plist -DESCR= ${MASTERDIR}/pkg-descr +LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl CONFLICTS= rtorrent-[0-9]* USE_GCC= 4.2+ -.include "${MASTERDIR}/Makefile" +GNU_CONFIGURE= yes +LDFLAGS+= -pthread +CONFIGURE_ARGS= --disable-debug + +SUB_FILES= pkg-message + +PORTDOCS= README + +OPTIONS_DEFINE= XMLRPC IPV6 DOCS +OPTIONS_DEFAULT= XMLRPC IPV6 +XMLRPC_DESC= Compile with xmlrpc-c support + +.include + +.if ${ARCH} == "arm" +BROKEN= Does not configure on arm +.endif + +.if ${PORT_OPTIONS:MXMLRPC} +CONFIGURE_ARGS+= --with-xmlrpc-c +LIB_DEPENDS+= xmlrpc:${PORTSDIR}/net/xmlrpc-c-devel +.else +CONFIGURE_ARGS+= --with-xmlrpc-c=no +.endif + +.if ${PORT_OPTIONS:MIPV6} +CONFIGURE_ARGS+= --enable-ipv6 +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure + +post-install: + ${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${EXAMPLESDIR}/ +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/ +.endif + @${CAT} ${PKGMESSAGE} + +.include Added: head/net-p2p/rtorrent-devel/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/rtorrent-devel/files/pkg-message.in Tue Jan 15 13:18:57 2013 (r310441) @@ -0,0 +1,8 @@ +------------------------------------------------------------------ +An example configuration file for rtorrent has been installed in +%%EXAMPLESDIR%%. Read it for more information on +how to tweak rtorrent configuration. + +Note that there are hash performance issues on *BSD: +- http://libtorrent.rakshasa.no/wiki/RTorrentPerformanceTuning +------------------------------------------------------------------ Added: head/net-p2p/rtorrent-devel/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/rtorrent-devel/pkg-descr Tue Jan 15 13:18:57 2013 (r310441) @@ -0,0 +1,11 @@ +Rtorrent is a ncurses BitTorrent Client written in C++ for *nix. + +Main Features are : + * Use an URL or file path to add torrents at runtime + * Stop/delete/resume torrents + * Optionally loads/saves/deletes torrents automatically in a session directory + * Safe fast resume support + * Peer's download speed calculated from incoming HAVE messages + * Peer download progress + +WWW: http://libtorrent.rakshasa.no/ Modified: head/net-p2p/rtorrent/Makefile ============================================================================== --- head/net-p2p/rtorrent/Makefile Tue Jan 15 13:07:54 2013 (r310440) +++ head/net-p2p/rtorrent/Makefile Tue Jan 15 13:18:57 2013 (r310441) @@ -1,21 +1,19 @@ # $FreeBSD$ PORTNAME?= rtorrent -PORTVERSION?= 0.9.2 -PORTREVISION?= 1 +PORTVERSION= 0.9.2 +PORTREVISION= 1 CATEGORIES= net-p2p -MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ \ - ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= flz/rtorrent/ - -MAINTAINER?= az@FreeBSD.org -COMMENT?= BitTorrent Client written in C++ - -BUILD_DEPENDS?= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent -RUN_DEPENDS?= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent -LIB_DEPENDS?= curl.6:${PORTSDIR}/ftp/curl +MASTER_SITES= http://libtorrent.rakshasa.no/downloads/ -CONFLICTS?= rtorrent-devel-[0-9]* +MAINTAINER= az@FreeBSD.org +COMMENT= BitTorrent Client written in C++ + +BUILD_DEPENDS= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent +RUN_DEPENDS= libtorrent=0.13.2_1:${PORTSDIR}/net-p2p/libtorrent +LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl + +CONFLICTS= rtorrent-devel-[0-9]* USE_GCC= 4.2+