D20725.id.diff
No OneTemporary
Actions

Size

17 KB

Referenced Files

None

Subscribers

None

D20725.id.diff
View Options

	Index: head/MOVED
	===================================================================
	--- head/MOVED
	+++ head/MOVED
	@@ -12809,3 +12809,4 @@
	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.
	Index: head/Mk/Uses/qmake.mk
	===================================================================
	--- head/Mk/Uses/qmake.mk
	+++ head/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
	#
	Index: head/Mk/Uses/qt.mk
	===================================================================
	--- head/Mk/Uses/qt.mk
	+++ head/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'
	Index: head/Mk/bsd.options.desc.mk
	===================================================================
	--- head/Mk/bsd.options.desc.mk
	+++ head/Mk/bsd.options.desc.mk
	@@ -415,7 +415,6 @@
	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
	Index: head/Mk/bsd.sanity.mk
	===================================================================
	--- head/Mk/bsd.sanity.mk
	+++ head/Mk/bsd.sanity.mk
	@@ -279,7 +279,7 @@
	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

	Index: head/archivers/peazip/Makefile
	===================================================================
	--- head/archivers/peazip/Makefile
	+++ head/archivers/peazip/Makefile
	@@ -24,9 +24,8 @@
	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= #

	Index: head/comms/cqrlog/Makefile
	===================================================================
	--- head/comms/cqrlog/Makefile
	+++ head/comms/cqrlog/Makefile
	@@ -40,9 +40,6 @@
	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

	Index: head/devel/py-sip/Makefile
	===================================================================
	--- head/devel/py-sip/Makefile
	+++ head/devel/py-sip/Makefile
	@@ -32,7 +32,6 @@
	# 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}
	Index: head/editors/cudatext/Makefile
	===================================================================
	--- head/editors/cudatext/Makefile
	+++ head/editors/cudatext/Makefile
	@@ -38,9 +38,8 @@
	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
	Index: head/editors/dexed/Makefile
	===================================================================
	--- head/editors/dexed/Makefile
	+++ head/editors/dexed/Makefile
	@@ -50,9 +50,8 @@

	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
	Index: head/editors/lazarus-qt5/Makefile
	===================================================================
	--- head/editors/lazarus-qt5/Makefile
	+++ head/editors/lazarus-qt5/Makefile
	@@ -4,7 +4,7 @@

	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

	Index: head/editors/lazarus/Makefile
	===================================================================
	--- head/editors/lazarus/Makefile
	+++ head/editors/lazarus/Makefile
	@@ -12,7 +12,7 @@
	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
	Index: head/editors/picpas/Makefile
	===================================================================
	--- head/editors/picpas/Makefile
	+++ head/editors/picpas/Makefile
	@@ -12,9 +12,8 @@

	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 \
	Index: head/graphics/lazpaint/Makefile
	===================================================================
	--- head/graphics/lazpaint/Makefile
	+++ head/graphics/lazpaint/Makefile
	@@ -12,9 +12,8 @@

	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 \
	Index: head/graphics/photivo/Makefile
	===================================================================
	--- head/graphics/photivo/Makefile
	+++ head/graphics/photivo/Makefile
	@@ -31,8 +31,6 @@

	WRKSRC= ${WRKDIR}/${PORTNAME}

	-CONFLICTS_INSTALL= ${PORTNAME}-qt4
	-
	post-patch:
	@${REINPLACE_CMD} -e 's,#define cimg_use_openmp 1,//&,' \
	${WRKSRC}/Sources/ptCimg.cpp \
	Index: head/mail/trojita/Makefile
	===================================================================
	--- head/mail/trojita/Makefile
	+++ head/mail/trojita/Makefile
	@@ -15,7 +15,6 @@

	LIB_DEPENDS= libqt5keychain.so:security/qtkeychain

	-CONFLICTS_INSTALL= trojita-qt4-[0-9]*
	INSTALLS_ICONS= yes
	USE_LDCONFIG= yes

	Index: head/multimedia/libquicktime/Makefile
	===================================================================
	--- head/multimedia/libquicktime/Makefile
	+++ head/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_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
	Index: head/multimedia/mlt-qt5/Makefile
	===================================================================
	--- head/multimedia/mlt-qt5/Makefile
	+++ head/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
	Index: head/multimedia/winff/Makefile
	===================================================================
	--- head/multimedia/winff/Makefile
	+++ head/multimedia/winff/Makefile
	@@ -37,9 +37,6 @@
	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}
	Index: head/net-p2p/Makefile
	===================================================================
	--- head/net-p2p/Makefile
	+++ head/net-p2p/Makefile
	@@ -92,6 +92,5 @@
	SUBDIR += vuze
	SUBDIR += xmrig
	SUBDIR += zetacoin
	- SUBDIR += zetacoin-nox11

	.include <bsd.port.subdir.mk>
	Index: head/net-p2p/awgg/Makefile
	===================================================================
	--- head/net-p2p/awgg/Makefile
	+++ head/net-p2p/awgg/Makefile
	@@ -17,9 +17,8 @@
	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 \
	Index: head/net-p2p/qbittorrent/Makefile
	===================================================================
	--- head/net-p2p/qbittorrent/Makefile
	+++ head/net-p2p/qbittorrent/Makefile
	@@ -7,7 +7,7 @@
	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
	Index: head/net-p2p/transmission-qt/Makefile
	===================================================================
	--- head/net-p2p/transmission-qt/Makefile
	+++ head/net-p2p/transmission-qt/Makefile
	@@ -6,8 +6,6 @@
	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 \
	Index: head/net-p2p/transmission-remote-gui/Makefile
	===================================================================
	--- head/net-p2p/transmission-remote-gui/Makefile
	+++ head/net-p2p/transmission-remote-gui/Makefile
	@@ -30,9 +30,8 @@
	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 && \
	Index: head/net-p2p/zetacoin/Makefile
	===================================================================
	--- head/net-p2p/zetacoin/Makefile
	+++ head/net-p2p/zetacoin/Makefile
	@@ -26,46 +26,31 @@

	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 @@
	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 @@
	${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>
	Index: head/net-p2p/zetacoin/pkg-plist
	===================================================================
	--- head/net-p2p/zetacoin/pkg-plist
	+++ head/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
	Index: head/print/hplip/Makefile
	===================================================================
	--- head/print/hplip/Makefile
	+++ head/print/hplip/Makefile
	@@ -78,7 +78,7 @@
	.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:
	Index: head/russian/emkatic/Makefile
	===================================================================
	--- head/russian/emkatic/Makefile
	+++ head/russian/emkatic/Makefile
	@@ -28,9 +28,8 @@
	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
	Index: head/sysutils/android-file-transfer-qt5/Makefile
	===================================================================
	--- head/sysutils/android-file-transfer-qt5/Makefile
	+++ head/sysutils/android-file-transfer-qt5/Makefile
	@@ -5,8 +5,6 @@

	MASTERDIR= ${.CURDIR}/../android-file-transfer

	-CONFLICTS_INSTALL= ${PORTNAME}-qt4
	-
	OPTIONS_SLAVE= QT5
	OPTIONS_EXCLUDE=CLI FUSE

	Index: head/sysutils/pcbsd-utils-qt5/Makefile
	===================================================================
	--- head/sysutils/pcbsd-utils-qt5/Makefile
	+++ head/sysutils/pcbsd-utils-qt5/Makefile
	@@ -27,8 +27,6 @@
	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
	Index: head/x11-themes/xfce-evolution/Makefile
	===================================================================
	--- head/x11-themes/xfce-evolution/Makefile
	+++ head/x11-themes/xfce-evolution/Makefile
	@@ -6,7 +6,7 @@
	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

File Metadata

Mime Type: text/plain
Expires: Wed, Jan 28, 12:34 AM (13 h, 33 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 28061582
Default Alt Text: D20725.id.diff (17 KB)

D20725.id.diffNo OneTemporaryActions

D20725.id.diffView Options

File Metadata

Event Timeline

D20725.id.diff
No OneTemporary
Actions

D20725.id.diff
View Options