From owner-svn-ports-head@freebsd.org Wed Nov 28 12:40:24 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8D111153779; Wed, 28 Nov 2018 12:40:24 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ED8472786; Wed, 28 Nov 2018 12:40:24 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2BEEF24A5; Wed, 28 Nov 2018 12:40:24 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wASCeO79059374; Wed, 28 Nov 2018 12:40:24 GMT (envelope-from makc@FreeBSD.org) Received: (from makc@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wASCeNgO059370; Wed, 28 Nov 2018 12:40:23 GMT (envelope-from makc@FreeBSD.org) Message-Id: <201811281240.wASCeNgO059370@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: makc set sender to makc@FreeBSD.org using -f From: Max Brazhnikov Date: Wed, 28 Nov 2018 12:40:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r486086 - in head/science/kst2: . files X-SVN-Group: ports-head X-SVN-Commit-Author: makc X-SVN-Commit-Paths: in head/science/kst2: . files X-SVN-Commit-Revision: 486086 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4ED8472786 X-Spamd-Result: default: False [1.29 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.42)[0.419,0]; NEURAL_SPAM_MEDIUM(0.36)[0.364,0]; NEURAL_SPAM_LONG(0.51)[0.511,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Nov 2018 12:40:24 -0000 Author: makc Date: Wed Nov 28 12:40:23 2018 New Revision: 486086 URL: https://svnweb.freebsd.org/changeset/ports/486086 Log: science/kst2: - Update to 2018.11.23 snapshot - Add LICENSE - Pass additional args to cmake instead of patching CMakeLists.txt Added: head/science/kst2/files/patch-src_libkstapp_shortcutdialog.cpp (contents, props changed) Modified: head/science/kst2/Makefile head/science/kst2/distinfo head/science/kst2/pkg-plist Modified: head/science/kst2/Makefile ============================================================================== --- head/science/kst2/Makefile Wed Nov 28 09:37:30 2018 (r486085) +++ head/science/kst2/Makefile Wed Nov 28 12:40:23 2018 (r486086) @@ -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 @@ -59,21 +65,5 @@ QT4_USE= ${_USE_QT4:S/^/QT=/} 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 Modified: head/science/kst2/distinfo ============================================================================== --- head/science/kst2/distinfo Wed Nov 28 09:37:30 2018 (r486085) +++ head/science/kst2/distinfo Wed Nov 28 12:40:23 2018 (r486086) @@ -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 Added: head/science/kst2/files/patch-src_libkstapp_shortcutdialog.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/science/kst2/files/patch-src_libkstapp_shortcutdialog.cpp Wed Nov 28 12:40:23 2018 (r486086) @@ -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 + #include + #include ++#include + + #include + Modified: head/science/kst2/pkg-plist ============================================================================== --- head/science/kst2/pkg-plist Wed Nov 28 09:37:30 2018 (r486085) +++ head/science/kst2/pkg-plist Wed Nov 28 12:40:23 2018 (r486086) @@ -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