Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 16 Mar 2019 17:54:46 +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: r495927 - head/science/kst2
Message-ID:  <201903161754.x2GHskCm042124@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tcberner
Date: Sat Mar 16 17:54:45 2019
New Revision: 495927
URL: https://svnweb.freebsd.org/changeset/ports/495927

Log:
  science/kst2: remove QT4/QT5 options (Qt4 deprecation)
  
  Approved by:	portmgr (implicit)

Modified:
  head/science/kst2/Makefile

Modified: head/science/kst2/Makefile
==============================================================================
--- head/science/kst2/Makefile	Sat Mar 16 17:53:54 2019	(r495926)
+++ head/science/kst2/Makefile	Sat Mar 16 17:54:45 2019	(r495927)
@@ -3,7 +3,7 @@
 
 PORTNAME=	kst
 DISTVERSION=	${KST_VERSION}.${KST_DATE}
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science kde
 
 MAINTAINER=	makc@FreeBSD.org
@@ -21,11 +21,9 @@ LIB_DEPENDS=	libgsl.so:math/gsl \
 KST_VERSION=	2.0.8
 KST_DATE=	20181123
 
-USES=		cmake desktop-file-utils pkgconfig \
-		shared-mime-info
-_USE_QT4=	corelib gui xml designer network svg linguisttools_build \
-		qmake_build moc_build rcc_build uic_build
-_USE_QT5=	concurrent core gui network printsupport svg widgets xml \
+USES=		cmake compiler:c++11-lang desktop-file-utils pkgconfig \
+		qt:5 shared-mime-info
+USE_QT=		concurrent core gui network printsupport svg widgets xml \
 		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
@@ -37,14 +35,12 @@ CMAKE_ARGS=	-Dkst_install_prefix=${PREFIX} \
 		-Dkst_pch=off \
 		-Dkst_version_string=${KST_VERSION} \
 		-Dkst_revision=${KST_DATE} \
-		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON \
+		-Dkst_qt5=on
 
 PLIST_SUB=	SHLIB_VER=${KST_VERSION}
 
 OPTIONS_DEFINE=	FITS MATLAB NETCDF
-OPTIONS_SINGLE=	TOOLKIT
-OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
-OPTIONS_DEFAULT=	QT5
 OPTIONS_SUB=	yes
 
 FITS_DESC=	Support for data in FITS format
@@ -59,19 +55,5 @@ NETCDF_DESC=	Support for data in NetCDF format (broken
 NETCDF_LIB_DEPENDS=	libnetcdf.so:science/netcdf
 NETCDF_IGNORE=	does not support NetCDF 4
 NETCDF_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Netcdf=ON
-
-TOOLKIT_DESC=	Qt toolkit
-QT4_USES=	qt:4
-QT4_USE=	${_USE_QT4:S/^/QT=/}
-QT5_USES=	compiler:c++11-lang qt:5
-QT5_USE=	${_USE_QT5:S/^/QT=/}
-QT5_CMAKE_ON=	-Dkst_qt5=on
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MQT4}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
 
 .include <bsd.port.mk>



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