Date: Sat, 7 Apr 2018 16:40:02 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r466756 - in head/science/kst2: . files Message-ID: <201804071640.w37Ge2QB069782@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Sat Apr 7 16:40:01 2018 New Revision: 466756 URL: https://svnweb.freebsd.org/changeset/ports/466756 Log: science/kst2: - Switch to GITHUB and update to 2018.04.05 snapshot - Remove stale patch - Build Qt 5 version by default - Take maintainership Deleted: head/science/kst2/files/patch-git_a9d24f9 Modified: head/science/kst2/Makefile head/science/kst2/distinfo head/science/kst2/files/patch-CMakeLists.txt head/science/kst2/files/patch-src__kst__CMakeLists.txt head/science/kst2/pkg-plist Modified: head/science/kst2/Makefile ============================================================================== --- head/science/kst2/Makefile Sat Apr 7 16:35:18 2018 (r466755) +++ head/science/kst2/Makefile Sat Apr 7 16:40:01 2018 (r466756) @@ -2,33 +2,41 @@ # $FreeBSD$ PORTNAME= kst -DISTVERSION= 2.0.8 -PORTREVISION= 3 +DISTVERSION= ${KST_VERSION}.${KST_DATE} CATEGORIES= science kde -MASTER_SITES= SF/${PORTNAME}/Kst%20${DISTVERSION:C/-r.*//}/ -DISTNAME= Kst-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= makc@FreeBSD.org COMMENT= Data viewing and plotting tool -LIB_DEPENDS= libgsl.so:math/gsl +LIB_DEPENDS= libgsl.so:math/gsl \ + libtiff.so:graphics/tiff -USES= cmake:outsource pkgconfig +KST_VERSION= 2.0.8 +KST_DATE= 20180405 + +USES= cmake:outsource desktop-file-utils pkgconfig \ + shared-mime-info _USE_QT4= gui xml designer svg linguisttools_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 +USE_GITHUB= yes +GH_ACCOUNT= Kst-plot +GH_TAGNAME= 6afa76a + CMAKE_ARGS+= -Dkst_install_prefix=${PREFIX} \ - -Dkst_pch=off + -Dkst_pch=off \ + -Dkst_version_string=${KST_VERSION} \ + -Dkst_revision=${KST_DATE} -PLIST_SUB= SHLIB_VER=${PORTVERSION} +PLIST_SUB= SHLIB_VER=${KST_VERSION} OPTIONS_DEFINE= FITS MATLAB NETCDF OPTIONS_SINGLE= TOOLKIT OPTIONS_SINGLE_TOOLKIT= QT4 QT5 -OPTIONS_DEFAULT= QT4 +OPTIONS_DEFAULT= QT5 OPTIONS_SUB= yes FITS_DESC= Support for data in FITS format @@ -47,8 +55,8 @@ QT5_USE= ${_USE_QT5:S/^/QT5=/} QT5_CMAKE_ON= -Dkst_qt5=on post-patch: - ${REINPLACE_CMD} -e '/^Exec=kst2/s,\(kst2\).*,\1 %f,' \ - ${WRKSRC}/src/kst/kst2.desktop + ${REINPLACE_CMD} -e '/find_package(Getdata)/d' \ + ${CMAKE_SOURCE_PATH}/CMakeLists.txt post-patch-FITS-off: ${REINPLACE_CMD} -e '/find_package(CFITSIO)/d' \ Modified: head/science/kst2/distinfo ============================================================================== --- head/science/kst2/distinfo Sat Apr 7 16:35:18 2018 (r466755) +++ head/science/kst2/distinfo Sat Apr 7 16:40:01 2018 (r466756) @@ -1,2 +1,3 @@ -SHA256 (Kst-2.0.8.tar.gz) = cefbfd3e3710771985e08f02a397ef8ab407168fa8415d2c3c5740c031af18c6 -SIZE (Kst-2.0.8.tar.gz) = 14527129 +TIMESTAMP = 1523062184 +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 Modified: head/science/kst2/files/patch-CMakeLists.txt ============================================================================== --- head/science/kst2/files/patch-CMakeLists.txt Sat Apr 7 16:35:18 2018 (r466755) +++ head/science/kst2/files/patch-CMakeLists.txt Sat Apr 7 16:40:01 2018 (r466756) @@ -1,18 +1,19 @@ ---- CMakeLists.txt.orig 2014-07-20 09:38:16 UTC +--- CMakeLists.txt.orig 2018-04-05 13:33:30 UTC +++ CMakeLists.txt -@@ -64,11 +64,6 @@ +@@ -72,12 +72,6 @@ endif() project(Kst) -if(kst_release) - set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type" FORCE) +- set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_WARNING_OUTPUT") -else() - set(CMAKE_BUILD_TYPE Debug CACHE STRING "Build type" FORCE) -endif() if(kst_sanitize) -@@ -226,11 +219,6 @@ +@@ -239,11 +233,6 @@ message(STATUS) # React on options Modified: head/science/kst2/files/patch-src__kst__CMakeLists.txt ============================================================================== --- head/science/kst2/files/patch-src__kst__CMakeLists.txt Sat Apr 7 16:35:18 2018 (r466755) +++ head/science/kst2/files/patch-src__kst__CMakeLists.txt Sat Apr 7 16:40:01 2018 (r466756) @@ -1,6 +1,6 @@ ---- src/kst/CMakeLists.txt.orig 2014-04-07 16:11:03 UTC +--- src/kst/CMakeLists.txt.orig 2018-04-05 13:33:30 UTC +++ src/kst/CMakeLists.txt -@@ -37,9 +37,7 @@ +@@ -37,9 +37,7 @@ kst_install_executable() 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,13 +11,3 @@ set(k ${kst_dir}/src/kst) # install(FILES ${k}/kstplugin.desktop -@@ -49,8 +47,7 @@ - # ${k}/kstfilter.desktop - # ${k}/kstextension.desktop - # DESTINATION share/servicetypes/kst) -- install(FILES ${k}/kst2.desktop DESTINATION share/applnk/Graphics) -- install(FILES ${k}/x-kst2.desktop DESTINATION share/mimelink/application) -+ install(FILES ${k}/x-kst2.desktop DESTINATION share/mimelnk/application) - install(FILES ${k}/kst2.desktop DESTINATION share/applications) - - # icons Modified: head/science/kst2/pkg-plist ============================================================================== --- head/science/kst2/pkg-plist Sat Apr 7 16:35:18 2018 (r466755) +++ head/science/kst2/pkg-plist Sat Apr 7 16:40:01 2018 (r466756) @@ -24,12 +24,13 @@ lib/kst2/plugins/libkst2_dataobject_shift.so lib/kst2/plugins/libkst2_dataobject_statistics.so 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 %%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 lib/kst2/plugins/libkst2_datasource_sourcelist.so +lib/kst2/plugins/libkst2_datasource_tiff16source.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 @@ -38,7 +39,9 @@ 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_flag.so lib/kst2/plugins/libkst2_filters_unwind.so +lib/kst2/plugins/libkst2_filters_window.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 @@ -66,25 +69,14 @@ lib/libkst2widgets.so.2 lib/libkst2widgets.so.%%SHLIB_VER%% man/man1/kst2.1.gz share/applications/kst2.desktop -share/icons/hicolor/128x128/apps/application-x-kst.png share/icons/hicolor/128x128/apps/kst.png -share/icons/hicolor/32x32/apps/application-x-kst.png +share/icons/hicolor/128x128/mimetypes/application-x-kst.png share/icons/hicolor/32x32/apps/kst.png -share/icons/hicolor/48x48/apps/application-x-kst.png +share/icons/hicolor/32x32/mimetypes/application-x-kst.png share/icons/hicolor/48x48/apps/kst.png -share/icons/hicolor/64x64/apps/application-x-kst.png +share/icons/hicolor/48x48/mimetypes/application-x-kst.png share/icons/hicolor/64x64/apps/kst.png -share/icons/hicolor/scalable/apps/application-x-kst.svg +share/icons/hicolor/64x64/mimetypes/application-x-kst.png share/icons/hicolor/scalable/apps/kst.svg -%%DATADIR%%/locale/kst_common_ca.qm -%%DATADIR%%/locale/kst_common_ca@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 +share/icons/hicolor/scalable/mimetypes/application-x-kst.svg +share/mime/packages/x-kst.xml
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201804071640.w37Ge2QB069782>