svn commit: r505150 - in head: . Mk Mk/Uses archivers/peazip comms/cqrlog devel/py-sip editors/cudatext editors/dexed editors/lazarus editors/lazarus-qt5 editors/picpas graphics/lazpaint graphics/p...
Rene Ladan
rene at FreeBSD.org
Wed Jun 26 11:52:31 UTC 2019
Author: rene
Date: Wed Jun 26 11:52:23 2019
New Revision: 505150
URL: https://svnweb.freebsd.org/changeset/ports/505150
Log:
Clean up final leftovers from Qt4.
Submitted by: rene
Reviewed by: mat, tcberner
Differential Revision: https://reviews.freebsd.org/D20725
Modified:
head/MOVED
head/Mk/Uses/qmake.mk
head/Mk/Uses/qt.mk
head/Mk/bsd.options.desc.mk
head/Mk/bsd.sanity.mk
head/archivers/peazip/Makefile
head/comms/cqrlog/Makefile
head/devel/py-sip/Makefile
head/editors/cudatext/Makefile
head/editors/dexed/Makefile
head/editors/lazarus-qt5/Makefile
head/editors/lazarus/Makefile
head/editors/picpas/Makefile
head/graphics/lazpaint/Makefile
head/graphics/photivo/Makefile
head/mail/trojita/Makefile
head/multimedia/libquicktime/Makefile
head/multimedia/mlt-qt5/Makefile
head/multimedia/winff/Makefile
head/net-p2p/Makefile
head/net-p2p/awgg/Makefile
head/net-p2p/qbittorrent/Makefile
head/net-p2p/transmission-qt/Makefile
head/net-p2p/transmission-remote-gui/Makefile
head/net-p2p/zetacoin/Makefile
head/net-p2p/zetacoin/pkg-plist
head/print/hplip/Makefile
head/russian/emkatic/Makefile
head/sysutils/android-file-transfer-qt5/Makefile
head/sysutils/pcbsd-utils-qt5/Makefile
head/x11-themes/xfce-evolution/Makefile
Modified: head/MOVED
==============================================================================
--- head/MOVED Wed Jun 26 10:45:33 2019 (r505149)
+++ head/MOVED Wed Jun 26 11:52:23 2019 (r505150)
@@ -12809,3 +12809,4 @@ www/rubygem-lograge-rails50|www/rubygem-lograge-rails5
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.
Modified: head/Mk/Uses/qmake.mk
==============================================================================
--- head/Mk/Uses/qmake.mk Wed Jun 26 10:45:33 2019 (r505149)
+++ head/Mk/Uses/qmake.mk Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
#
Modified: head/Mk/Uses/qt.mk
==============================================================================
--- head/Mk/Uses/qt.mk Wed Jun 26 10:45:33 2019 (r505149)
+++ head/Mk/Uses/qt.mk Wed Jun 26 11:52:23 2019 (r505150)
@@ -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'
Modified: head/Mk/bsd.options.desc.mk
==============================================================================
--- head/Mk/bsd.options.desc.mk Wed Jun 26 10:45:33 2019 (r505149)
+++ head/Mk/bsd.options.desc.mk Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/Mk/bsd.sanity.mk
==============================================================================
--- head/Mk/bsd.sanity.mk Wed Jun 26 10:45:33 2019 (r505149)
+++ head/Mk/bsd.sanity.mk Wed Jun 26 11:52:23 2019 (r505150)
@@ -279,7 +279,7 @@ APACHE_PORT_ALT= DEFAULT_VERSIONS+=apache=${APACHE_POR
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
Modified: head/archivers/peazip/Makefile
==============================================================================
--- head/archivers/peazip/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/archivers/peazip/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -24,9 +24,8 @@ LAZARUS_PROJECT_FILES= project_pea.lpi project_peach.l
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= #
Modified: head/comms/cqrlog/Makefile
==============================================================================
--- head/comms/cqrlog/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/comms/cqrlog/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/devel/py-sip/Makefile
==============================================================================
--- head/devel/py-sip/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/devel/py-sip/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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}
Modified: head/editors/cudatext/Makefile
==============================================================================
--- head/editors/cudatext/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/editors/cudatext/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/editors/dexed/Makefile
==============================================================================
--- head/editors/dexed/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/editors/dexed/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/editors/lazarus-qt5/Makefile
==============================================================================
--- head/editors/lazarus-qt5/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/editors/lazarus-qt5/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/editors/lazarus/Makefile
==============================================================================
--- head/editors/lazarus/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/editors/lazarus/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -12,7 +12,7 @@ DIST_SUBDIR= freepascal
MAINTAINER?= acm at 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
Modified: head/editors/picpas/Makefile
==============================================================================
--- head/editors/picpas/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/editors/picpas/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -12,9 +12,8 @@ COMMENT= Multi-platform Pascal for Microchip PIC16F mi
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 \
Modified: head/graphics/lazpaint/Makefile
==============================================================================
--- head/graphics/lazpaint/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/graphics/lazpaint/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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 \
Modified: head/graphics/photivo/Makefile
==============================================================================
--- head/graphics/photivo/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/graphics/photivo/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -31,8 +31,6 @@ DOS2UNIX_FILES= Sources/ptImage.cpp Sources/ptCheck.cp
WRKSRC= ${WRKDIR}/${PORTNAME}
-CONFLICTS_INSTALL= ${PORTNAME}-qt4
-
post-patch:
@${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \
${WRKSRC}/Sources/ptCimg.cpp \
Modified: head/mail/trojita/Makefile
==============================================================================
--- head/mail/trojita/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/mail/trojita/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/multimedia/libquicktime/Makefile
==============================================================================
--- head/multimedia/libquicktime/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/multimedia/libquicktime/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -3,12 +3,12 @@
PORTNAME= libquicktime
PORTVERSION= 1.2.4
-PORTREVISION?= 25
+PORTREVISION?= 26
CATEGORIES= multimedia
MASTER_SITES= SF
MAINTAINER= ports at 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 OPE
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
Modified: head/multimedia/mlt-qt5/Makefile
==============================================================================
--- head/multimedia/mlt-qt5/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/multimedia/mlt-qt5/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -2,8 +2,6 @@
PORTREVISION= 0
-CONFLICTS_INSTALL= ${PORTNAME}-qt4-*
-
USES= qt:5
USE_CXXSTD= c++11
USE_QT= core gui svg widgets xml
Modified: head/multimedia/winff/Makefile
==============================================================================
--- head/multimedia/winff/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/multimedia/winff/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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}
Modified: head/net-p2p/Makefile
==============================================================================
--- head/net-p2p/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/net-p2p/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -92,6 +92,5 @@
SUBDIR += vuze
SUBDIR += xmrig
SUBDIR += zetacoin
- SUBDIR += zetacoin-nox11
.include <bsd.port.subdir.mk>
Modified: head/net-p2p/awgg/Makefile
==============================================================================
--- head/net-p2p/awgg/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/net-p2p/awgg/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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 \
Modified: head/net-p2p/qbittorrent/Makefile
==============================================================================
--- head/net-p2p/qbittorrent/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/net-p2p/qbittorrent/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -7,7 +7,7 @@ CATEGORIES= net-p2p ipv6
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= yuri at 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
Modified: head/net-p2p/transmission-qt/Makefile
==============================================================================
--- head/net-p2p/transmission-qt/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/net-p2p/transmission-qt/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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 \
Modified: head/net-p2p/transmission-remote-gui/Makefile
==============================================================================
--- head/net-p2p/transmission-remote-gui/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/net-p2p/transmission-remote-gui/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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 && \
Modified: head/net-p2p/zetacoin/Makefile
==============================================================================
--- head/net-p2p/zetacoin/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/net-p2p/zetacoin/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -26,46 +26,31 @@ BROKEN_powerpc64= fails to configure: No working boost
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>
Modified: head/net-p2p/zetacoin/pkg-plist
==============================================================================
--- head/net-p2p/zetacoin/pkg-plist Wed Jun 26 10:45:33 2019 (r505149)
+++ head/net-p2p/zetacoin/pkg-plist Wed Jun 26 11:52:23 2019 (r505150)
@@ -1,6 +1,3 @@
-%%NO_X11%%%%EXECUTABLE_DAEMON%%
-%%NO_X11%%@sample etc/%%PORTNAME%%.conf.sample
+%%EXECUTABLE_DAEMON%%
+ at sample etc/%%PORTNAME%%.conf.sample
%%CLI%%%%EXECUTABLE_CLI%%
-%%X11%%%%EXECUTABLE_QT%%
-%%X11%%share/applications/%%PORTNAME%%-qt.desktop
-%%X11%%share/pixmaps/%%PORTNAME%%.png
Modified: head/print/hplip/Makefile
==============================================================================
--- head/print/hplip/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/print/hplip/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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:
Modified: head/russian/emkatic/Makefile
==============================================================================
--- head/russian/emkatic/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/russian/emkatic/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/sysutils/android-file-transfer-qt5/Makefile
==============================================================================
--- head/sysutils/android-file-transfer-qt5/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/sysutils/android-file-transfer-qt5/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -5,8 +5,6 @@ PKGNAMESUFFIX= -qt5
MASTERDIR= ${.CURDIR}/../android-file-transfer
-CONFLICTS_INSTALL= ${PORTNAME}-qt4
-
OPTIONS_SLAVE= QT5
OPTIONS_EXCLUDE=CLI FUSE
Modified: head/sysutils/pcbsd-utils-qt5/Makefile
==============================================================================
--- head/sysutils/pcbsd-utils-qt5/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/sysutils/pcbsd-utils-qt5/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -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
Modified: head/x11-themes/xfce-evolution/Makefile
==============================================================================
--- head/x11-themes/xfce-evolution/Makefile Wed Jun 26 10:45:33 2019 (r505149)
+++ head/x11-themes/xfce-evolution/Makefile Wed Jun 26 11:52:23 2019 (r505150)
@@ -6,7 +6,7 @@ CATEGORIES= x11-themes
MASTER_SITES= SF/${PORTNAME}
MAINTAINER= fbsd at 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
More information about the svn-ports-all
mailing list