Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2019 20:00:07 +0000 (UTC)
From:      "Tobias C. Berner" <tcberner@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495952 - in head: . audio/amarok audio/clementine-player audio/libechonest devel/qjson graphics/qgis graphics/qgis-ltr net/qtweetlib www/choqok x11/leechcraft
Message-ID:  <201903162000.x2GK07MY008205@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sat Mar 16 20:00:07 2019
New Revision: 495952
URL: https://svnweb.freebsd.org/changeset/ports/495952

Log:
  devel/qjson: remove flavors (Qt4 deprecation)

Modified:
  head/MOVED
  head/audio/amarok/Makefile
  head/audio/clementine-player/Makefile
  head/audio/libechonest/Makefile
  head/devel/qjson/Makefile
  head/graphics/qgis-ltr/Makefile
  head/graphics/qgis/Makefile
  head/net/qtweetlib/Makefile
  head/www/choqok/Makefile
  head/x11/leechcraft/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/MOVED	Sat Mar 16 20:00:07 2019	(r495952)
@@ -10077,7 +10077,6 @@ finance/libalkimia|finance/alkimia-qt4|2018-04-13|Proj
 security/py-zxcvbn-python|security/py-zxcvbn|2018-04-13|Renamed upstream
 devel/py-libusb115|devel/py-libusb1|2018-04-14|Unused and unmaintained upstream
 devel/qca-qt5|devel/qca@qt5|2018-04-14|Moved to a flavoured version
-devel/qjson-qt5|devel/qjson@qt5|2018-04-14|Moved to a flavoured version
 multimedia/gstreamer1-qt4|multimedia/gstreamer1-qt@qt4|2018-04-14|Moved to a flavoured version
 multimedia/gstreamer1-qt5|multimedia/gstreamer1-qt@qt5|2018-04-14|Moved to a flavoured version
 www/mod_antiloris||2018-04-16|Apache 2.2 End of Life
@@ -11678,3 +11677,5 @@ net-p2p/transmission@qt4||2019-03-16|Qt4 deprecation
 net-p2p/transmission@qt5|net-p2p/transmission-qt|2019-03-16|Flavor has been removed
 x11-themes/Kvantum@qt4||2019-03-16|Qt4 deprecation
 x11-themes/Kvantum@qt5|2019-03-16|Flavor has been removed
+devel/qjson@qt4||2019-03-16|Qt4 deprecation
+devel/qjson@qt5|devel/qjson|2019-03-16|Flavor has been removed

Modified: head/audio/amarok/Makefile
==============================================================================
--- head/audio/amarok/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/audio/amarok/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -4,7 +4,7 @@ PORTNAME=	amarok
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.0-277
 DISTVERSIONSUFFIX=	-gd50ecc430c
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio kde
 
 MAINTAINER=	kde@FreeBSD.org
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libfftw3.so:math/fftw3 \
 		liblastfm5.so:audio/liblastfm-qt5 \
-		libqjson-qt5.so:devel/qjson@qt5 \
+		libqjson-qt5.so:devel/qjson \
 		libqca-qt5.so:devel/qca@qt5 \
 		libtag.so:audio/taglib \
 		libtag-extras.so:audio/taglib-extras

Modified: head/audio/clementine-player/Makefile
==============================================================================
--- head/audio/clementine-player/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/audio/clementine-player/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -4,7 +4,7 @@
 PORTNAME=	clementine
 DISTVERSION=	1.3.1-661
 DISTVERSIONSUFFIX=	-g4ff370ce1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 PKGNAMESUFFIX=	-player
 
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libtag.so:audio/taglib \
 		libchromaprint.so:audio/chromaprint \
 		libprotobuf.so:devel/protobuf \
 		libqca-qt5.so:devel/qca@qt5 \
-		libqjson-qt5.so:devel/qjson@qt5 \
+		libqjson-qt5.so:devel/qjson \
 		libfftw3.so:math/fftw3 \
 		libechonest5.so:audio/libechonest \
 		libcryptopp.so:security/cryptopp

Modified: head/audio/libechonest/Makefile
==============================================================================
--- head/audio/libechonest/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/audio/libechonest/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -3,7 +3,7 @@
 
 PORTNAME=	libechonest
 PORTVERSION=	2.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -12,7 +12,7 @@ COMMENT=	Collection of C++/Qt classes designed to use 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqjson-qt5.so:devel/qjson@qt5
+LIB_DEPENDS=	libqjson-qt5.so:devel/qjson
 
 USES=		cmake compiler:c++11-lang pkgconfig qt:5
 USE_LDCONFIG=	yes

Modified: head/devel/qjson/Makefile
==============================================================================
--- head/devel/qjson/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/devel/qjson/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -2,9 +2,9 @@
 
 PORTNAME=	qjson
 DISTVERSION=	0.9.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel
-PKGNAMESUFFIX=	-${FLAVOR}
+PKGNAMESUFFIX=	-qt5
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library to manage JSON objects with Qt
@@ -12,27 +12,13 @@ COMMENT=	Library to manage JSON objects with Qt
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.lib
 
-FLAVORS=	qt5 qt4
-FLAVOR?=	${FLAVORS:[1]}
-
-USES=		cmake pathfix
+USES=		cmake compiler:c++11-lang pathfix qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	flavio
 USE_LDCONFIG=	yes
-
-.  if ${FLAVOR} == qt4
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-
-USES+=		qt:4
-USE_QT=		corelib moc_build qmake_build rcc_build uic_build
-CMAKE_ON=	QT4_BUILD
-.  else
-USES+=		compiler:c++11-lang qt:5
 USE_QT=		core buildtools_build qmake_build
 CMAKE_OFF=	QT4_BUILD
 QT_SUFFIX=	-qt5
-.  endif
 
 _DOCSDIR=	${DOCSDIR}${QT_SUFFIX}
 DOCSDIR_REL=	${_DOCSDIR:S,^${PREFIX}/,,}

Modified: head/graphics/qgis-ltr/Makefile
==============================================================================
--- head/graphics/qgis-ltr/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/graphics/qgis-ltr/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -4,7 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_4_5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
@@ -67,7 +67,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libnetcdf.so:science/netcdf \
 		libproj.so:graphics/proj \
 		libqca-qt5.so:devel/qca@qt5 \
-		libqjson-qt5.so:devel/qjson@qt5 \
+		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain \
 		libqwt6.so:x11-toolkits/qwt6@qt5 \

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/graphics/qgis/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -4,7 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_6_0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
@@ -66,7 +66,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libnetcdf.so:science/netcdf \
 		libproj.so:graphics/proj \
 		libqca-qt5.so:devel/qca@qt5 \
-		libqjson-qt5.so:devel/qjson@qt5 \
+		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain \
 		libqwt6.so:x11-toolkits/qwt6@qt5 \

Modified: head/net/qtweetlib/Makefile
==============================================================================
--- head/net/qtweetlib/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/net/qtweetlib/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qtweetlib
 PORTVERSION=	0.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net
 
 MAINTAINER=	nivit@FreeBSD.org
@@ -14,7 +14,7 @@ LICENSE=	LGPL21
 DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 
-LIB_DEPENDS=	libqjson.so:devel/qjson@qt4
+BROKEN=		Missing libqjson.so:devel/qjson@qt4
 
 GH_ACCOUNT=	minimoog
 GH_PROJECT=	QTweetLib

Modified: head/www/choqok/Makefile
==============================================================================
--- head/www/choqok/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/www/choqok/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -2,7 +2,7 @@
 
 PORTNAME=	choqok
 DISTVERSION=	1.6.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	www kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION:R}/src
 DIST_SUBDIR=	KDE/${PORTNAME}
@@ -13,7 +13,7 @@ COMMENT=	KDE micro-blogging client
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libqjson-qt5.so:devel/qjson@qt5 \
+LIB_DEPENDS=	libqjson-qt5.so:devel/qjson \
 		libqca-qt5.so:devel/qca@qt5 \
 		libqoauth-qt5.so:net/qoauth-qt5 \
 		libtelepathy-qt5.so:net-im/telepathy-qt

Modified: head/x11/leechcraft/Makefile
==============================================================================
--- head/x11/leechcraft/Makefile	Sat Mar 16 19:49:15 2019	(r495951)
+++ head/x11/leechcraft/Makefile	Sat Mar 16 20:00:07 2019	(r495952)
@@ -3,7 +3,7 @@
 
 PORTNAME=	leechcraft
 PORTVERSION=	0.6.70
-PORTREVISION=	41
+PORTREVISION=	42
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.leechcraft.org/LeechCraft/0.6.70/
 
@@ -382,7 +382,7 @@ USE_QT+=	xmlpatterns
     ${PORT_OPTIONS:MNETSTOREMANAGER} || ${PORT_OPTIONS:MPOSHUKU} || \
     ${PORT_OPTIONS:MQROSP} || ${PORT_OPTIONS:MSB2} || \
     ${PORT_OPTIONS:MTOUCHSTREAMS}
-LIB_DEPENDS+=	libqjson.so:devel/qjson@qt4
+BROKEN=		Missing libqjson.so:devel/qjson@qt4
 .endif
 
 .if ${PORT_OPTIONS:MELEEMINATOR}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903162000.x2GK07MY008205>