science/kst2:

- Update to 2018.11.23 snapshot
- Add LICENSE
- Pass additional args to cmake instead of patching CMakeLists.txt

4 files changed, 28 insertions, 27 deletions

diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 9818851a5cb5..63abd5b7e356 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -3,20 +3,22 @@
 
 PORTNAME=	kst
 DISTVERSION=	${KST_VERSION}.${KST_DATE}
-PORTREVISION=	1
 CATEGORIES=	science kde
 
-PATCH_SITES=	https://github.com/KDE/kst-plot/commit/
-PATCHFILES=	de3110c59874.patch:-p1
-
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Data viewing and plotting tool
 
+LICENSE=	GPLv2 GFDL LGPL20
+LICENSE_COMB=	multi
+LICENSE_FILE_GPLv2=	${WRKSRC}/COPYING
+LICENSE_FILE_GFDL=	${WRKSRC}/COPYING-DOCS
+LICENSE_FILE_LGPL20=	${WRKSRC}/COPYING.LGPL
+
 LIB_DEPENDS=	libgsl.so:math/gsl \
 		libtiff.so:graphics/tiff
 
 KST_VERSION=	2.0.8
-KST_DATE=	20180405
+KST_DATE=	20181123
 
 USES=		cmake:outsource desktop-file-utils pkgconfig \
 		shared-mime-info
@@ -28,12 +30,13 @@ USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Kst-plot
-GH_TAGNAME=	6afa76a
+GH_TAGNAME=	c5dddb1
 
-CMAKE_ARGS+=	-Dkst_install_prefix=${PREFIX} \
+CMAKE_ARGS=	-Dkst_install_prefix=${PREFIX} \
 		-Dkst_pch=off \
 		-Dkst_version_string=${KST_VERSION} \
-		-Dkst_revision=${KST_DATE}
+		-Dkst_revision=${KST_DATE} \
+		-DCMAKE_DISABLE_FIND_PACKAGE_Getdata=ON
 
 PLIST_SUB=	SHLIB_VER=${KST_VERSION}
 
@@ -45,13 +48,16 @@ OPTIONS_SUB=	yes
 
 FITS_DESC=	Support for data in FITS format
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
+FITS_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_CFITSIO=ON
 
 MATLAB_DESC=	Support for data in MATLAB format
 MATLAB_LIB_DEPENDS=	libmatio.so:math/matio
+MATLAB_CMAKE_OFF=	-DCMAKE_DISABLE_FIND_PACKAGE_Matio=ON
 
 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
@@ -60,20 +66,4 @@ QT5_USES=	qt:5
 QT5_USE=	${_USE_QT5:S/^/QT=/}
 QT5_CMAKE_ON=	-Dkst_qt5=on
 
-post-patch:
-	${REINPLACE_CMD} -e '/find_package(Getdata)/d' \
-		${CMAKE_SOURCE_PATH}/CMakeLists.txt
-
-post-patch-FITS-off:
-	${REINPLACE_CMD} -e '/find_package(CFITSIO)/d' \
-		${CMAKE_SOURCE_PATH}/CMakeLists.txt
-
-post-patch-MATLAB-off:
-	${REINPLACE_CMD} -e '/find_package(Matio)/d' \
-		${CMAKE_SOURCE_PATH}/CMakeLists.txt
-
-post-patch-NETCDF-off:
-	${REINPLACE_CMD} -e '/find_package(Netcdf)/d' \
-		${CMAKE_SOURCE_PATH}/CMakeLists.txt
-
 .include <bsd.port.mk>
diff --git a/science/kst2/distinfo b/science/kst2/distinfo
index b757b4f9f00a..89c79566b077 100644
--- a/science/kst2/distinfo
+++ b/science/kst2/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1535705578
-SHA256 (Kst-plot-kst-2.0.8.20180405-6afa76a_GH0.tar.gz) = beee92019c0b320c9a4d1e51ce25b8f4783f60baa3a90b1e810c11d48b2bc418
-SIZE (Kst-plot-kst-2.0.8.20180405-6afa76a_GH0.tar.gz) = 18731504
+TIMESTAMP = 1543060711
+SHA256 (Kst-plot-kst-2.0.8.20181123-c5dddb1_GH0.tar.gz) = a590558a3b090cfacf81739daa0cbe28697265b7b93b28801e9a2385d0203ebd
+SIZE (Kst-plot-kst-2.0.8.20181123-c5dddb1_GH0.tar.gz) = 18774842
 SHA256 (de3110c59874.patch) = d3d4a95ad65a680f11efdbbd2f9b0e753f409b84f04c517563eb010856894b22
 SIZE (de3110c59874.patch) = 1131
diff --git a/science/kst2/files/patch-src_libkstapp_shortcutdialog.cpp b/science/kst2/files/patch-src_libkstapp_shortcutdialog.cpp
new file mode 100644
index 000000000000..036c635ca902
--- /dev/null
+++ b/science/kst2/files/patch-src_libkstapp_shortcutdialog.cpp
@@ -0,0 +1,10 @@
+--- src/libkstapp/shortcutdialog.cpp.orig	2018-11-23 19:35:50 UTC
++++ src/libkstapp/shortcutdialog.cpp
+@@ -17,6 +17,7 @@
+ #include <QDebug>
+ #include <QTextEdit>
+ #include <QFile>
++#include <QStyle>
+ 
+ #include <QStringList>
+ 
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index ced5f4f57ccd..31cc5fc0c5ce 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -26,6 +26,7 @@ lib/kst2/plugins/libkst2_dataobject_syncbin.so
 lib/kst2/plugins/libkst2_datasource_ascii.so
 lib/kst2/plugins/libkst2_datasource_bis.so
 %%FITS%%lib/kst2/plugins/libkst2_datasource_fitsimage.so
+lib/kst2/plugins/libkst2_datasource_its.so
 %%MATLAB%%lib/kst2/plugins/libkst2_datasource_matlab.so
 %%NETCDF%%lib/kst2/plugins/libkst2_datasource_netcdf.so
 lib/kst2/plugins/libkst2_datasource_qimagesource.so