Index: head/science/kst2/Makefile =================================================================== --- head/science/kst2/Makefile (revision 466755) +++ head/science/kst2/Makefile (revision 466756) @@ -1,65 +1,73 @@ # Created by: Markus Brueffer # $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 FITS_LIB_DEPENDS= libcfitsio.so:astro/cfitsio MATLAB_DESC= Support for data in MATLAB format MATLAB_LIB_DEPENDS= libmatio.so:math/matio NETCDF_DESC= Support for data in NetCDF format (broken) NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf NETCDF_IGNORE= does not support NetCDF 4 TOOLKIT_DESC= Qt toolkit QT4_USE= ${_USE_QT4:S/^/QT4=/} 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' \ ${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 Index: head/science/kst2/distinfo =================================================================== --- head/science/kst2/distinfo (revision 466755) +++ head/science/kst2/distinfo (revision 466756) @@ -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 Index: head/science/kst2/files/patch-git_a9d24f9 =================================================================== --- head/science/kst2/files/patch-git_a9d24f9 (revision 466755) +++ head/science/kst2/files/patch-git_a9d24f9 (nonexistent) @@ -1,106 +0,0 @@ -Backport of: -https://github.com/Kst-plot/kst/commit/a9d24f91057441bbd2e3ed9e7536b071121526cb - -From a9d24f91057441bbd2e3ed9e7536b071121526cb Mon Sep 17 00:00:00 2001 -From: "D. V. Wiebe" -Date: Thu, 10 Mar 2016 14:09:26 -0800 -Subject: [PATCH] GSL-2.x support. - - ---- src/plugins/fits/non_linear.h.orig 2014-02-13 09:41:44 UTC -+++ src/plugins/fits/non_linear.h -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include "common.h" - - struct data { -@@ -100,6 +101,7 @@ bool kstfit_nonlinear( - gsl_multifit_function_fdf function; - gsl_vector_view vectorViewInitial; - gsl_matrix* pMatrixCovariance; -+ gsl_matrix* pMatrixJacobian; - struct data d; - double dXInitial[NUM_PARAMS]; - double* pInputX; -@@ -177,7 +179,16 @@ bool kstfit_nonlinear( - } - iIterations++; - } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); -- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); -+#if GSL_MAJOR_VERSION >= 2 -+ pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS ); -+#else -+ pMatrixJacobian = pSolver->J; -+#endif -+ if ( pMatrixJacobian != NULL ) { -+#if GSL_MAJOR_VERSION >= 2 -+ gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian ); -+#endif -+ gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance ); - - // - // determine the fitted values... -@@ -207,7 +218,10 @@ bool kstfit_nonlinear( - scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); - - bReturn = true; -- -+#if GSL_MAJOR_VERSION >= 2 -+ gsl_matrix_free( pMatrixJacobian ); -+#endif -+ } - gsl_matrix_free( pMatrixCovariance ); - } - gsl_multifit_fdfsolver_free( pSolver ); ---- src/plugins/fits/non_linear_weighted.h.orig 2014-02-13 09:41:44 UTC -+++ src/plugins/fits/non_linear_weighted.h -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - #include "common.h" - - struct data { -@@ -101,6 +102,7 @@ bool kstfit_nonlinear_weighted( - gsl_multifit_function_fdf function; - gsl_vector_view vectorViewInitial; - gsl_matrix* pMatrixCovariance; -+ gsl_matrix* pMatrixJacobian; - struct data d; - double dXInitial[NUM_PARAMS]; - double* pInputs[3]; -@@ -193,7 +195,17 @@ bool kstfit_nonlinear_weighted( - } - while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); - -- gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); -+#if GSL_MAJOR_VERSION >= 2 -+ pMatrixJacobian = gsl_matrix_alloc( iLength, NUM_PARAMS ); -+#else -+ pMatrixJacobian = pSolver->J; -+#endif -+ -+ if ( pMatrixJacobian != NULL ) { -+#if GSL_MAJOR_VERSION >= 2 -+ gsl_multifit_fdfsolver_jac( pSolver, pMatrixJacobian ); -+#endif -+ gsl_multifit_covar( pMatrixJacobian, 0.0, pMatrixCovariance ); - - // - // determine the fitted values... -@@ -223,7 +235,10 @@ bool kstfit_nonlinear_weighted( - scalarOutChi->setValue(gsl_blas_dnrm2( pSolver->f )); - - bReturn = true; -- -+#if GSL_VERSION_MAJOR >= 2 -+ gsl_matrix_free( pMatrixJacobian ); -+#endif -+ } - gsl_matrix_free( pMatrixCovariance ); - } - gsl_multifit_fdfsolver_free( pSolver ); Property changes on: head/science/kst2/files/patch-git_a9d24f9 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/science/kst2/files/patch-CMakeLists.txt =================================================================== --- head/science/kst2/files/patch-CMakeLists.txt (revision 466755) +++ head/science/kst2/files/patch-CMakeLists.txt (revision 466756) @@ -1,26 +1,27 @@ ---- 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 -if(kst_verbose) - set(CMAKE_VERBOSE_MAKEFILE 1) -else() - 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) Index: head/science/kst2/files/patch-src__kst__CMakeLists.txt =================================================================== --- head/science/kst2/files/patch-src__kst__CMakeLists.txt (revision 466755) +++ head/science/kst2/files/patch-src__kst__CMakeLists.txt (revision 466756) @@ -1,23 +1,13 @@ ---- 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}) - install(CODE "execute_process(COMMAND gzip ${man})") - 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 @@ - # ${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 Index: head/science/kst2/pkg-plist =================================================================== --- head/science/kst2/pkg-plist (revision 466755) +++ head/science/kst2/pkg-plist (revision 466756) @@ -1,90 +1,82 @@ 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 lib/kst2/plugins/libkst2_dataobject_convolution_deconvolve.so 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_effectivebandwidth.so lib/kst2/plugins/libkst2_dataobject_genericfilter.so lib/kst2/plugins/libkst2_dataobject_interpolations_akima.so lib/kst2/plugins/libkst2_dataobject_interpolations_akimaperiodic.so lib/kst2/plugins/libkst2_dataobject_interpolations_cspline.so lib/kst2/plugins/libkst2_dataobject_interpolations_csplineperiodic.so lib/kst2/plugins/libkst2_dataobject_interpolations_linear.so lib/kst2/plugins/libkst2_dataobject_interpolations_polynomial.so lib/kst2/plugins/libkst2_dataobject_linefit.so lib/kst2/plugins/libkst2_dataobject_lockin.so lib/kst2/plugins/libkst2_dataobject_noiseaddition.so lib/kst2/plugins/libkst2_dataobject_periodogram.so lib/kst2/plugins/libkst2_dataobject_phase.so 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 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_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 lib/kst2/plugins/libkst2_fits_gaussian_weighted.so lib/kst2/plugins/libkst2_fits_gradient_unweighted.so lib/kst2/plugins/libkst2_fits_gradient_weighted.so lib/kst2/plugins/libkst2_fits_kneefrequency.so lib/kst2/plugins/libkst2_fits_linear_unweighted.so lib/kst2/plugins/libkst2_fits_linear_weighted.so lib/kst2/plugins/libkst2_fits_lorentzian_unweighted.so lib/kst2/plugins/libkst2_fits_lorentzian_weighted.so lib/kst2/plugins/libkst2_fits_polynomial_unweighted.so lib/kst2/plugins/libkst2_fits_polynomial_weighted.so lib/kst2/plugins/libkst2_fits_sinusoid_unweighted.so lib/kst2/plugins/libkst2_fits_sinusoid_weighted.so lib/libkst2app.a lib/libkst2core.so lib/libkst2core.so.2 lib/libkst2core.so.%%SHLIB_VER%% lib/libkst2math.so lib/libkst2math.so.2 lib/libkst2math.so.%%SHLIB_VER%% lib/libkst2widgets.so 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