svn commit: r372255 - in head/science/kst2: . files

Max Brazhnikov makc at FreeBSD.org
Fri Nov 7 11:42:32 UTC 2014 

Author: makc
Date: Fri Nov  7 11:42:30 2014
New Revision: 372255
URL: https://svnweb.freebsd.org/changeset/ports/372255
QAT: https://qat.redports.org/buildarchive/r372255/

Log:
  science/kst2:
  - Update to 2.0.8
  - Remove now needless patches
  - Add option for building with Qt 5

Added:
  head/science/kst2/files/patch-CMakeLists.txt
     - copied, changed from r372239, head/science/kst2/files/patch-cmake__CMakeLists.txt
  head/science/kst2/files/patch-src__kst__CMakeLists.txt
     - copied, changed from r371080, head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt
Deleted:
  head/science/kst2/files/patch-cmake__CMakeLists.txt
  head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt
  head/science/kst2/files/patch-src__datasources__ascii__kst_atof.cpp
  head/science/kst2/files/patch-src__libkst__ksttimezone.h
  head/science/kst2/files/patch-src__libkstapp__logdialog.h
Modified:
  head/science/kst2/Makefile
  head/science/kst2/distinfo
  head/science/kst2/pkg-plist

Modified: head/science/kst2/Makefile
==============================================================================
--- head/science/kst2/Makefile	Fri Nov  7 11:42:04 2014	(r372254)
+++ head/science/kst2/Makefile	Fri Nov  7 11:42:30 2014	(r372255)
@@ -2,28 +2,32 @@
 # $FreeBSD$
 
 PORTNAME=	kst
-DISTVERSION=	2.0.6
-PORTREVISION=	7
+DISTVERSION=	2.0.8
 CATEGORIES=	science kde
 MASTER_SITES=	SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/
+DISTNAME=	Kst-${DISTVERSION}
 
 MAINTAINER=	makc at FreeBSD.org
 COMMENT=	Data viewing and plotting tool
 
 LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
 
-USES=		cmake pkgconfig
-USE_QT4=	gui xml designer svg opengl \
+USES=		cmake:outsource pkgconfig
+_USE_QT4=	gui xml designer svg linguist_build \
 		qmake_build moc_build rcc_build uic_build
+_USE_QT5=	concurrent network printsupport widgets xml \
+		buildtools_build linguisttools_build qmake_build
 USE_LDCONFIG=	yes
 
-CMAKE_SOURCE_PATH=	${WRKSRC}/cmake
 CMAKE_ARGS+=	-Dkst_install_prefix=${PREFIX} \
 		-Dkst_pch=off
 
 PLIST_SUB=	SHLIB_VER=${PORTVERSION}
 
 OPTIONS_DEFINE=	FITS MATLAB NETCDF
+OPTIONS_SINGLE=	TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
+OPTIONS_DEFAULT=	QT4
 OPTIONS_SUB=	yes
 
 FITS_DESC=	Support for data in FITS format
@@ -35,6 +39,11 @@ MATLAB_LIB_DEPENDS=	libmatio.so:${PORTSD
 NETCDF_DESC=	Support for data in NetCDF format
 NETCDF_LIB_DEPENDS=	libnetcdf.so:${PORTSDIR}/science/netcdf
 
+TOOLKIT_DESC=	Qt toolkit
+QT4_USE=	${_USE_QT4:S/^/QT4=/}
+QT5_USE=	${_USE_QT5:S/^/QT5=/}
+QT5_CMAKE_ON=	-Dkst_qt5=on
+
 .include <bsd.port.options.mk>
 
 post-patch:

Modified: head/science/kst2/distinfo
==============================================================================
--- head/science/kst2/distinfo	Fri Nov  7 11:42:04 2014	(r372254)
+++ head/science/kst2/distinfo	Fri Nov  7 11:42:30 2014	(r372255)
@@ -1,2 +1,2 @@
-SHA256 (kst-2.0.6.tar.gz) = 7968e604a188065d02da48a9a971fb04afab4b4b5358315b09e66f3deab1b80f
-SIZE (kst-2.0.6.tar.gz) = 11388226
+SHA256 (Kst-2.0.8.tar.gz) = cefbfd3e3710771985e08f02a397ef8ab407168fa8415d2c3c5740c031af18c6
+SIZE (Kst-2.0.8.tar.gz) = 14527129

Copied and modified: head/science/kst2/files/patch-CMakeLists.txt (from r372239, head/science/kst2/files/patch-cmake__CMakeLists.txt)
==============================================================================
--- head/science/kst2/files/patch-cmake__CMakeLists.txt	Thu Nov  6 20:51:41 2014	(r372239, copy source)
+++ head/science/kst2/files/patch-CMakeLists.txt	Fri Nov  7 11:42:30 2014	(r372255)
@@ -1,63 +1,26 @@
---- ./cmake/CMakeLists.txt.orig	2012-05-11 22:16:54.000000000 +0000
-+++ ./cmake/CMakeLists.txt	2012-05-13 16:13:25.632207723 +0000
-@@ -41,19 +41,12 @@
- message(STATUS)
+--- CMakeLists.txt.orig	2014-07-20 09:38:16 UTC
++++ CMakeLists.txt
+@@ -64,11 +64,6 @@
+ project(Kst)
  
  
 -if(kst_release)
--	set(CMAKE_BUILD_TYPE Release)
+-    set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE)
 -else()
--	set(CMAKE_BUILD_TYPE Debug)
+-    set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE)
 -endif()
--
--
- set(kst_version_major 2)
- if(kst_version_string)
- 	set(kst_version ${kst_version_string})
- else()
- 	set(kst_version_minor 0)
--	set(kst_version_patch x)
-+	set(kst_version_patch 6)
- 	set(kst_version ${kst_version_major}.${kst_version_minor}.${kst_version_patch})
- endif()
  
-@@ -133,11 +126,6 @@
+ 
+ if(kst_sanitize)
+@@ -226,11 +219,6 @@
  # React on options
  
  
 -if(kst_verbose)
--	set(CMAKE_VERBOSE_MAKEFILE 1)
+-    set(CMAKE_VERBOSE_MAKEFILE 1)
 -else()
--	set(CMAKE_VERBOSE_MAKEFILE 0)
+-    set(CMAKE_VERBOSE_MAKEFILE 0)
 -endif()
  
  if(kst_install_prefix)
- 	set(CMAKE_INSTALL_PREFIX ${kst_install_prefix} CACHE PATH "User's choice for install prefix" FORCE)
-@@ -161,7 +149,7 @@
- endif()
- 
- #path to install the .desktop files
--set(kst_install_plugin_desktop_file_path share/services/kst)
-+set(kst_install_plugin_desktop_file_path share/services/kst2)
- 
- 
- 
-@@ -210,7 +198,9 @@
- 
- configure_file(${kst_dir}/cmake/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
- 
--include_directories(${CMAKE_BINARY_DIR} ${QT_INCLUDES})
-+find_package(OpenGL)
-+
-+include_directories(${CMAKE_BINARY_DIR} ${QT_INCLUDES} ${OPENGL_INCLUDE_DIR})
- 
- message(STATUS "Build summary----------------------------------")
- message(STATUS)
-@@ -236,7 +226,6 @@
- endif()
- 
- if (NOT APPLE)
--	add_subdirectory(misc)
- endif()
- 
- if(kst_python)
+     set(CMAKE_INSTALL_PREFIX ${kst_install_prefix} CACHE PATH "User's choice for install prefix" FORCE)

Copied and modified: head/science/kst2/files/patch-src__kst__CMakeLists.txt (from r371080, head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt)
==============================================================================
--- head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt	Fri Oct 17 21:14:58 2014	(r371080, copy source)
+++ head/science/kst2/files/patch-src__kst__CMakeLists.txt	Fri Nov  7 11:42:30 2014	(r372255)
@@ -1,6 +1,6 @@
---- ./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 @@
+--- src/kst/CMakeLists.txt.orig	2014-04-07 16:11:03 UTC
++++ src/kst/CMakeLists.txt
+@@ -37,9 +37,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})
@@ -11,7 +11,7 @@
  
  	set(k ${kst_dir}/src/kst)
  #	install(FILES ${k}/kstplugin.desktop
-@@ -50,8 +48,7 @@
+@@ -49,8 +47,7 @@
  #	              ${k}/kstfilter.desktop
  #	              ${k}/kstextension.desktop
  #	                                 DESTINATION share/servicetypes/kst)

Modified: head/science/kst2/pkg-plist
==============================================================================
--- head/science/kst2/pkg-plist	Fri Nov  7 11:42:04 2014	(r372254)
+++ head/science/kst2/pkg-plist	Fri Nov  7 11:42:30 2014	(r372255)
@@ -1,4 +1,5 @@
 bin/kst2
+lib/kst2/plugins/libkst2_dataobject_activitylevel.so
 lib/kst2/plugins/libkst2_dataobject_bin.so
 lib/kst2/plugins/libkst2_dataobject_chop.so
 lib/kst2/plugins/libkst2_dataobject_convolution_convolve.so
@@ -6,7 +7,6 @@ lib/kst2/plugins/libkst2_dataobject_conv
 lib/kst2/plugins/libkst2_dataobject_correlation_autocorrelation.so
 lib/kst2/plugins/libkst2_dataobject_correlation_crosscorrelation.so
 lib/kst2/plugins/libkst2_dataobject_crossspectrum.so
-lib/kst2/plugins/libkst2_dataobject_differentiation.so
 lib/kst2/plugins/libkst2_dataobject_effectivebandwidth.so
 lib/kst2/plugins/libkst2_dataobject_genericfilter.so
 lib/kst2/plugins/libkst2_dataobject_interpolations_akima.so
@@ -29,13 +29,16 @@ lib/kst2/plugins/libkst2_datasource_asci
 %%NETCDF%%lib/kst2/plugins/libkst2_datasource_netcdf.so
 lib/kst2/plugins/libkst2_datasource_qimagesource.so
 lib/kst2/plugins/libkst2_datasource_sampledatasource.so
+lib/kst2/plugins/libkst2_datasource_sourcelist.so
 lib/kst2/plugins/libkst2_filters_butterworth_bandpass.so
 lib/kst2/plugins/libkst2_filters_butterworth_bandstop.so
 lib/kst2/plugins/libkst2_filters_butterworth_highpass.so
 lib/kst2/plugins/libkst2_filters_butterworth_lowpass.so
+lib/kst2/plugins/libkst2_filters_cumulativeaverage.so
 lib/kst2/plugins/libkst2_filters_cumulativesum.so
 lib/kst2/plugins/libkst2_filters_despike.so
 lib/kst2/plugins/libkst2_filters_differentiation.so
+lib/kst2/plugins/libkst2_filters_unwind.so
 lib/kst2/plugins/libkst2_fits_exponential_unweighted.so
 lib/kst2/plugins/libkst2_fits_exponential_weighted.so
 lib/kst2/plugins/libkst2_fits_gaussian_unweighted.so
@@ -73,20 +76,15 @@ share/icons/hicolor/64x64/apps/applicati
 share/icons/hicolor/64x64/apps/kst.png
 share/icons/hicolor/scalable/apps/application-x-kst.svg
 share/icons/hicolor/scalable/apps/kst.svg
+%%DATADIR%%/locale/kst_common_ca.qm
+%%DATADIR%%/locale/kst_common_ca at valencia.qm
+%%DATADIR%%/locale/kst_common_de.qm
+%%DATADIR%%/locale/kst_common_en_GB.qm
+%%DATADIR%%/locale/kst_common_fr.qm
+%%DATADIR%%/locale/kst_common_nl.qm
+%%DATADIR%%/locale/kst_common_pl.qm
+%%DATADIR%%/locale/kst_common_pt.qm
+%%DATADIR%%/locale/kst_common_pt_BR.qm
+%%DATADIR%%/locale/kst_common_sv.qm
+%%DATADIR%%/locale/kst_common_uk.qm
 share/mimelnk/application/x-kst2.desktop
- at dirrmtry share/mimelnk/application
- at dirrmtry share/mimelnk
- at dirrmtry share/icons/hicolor/scalable/apps
- at dirrmtry share/icons/hicolor/scalable
- at dirrmtry share/icons/hicolor/64x64/apps
- at dirrmtry share/icons/hicolor/64x64
- at dirrmtry share/icons/hicolor/48x48/apps
- at dirrmtry share/icons/hicolor/48x48
- at dirrmtry share/icons/hicolor/32x32/apps
- at dirrmtry share/icons/hicolor/32x32
- at dirrmtry share/icons/hicolor/128x128/apps
- at dirrmtry share/icons/hicolor/128x128
- at dirrmtry share/icons/hicolor
- at dirrmtry share/icons
- at dirrm lib/kst2/plugins
- at dirrm lib/kst2

More information about the svn-ports-all mailing list