- 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

5 files changed, 28 insertions, 25 deletions

diff --git a/net-p2p/rtorrent/Makefile b/net-p2p/rtorrent/Makefile
index 9871895eb139..cdb361286ab4 100644
--- a/net-p2p/rtorrent/Makefile
+++ b/net-p2p/rtorrent/Makefile
@@ -8,36 +8,39 @@ MASTER_SITES=	http://rtorrent.net/downloads/
 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 <bsd.port.options.mk>
 
 # 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 <bsd.port.mk>
diff --git a/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc b/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc
index c73be8b902ac..93676b2dfcfe 100644
--- a/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc
+++ b/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc
@@ -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"
diff --git a/net-p2p/rtorrent/files/patch-src_signal__handler.cc b/net-p2p/rtorrent/files/patch-src_signal__handler.cc
index dd273dcc316c..bfaaddc40035 100644
--- a/net-p2p/rtorrent/files/patch-src_signal__handler.cc
+++ b/net-p2p/rtorrent/files/patch-src_signal__handler.cc
@@ -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 <signal.h>
diff --git a/net-p2p/rtorrent/files/patch-src_utils_directory.cc b/net-p2p/rtorrent/files/patch-src_utils_directory.cc
index 0f0cc5c0bb52..075f2ec4f0f7 100644
--- a/net-p2p/rtorrent/files/patch-src_utils_directory.cc
+++ b/net-p2p/rtorrent/files/patch-src_utils_directory.cc
@@ -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;
diff --git a/net-p2p/rtorrent/pkg-plist b/net-p2p/rtorrent/pkg-plist
deleted file mode 100644
index 75d213b2d562..000000000000
--- a/net-p2p/rtorrent/pkg-plist
+++ /dev/null
@@ -1,2 +0,0 @@
-bin/rtorrent
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtorrent.rc