From 73231f466568ace0b4d040877fffc88e90f2e795 Mon Sep 17 00:00:00 2001
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Wed, 20 Jun 2018 08:56:04 +0000
Subject: net-p2p/qbittorrent: Update 3.3.16 -> 4.1.1

net-p2p/qbittorrent-nox11 is flavorized in net-p2p/qbittorrent and removed.

Approved by:	portmgr
Differential Revision:	D13416
---
 net-p2p/qbittorrent/Makefile | 59 +++++++++++++++++++++++---------------------
 1 file changed, 31 insertions(+), 28 deletions(-)

(limited to 'net-p2p/qbittorrent/Makefile')

diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index 390b951a12f0..a3c50eff0d73 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -2,61 +2,64 @@
 # $FreeBSD$
 
 PORTNAME=	qbittorrent
-DISTVERSION=	3.3.16
-PORTREVISION=	2
+DISTVERSION=	4.1.1
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yuri@FreeBSD.org
-COMMENT?=	Bittorrent client using Qt4/5 and libtorrent-rasterbar
+COMMENT=	Bittorrent client using Qt4/5 and libtorrent-rasterbar
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+BROKEN_FreeBSD_10=	error: no matching constructor for initialization of 'const QString'
+
 LIB_DEPENDS=	libtorrent-rasterbar.so:net-p2p/libtorrent-rasterbar \
 		libboost_system.so:devel/boost-libs
 
-USES=		compiler:c++11-lib pkgconfig tar:xz
-GNU_CONFIGURE=	yes
-USE_QT5=	core network xml qmake_build buildtools_build linguisttools_build
-QT_NONSTANDARD=	yes
-DESTDIRNAME=	INSTALL_ROOT
+FLAVORS=	default nox
+default_LIB_DEPENDS=	libGeoIP.so:net/GeoIP
+nox_PKGNAMESUFFIX=	-nox
+nox_PLIST=		${NONEXISTENT}
+
+USES=			compiler:c++11-lib pkgconfig tar:xz
+GNU_CONFIGURE=		yes
+USE_QT5=		core network svg xml buildtools_build linguisttools_build qmake_build
+CONFIGURE_ARGS=		CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+QT_NONSTANDARD=		yes
+DESTDIRNAME=		INSTALL_ROOT
 
-PORTDOCS=	AUTHORS Changelog README.md
+.if ${FLAVOR:Udefault} == default
+USES+=			desktop-file-utils
+USE_QT5+=		concurrent gui widgets
+USE_GL=			gl
+.endif
 
-.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} == "no"
-WITH_GUI:=	yes
-.else
-WITH_GUI:=	no
-SUFFIX:=	-nox
+.if ${FLAVOR:U} == nox
+SUFFIX=			-nox
+COMMENT+=		(web UI version)
+CONFIGURE_ARGS+=	--disable-gui
+PLIST_FILES=		bin/qbittorrent${SUFFIX} \
+			man/man1/qbittorrent${SUFFIX}.1.gz
 .endif
 
 OPTIONS_DEFINE=		DBUS DEBUG DOCS
+OPTIONS_DEFAULT=	DBUS
 
 DEBUG_CONFIGURE_ENABLE=	debug
 DBUS_CONFIGURE_ENABLE=	qt-dbus
 DBUS_USE=		qt5=dbus
 
-.if ${WITH_GUI} == "yes"
-LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
-USES+=			desktop-file-utils
-USE_QT5+=		concurrent gui widgets
-USE_GL+=		gl
-OPTIONS_DEFAULT+=	DBUS
-.else
-CONFIGURE_ARGS+=	--disable-gui
-.endif
-
-CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+PORTDOCS=		AUTHORS Changelog README.md
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/qbittorrent${SUFFIX}
 	${INSTALL_MAN} ${WRKSRC}/doc/qbittorrent${SUFFIX}.1 \
 		${STAGEDIR}${MAN1PREFIX}/man/man1/
-	${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>
-- 
cgit v1.2.3