net-p2p/qbittorrent: Update to 3.3.15

PR:		221463
Submitted by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)

4 files changed, 20 insertions, 74 deletions

diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 262199acdcfb..65b0472c2599 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	qbittorrent
-PORTVERSION=	3.3.13
+PORTVERSION=	3.3.15
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -16,11 +16,11 @@ LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		libboost_system.so:devel/boost-libs
 
 USES=		compiler:c++11-lib execinfo pkgconfig tar:xz
-QT4_USE=	QT4=corelib,network,xml,qmake_build,linguisttools_build,moc_build,rcc_build,uic_build
-QT5_USE=	QT5=core,network,xml,qmake_build,buildtools_build,linguisttools_build
+GNU_CONFIGURE=	yes
+USE_QT5=	core network xml qmake_build buildtools_build linguisttools_build
 QT_NONSTANDARD=	yes
 DESTDIRNAME=	INSTALL_ROOT
-GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 
 PORTDOCS=	AUTHORS Changelog README.md
 
@@ -28,50 +28,40 @@ PORTDOCS=	AUTHORS Changelog README.md
 WITH_GUI:=	yes
 .else
 WITH_GUI:=	no
+SUFFIX:=	-nox
 .endif
 
 OPTIONS_DEFINE=		DBUS DEBUG DOCS
-OPTIONS_SINGLE=		QT
-OPTIONS_SINGLE_QT=	QT4 QT5
-OPTIONS_DEFAULT=	QT5
-OPTION_QT=		${SELECTED_OPTIONS:MQT*}
 
 DEBUG_CONFIGURE_ENABLE=	debug
 DBUS_CONFIGURE_ENABLE=	qt-dbus
-QT4_CONFIGURE_ON=	--with-qt4
+DBUS_USE=		qt5=dbus
 
 .if ${WITH_GUI} == "yes"
 LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
 USES+=			desktop-file-utils
-QT4_USE+=		QT4=gui
-QT5_USE+=		QT5=concurrent,gui,widgets GL=gl
+USE_QT5+=		concurrent gui widgets
+USE_GL+=		gl
 OPTIONS_DEFAULT+=	DBUS
 .else
 CONFIGURE_ARGS+=	--disable-gui
 .endif
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDBUS}
-USE_${OPTION_QT}+=	dbus
-.endif
-
 CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
 
+post-patch:
+	@${REINPLACE_CMD} \
+		-e 's/#ifdef Q_OS_MAC/#if defined(Q_OS_MAC) || (defined(__FreeBSD__) \&\& __FreeBSD_version < 1003506)/' \
+		${WRKSRC}/src/base/utils/string.cpp
+
 post-install:
-.if ${WITH_GUI} == "yes"
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent
-	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent.1 \
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX}
+	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent${SUFFIX}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
-.else
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent-nox
-	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent-nox.1 \
-		${STAGEDIR}${MAN1PREFIX}/man/man1/
-.endif
-	@${RM} -r ${STAGEDIR}${PREFIX}/share/man
+	${RM} -r ${STAGEDIR}${PREFIX}/share/man
 
 post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net-p2p/qbittorrent/distinfo b/net-p2p/qbittorrent/distinfo
index b04ef938ee15..347ebba47338 100644
--- a/net-p2p/qbittorrent/distinfo
+++ b/net-p2p/qbittorrent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499042913
-SHA256 (qbittorrent-3.3.13.tar.xz) = 84317b5127def320cb17fedc2ba78807660216b6ee44650d94eb75e2c8ce468d
-SIZE (qbittorrent-3.3.13.tar.xz) = 2995368
+TIMESTAMP = 1502604727
+SHA256 (qbittorrent-3.3.15.tar.xz) = a7bbc08a39912a15a496702e736a98c083011bbb14fe5f04440880d7e6b2ceae
+SIZE (qbittorrent-3.3.15.tar.xz) = 2998064
diff --git a/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp b/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp
deleted file mode 100644
index 72f4a55523d9..000000000000
--- a/net-p2p/qbittorrent/files/patch-src_base_utils_string.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-# Avoid use of thread local storage on versions prior to which it was supported.
-#
---- src/base/utils/string.cpp.orig	2017-04-06 16:53:25 UTC
-+++ src/base/utils/string.cpp
-@@ -38,7 +38,7 @@
- #ifdef QBT_USES_QT5
- #include <QCollator>
- #endif
--#ifdef Q_OS_MAC
-+#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506)
- #include <QThreadStorage>
- #endif
- 
-@@ -147,7 +147,8 @@ bool Utils::String::naturalCompareCaseSe
- {
-     // provide a single `NaturalCompare` instance for easy use
-     // https://doc.qt.io/qt-5/threads-reentrancy.html
--#ifdef Q_OS_MAC  // workaround for Apple xcode: https://stackoverflow.com/a/29929949
-+#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506)
-+// workaround for Apple xcode: https://stackoverflow.com/a/29929949
-     static QThreadStorage<NaturalCompare> nCmp;
-     if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(true));
-     return (nCmp.localData())(left, right);
-@@ -161,7 +162,8 @@ bool Utils::String::naturalCompareCaseIn
- {
-     // provide a single `NaturalCompare` instance for easy use
-     // https://doc.qt.io/qt-5/threads-reentrancy.html
--#ifdef Q_OS_MAC  // workaround for Apple xcode: https://stackoverflow.com/a/29929949
-+#if defined(Q_OS_MAC) || (defined(__FreeBSD__) && __FreeBSD_version < 1003506)
-+// workaround for Apple xcode: https://stackoverflow.com/a/29929949
-     static QThreadStorage<NaturalCompare> nCmp;
-     if (!nCmp.hasLocalData()) nCmp.setLocalData(NaturalCompare(false));
-     return (nCmp.localData())(left, right);
diff --git a/net-p2p/qbittorrent/files/pkg-message.in b/net-p2p/qbittorrent/files/pkg-message.in
deleted file mode 100644
index bd375d620578..000000000000
--- a/net-p2p/qbittorrent/files/pkg-message.in
+++ /dev/null
@@ -1,11 +0,0 @@
-===============================================================================
-
-qBittorrent has been installed.
-
-When you have problems, please reinstall qBittorrent
-
-cd /usr/ports/net-p2p/qbittorrent && make deinstall clean reinstall
-
-Have fun!
-
-===============================================================================