From owner-svn-ports-all@FreeBSD.ORG Thu Oct 11 11:25:20 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0C486A84; Thu, 11 Oct 2012 11:25:20 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DDD7C8FC12; Thu, 11 Oct 2012 11:25:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9BBPJ4u014314; Thu, 11 Oct 2012 11:25:19 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9BBPJ9X014307; Thu, 11 Oct 2012 11:25:19 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201210111125.q9BBPJ9X014307@svn.freebsd.org> From: Max Brazhnikov Date: Thu, 11 Oct 2012 11:25:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r305711 - in head/science/kst2: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 11 Oct 2012 11:25:20 -0000 Author: makc Date: Thu Oct 11 11:25:19 2012 New Revision: 305711 URL: http://svn.freebsd.org/changeset/ports/305711 Log: Update to 2.0.6 Add optional support for Matlab files via math/matio Trip Makefile header Feature safe: yes Modified: head/science/kst2/Makefile head/science/kst2/distinfo (contents, props changed) head/science/kst2/files/patch-cmake__CMakeLists.txt (contents, props changed) head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt (contents, props changed) head/science/kst2/pkg-plist (contents, props changed) Modified: head/science/kst2/Makefile ============================================================================== --- head/science/kst2/Makefile Thu Oct 11 11:02:27 2012 (r305710) +++ head/science/kst2/Makefile Thu Oct 11 11:25:19 2012 (r305711) @@ -1,12 +1,8 @@ -# New ports collection makefile for: kst -# Date created: Fri Apr 30 17:28:56 CEST 2004 -# Whom: Markus Brueffer -# +# Created by: Markus Brueffer # $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=${PREF 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 @@ -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 Modified: head/science/kst2/distinfo ============================================================================== --- head/science/kst2/distinfo Thu Oct 11 11:02:27 2012 (r305710) +++ head/science/kst2/distinfo Thu Oct 11 11:25:19 2012 (r305711) @@ -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 Modified: head/science/kst2/files/patch-cmake__CMakeLists.txt ============================================================================== --- head/science/kst2/files/patch-cmake__CMakeLists.txt Thu Oct 11 11:02:27 2012 (r305710) +++ head/science/kst2/files/patch-cmake__CMakeLists.txt Thu Oct 11 11:25:19 2012 (r305711) @@ -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() Modified: head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt ============================================================================== --- head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt Thu Oct 11 11:02:27 2012 (r305710) +++ head/science/kst2/files/patch-cmake__src__kst__CMakeLists.txt Thu Oct 11 11:25:19 2012 (r305711) @@ -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) Modified: head/science/kst2/pkg-plist ============================================================================== --- head/science/kst2/pkg-plist Thu Oct 11 11:02:27 2012 (r305710) +++ head/science/kst2/pkg-plist Thu Oct 11 11:25:19 2012 (r305711) @@ -25,6 +25,7 @@ lib/kst2/plugins/libkst2_dataobject_stat 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