Index: head/net-p2p/rtorrent/pkg-plist
===================================================================
--- head/net-p2p/rtorrent/pkg-plist	(revision 402121)
+++ head/net-p2p/rtorrent/pkg-plist	(nonexistent)
@@ -1,2 +0,0 @@
-bin/rtorrent
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rtorrent.rc

Property changes on: head/net-p2p/rtorrent/pkg-plist
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/net-p2p/rtorrent/Makefile
===================================================================
--- head/net-p2p/rtorrent/Makefile	(revision 402121)
+++ head/net-p2p/rtorrent/Makefile	(revision 402122)
@@ -1,60 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=	rtorrent
 PORTVERSION=	0.9.6
 CATEGORIES=	net-p2p
 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
+USES=		compiler:c++11-lang pkgconfig
 
+PLIST_FILES=	bin/rtorrent
+PORTDOCS=	README
+PORTEXAMPLES=	rtorrent.rc
 SUB_FILES=	pkg-message
 
-PORTDOCS=	README
-
-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
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O3|${CFLAGS}|' ${WRKSRC}/configure
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 	@${FIND} ${WRKSRC} \( -name '*.h' -o -name '*.cc' \) -type f \
 		-exec ${REINPLACE_CMD} -e 's/tr1::/std::/g' {} \; \
 		-exec ${REINPLACE_CMD} -e 's/std::std::/std::/g' {} \; \
 		-exec ${REINPLACE_CMD} -e '/namespace tr1/d' {} \; \
 		-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>
Index: head/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc
===================================================================
--- head/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc	(revision 402121)
+++ head/net-p2p/rtorrent/files/patch-src_display_window__file__list.cc	(revision 402122)
@@ -1,10 +1,10 @@
---- 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"
  
 +#include <locale>
  #include <stdio.h>
  #include <torrent/path.h>
  #include <torrent/data/file.h>
Index: head/net-p2p/rtorrent/files/patch-src_signal__handler.cc
===================================================================
--- head/net-p2p/rtorrent/files/patch-src_signal__handler.cc	(revision 402121)
+++ head/net-p2p/rtorrent/files/patch-src_signal__handler.cc	(revision 402122)
@@ -1,10 +1,10 @@
---- 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>
  #include <stdexcept>
 +#include <string>
  #include "rak/error_number.h"
  #include "signal_handler.h"
  
Index: head/net-p2p/rtorrent/files/patch-src_utils_directory.cc
===================================================================
--- head/net-p2p/rtorrent/files/patch-src_utils_directory.cc	(revision 402121)
+++ head/net-p2p/rtorrent/files/patch-src_utils_directory.cc	(revision 402122)
@@ -1,13 +1,13 @@
---- 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;
      itr->d_reclen = 0;
      itr->d_type = s.st_mode;
 +#elif defined(__DragonFly__)
 +    itr->d_fileno = entry->d_fileno;
 +    itr->d_reclen = _DIRENT_RECLEN(entry->d_namlen);
 +    itr->d_type   = entry->d_type;
  #else
      itr->d_fileno = entry->d_fileno;
      itr->d_reclen = entry->d_reclen;