- Update libtorrent-rasterbar to 1.0.4

- Update qbittorrent 3.2.0
- Use Github masterisite for qbittorrent
- Remove STRIP option, it's the default, and can be inhibited with
  the DEBUG option
- Pet some portlint warnings

PR:		200108
Submitted by:	yuri at rawbw.com

12 files changed, 181 insertions, 83 deletions

diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index 489595b12590..87e85033b339 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-PORTVERSION=	0.16.19
-PORTREVISION=	1
+PORTVERSION=	1.0.4
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME:S/-rasterbar//}/${PORTNAME:S/-rasterbar//}/
 
@@ -15,7 +14,7 @@ LICENSE=	BSD3CLAUSE
 LIB_DEPENDS?=	libboost_date_time.so:${PORTSDIR}/devel/boost-libs \
 		libGeoIP.so:${PORTSDIR}/net/GeoIP
 
-USES+=		compiler:c++11-lang libtool pathfix pkgconfig iconv
+USES+=		compiler:c++11-lang iconv libtool pathfix pkgconfig
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -32,22 +31,23 @@ CONFIGURE_ARGS=	--disable-static \
 		--with-libiconv \
 		--with-openssl=${OPENSSLBASE}
 
-SHLIB_VER=	7
+SHLIB_VER=	8
 PLIST_SUB+=	SHLIB_VER="${SHLIB_VER}"
 
-PORTDOCS=	*
-
 DOCSRCDIR1=	${WRKSRC}
 DOC_FILES1=	AUTHORS ChangeLog README
 
 DOCSRCDIR2=	${WRKSRC}/docs
 DOCSDIR2=	${DOCSDIR}/docs
-DOC_FILES2=	*
+DOC_FILES2=	*.*
+
+DOCSRCDIR3=	${WRKSRC}/docs/img
+DOCSDIR3=	${DOCSDIR}/docs/img
+DOC_FILES3=	*
 
 PORTEXAMPLES=	*.cpp
 
-OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES STRIP
-OPTIONS_DEFAULT=	STRIP
+OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES
 
 DEBUG_CONFIGURE_ENABLE=	debug
 
@@ -69,18 +69,15 @@ post-patch:
 		${WRKSRC}/Jamfile
 
 post-install:
-.if ${PORT_OPTIONS:MSTRIP}
 	${STRIP_CMD} \
 	${STAGEDIR}${PREFIX}/lib/libtorrent-rasterbar.so.${SHLIB_VER}
-.else
-	${STRIP_CMD} \
-	${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}/site-packages/libtorrent.so
-.endif
 
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR2}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DOCSDIR3}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3}
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo
index dc7edabde8bd..58465798a4d9 100644
--- a/net-p2p/libtorrent-rasterbar/distinfo
+++ b/net-p2p/libtorrent-rasterbar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libtorrent-rasterbar-0.16.19.tar.gz) = 9ebd3fa8accfa27d0c81cdbbe15d7b411ea1deec34ac6325dec7197f05d82982
-SIZE (libtorrent-rasterbar-0.16.19.tar.gz) = 3030253
+SHA256 (libtorrent-rasterbar-1.0.4.tar.gz) = 1f567823133b1493b9717afc8334eed691bf0ab452d4a2e0f644989f13ce9db0
+SIZE (libtorrent-rasterbar-1.0.4.tar.gz) = 3297242
diff --git a/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp b/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp
index 26c22203c2cb..e1ab293b3062 100644
--- a/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp
+++ b/net-p2p/libtorrent-rasterbar/files/patch-include-libtorrent-config.hpp
@@ -1,9 +1,9 @@
---- include/libtorrent/config.hpp.orig	2014-08-15 06:51:56 UTC
+--- include/libtorrent/config.hpp.orig	2014-12-05 01:00:07 UTC
 +++ include/libtorrent/config.hpp
-@@ -184,12 +184,6 @@ POSSIBILITY OF SUCH DAMAGE.
- // execinfo.h is available in the MacOS X 10.5 SDK.
- #define TORRENT_USE_EXECINFO MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
- #endif
+@@ -166,12 +166,6 @@ POSSIBILITY OF SUCH DAMAGE.
+ 
+ #endif // __APPLE__
+ 
 -#else
 -// FreeBSD has a reasonable iconv signature
 -// unless we're on glibc
diff --git a/net-p2p/libtorrent-rasterbar/files/patch-libressl b/net-p2p/libtorrent-rasterbar/files/patch-libressl
deleted file mode 100644
index 88072dd79414..000000000000
--- a/net-p2p/libtorrent-rasterbar/files/patch-libressl
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/torrent.cpp	(revision 10629)
-+++ src/torrent.cpp	(revision 10630)
-@@ -82,6 +82,7 @@
- #ifdef TORRENT_USE_OPENSSL
- #include "libtorrent/ssl_stream.hpp"
- #include <boost/asio/ssl/context.hpp>
-+#include <openssl/rand.h>
- #if BOOST_VERSION >= 104700
- #include <boost/asio/ssl/verify_context.hpp>
- #endif // BOOST_VERSION
-Index: src/peer_connection.cpp
-===================================================================
---- src/peer_connection.cpp	(revision 10629)
-+++ src/peer_connection.cpp	(revision 10630)
-@@ -65,6 +65,10 @@
- #include <set>
- #endif
- 
-+#ifdef TORRENT_USE_OPENSSL
-+#include <openssl/rand.h>
-+#endif
-+
- //#define TORRENT_CORRUPT_DATA
- 
- using boost::shared_ptr;
-Index: src/session_impl.cpp
-===================================================================
---- src/session_impl.cpp	(revision 10629)
-+++ src/session_impl.cpp	(revision 10630)
-@@ -149,6 +149,7 @@
- #ifdef TORRENT_USE_OPENSSL
- 
- #include <openssl/crypto.h>
-+#include <openssl/rand.h>
- 
- namespace
- {
-
diff --git a/net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp b/net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp
index 23c60c6deabe..b9edb7711d93 100644
--- a/net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp
+++ b/net-p2p/libtorrent-rasterbar/files/patch-src_lazy__bdecode.cpp
@@ -1,4 +1,4 @@
---- src/lazy_bdecode.cpp.orig	2014-04-04 02:51:48.000000000 +0000
+--- src/lazy_bdecode.cpp.orig	2014-12-05 01:00:07 UTC
 +++ src/lazy_bdecode.cpp
 @@ -30,6 +30,9 @@ POSSIBILITY OF SUCH DAMAGE.
  
@@ -9,4 +9,4 @@
 +
  #include "libtorrent/config.hpp"
  #include "libtorrent/lazy_entry.hpp"
- #include "libtorrent/escape_string.hpp"
+ #include <cstring>
diff --git a/net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp b/net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp
index 0823147f0528..661582fb3267 100644
--- a/net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp
+++ b/net-p2p/libtorrent-rasterbar/files/patch-src_utp__stream.cpp
@@ -1,9 +1,9 @@
---- src/utp_stream.cpp.orig	2013-09-20 12:07:06.000000000 +0000
+--- src/utp_stream.cpp.orig	2014-12-05 01:00:07 UTC
 +++ src/utp_stream.cpp
 @@ -30,6 +30,8 @@ POSSIBILITY OF SUCH DAMAGE.
  
  */
-
+ 
 +#define __STDC_LIMIT_MACROS 
 +#include <stdint.h>
  #include "libtorrent/config.hpp"
diff --git a/net-p2p/libtorrent-rasterbar/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 117923b2b1bd..db3dec7173d4 100644
--- a/net-p2p/libtorrent-rasterbar/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -2,6 +2,8 @@ include/libtorrent/ConvertUTF.h
 include/libtorrent/add_torrent_params.hpp
 include/libtorrent/address.hpp
 include/libtorrent/alert.hpp
+include/libtorrent/alert_dispatcher.hpp
+include/libtorrent/alert_manager.hpp
 include/libtorrent/alert_types.hpp
 include/libtorrent/alloca.hpp
 include/libtorrent/allocator.hpp
@@ -28,11 +30,13 @@ include/libtorrent/debug.hpp
 include/libtorrent/disk_buffer_holder.hpp
 include/libtorrent/disk_buffer_pool.hpp
 include/libtorrent/disk_io_thread.hpp
+include/libtorrent/ed25519.hpp
 include/libtorrent/entry.hpp
 include/libtorrent/enum_net.hpp
 include/libtorrent/error.hpp
 include/libtorrent/error_code.hpp
 include/libtorrent/escape_string.hpp
+include/libtorrent/export.hpp
 include/libtorrent/extensions.hpp
 include/libtorrent/extensions/logger.hpp
 include/libtorrent/extensions/lt_trackers.hpp
@@ -60,8 +64,13 @@ include/libtorrent/io.hpp
 include/libtorrent/io_service.hpp
 include/libtorrent/io_service_fwd.hpp
 include/libtorrent/ip_filter.hpp
+include/libtorrent/ip_voter.hpp
+include/libtorrent/kademlia/dht_observer.hpp
 include/libtorrent/kademlia/dht_tracker.hpp
 include/libtorrent/kademlia/find_data.hpp
+include/libtorrent/kademlia/get_item.hpp
+include/libtorrent/kademlia/get_peers.hpp
+include/libtorrent/kademlia/item.hpp
 include/libtorrent/kademlia/logging.hpp
 include/libtorrent/kademlia/msg.hpp
 include/libtorrent/kademlia/node.hpp
@@ -79,7 +88,6 @@ include/libtorrent/max.hpp
 include/libtorrent/natpmp.hpp
 include/libtorrent/packet_buffer.hpp
 include/libtorrent/parse_url.hpp
-include/libtorrent/pch.hpp
 include/libtorrent/pe_crypto.hpp
 include/libtorrent/peer.hpp
 include/libtorrent/peer_connection.hpp
@@ -93,12 +101,12 @@ include/libtorrent/proxy_base.hpp
 include/libtorrent/ptime.hpp
 include/libtorrent/puff.hpp
 include/libtorrent/random.hpp
-include/libtorrent/rsa.hpp
 include/libtorrent/rss.hpp
 include/libtorrent/session.hpp
 include/libtorrent/session_settings.hpp
 include/libtorrent/session_status.hpp
 include/libtorrent/settings.hpp
+include/libtorrent/sha1_hash.hpp
 include/libtorrent/size_type.hpp
 include/libtorrent/sliding_average.hpp
 include/libtorrent/socket.hpp
@@ -111,7 +119,6 @@ include/libtorrent/stat.hpp
 include/libtorrent/storage.hpp
 include/libtorrent/storage_defs.hpp
 include/libtorrent/string_util.hpp
-include/libtorrent/struct_debug.hpp
 include/libtorrent/thread.hpp
 include/libtorrent/time.hpp
 include/libtorrent/timestamp_history.hpp
@@ -137,3 +144,104 @@ lib/libtorrent-rasterbar.so
 lib/libtorrent-rasterbar.so.%%SHLIB_VER%%
 lib/libtorrent-rasterbar.so.%%SHLIB_VER%%.0.0
 libdata/pkgconfig/libtorrent-rasterbar.pc
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/docs/building.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/building.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/client_test.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/complete_bit_prefixes.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/contributing.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/contributing.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/cwnd.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/cwnd_thumb.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/delays.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/delays_thumb.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_extensions.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_extensions.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_rss.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_rss.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_sec.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_sec.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_store.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/dht_store.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access_elevator.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/disk_access_no_elevator.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer_before_optimization.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/disk_buffer_sample.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/disk_io.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/examples.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/extension_protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/extension_protocol.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/features.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/features.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.diagram
+%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/hacking.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/hash_distribution.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/im_thumb.jpg
+%%PORTDOCS%%%%DOCSDIR%%/docs/img/bg.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/img/blue_bottom.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/img/blue_top.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/img/dotline.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/img/minus.gif
+%%PORTDOCS%%%%DOCSDIR%%/docs/img/orange.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/index.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/index.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/ip_id_v4.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/ip_id_v6.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/manual-ref.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/manual-ref.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/merkle_tree.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/our_delay_base.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/our_delay_base_thumb.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/projects.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/projects.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/python_binding.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/python_binding.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/read_disk_buffers.diagram
+%%PORTDOCS%%%%DOCSDIR%%/docs/read_disk_buffers.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Alerts.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Bencoding.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Core.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Create_Torrents.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Custom_Storage.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Error_Codes.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Filter.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-RSS.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Session.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Settings.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Storage.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-String.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Time.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference-Utility.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/reference.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/rst.css
+%%PORTDOCS%%%%DOCSDIR%%/docs/session_stats_peers.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/storage.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/streaming.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/streaming.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/style.css
+%%PORTDOCS%%%%DOCSDIR%%/docs/todo.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.dot
+%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/troubleshooting_thumb.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/tuning.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/tuning.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/udp_tracker_protocol.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/udp_tracker_protocol.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/utp.html
+%%PORTDOCS%%%%DOCSDIR%%/docs/utp.rst
+%%PORTDOCS%%%%DOCSDIR%%/docs/utp_stack.diagram
+%%PORTDOCS%%%%DOCSDIR%%/docs/utp_stack.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/write_disk_buffers.diagram
+%%PORTDOCS%%%%DOCSDIR%%/docs/write_disk_buffers.png
+%%PORTDOCS%%%%DOCSDIR%%/docs/ziptorrent_thumb.gif
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index ca2278550630..f4f71c6dae9e 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	qbittorrent
-PORTVERSION=	3.1.12
-PORTREVISION?=	0
+PORTVERSION=	3.2.0
 CATEGORIES=	net-p2p ipv6
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}/
+MASTER_SITES=	GH
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT?=	Bittorrent client using Qt4 and libtorrent-rasterbar
@@ -13,9 +12,15 @@ COMMENT?=	Bittorrent client using Qt4 and libtorrent-rasterbar
 LICENSE=	GPLv2
 
 # ABI versions specified on purpose for libtorrent-rasterbar
-LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar
+LIB_DEPENDS=	libtorrent-rasterbar.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar \
+		libboost_system.so:${PORTSDIR}/devel/boost-libs
 
-USES=		execinfo pkgconfig tar:xz
+USE_GITHUB=	yes
+GH_ACCOUNT=	qBittorrent
+GH_PROJECT=	qBittorrent
+GH_TAGNAME=	release-${PORTVERSION}
+
+USES=		compiler:c++11-lang execinfo pkgconfig tar:xz
 USE_QT4=	corelib network qmake_build linguisttools_build moc_build \
 		rcc_build uic_build
 QT_NONSTANDARD=	yes
@@ -29,28 +34,28 @@ INSTALLS_ICONS=	yes
 OPTIONS_DEFINE=	DBUS
 .endif
 
-SUB_FILES=	pkg-message
-
 PORTDOCS=	AUTHORS Changelog README.md
 
 OPTIONS_DEFINE=	DEBUG DOCS DBUS
 
 DEBUG_CONFIGURE_ENABLE=	debug
 DBUS_CONFIGURE_ENABLE=	qt-dbus
+DBUS_USE=		QT4=dbus
+CONFIGURE_ENV+=		zlib_CFLAGS=-I/usr/include
+CONFIGURE_ENV+=		zlib_LIBS=-lz
+CONFIGURE_ARGS+=	CXXFLAGS=-DBOOST_ASIO_DYN_LINK
 
-.include <bsd.port.options.mk>
+USE_OPENSSL=	yes
 
-.if ${PORT_OPTIONS:MDBUS}
-USE_QT4+=	dbus
-.endif
+.include <bsd.port.options.mk>
 
 do-configure:
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "no"
 	@cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \
-		./configure --prefix=${PREFIX}
+		./configure --prefix=${PREFIX} ${CONFIGURE_ARGS}
 .else
 	@cd ${WRKSRC} ; ${SETENV} ${CONFIGURE_ENV} \
-		./configure --prefix=${PREFIX} --disable-gui
+		./configure --prefix=${PREFIX} ${CONFIGURE_ARGS} --disable-gui
 .endif
 
 post-install:
@@ -68,5 +73,6 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
 .endif
+	@${RM} -rf ${STAGEDIR}${PREFIX}/share/man
 
 .include <bsd.port.mk>
diff --git a/net-p2p/qbittorrent/distinfo b/net-p2p/qbittorrent/distinfo
index c42e9bf7af27..061795fd1245 100644
--- a/net-p2p/qbittorrent/distinfo
+++ b/net-p2p/qbittorrent/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qbittorrent-3.1.12.tar.xz) = d5d5b27958297f0b14cf03af8dd24a0d2a990e108c9a7a6159e4a2fbb1111c83
-SIZE (qbittorrent-3.1.12.tar.xz) = 2465744
+SHA256 (qBittorrent-qBittorrent-3.2.0-release-3.2.0_GH0.tar.xz) = 1ca59b532c36c1c4e5b87ddfb13789104ecfbf79cd09afc3b05a5871011d0a75
+SIZE (qBittorrent-qBittorrent-3.2.0-release-3.2.0_GH0.tar.xz) = 4467597
diff --git a/net-p2p/qbittorrent/files/patch-configure b/net-p2p/qbittorrent/files/patch-configure
new file mode 100644
index 000000000000..596e5583a7a8
--- /dev/null
+++ b/net-p2p/qbittorrent/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	2015-05-10 01:20:19 UTC
++++ configure
+@@ -4263,7 +4263,7 @@ fi
+ # Detect OS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether OS is FreeBSD" >&5
+ $as_echo_n "checking whether OS is FreeBSD... " >&6; }
+-if test "x$host_os" = "x*FreeBSD*"; then :
++if expr "$host_os" : ".*freebsd.*" > /dev/null; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+       LIBS="-lexecinfo $LIBS"
+@@ -5808,8 +5808,8 @@ extract() {
+     return 1
+   fi
+ 
+-  # Convert " -" to "\n" if not between quotes
+-  string=$(echo " $*" | $SED -e 's: -:\n:g' -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g")
++  # Convert " -" to "\n" if not between quotes and remove possible leading white spaces
++  string=$(echo " $*" | tr ' -' '\n' | $SED -e 's:"\(.*\)\n\(.*\)":\"\1 -\2":g' -e "s:'\(.*\)\n\(.*\)':\'\1 -\2':g" -e 's/^[:space:]*//')
+   SAVEIFS=$IFS
+   IFS=$(printf "\n\b")
+   for i in $string; do
diff --git a/net-p2p/qbittorrent/pkg-descr b/net-p2p/qbittorrent/pkg-descr
index 47665366e4ef..4372d299cccb 100644
--- a/net-p2p/qbittorrent/pkg-descr
+++ b/net-p2p/qbittorrent/pkg-descr
@@ -1,5 +1,7 @@
-qBittorrent is the closest open source (GNU GPL v2 licensed) equivalent to
-popular uTorrent.  It is based on the Qt4 toolkit and libtorrent-rasterbar.
+qBittorrent is the open source bittorrent client in C++/Qt that uses
+libtorrent-rasterbar. It aims to be a good alternative to all other
+bittorrent clients. qBittorrent is fast, stable and provides unicode
+support as well as many features.
 
 Features:
 
diff --git a/net-p2p/qbittorrent/pkg-plist b/net-p2p/qbittorrent/pkg-plist
index acb890fba9ff..999ad1d91125 100644
--- a/net-p2p/qbittorrent/pkg-plist
+++ b/net-p2p/qbittorrent/pkg-plist
@@ -13,3 +13,4 @@ share/icons/hicolor/64x64/apps/qbittorrent.png
 share/icons/hicolor/72x72/apps/qbittorrent.png
 share/icons/hicolor/96x96/apps/qbittorrent.png
 share/pixmaps/qbittorrent.png
+share/appdata/qBittorrent.appdata.xml