aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrene <rene@FreeBSD.org>2019-06-26 19:52:23 +0800
committerrene <rene@FreeBSD.org>2019-06-26 19:52:23 +0800
commit6de786bfc359c3212db1b4971c7e32823e61c107 (patch)
tree98bd11bbc78254c28d6911f7ea7651047ebaca9d
parent3cf152591cc3a3838e933abb3519a6c1e2b65d5e (diff)
downloadfreebsd-ports-gnome-6de786bfc359c3212db1b4971c7e32823e61c107.tar.gz
freebsd-ports-gnome-6de786bfc359c3212db1b4971c7e32823e61c107.tar.zst
freebsd-ports-gnome-6de786bfc359c3212db1b4971c7e32823e61c107.zip
Clean up final leftovers from Qt4.
Submitted by: rene Reviewed by: mat, tcberner Differential Revision: https://reviews.freebsd.org/D20725
-rw-r--r--MOVED1
-rw-r--r--Mk/Uses/qmake.mk2
-rw-r--r--Mk/Uses/qt.mk4
-rw-r--r--Mk/bsd.options.desc.mk1
-rw-r--r--Mk/bsd.sanity.mk2
-rw-r--r--archivers/peazip/Makefile5
-rw-r--r--comms/cqrlog/Makefile3
-rw-r--r--devel/py-sip/Makefile1
-rw-r--r--editors/cudatext/Makefile5
-rw-r--r--editors/dexed/Makefile5
-rw-r--r--editors/lazarus-qt5/Makefile2
-rw-r--r--editors/lazarus/Makefile2
-rw-r--r--editors/picpas/Makefile5
-rw-r--r--graphics/lazpaint/Makefile5
-rw-r--r--graphics/photivo/Makefile2
-rw-r--r--mail/trojita/Makefile1
-rw-r--r--multimedia/libquicktime/Makefile9
-rw-r--r--multimedia/mlt-qt5/Makefile2
-rw-r--r--multimedia/winff/Makefile3
-rw-r--r--net-p2p/Makefile1
-rw-r--r--net-p2p/awgg/Makefile5
-rw-r--r--net-p2p/qbittorrent/Makefile2
-rw-r--r--net-p2p/transmission-qt/Makefile2
-rw-r--r--net-p2p/transmission-remote-gui/Makefile5
-rw-r--r--net-p2p/zetacoin/Makefile40
-rw-r--r--net-p2p/zetacoin/pkg-plist7
-rw-r--r--print/hplip/Makefile2
-rw-r--r--russian/emkatic/Makefile5
-rw-r--r--sysutils/android-file-transfer-qt5/Makefile2
-rw-r--r--sysutils/pcbsd-utils-qt5/Makefile2
-rw-r--r--x11-themes/xfce-evolution/Makefile2
31 files changed, 35 insertions, 100 deletions
diff --git a/MOVED b/MOVED
index ec4ef14cd2b9..2e11a47e7805 100644
--- a/MOVED
+++ b/MOVED
@@ -12809,3 +12809,4 @@ www/rubygem-lograge-rails50|www/rubygem-lograge-rails5|2019-06-21|Obsolete by gi
devel/rubygem-batch-loader12|devel/rubygem-batch-loader|2019-06-21|Obsolete by gitlab-ce upgrade, use devel/rubygem-batch-loader instead
security/easy-rsa2|security/easy-rsa|2019-06-23|Has expired: Use easy-rsa 3 instead.
devel/py-robotframework-selenium2library|devel/py-robotframework-seleniumlibrary|2019-06-25|Renamed to match upstream
+net-p2p/zetacoin-nox11|net-p2p/zetacoin|2019-06-26|Slave port folded back into now text-only master port.
diff --git a/Mk/Uses/qmake.mk b/Mk/Uses/qmake.mk
index ce9b0ebc4646..f078592952b9 100644
--- a/Mk/Uses/qmake.mk
+++ b/Mk/Uses/qmake.mk
@@ -3,7 +3,7 @@
# There are three Qt related USES files with different access to Qt.
# - qmake: The port requires Qt's qmake to build -- creates the configure target
# - auto includes qt.mk
-# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - qt-dist: The port is a port for a part of Qt5
# - auto inclues qt.mk
# - qt.mk - Dependency handling. USE_QT=foo bar
#
diff --git a/Mk/Uses/qt.mk b/Mk/Uses/qt.mk
index 7061160583f7..d99d4c6aa9cc 100644
--- a/Mk/Uses/qt.mk
+++ b/Mk/Uses/qt.mk
@@ -3,14 +3,14 @@
# There are three Qt related USES files with different access to Qt.
# - qmake: The port requires Qt's qmake to build -- creates the configure target
# - auto includes qt.mk
-# - qt-dist: The port is a port for an part of Qt4 or Qt5
+# - qt-dist: The port is a port for a part of Qt5
# - auto includes qt.mk and qmake.mk
# - qt.mk - Dependency handling. USE_QT=foo bar
#
# Usage:
# USES=qt:<version>[,no_env]
#
-# Versions: 4 5
+# Versions: 5
#
# Port variables:
# USE_QT - List of Qt modules to depend on, with optional '_build'
diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
index 5737733f2ffc..1b01fe9ad345 100644
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -415,7 +415,6 @@ PYMALLOC_DESC?= Use Python's internal malloc()
PYTHON_DESC?= Python bindings or support
PYTHON2_DESC?= Python 2.x bindings or support
PYTHON3_DESC?= Python 3.x bindings or support
-QT4_DESC?= Qt 4 toolkit support
QT5_DESC?= Qt 5 toolkit support
QUICKTIME_DESC?= QuickTime media support
RADIUS_DESC?= RADIUS protocol support
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index 5bd2f506dff7..2aa0f21fe4c8 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -279,7 +279,7 @@ APACHE_PORT_ALT= DEFAULT_VERSIONS+=apache=${APACHE_PORT:S/www\/apache//:C/2(0-9)
USE_FPC_RUN_ALT= USES=fpc:run
WANT_FPC_BASE_ALT= USES=fpc:base
WANT_FPC_ALL_ALT= USES=fpc:all
-USE_QT4_ALT= USES=qt:4 and USE_QT=${USE_QT4}
+USE_QT4_ALT= USES=qt:5 and USE_QT=${USE_QT4} (beware) as Qt4 has been removed
USE_QT5_ALT= USES=qt:5 and USE_QT=${USE_QT5}
QT_NONSTANDARD_ALT= USES=qmake:no_env
diff --git a/archivers/peazip/Makefile b/archivers/peazip/Makefile
index 2a7473108e98..92f2eaa142fa 100644
--- a/archivers/peazip/Makefile
+++ b/archivers/peazip/Makefile
@@ -24,9 +24,8 @@ LAZARUS_PROJECT_FILES= project_pea.lpi project_peach.lpi
LAZBUILD_ARGS= -d
LLD_UNSAFE= yes
-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
ARCHIVER_FILES= #
diff --git a/comms/cqrlog/Makefile b/comms/cqrlog/Makefile
index 401f896d2a31..e68adba534f2 100644
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@@ -40,9 +40,6 @@ LAZARUS_NO_FLAVORS=qt5
INSTALLS_ICONS= yes
DOS2UNIX_WRKSRC=${WRKSRC}/src/synapse/
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4
-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
-
post-extract:
@${RM} -r ${WRKSRC}/src/lnet/lib/openssl.pas
diff --git a/devel/py-sip/Makefile b/devel/py-sip/Makefile
index 7293d00e53f6..2e434eea6e1c 100644
--- a/devel/py-sip/Makefile
+++ b/devel/py-sip/Makefile
@@ -32,7 +32,6 @@ DEBUG_CONFIGURE_ON= --debug
# When building PyQt5 v5.11 or later you must configure SIP to create a
# private copy of the sip module using a command line similar to the following:
# > python configure.py --sip-module PyQt5.sip --no-tools
-# As this port is already flavored we cannot add further Qt4/Qt5 flavoring.
CONFIGURE_WRKSRC= ${WRKSRC}/default
BUILD_WRKSRC= ${CONFIGURE_WRKSRC}
INSTALL_WRKSRC= ${CONFIGURE_WRKSRC}
diff --git a/editors/cudatext/Makefile b/editors/cudatext/Makefile
index 254f753b40e2..e3c9ebb1b893 100644
--- a/editors/cudatext/Makefile
+++ b/editors/cudatext/Makefile
@@ -38,9 +38,8 @@ LAZARUS_PROJECT_FILES+= app/cudatext.lpi
LAZBUILD_ARGS= -d
LLD_UNSAFE= yes
-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
USE_FPC_gtk2= cairo
USE_GNOME_gtk2= cairo
diff --git a/editors/dexed/Makefile b/editors/dexed/Makefile
index 7864a6732f9b..a4d168cdc0f7 100644
--- a/editors/dexed/Makefile
+++ b/editors/dexed/Makefile
@@ -50,9 +50,8 @@ LLD_UNSAFE= yes
LDMD2_CMD= ${LOCALBASE}/bin/ldmd2
-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
.if ${FLAVOR:Ugtk2:Mgtk2}
USE_FPC+= cairo
diff --git a/editors/lazarus-qt5/Makefile b/editors/lazarus-qt5/Makefile
index db9720fa6cb3..c220086a49ab 100644
--- a/editors/lazarus-qt5/Makefile
+++ b/editors/lazarus-qt5/Makefile
@@ -4,7 +4,7 @@ PKGNAMESUFFIX?= -qt5
COMMENT= Portable Delphi-like IDE for the FreePascal compiler (QT5)
-CONFLICTS= ${PORTNAME}-gtk2-* ${PORTNAME}-qt4-*
+CONFLICTS= ${PORTNAME}-gtk2-*
LIB_DEPENDS= libQt5Pas.so:x11-toolkits/qt5pas
diff --git a/editors/lazarus/Makefile b/editors/lazarus/Makefile
index 881d1c32607d..870bee6de0ef 100644
--- a/editors/lazarus/Makefile
+++ b/editors/lazarus/Makefile
@@ -12,7 +12,7 @@ DIST_SUBDIR= freepascal
MAINTAINER?= acm@FreeBSD.org
COMMENT?= Portable Delphi-like IDE for the FreePascal compiler (GTK2)
-CONFLICTS?= ${PORTNAME}-qt4-* ${PORTNAME}-qt5-*
+CONFLICTS?= ${PORTNAME}-qt5-*
BUILD_DEPENDS?= fpcres:lang/fpc-utils
RUN_DEPENDS?= fpcres:lang/fpc-utils
diff --git a/editors/picpas/Makefile b/editors/picpas/Makefile
index db9934ab1c94..722733f55b06 100644
--- a/editors/picpas/Makefile
+++ b/editors/picpas/Makefile
@@ -12,9 +12,8 @@ COMMENT= Multi-platform Pascal for Microchip PIC16F microcontrollers
LICENSE= GPLv2
-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= dos2unix fpc lazarus:flavors
USE_FPC= chm fcl-base fcl-image fcl-json fcl-registry fcl-xml pasjpeg regexpr \
diff --git a/graphics/lazpaint/Makefile b/graphics/lazpaint/Makefile
index 4d35f62cf510..fd6688c35b46 100644
--- a/graphics/lazpaint/Makefile
+++ b/graphics/lazpaint/Makefile
@@ -12,9 +12,8 @@ COMMENT= Image editor written in Lazarus
LICENSE= GPLv3
-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= dos2unix fpc lazarus:flavors
USE_FPC= chm fcl-base fcl-image fcl-json fcl-net fcl-web fcl-xml \
diff --git a/graphics/photivo/Makefile b/graphics/photivo/Makefile
index 3f4eb994099d..23b9575b4ab2 100644
--- a/graphics/photivo/Makefile
+++ b/graphics/photivo/Makefile
@@ -31,8 +31,6 @@ DOS2UNIX_FILES= Sources/ptImage.cpp Sources/ptCheck.cpp Sources/filemgmt/ptFileM
WRKSRC= ${WRKDIR}/${PORTNAME}
-CONFLICTS_INSTALL= ${PORTNAME}-qt4
-
post-patch:
@${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \
${WRKSRC}/Sources/ptCimg.cpp \
diff --git a/mail/trojita/Makefile b/mail/trojita/Makefile
index 134447306504..f12fc22d98e8 100644
--- a/mail/trojita/Makefile
+++ b/mail/trojita/Makefile
@@ -15,7 +15,6 @@ LICENSE_COMB= dual
LIB_DEPENDS= libqt5keychain.so:security/qtkeychain
-CONFLICTS_INSTALL= trojita-qt4-[0-9]*
INSTALLS_ICONS= yes
USE_LDCONFIG= yes
diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile
index b35cde53eb63..767296ac99c2 100644
--- a/multimedia/libquicktime/Makefile
+++ b/multimedia/libquicktime/Makefile
@@ -3,12 +3,12 @@
PORTNAME= libquicktime
PORTVERSION= 1.2.4
-PORTREVISION?= 25
+PORTREVISION?= 26
CATEGORIES= multimedia
MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
-COMMENT= library for reading and writing quicktime files
+COMMENT= Library for reading and writing quicktime files
.if !defined(_BUILDING_LIBQUICKTIME_PLUGINS)
LIB_DEPENDS= libvorbis.so:audio/libvorbis
@@ -33,10 +33,7 @@ OPTIONS_DEFINE= ALSA DV FAAC FAAD FFMPEG GTK2 JPEG OPENGL OPTIMIZED_CFLAGS PNG \
OPTIONS_DEFAULT= FFMPEG JPEG OPENGL PNG SCHROEDINGER X264
OPTIONS_SUB= yes
-PORTDOCS= api_usage.html codecs.html qt4l_building.html \
- qt4l_codecs.html qt4l_index.html \
- qt4l_license.html qt4l_opening.html qt4l_positioning.html \
- qt4l_reading.html qt4l_util.html qt4l_writing.html
+PORTDOCS= api_usage.html codecs.html
.else
CONFIGURE_ARGS+= --without-x --enable-gpl --without-doxygen
diff --git a/multimedia/mlt-qt5/Makefile b/multimedia/mlt-qt5/Makefile
index 7b6465f36c9a..f1be17e4092f 100644
--- a/multimedia/mlt-qt5/Makefile
+++ b/multimedia/mlt-qt5/Makefile
@@ -2,8 +2,6 @@
PORTREVISION= 0
-CONFLICTS_INSTALL= ${PORTNAME}-qt4-*
-
USES= qt:5
USE_CXXSTD= c++11
USE_QT= core gui svg widgets xml
diff --git a/multimedia/winff/Makefile b/multimedia/winff/Makefile
index 670c86c9a8fe..3a4857b565ad 100644
--- a/multimedia/winff/Makefile
+++ b/multimedia/winff/Makefile
@@ -37,9 +37,6 @@ LAZARUS_NO_FLAVORS= qt5
LAZARUS_PROJECT_FILES= winff.lpr
LAZBUILD_ARGS= -d
-gtk2_CONFLICTS_INSTALL= ${PORTNAME}-qt4
-qt4_CONFLICTS_INSTALL= ${PORTNAME}-gtk2
-
BUILD_WRKSRC= ${WRKDIR}/${PKGNAME}/${_PORTNAME}
.if ${FLAVOR:Ugtk2:Mgtk2}
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
diff --git a/print/hplip/Makefile b/print/hplip/Makefile
index 24e669481279..767eea030819 100644
--- a/print/hplip/Makefile
+++ b/print/hplip/Makefile
@@ -78,7 +78,7 @@ CONFIGURE_ARGS+= --disable-qt5
.endif
.if ${PORT_OPTIONS:MX11} && ! ${PORT_OPTIONS:MQT5}
-BROKEN= The X11 option requires one of the QT4 or QT5 options
+BROKEN= The X11 option requires the QT5 option
.endif
post-patch:
diff --git a/russian/emkatic/Makefile b/russian/emkatic/Makefile
index 64e45206b03f..6c66b107881e 100644
--- a/russian/emkatic/Makefile
+++ b/russian/emkatic/Makefile
@@ -28,9 +28,8 @@ PLIST_FILES= bin/${PORTNAME}
PORTDATA= *
PORTDOCS= CHANGELOG.*.txt README.*.txt
-gtk2_CONFLICTS_INSTALL= ru-${PORTNAME}-qt4 ru-${PORTNAME}-qt5
-qt4_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt5
-qt5_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2 ru-${PORTNAME}-qt4
+gtk2_CONFLICTS_INSTALL= ru-${PORTNAME}-qt5
+qt5_CONFLICTS_INSTALL= ru-${PORTNAME}-gtk2
OPTIONS_DEFINE= DOCS PORTAUDIO
OPTIONS_DEFAULT= PORTAUDIO
diff --git a/sysutils/android-file-transfer-qt5/Makefile b/sysutils/android-file-transfer-qt5/Makefile
index 02fa1df405e0..8158b13b6517 100644
--- a/sysutils/android-file-transfer-qt5/Makefile
+++ b/sysutils/android-file-transfer-qt5/Makefile
@@ -5,8 +5,6 @@ PKGNAMESUFFIX= -qt5
MASTERDIR= ${.CURDIR}/../android-file-transfer
-CONFLICTS_INSTALL= ${PORTNAME}-qt4
-
OPTIONS_SLAVE= QT5
OPTIONS_EXCLUDE=CLI FUSE
diff --git a/sysutils/pcbsd-utils-qt5/Makefile b/sysutils/pcbsd-utils-qt5/Makefile
index 095f0da1deb9..474a55cb55e7 100644
--- a/sysutils/pcbsd-utils-qt5/Makefile
+++ b/sysutils/pcbsd-utils-qt5/Makefile
@@ -27,8 +27,6 @@ RUN_DEPENDS= pc-updatemanager:sysutils/pcbsd-utils \
LIB_DEPENDS= libcurl.so:ftp/curl \
libpoppler-qt5.so:graphics/poppler-qt5
-CONFLICTS?= pcbsd-utils-qt4-[0-9]*
-
MAKE_JOBS_UNSAFE=yes
ONLY_FOR_ARCHS= amd64
USE_LDCONFIG= yes
diff --git a/x11-themes/xfce-evolution/Makefile b/x11-themes/xfce-evolution/Makefile
index 1e1db64609a3..3e11747411e4 100644
--- a/x11-themes/xfce-evolution/Makefile
+++ b/x11-themes/xfce-evolution/Makefile
@@ -6,7 +6,7 @@ CATEGORIES= x11-themes
MASTER_SITES= SF/${PORTNAME}
MAINTAINER= fbsd@opal.com
-COMMENT= Complete Xfce Evolution Gtk2, Gtk3, Qt4, Qt5, wxWidgets, Xfce themes
+COMMENT= Complete Xfce Evolution Gtk2, Gtk3, Qt5, wxWidgets, Xfce themes
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/GPL-v2