Index: MOVED
===================================================================
--- MOVED
+++ MOVED
@@ -9972,3 +9972,4 @@
 devel/elixir-sorted_set||2018-02-19|Has expired: No longer maintained upstream
 devel/elixir-red_black_tree||2018-02-19|Has expired: No longer maintained upstream
 emulators/wine-staging|emulators/wine-devel|2018-02-20|Broken for months, abandoned upstream
+net-p2p/qbittorrent-nox11|net-p2p/qbittorrent@nogui|2018-02-21|Moved to a flavored version
Index: net-p2p/Makefile
===================================================================
--- net-p2p/Makefile
+++ net-p2p/Makefile
@@ -76,7 +76,6 @@
     SUBDIR += py-tremc
     SUBDIR += py-vertex
     SUBDIR += qbittorrent
-    SUBDIR += qbittorrent-nox11
     SUBDIR += qtum
     SUBDIR += radarr
     SUBDIR += retroshare
Index: net-p2p/qbittorrent/Makefile
===================================================================
--- net-p2p/qbittorrent/Makefile
+++ net-p2p/qbittorrent/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	qbittorrent
-DISTVERSION=	3.3.16
-PORTREVISION=	1
+DISTVERSION=	4.0.4
 CATEGORIES=	net-p2p ipv6
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	yuri@rawbw.com
-COMMENT?=	Bittorrent client using Qt4/5 and libtorrent-rasterbar
+COMMENT=	Bittorrent client using Qt4/5 and libtorrent-rasterbar
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -16,38 +15,40 @@
 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
-
-PORTDOCS=	AUTHORS Changelog README.md
-
-.if !defined(SLAVE_PORT) || ${SLAVE_PORT:tl} == "no"
-WITH_GUI:=	yes
-.else
-WITH_GUI:=	no
-SUFFIX:=	-nox
-.endif
+FLAVORS=	default nogui
+default_LIB_DEPENDS+=		libGeoIP.so:net/GeoIP
+nogui_PKGNAMESUFFIX=	-nox11
+nogui_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
 
 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
+PORTDOCS=		AUTHORS Changelog README.md
+
+.if ${FLAVOR:Udefault} == default
 USES+=			desktop-file-utils
 USE_QT5+=		concurrent gui widgets
-USE_GL+=		gl
-OPTIONS_DEFAULT+=	DBUS
-.else
-CONFIGURE_ARGS+=	--disable-gui
+USE_GL=			gl
 .endif
 
-CONFIGURE_ARGS+=	CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
+.if ${FLAVOR:U} == nogui
+SUFFIX=			-nox
+COMMENT+=		(web UI version)
+CONFIGURE_ARGS=		--disable-gui
+PLIST_FILES=		bin/qbittorrent${SUFFIX} \
+			man/man1/qbittorrent${SUFFIX}.1.gz
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -55,13 +56,13 @@
 		${WRKSRC}/src/base/utils/string.cpp
 
 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>
Index: net-p2p/qbittorrent/distinfo
===================================================================
--- net-p2p/qbittorrent/distinfo
+++ net-p2p/qbittorrent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508414513
-SHA256 (qbittorrent-3.3.16.tar.xz) = ea08a61872c397258c2627780f6e09fe777189d9a57cc5e02a656da9aeb0be57
-SIZE (qbittorrent-3.3.16.tar.xz) = 2961420
+TIMESTAMP = 1518887607
+SHA256 (qbittorrent-4.0.4.tar.xz) = 530a9d7a775348227133e7bf7d732347a8cdcd9bbba74b6f22f529c19b065c8f
+SIZE (qbittorrent-4.0.4.tar.xz) = 4279752
Index: net-p2p/qbittorrent/pkg-plist
===================================================================
--- net-p2p/qbittorrent/pkg-plist
+++ net-p2p/qbittorrent/pkg-plist
@@ -24,4 +24,7 @@
 share/icons/hicolor/72x72/status/qbittorrent-tray.png
 share/icons/hicolor/96x96/apps/qbittorrent.png
 share/icons/hicolor/96x96/status/qbittorrent-tray.png
+share/icons/hicolor/scalable/status/qbittorrent-tray-dark.svg
+share/icons/hicolor/scalable/status/qbittorrent-tray-light.svg
+share/icons/hicolor/scalable/status/qbittorrent-tray.svg
 share/pixmaps/qbittorrent.png