5 files changed, 25 insertions, 16 deletions

diff --git a/science/kst2/Makefile b/science/kst2/Makefile
index 2af1273bcdc0..e64b356d829e 100644
--- a/science/kst2/Makefile
+++ b/science/kst2/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	kst
-# Date created:			Fri Apr 30 17:28:56 CEST 2004
-# Whom:				Markus Brueffer <markus@FreeBSD.org>
-#
+# Created by: Markus Brueffer <markus@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	kst
-DISTVERSION=	2.0.5
-PORTREVISION=	1
+DISTVERSION=	2.0.6
 CATEGORIES=	science kde
 MASTER_SITES=	SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/
 
@@ -29,9 +25,10 @@ CMAKE_ARGS+=	-Dkst_install_prefix=${PREFIX}
 MAN1=		kst2.1
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
-OPTIONS_DEFINE=	FITS NETCDF
+OPTIONS_DEFINE=	FITS MATLAB NETCDF
 
 FITS_DESC=	Support for data in FITS format
+MATLAB_DESC=	Support for data in MATLAB format
 NETCDF_DESC=	Support for data in NetCDF format
 
 .include <bsd.port.options.mk>
@@ -43,6 +40,13 @@ PLIST_SUB+=	FITS=""
 PLIST_SUB+=	FITS="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MMATLAB}
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libmatio.a:${PORTSDIR}/math/matio
+PLIST_SUB+=	MATLAB=""
+.else
+PLIST_SUB+=	MATLAB="@comment "
+.endif
+
 .if ${PORT_OPTIONS:MNETCDF}
 LIB_DEPENDS+=	netcdf.4:${PORTSDIR}/science/netcdf
 PLIST_SUB+=	NETCDF=""
@@ -59,6 +63,10 @@ pre-configure:
 	${REINPLACE_CMD} -e '/find_package(CFITSIO)/d' \
 		${CMAKE_SOURCE_PATH}/CMakeLists.txt
 .endif
+.if !${PORT_OPTIONS:MMATLAB}
+	${REINPLACE_CMD} -e '/find_package(Matio)/d' \
+		${CMAKE_SOURCE_PATH}/CMakeLists.txt
+.endif
 .if !${PORT_OPTIONS:MNETCDF}
 	${REINPLACE_CMD} -e '/find_package(Netcdf)/d' \
 		${CMAKE_SOURCE_PATH}/CMakeLists.txt
diff --git a/science/kst2/distinfo b/science/kst2/distinfo
index 3bb7e9c78c1b..dfb2ff6891e8 100644
--- a/science/kst2/distinfo
+++ b/science/kst2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (kst-2.0.5.tar.gz) = f64b0c44e2728afbb0a1c6fcf2fe792c9e412f1c8f15f882670463431cca353a
-SIZE (kst-2.0.5.tar.gz) = 11398465
+SHA256 (kst-2.0.6.tar.gz) = 7968e604a188065d02da48a9a971fb04afab4b4b5358315b09e66f3deab1b80f
+SIZE (kst-2.0.6.tar.gz) = 11388226
diff --git a/science/kst2/files/patch-cmake__CMakeLists.txt b/science/kst2/files/patch-cmake__CMakeLists.txt
index dba8d813ca73..6a9952916306 100644
--- a/science/kst2/files/patch-cmake__CMakeLists.txt
+++ b/science/kst2/files/patch-cmake__CMakeLists.txt
@@ -17,7 +17,7 @@
  else()
  	set(kst_version_minor 0)
 -	set(kst_version_patch x)
-+	set(kst_version_patch 5)
++	set(kst_version_patch 6)
  	set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
  endif()
  
diff --git a/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt b/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt
index 7c8375defb87..7b29aa86d2dc 100644
--- a/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt
+++ b/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt
@@ -1,17 +1,17 @@
---- ./cmake/src/kst/CMakeLists.txt.orig	2011-09-12 15:34:28.000000000 +0000
-+++ ./cmake/src/kst/CMakeLists.txt	2011-10-15 00:36:57.039906521 +0000
-@@ -37,9 +37,7 @@
+--- ./cmake/src/kst/CMakeLists.txt.orig	2012-08-05 15:16:15.233405189 +0000
++++ ./cmake/src/kst/CMakeLists.txt	2012-08-05 15:17:39.675406925 +0000
+@@ -38,9 +38,7 @@
  if(UNIX AND NOT APPLE)
  	set(man ${CMAKE_BINARY_DIR}/${kst_binary_name}.1)
  	configure_file(${kst_dir}/src/kst/kst.1.txt ${man})
 -	install(CODE "execute_process(COMMAND gzip ${man})")
--	set_source_files_properties(${man}.gz PROPERTIES GENERATED TRUE) 
+-	set_source_files_properties(${man}.gz PROPERTIES GENERATED TRUE)
 -	install(FILES ${man}.gz DESTINATION share/man/man1)
 +	install(FILES ${man} DESTINATION man/man1)
- 	
+ 
  	set(k ${kst_dir}/src/kst)
  #	install(FILES ${k}/kstplugin.desktop
-@@ -49,8 +47,7 @@
+@@ -50,8 +48,7 @@
  #	              ${k}/kstfilter.desktop
  #	              ${k}/kstextension.desktop
  #	                                 DESTINATION share/servicetypes/kst)
diff --git a/science/kst2/pkg-plist b/science/kst2/pkg-plist
index e1edc5d66e72..4d427b079e30 100644
--- a/science/kst2/pkg-plist
+++ b/science/kst2/pkg-plist
@@ -25,6 +25,7 @@ lib/kst2/plugins/libkst2_dataobject_statistics.so
 lib/kst2/plugins/libkst2_dataobject_syncbin.so
 lib/kst2/plugins/libkst2_datasource_ascii.so
 %%FITS%%lib/kst2/plugins/libkst2_datasource_fitsimage.so
+%%MATLAB%%lib/kst2/plugins/libkst2_datasource_matlab.so
 %%NETCDF%%lib/kst2/plugins/libkst2_datasource_netcdf.so
 lib/kst2/plugins/libkst2_datasource_qimagesource.so
 lib/kst2/plugins/libkst2_datasource_sampledatasource.so