Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2019 20:48:16 +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: r495958 - in head: . finance/qhacc graphics/qgis graphics/qgis-ltr misc/zygrib x11-toolkits/qwt6 x11/leechcraft
Message-ID:  <201903162048.x2GKmGbt035391@repo.freebsd.org>

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

Log:
  x11-toolkits/qwt6: remove flavors (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/MOVED
  head/finance/qhacc/Makefile
  head/graphics/qgis-ltr/Makefile
  head/graphics/qgis/Makefile
  head/misc/zygrib/Makefile
  head/x11-toolkits/qwt6/Makefile
  head/x11/leechcraft/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sat Mar 16 20:40:49 2019	(r495957)
+++ head/MOVED	Sat Mar 16 20:48:15 2019	(r495958)
@@ -11681,3 +11681,5 @@ devel/libdbusmenu-qt@qt4||2019-03-16|Qt4 deprecation
 devel/libdbusmenu-qt@qt5|devel/libdbusmenu-qt|2019-03-16|Flavor has been removed
 multimedia/gstreamer1-qt@qt4||2019-03-16|Qt4 deprecation
 multimedia/gstreamer1-qt@qt5|multimedia/gstreamer1-qt|2019-03-16|Flavor has been removed
+x11-toolkits/qwt6@qt4||2019-03-16|Qt4 deprecation
+x11-toolkits/qwt6@qt5|x11-toolkits/qwt6|2019-03-16|Flavor has been removed

Modified: head/finance/qhacc/Makefile
==============================================================================
--- head/finance/qhacc/Makefile	Sat Mar 16 20:40:49 2019	(r495957)
+++ head/finance/qhacc/Makefile	Sat Mar 16 20:48:15 2019	(r495958)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qhacc
 PORTVERSION=	4.3
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	finance
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 
-LIB_DEPENDS=	libgpgme.so:security/gpgme \
-		libqwt6.so:x11-toolkits/qwt6@qt4
+LIB_DEPENDS=	libgpgme.so:security/gpgme 
+BROKEN=		Missing libqwt6.so:x11-toolkits/qwt6@qt4
 
 USES=		compiler:c++11-lib qmake:norecursive qt:4 tar:tgz
 USE_QT=		corelib gui sql moc_build rcc_build uic_build

Modified: head/graphics/qgis-ltr/Makefile
==============================================================================
--- head/graphics/qgis-ltr/Makefile	Sat Mar 16 20:40:49 2019	(r495957)
+++ head/graphics/qgis-ltr/Makefile	Sat Mar 16 20:48:15 2019	(r495958)
@@ -4,7 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_4_5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics geography
 PKGNAMESUFFIX=	-ltr
 
@@ -70,7 +70,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain \
-		libqwt6.so:x11-toolkits/qwt6@qt5 \
+		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libxerces-c.so:textproc/xerces-c3 \

Modified: head/graphics/qgis/Makefile
==============================================================================
--- head/graphics/qgis/Makefile	Sat Mar 16 20:40:49 2019	(r495957)
+++ head/graphics/qgis/Makefile	Sat Mar 16 20:48:15 2019	(r495958)
@@ -4,7 +4,7 @@
 PORTNAME=	qgis
 DISTVERSIONPREFIX=	final-
 DISTVERSION=	3_6_0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics geography
 
 MAINTAINER=	rhurlin@gwdg.de
@@ -69,7 +69,7 @@ LIB_DEPENDS=	libexiv2.so:graphics/exiv2 \
 		libqjson-qt5.so:devel/qjson \
 		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libqt5keychain.so:security/qtkeychain \
-		libqwt6.so:x11-toolkits/qwt6@qt5 \
+		libqwt6.so:x11-toolkits/qwt6 \
 		libspatialindex.so:devel/spatialindex \
 		libspatialite.so:databases/spatialite \
 		libxerces-c.so:textproc/xerces-c3 \

Modified: head/misc/zygrib/Makefile
==============================================================================
--- head/misc/zygrib/Makefile	Sat Mar 16 20:40:49 2019	(r495957)
+++ head/misc/zygrib/Makefile	Sat Mar 16 20:48:15 2019	(r495958)
@@ -2,7 +2,7 @@
 
 PORTNAME=	zygrib
 DISTVERSION=	8.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 MASTER_SITES=	http://www.zygrib.org/getfile.php?file=
 DISTNAME=	zyGrib-${DISTVERSION}
@@ -19,7 +19,7 @@ LIB_DEPENDS=	libjasper.so:graphics/jasper \
 		libnova.so:astro/libnova \
 		libpng16.so:graphics/png \
 		libproj.so:graphics/proj \
-		libqwt6.so:x11-toolkits/qwt6@qt5
+		libqwt6.so:x11-toolkits/qwt6
 
 USES=		gmake localbase tar:tgz qt:5
 USE_QT=		core gui network printsupport widgets xml buildtools_build qmake_build

Modified: head/x11-toolkits/qwt6/Makefile
==============================================================================
--- head/x11-toolkits/qwt6/Makefile	Sat Mar 16 20:40:49 2019	(r495957)
+++ head/x11-toolkits/qwt6/Makefile	Sat Mar 16 20:48:15 2019	(r495958)
@@ -2,43 +2,33 @@
 
 PORTNAME=	qwt
 PORTVERSION=	6.1.4
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
-PKGNAMESUFFIX=	6-${FLAVOR}
+PKGNAMESUFFIX=	6-qt5
 
 MAINTAINER=	lbartoletti@tuxfamily.org
 COMMENT=	Qt Widgets for Technical Applications
 
-FLAVORS=	qt5 qt4
-FLAVOR?=	${FLAVORS:[1]}
-
-USES=		gl gmake qmake tar:bzip2
+USES=		compiler:c++11-lang gl gmake qmake qt:5 tar:bzip2
 USE_GL=		gl
+USE_QT=		buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-DOCSDIR=	${PREFIX}/share/doc/qwt6-${FLAVOR}
+DOCSDIR=	${PREFIX}/share/doc/qwt6-qt5
 PORTDOCS=	*
 PLIST_SUB=	SHLIB_VER=${PORTVERSION} \
 		SHLIB_SHVER=${PORTVERSION:R}
 
 QMAKE_ARGS+=	PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
 
-.if ${FLAVOR} == qt4
-DEPRECATED=	Qt4 has been EOL since december 2015
-EXPIRATION_DATE=2019-03-15
-USES+=		qt:4
-USE_QT=		corelib designer gui opengl svg xml moc_build rcc_build script
-.else
-USES+=		compiler:c++11-lang qt:5
-USE_QT=		buildtools_build widgets gui core designer gui opengl svg xml printsupport concurrent
 PLIST_FILES=	${PREFIX}/${QT_PLUGINDIR_REL}/designer/libqwt6_designer_plugin.so
-.endif
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e '/INSTALLS.*doc/d' ${WRKSRC}/doc/doc.pro
-	@${REINPLACE_CMD} -e 's/%%QT_VERSION%%/${FLAVOR:S/qt//}/g' \
+	@${REINPLACE_CMD} -e 's/%%QT_VERSION%%/5/g' \
 			-e 's|%%QT_INCDIR%%|${QT_INCDIR}|g' \
 			-e 's|%%QT_LIBDIR%%|${QT_LIBDIR}|g' \
 			-e 's|%%QT_MKSPECDIR%%|${QT_MKSPECDIR}|g' \

Modified: head/x11/leechcraft/Makefile
==============================================================================
--- head/x11/leechcraft/Makefile	Sat Mar 16 20:40:49 2019	(r495957)
+++ head/x11/leechcraft/Makefile	Sat Mar 16 20:48:15 2019	(r495958)
@@ -3,7 +3,7 @@
 
 PORTNAME=	leechcraft
 PORTVERSION=	0.6.70
-PORTREVISION=	43
+PORTREVISION=	44
 CATEGORIES=	x11
 MASTER_SITES=	http://dist.leechcraft.org/LeechCraft/0.6.70/
 
@@ -16,8 +16,8 @@ LICENSE_FILE=	${WRKDIR}/${DISTNAME}/LICENSE
 DEPRECATED=		Qt4 has been EOL since december 2015
 EXPIRATION_DATE=	2019-03-15
 
-LIB_DEPENDS=	libqwt6.so:x11-toolkits/qwt6@qt4 \
-		libpcre.so:devel/pcre \
+BROKEN=		Missing libqwt6.so:x11-toolkits/qwt6@qt4 
+LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libboost_program_options.so:devel/boost-libs
 
 #LC_REV=		1526-g7fdb92a



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