Clean up final leftovers from Qt4.

Submitted by:	rene
Reviewed by:	mat, tcberner
Differential Revision:	https://reviews.freebsd.org/D20725

7 files changed, 11 insertions, 51 deletions

diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index 2e754bbdc63d..d816fc87d87c 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -92,6 +92,5 @@
     SUBDIR += vuze
     SUBDIR += xmrig
     SUBDIR += zetacoin
-    SUBDIR += zetacoin-nox11
 
 .include <bsd.port.subdir.mk>
diff --git a/net-p2p/awgg/Makefile b/net-p2p/awgg/Makefile
index 0bbde04e71ce..3f9f6ce392c9 100644
--- a/net-p2p/awgg/Makefile
+++ b/net-p2p/awgg/Makefile
@@ -17,9 +17,8 @@ RUN_DEPENDS=	aria2c:www/aria2 \
 		youtube-dl:www/youtube_dl \
 		axel:ftp/axel
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
-qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt4
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 USES=		fpc lazarus:flavors
 USE_FPC=	chm fcl-base fcl-db fcl-image fcl-json fcl-registry fcl-xml \
diff --git a/net-p2p/qbittorrent/Makefile b/net-p2p/qbittorrent/Makefile
index d7834d1e4da8..3d86b95bb45e 100644
--- a/net-p2p/qbittorrent/Makefile
+++ b/net-p2p/qbittorrent/Makefile
@@ -7,7 +7,7 @@ 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 Qt5 and libtorrent-rasterbar
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
diff --git a/net-p2p/transmission-qt/Makefile b/net-p2p/transmission-qt/Makefile
index 4556201fd252..1a1208777d8a 100644
--- a/net-p2p/transmission-qt/Makefile
+++ b/net-p2p/transmission-qt/Makefile
@@ -6,8 +6,6 @@ PKGNAMESUFFIX=	-qt5
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
-CONFLICTS_INSTALL=	transmission-qt4
-
 USES=		compiler:c++11-lang qt:5
 NLS_USES=	gettext-runtime:run qt:5
 USE_QT=		buildtools_build linguisttools_build qmake_build \
diff --git a/net-p2p/transmission-remote-gui/Makefile b/net-p2p/transmission-remote-gui/Makefile
index 1e655c33d7ef..aa727e4125e5 100644
--- a/net-p2p/transmission-remote-gui/Makefile
+++ b/net-p2p/transmission-remote-gui/Makefile
@@ -30,9 +30,8 @@ LAZARUS_PROJECT_FILES=	transgui.lpi
 LAZBUILD_ARGS=		-d
 PROJECT_NAME=		transgui
 
-gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt4 ${PORTNAME}-qt5
-qt4_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2 ${PORTNAME}-qt4
+gtk2_CONFLICTS_INSTALL=	${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL=	${PORTNAME}-gtk2
 
 do-install:
 	@cd ${WRKSRC}/units && \
diff --git a/net-p2p/zetacoin/Makefile b/net-p2p/zetacoin/Makefile
index d591cd09f9ed..adac267ffd58 100644
--- a/net-p2p/zetacoin/Makefile
+++ b/net-p2p/zetacoin/Makefile
@@ -26,46 +26,31 @@ BROKEN_powerpc64=	fails to configure: No working boost sleep implementation foun
 
 USE_GITHUB=	yes
 
-OPTIONS_DEFINE=	X11 UPNP WALLET CLI TEST
+OPTIONS_DEFINE=	UPNP WALLET CLI TEST
 OPTIONS_SUB=	yes
 
 WALLET_DESC=	Build wallet or P2P server node only
-QRCODES_DESC=	Enable QR code display when building graphical interface
 CLI_DESC=		Build command line RPC client
 
 OPTIONS_DEFAULT=	WALLET
-OPTIONS_GROUP=		X11
-OPTIONS_GROUP_X11=	QRCODES
 
 UPNP_CONFIGURE_WITH=	miniupnpc
 UPNP_LIB_DEPENDS=	libminiupnpc.so:net/miniupnpc
 UPNP_CPPFLAGS=		-I${LOCALBASE}/include
 UPNP_LIBS=		-L${LOCALBASE}/lib
 
-X11_CONFIGURE_WITH=	gui
-X11_CONFIGURE_ON=	--without-daemon
-X11_CONFIGURE_OFF=	--with-daemon
-X11_BUILD_DEPENDS=	protoc:devel/protobuf
-X11_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
-X11_USE=		qt=corelib,network,gui,qmake_build,linguisttools_build \
-			qt=uic_build,moc_build,rcc_build,qtestlib_build
-X11_USES=		desktop-file-utils qmake:no_env qt:4
-
 WALLET_CONFIGURE_ENABLE=wallet
 WALLET_CXXFLAGS=	-I${BDB_INCLUDE_DIR}
 WALLET_LIBS=		-L${BDB_LIB_DIR}
 WALLET_USES=		bdb:48
 
-QRCODES_IMPLIES=	X11
-QRCODES_LIB_DEPENDS=	libqrencode.so:graphics/libqrencode
-QRCODES_CONFIGURE_WITH=	qrencode
-
 CLI_CONFIGURE_WITH=	cli
 
 TEST_CONFIGURE_ENABLE=	tests
 TEST_ALL_TARGET=	check
 
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--with-daemon
 CONFIGURE_ENV=	CRYPTO_CFLAGS="-I${OPENSSLINC}" CRYPTO_LIBS="-L${OPENSSLLIB} -lcrypto" \
 		SSL_CFLAGS="-I${OPENSSLINC}" SSL_LIBS="-L${OPENSSLLIB} -lssl" \
 		OBJC="${CC}" OBJCFLAGS="${CFLAGS}" OBJCXX="${CXX}" OBJCXXFLAGS="${CXXFLAGS}"
@@ -86,16 +71,11 @@ PLIST_SUB+=	EXECUTABLE_QT=bin/${QT_BINARY} \
 BROKEN=	automated testing fails
 .endif
 
-.if ! ${PORT_OPTIONS:MX11}
 USE_RC_SUBR=	${PORTNAME}
 SUB_LIST+=	PORTNAME=${PORTNAME}
 SUB_FILES=	pkg-message
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
-.else
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
 
 .include <bsd.port.pre.mk>
 
@@ -113,22 +93,10 @@ post-patch:
 	${MKDIR} ${WRKSRC}/src/build-aux
 
 do-install:
-	@${DO_NADA}
+	${INSTALL_PROGRAM} -s ${WRKSRC}/src/${DAEMON} ${STAGEDIR}${PREFIX}/bin/${DAEMON}
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
 
 do-install-CLI-on:
 	${INSTALL_PROGRAM} -s ${WRKSRC}/src/${CLI_BINARY} ${STAGEDIR}${PREFIX}/bin/${CLI_BINARY}
 
-do-install-X11-on:
-	${INSTALL_PROGRAM} -s ${WRKSRC}/src/qt/${QT_BINARY} ${STAGEDIR}${PREFIX}/bin/${QT_BINARY}
-	${REINPLACE_CMD} -e 's,=/usr,=${PREFIX},' \
-		-e 's,bitcoin,zetacoin,g' \
-		-e 's,Bitcoin,Zetacoin,g' \
-		-e 's,128,,g' ${WRKSRC}/contrib/debian/bitcoin-qt.desktop
-	${INSTALL} ${WRKSRC}/contrib/debian/bitcoin-qt.desktop ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}-qt.desktop
-	${INSTALL} ${WRKSRC}/src/qt/res/icons/bitcoin.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
-
-do-install-X11-off:
-	${INSTALL_PROGRAM} -s ${WRKSRC}/src/${DAEMON} ${STAGEDIR}${PREFIX}/bin/${DAEMON}
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf.sample
-
 .include <bsd.port.post.mk>
diff --git a/net-p2p/zetacoin/pkg-plist b/net-p2p/zetacoin/pkg-plist
index 9a10392aac40..49f88970232f 100644
--- a/net-p2p/zetacoin/pkg-plist
+++ b/net-p2p/zetacoin/pkg-plist
@@ -1,6 +1,3 @@
-%%NO_X11%%%%EXECUTABLE_DAEMON%%
-%%NO_X11%%@sample etc/%%PORTNAME%%.conf.sample
+%%EXECUTABLE_DAEMON%%
+@sample etc/%%PORTNAME%%.conf.sample
 %%CLI%%%%EXECUTABLE_CLI%%
-%%X11%%%%EXECUTABLE_QT%%
-%%X11%%share/applications/%%PORTNAME%%-qt.desktop
-%%X11%%share/pixmaps/%%PORTNAME%%.png