From owner-svn-ports-head@freebsd.org Sat Nov 21 02:10:10 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BF7F5A32CD7; Sat, 21 Nov 2015 02:10:10 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7C37F100E; Sat, 21 Nov 2015 02:10:10 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAL2A9A3010414; Sat, 21 Nov 2015 02:10:09 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAL2A94L010410; Sat, 21 Nov 2015 02:10:09 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201511210210.tAL2A94L010410@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 21 Nov 2015 02:10:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r402122 - in head/net-p2p/rtorrent: . 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-head@freebsd.org X-Mailman-Version: 2.1.20 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: Sat, 21 Nov 2015 02:10:10 -0000 Author: sunpoet Date: Sat Nov 21 02:10:09 2015 New Revision: 402122 URL: https://svnweb.freebsd.org/changeset/ports/402122 Log: - Update LICENSE - Use PLIST_FILES and PORTEXAMPLES instead of PLIST - Use USE_CXXSTD - Convert to new options target helper - Cosmetic change - Pet portlint: fix diff header of patch files Deleted: head/net-p2p/rtorrent/pkg-plist Modified: head/net-p2p/rtorrent/Makefile head/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc head/net-p2p/rtorrent/files/patch-src_signal__handler.cc head/net-p2p/rtorrent/files/patch-src_utils_directory.cc Modified: head/net-p2p/rtorrent/Makefile ============================================================================== --- head/net-p2p/rtorrent/Makefile Sat Nov 21 02:10:04 2015 (r402121) +++ head/net-p2p/rtorrent/Makefile Sat Nov 21 02:10:09 2015 (r402122) @@ -8,36 +8,39 @@ MASTER_SITES= http://rtorrent.net/downlo MAINTAINER= ports@FreeBSD.org COMMENT= BitTorrent Client written in C++ -LICENSE= GPLv2 # or later -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE= GPLv2 GPLv3 +LICENSE_COMB= dual +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ libtorrent.so:${PORTSDIR}/net-p2p/libtorrent BROKEN_arm= does not configure on arm +OPTIONS_DEFINE= DOCS EXAMPLES IPV6 XMLRPC +OPTIONS_DEFAULT=XMLRPC +XMLRPC_DESC= Compile with xmlrpc-c support + +CONFIGURE_ARGS= --disable-debug GNU_CONFIGURE= yes -USES= compiler:c++11-lang pkgconfig LDFLAGS+= -pthread -CONFIGURE_ARGS= --disable-debug - -SUB_FILES= pkg-message +USES= compiler:c++11-lang pkgconfig +PLIST_FILES= bin/rtorrent PORTDOCS= README +PORTEXAMPLES= rtorrent.rc +SUB_FILES= pkg-message -OPTIONS_DEFINE= XMLRPC IPV6 DOCS EXAMPLES -OPTIONS_DEFAULT=XMLRPC -XMLRPC_DESC= Compile with xmlrpc-c support -IPV6_CONFIGURE_ON= --enable-ipv6 -XMLRPC_LIB_DEPENDS= libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c-devel -XMLRPC_CONFIGURE_ON= --with-xmlrpc-c +IPV6_CONFIGURE_ENABLE= ipv6 XMLRPC_CONFIGURE_OFF= --with-xmlrpc-c=no +XMLRPC_CONFIGURE_ON= --with-xmlrpc-c +XMLRPC_LIB_DEPENDS= libxmlrpc.so:${PORTSDIR}/net/xmlrpc-c-devel .include # Workaround to build on >= 10.x .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000 -CXXFLAGS+= -std=c++11 +USE_CXXSTD= c++11 EXTRA_PATCHES+= ${FILESDIR}/extra-clang .endif @@ -51,10 +54,12 @@ post-patch: -exec ${REINPLACE_CMD} -e '/include/s,tr1/,,' {} \; .endif -post-install: - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${STAGEDIR}${EXAMPLESDIR} - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ + +post-install-EXAMPLES-on: + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/ + ${INSTALL_DATA} ${WRKSRC}/doc/rtorrent.rc ${STAGEDIR}${EXAMPLESDIR}/ .include Modified: head/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc ============================================================================== --- head/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc Sat Nov 21 02:10:04 2015 (r402121) +++ head/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc Sat Nov 21 02:10:09 2015 (r402122) @@ -1,5 +1,5 @@ ---- src/display/window_file_list.cc.orig 2012-02-14 04:32:01.000000000 +0100 -+++ src/display/window_file_list.cc 2014-02-02 22:49:44.000000000 +0100 +--- src/display/window_file_list.cc.orig 2014-05-14 14:30:51 UTC ++++ src/display/window_file_list.cc @@ -36,6 +36,7 @@ #include "config.h" Modified: head/net-p2p/rtorrent/files/patch-src_signal__handler.cc ============================================================================== --- head/net-p2p/rtorrent/files/patch-src_signal__handler.cc Sat Nov 21 02:10:04 2015 (r402121) +++ head/net-p2p/rtorrent/files/patch-src_signal__handler.cc Sat Nov 21 02:10:09 2015 (r402122) @@ -1,5 +1,5 @@ ---- src/signal_handler.cc.orig 2012-03-29 15:06:11.000000000 +0200 -+++ src/signal_handler.cc 2014-02-02 22:46:43.000000000 +0100 +--- src/signal_handler.cc.orig 2014-05-14 14:30:51 UTC ++++ src/signal_handler.cc @@ -38,6 +38,7 @@ #include Modified: head/net-p2p/rtorrent/files/patch-src_utils_directory.cc ============================================================================== --- head/net-p2p/rtorrent/files/patch-src_utils_directory.cc Sat Nov 21 02:10:04 2015 (r402121) +++ head/net-p2p/rtorrent/files/patch-src_utils_directory.cc Sat Nov 21 02:10:09 2015 (r402122) @@ -1,4 +1,4 @@ ---- src/utils/directory.cc.orig 2012-03-29 13:06:11.000000000 +0000 +--- src/utils/directory.cc.orig 2014-04-21 13:34:45 UTC +++ src/utils/directory.cc @@ -88,6 +88,10 @@ Directory::update(int flags) { itr->d_fileno = entry->d_ino;