Index: head/math/labplot/Makefile =================================================================== --- head/math/labplot/Makefile +++ head/math/labplot/Makefile @@ -2,33 +2,40 @@ # $FreeBSD$ PORTNAME= labplot -PORTVERSION= 2.0.1 -PORTREVISION= 5 +PORTVERSION= 2.3.0 +DISTVERSIONSUFFIX=-kf5 CATEGORIES= math kde -MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:R}.0 +MASTER_SITES= KDE/stable/${PORTNAME}/${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= kde@FreeBSD.org COMMENT= Data plotting and function analysis tool for KDE -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgsl.so:math/gsl -USES= cmake kde:4 shared-mime-info tar:bzip2 -USE_XORG= xft xpm -USE_GCC= yes -USE_KDE= automoc4 kdelibs -USE_QT4= moc_build qmake_build rcc_build uic_build - -post-patch: - @${REINPLACE_CMD} -e \ - 's|/usr/local/|${LOCALBASE}/|g' ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e \ - 's|i->\(children\)|\1|' \ - ${WRKSRC}/src/backend/core/AbstractAspect.h - @${REINPLACE_CMD} -e \ - 's|!isnan|!std::isnan|' \ - ${WRKSRC}/src/backend/worksheet/plots/cartesian/CartesianCoordinateSystem.cpp +OPTIONS_DEFINE= FFTW3 HDF5 NETCDF +OPTIONS_DEFAULT= ${OPTIONS_DEFINE} +FFTW3_DESC= Build with FFTW support +FFTW3_CMAKE_BOOL= ENABLE_FFTW +FFTW3_LIB_DEPENDS= libfftw3.so:math/fftw3 +HDF5_DESC= Build with HDF5 support +HDF5_CMAKE_BOOL= ENABLE_HDF5 +HDF5_LIB_DEPENDS= libhdf5.so:science/hdf5 +NETCDF_DESC= Build with NetCDF support +NETCDF_CMAKE_BOOL= ENABLE_NETCDF +NETCDF_LIB_DEPENDS= libnetcdf.so:science/netcdf + +USES= cmake:outsource desktop-file-utils kde:5 shared-mime-info tar:xz +USE_KDE= archive auth bookmarks codecs completion config configwidgets \ + coreaddons crash ecm guiaddons i18n iconthemes itemviews \ + jobwidgets kdelibs4support kio notifications parts service \ + solid sonnet textwidgets unitconversion widgetsaddons \ + windowsystem xmlgui +USE_QT5= core dbus gui network printsupport svg widgets xml \ + buildtools_build qmake_build + +DATADIR= ${PREFIX}/share/labplot2 .include Index: head/math/labplot/distinfo =================================================================== --- head/math/labplot/distinfo +++ head/math/labplot/distinfo @@ -1,2 +1,3 @@ -SHA256 (labplot-2.0.1.tar.bz2) = 2d4f28acdb57ffd093b4da5ca0362d8cbfe11163fe04149ae126dac3764b25b3 -SIZE (labplot-2.0.1.tar.bz2) = 580701 +TIMESTAMP = 1490774921 +SHA256 (labplot-2.3.0-kf5.tar.xz) = a5a7d706de5f978430b359ada42f9227a2619f5fa9608d56af16c760b7626f33 +SIZE (labplot-2.3.0-kf5.tar.xz) = 4531156 Index: head/math/labplot/files/patch-CMakeLists.txt =================================================================== --- head/math/labplot/files/patch-CMakeLists.txt +++ head/math/labplot/files/patch-CMakeLists.txt @@ -0,0 +1,56 @@ +Make the dependencies on FFTW3, HDF5 and NETCDF toggelable. + +This is a simlified backport of + https://github.com/KDE/labplot/commit/3a3594f077fcc53d725878d3d2c5ef0b263463e4 + +--- CMakeLists.txt.orig 2017-04-04 13:07:03 UTC ++++ CMakeLists.txt +@@ -26,7 +26,13 @@ add_definitions(-fvisibility=default) + cmake_policy(SET CMP0002 OLD) + #cmake_policy(SET CMP0063 NEW) + ++### Options ###################################### ++option(ENABLE_FFTW "Build with FFTW support" "ON") ++option(ENABLE_HDF5 "Build with HDF5 support" "ON") ++option(ENABLE_NETCDF "Build with NetCDF support" "ON") ++ + ### FFTW ###################################### ++IF (ENABLE_FFTW) + FIND_LIBRARY(FFTW_LIBRARIES fftw3 + PATHS + /usr/lib +@@ -49,6 +55,7 @@ IF (FFTW_FOUND) + ELSE (FFTW_FOUND) + MESSAGE (STATUS "FFTW 3 Library not found.") + ENDIF (FFTW_FOUND) ++ENDIF (ENABLE_FFTW) + + ### GSL ###################################### + FIND_LIBRARY(GSL_LIBRARIES gsl +@@ -112,6 +119,7 @@ ELSE (CANTOR_LIBS_FOUND) + ENDIF (CANTOR_LIBS_FOUND) + + ### HDF5 ##################################### ++IF (ENABLE_HDF5) + FIND_LIBRARY(HDF5_LIBRARY hdf5 + PATHS + /usr/lib +@@ -136,8 +144,10 @@ IF (HDF5_FOUND) + ELSE (HDF5_FOUND) + MESSAGE (STATUS "Hierarchical Data Format (HDF) 5 Library not found.") + ENDIF (HDF5_FOUND) ++ENDIF (ENABLE_HDF5) + + ### NETCDF ##################################### ++IF (ENABLE_NETCDF) + FIND_LIBRARY(NETCDF_LIBRARY netcdf + PATHS + /usr/lib +@@ -159,6 +169,7 @@ IF (NETCDF_FOUND) + ELSE (NETCDF_FOUND) + MESSAGE (STATUS "Network Common Data Format (NetCDF) Library not found.") + ENDIF (NETCDF_FOUND) ++ENDIF (ENABLE_NETCDF) + + add_subdirectory(icons) + add_subdirectory(src) Index: head/math/labplot/files/patch-src_backend_gsl_parser.tab.c =================================================================== --- head/math/labplot/files/patch-src_backend_gsl_parser.tab.c +++ head/math/labplot/files/patch-src_backend_gsl_parser.tab.c @@ -0,0 +1,13 @@ +The function strtod_l is defined in xlocale.h . + +--- src/backend/gsl/parser.tab.c.orig 2017-04-04 13:04:15 UTC ++++ src/backend/gsl/parser.tab.c +@@ -65,7 +65,7 @@ + /* Line 371 of yacc.c */ + #line 3 "parser.y" + +-#include ++#include + #include "parser.h" + + /* Line 371 of yacc.c */ Index: head/math/labplot/files/patch-src_backend_gsl_parser.y =================================================================== --- head/math/labplot/files/patch-src_backend_gsl_parser.y +++ head/math/labplot/files/patch-src_backend_gsl_parser.y @@ -0,0 +1,13 @@ +The function strtod_l is defined in xlocale.h . + +--- src/backend/gsl/parser.y.orig 2017-03-29 08:51:19 UTC ++++ src/backend/gsl/parser.y +@@ -1,7 +1,7 @@ + /* LabPlot : parser.y */ + + %{ +-#include ++#include + #include "parser.h" + %} + Index: head/math/labplot/pkg-plist =================================================================== --- head/math/labplot/pkg-plist +++ head/math/labplot/pkg-plist @@ -1,43 +1,207 @@ bin/labplot2 -share/applications/kde4/LabPlot2.desktop -share/apps/LabPlot2/LabPlot2ui.rc -share/apps/LabPlot2/pics/TeX_logo.png -share/apps/LabPlot2/pics/auto-scale-all.png -share/apps/LabPlot2/pics/auto-scale-x.png -share/apps/LabPlot2/pics/auto-scale-y.png -share/apps/LabPlot2/pics/axis-horizontal.png -share/apps/LabPlot2/pics/axis-horizontal.svg -share/apps/LabPlot2/pics/axis-vertical.png -share/apps/LabPlot2/pics/axis-vertical.svg -share/apps/LabPlot2/pics/cartesian-plot-four-axes.svg -share/apps/LabPlot2/pics/cartesian-plot-two-axes-centered-origin.svg -share/apps/LabPlot2/pics/cartesian-plot-two-axes-centered.svg -share/apps/LabPlot2/pics/cartesian-plot-two-axes.svg -share/apps/LabPlot2/pics/editbreaklayout.png -share/apps/LabPlot2/pics/editgrid.png -share/apps/LabPlot2/pics/edithlayout.png -share/apps/LabPlot2/pics/editvlayout.png -share/apps/LabPlot2/pics/shift-down-y.png -share/apps/LabPlot2/pics/shift-left-x.png -share/apps/LabPlot2/pics/shift-right-x.png -share/apps/LabPlot2/pics/shift-up-y.png -share/apps/LabPlot2/pics/x-zoom-in.png -share/apps/LabPlot2/pics/x-zoom-out.png -share/apps/LabPlot2/pics/xy-curve.png -share/apps/LabPlot2/pics/xy-curve.svg -share/apps/LabPlot2/pics/y-zoom-in.png -share/apps/LabPlot2/pics/y-zoom-out.png -share/apps/LabPlot2/pics/zoom-in-x.png -share/apps/LabPlot2/pics/zoom-in-y.png -share/apps/LabPlot2/pics/zoom-out-x.png -share/apps/LabPlot2/pics/zoom-out-y.png -share/apps/LabPlot2/splash.png -share/icons/hicolor/128x128/apps/LabPlot2.png -share/icons/hicolor/22x22/apps/LabPlot2.png -share/icons/hicolor/256x256/apps/LabPlot2.png -share/icons/hicolor/32x32/apps/LabPlot2.png -share/icons/hicolor/48x48/apps/LabPlot2.png -share/icons/hicolor/512x512/apps/LabPlot2.png -share/icons/hicolor/64x64/apps/LabPlot2.png -share/icons/hicolor/scalable/apps/LabPlot2.svgz +share/appdata/org.kde.labplot.appdata.xml +share/applications/labplot2.desktop +share/doc/HTML/en/labplot2/datapicker_active_curve_data_spreadsheet.png +share/doc/HTML/en/labplot2/datapicker_original_transformed_segments.png +share/doc/HTML/en/labplot2/datapicker_segments.png +share/doc/HTML/en/labplot2/export_spreadsheet_dialog.png +share/doc/HTML/en/labplot2/export_worksheet_dialog.png +share/doc/HTML/en/labplot2/file_data_source.png +share/doc/HTML/en/labplot2/import-dialog.png +share/doc/HTML/en/labplot2/index.cache.bz2 +share/doc/HTML/en/labplot2/index.docbook +share/doc/HTML/en/labplot2/labplot.png +share/doc/HTML/en/labplot2/matrix.png +share/doc/HTML/en/labplot2/matrix_function_values.png +share/doc/HTML/en/labplot2/pe-context-menu.png +share/doc/HTML/en/labplot2/project-explorer.png +share/doc/HTML/en/labplot2/properties.png +share/doc/HTML/en/labplot2/spreadsheet.png +share/doc/HTML/en/labplot2/spreadsheet_generate_equidistant_values.png +share/doc/HTML/en/labplot2/spreadsheet_generate_function_values.png +share/doc/HTML/en/labplot2/spreadsheet_generate_multivariant_function_values.png +share/doc/HTML/en/labplot2/spreadsheet_generate_random_values.png +share/doc/HTML/en/labplot2/sub_window_tabbed_view_interfaces.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet1.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet2.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet3.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet4.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet5.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet6.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet7.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet8.png +share/doc/HTML/en/labplot2/tutorial-spreadsheet9.png +share/doc/HTML/en/labplot2/tutorial-xy-function1.png +share/doc/HTML/en/labplot2/tutorial-xy-function10.png +share/doc/HTML/en/labplot2/tutorial-xy-function2.png +share/doc/HTML/en/labplot2/tutorial-xy-function3.png +share/doc/HTML/en/labplot2/tutorial-xy-function4.png +share/doc/HTML/en/labplot2/tutorial-xy-function5.png +share/doc/HTML/en/labplot2/tutorial-xy-function6.png +share/doc/HTML/en/labplot2/tutorial-xy-function7.png +share/doc/HTML/en/labplot2/tutorial-xy-function8.png +share/doc/HTML/en/labplot2/tutorial-xy-function9.png +share/doc/HTML/en/labplot2/workbook.png +share/doc/HTML/en/labplot2/worksheet.png +share/doc/HTML/es/labplot2/index.cache.bz2 +share/doc/HTML/es/labplot2/index.docbook +share/doc/HTML/nl/labplot2/index.cache.bz2 +share/doc/HTML/nl/labplot2/index.docbook +share/doc/HTML/pt/labplot2/index.cache.bz2 +share/doc/HTML/pt/labplot2/index.docbook +share/doc/HTML/pt_BR/labplot2/index.cache.bz2 +share/doc/HTML/pt_BR/labplot2/index.docbook +share/doc/HTML/sv/labplot2/index.cache.bz2 +share/doc/HTML/sv/labplot2/index.docbook +share/doc/HTML/uk/labplot2/export_spreadsheet_dialog.png +share/doc/HTML/uk/labplot2/export_worksheet_dialog.png +share/doc/HTML/uk/labplot2/import-dialog.png +share/doc/HTML/uk/labplot2/index.cache.bz2 +share/doc/HTML/uk/labplot2/index.docbook +share/doc/HTML/uk/labplot2/labplot.png +share/doc/HTML/uk/labplot2/pe-context-menu.png +share/doc/HTML/uk/labplot2/project-explorer.png +share/doc/HTML/uk/labplot2/properties.png +share/doc/HTML/uk/labplot2/spreadsheet.png +share/doc/HTML/uk/labplot2/spreadsheet_generate_equidistant_values.png +share/doc/HTML/uk/labplot2/spreadsheet_generate_function_values.png +share/doc/HTML/uk/labplot2/spreadsheet_generate_random_values.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet1.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet2.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet3.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet4.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet5.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet6.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet7.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet8.png +share/doc/HTML/uk/labplot2/tutorial-spreadsheet9.png +share/doc/HTML/uk/labplot2/tutorial-xy-function1.png +share/doc/HTML/uk/labplot2/tutorial-xy-function10.png +share/doc/HTML/uk/labplot2/tutorial-xy-function2.png +share/doc/HTML/uk/labplot2/tutorial-xy-function3.png +share/doc/HTML/uk/labplot2/tutorial-xy-function4.png +share/doc/HTML/uk/labplot2/tutorial-xy-function5.png +share/doc/HTML/uk/labplot2/tutorial-xy-function6.png +share/doc/HTML/uk/labplot2/tutorial-xy-function7.png +share/doc/HTML/uk/labplot2/tutorial-xy-function8.png +share/doc/HTML/uk/labplot2/tutorial-xy-function9.png +share/doc/HTML/uk/labplot2/worksheet.png +share/icons/hicolor/128x128/apps/labplot2.png +share/icons/hicolor/22x22/apps/labplot2.png +share/icons/hicolor/256x256/apps/labplot2.png +share/icons/hicolor/32x32/apps/labplot2.png +share/icons/hicolor/48x48/apps/labplot2.png +share/icons/hicolor/512x512/apps/labplot2.png +share/icons/hicolor/64x64/apps/labplot2.png +share/icons/hicolor/scalable/apps/labplot-1x-zoom.svg +share/icons/hicolor/scalable/apps/labplot-2x-zoom.svg +share/icons/hicolor/scalable/apps/labplot-3x-zoom.svg +share/icons/hicolor/scalable/apps/labplot-4x-zoom.svg +share/icons/hicolor/scalable/apps/labplot-5x-zoom.svg +share/icons/hicolor/scalable/apps/labplot-TeX-logo.svg +share/icons/hicolor/scalable/apps/labplot-auto-scale-all.svg +share/icons/hicolor/scalable/apps/labplot-auto-scale-x.svg +share/icons/hicolor/scalable/apps/labplot-auto-scale-y.svg +share/icons/hicolor/scalable/apps/labplot-axis-horizontal.svg +share/icons/hicolor/scalable/apps/labplot-axis-vertical.svg +share/icons/hicolor/scalable/apps/labplot-cursor-arrow.svg +share/icons/hicolor/scalable/apps/labplot-editbreaklayout.svg +share/icons/hicolor/scalable/apps/labplot-editgrid.svg +share/icons/hicolor/scalable/apps/labplot-edithlayout.svg +share/icons/hicolor/scalable/apps/labplot-editvlayout.svg +share/icons/hicolor/scalable/apps/labplot-format-text-symbol.svg +share/icons/hicolor/scalable/apps/labplot-matrix-new.svg +share/icons/hicolor/scalable/apps/labplot-matrix.svg +share/icons/hicolor/scalable/apps/labplot-plot-axis-points.svg +share/icons/hicolor/scalable/apps/labplot-shift-down-y.svg +share/icons/hicolor/scalable/apps/labplot-shift-left-x.svg +share/icons/hicolor/scalable/apps/labplot-shift-right-x.svg +share/icons/hicolor/scalable/apps/labplot-shift-up-y.svg +share/icons/hicolor/scalable/apps/labplot-spreadsheet-new.svg +share/icons/hicolor/scalable/apps/labplot-spreadsheet.svg +share/icons/hicolor/scalable/apps/labplot-transform-move.svg +share/icons/hicolor/scalable/apps/labplot-workbook-new.svg +share/icons/hicolor/scalable/apps/labplot-workbook.svg +share/icons/hicolor/scalable/apps/labplot-worksheet-new.svg +share/icons/hicolor/scalable/apps/labplot-worksheet.svg +share/icons/hicolor/scalable/apps/labplot-xy-curve-points.svg +share/icons/hicolor/scalable/apps/labplot-xy-curve-segments.svg +share/icons/hicolor/scalable/apps/labplot-xy-curve.svg +share/icons/hicolor/scalable/apps/labplot-xy-equation-curve.svg +share/icons/hicolor/scalable/apps/labplot-xy-fit-curve.svg +share/icons/hicolor/scalable/apps/labplot-xy-plot-four-axes.svg +share/icons/hicolor/scalable/apps/labplot-xy-plot-two-axes-centered-origin.svg +share/icons/hicolor/scalable/apps/labplot-xy-plot-two-axes-centered.svg +share/icons/hicolor/scalable/apps/labplot-xy-plot-two-axes.svg +share/icons/hicolor/scalable/apps/labplot-zoom-in-x.svg +share/icons/hicolor/scalable/apps/labplot-zoom-in-y.svg +share/icons/hicolor/scalable/apps/labplot-zoom-out-x.svg +share/icons/hicolor/scalable/apps/labplot-zoom-out-y.svg +share/icons/hicolor/scalable/apps/labplot-zoom-select-x.svg +share/icons/hicolor/scalable/apps/labplot-zoom-select-y.svg +share/icons/hicolor/scalable/apps/labplot-zoom-select.svg +share/icons/hicolor/scalable/apps/labplot-zoom.svg +share/icons/hicolor/scalable/apps/labplot2.svgz +share/kxmlgui5/labplot2/labplot2ui.rc +%%DATADIR%%/labplot2.ico +%%DATADIR%%/labplot2ui.rc +%%DATADIR%%/pics/colorchooser/colorchooser_hue.xpm +%%DATADIR%%/pics/colorchooser/colorchooser_saturation.xpm +%%DATADIR%%/pics/colorchooser/colorchooser_value.xpm +%%DATADIR%%/pics/gsl_distributions/F.jpg +%%DATADIR%%/pics/gsl_distributions/bernoulli.jpg +%%DATADIR%%/pics/gsl_distributions/beta.jpg +%%DATADIR%%/pics/gsl_distributions/binomial.jpg +%%DATADIR%%/pics/gsl_distributions/binomial_negative.jpg +%%DATADIR%%/pics/gsl_distributions/cauchy.jpg +%%DATADIR%%/pics/gsl_distributions/chi_squared.jpg +%%DATADIR%%/pics/gsl_distributions/exponential.jpg +%%DATADIR%%/pics/gsl_distributions/exponential_power.jpg +%%DATADIR%%/pics/gsl_distributions/flat.jpg +%%DATADIR%%/pics/gsl_distributions/gamma.jpg +%%DATADIR%%/pics/gsl_distributions/gaussian.jpg +%%DATADIR%%/pics/gsl_distributions/geometric.jpg +%%DATADIR%%/pics/gsl_distributions/gumbel_type_1.jpg +%%DATADIR%%/pics/gsl_distributions/gumbel_type_2.jpg +%%DATADIR%%/pics/gsl_distributions/hypergeometric.jpg +%%DATADIR%%/pics/gsl_distributions/landau.jpg +%%DATADIR%%/pics/gsl_distributions/laplace.jpg +%%DATADIR%%/pics/gsl_distributions/levy_alpha_stable.jpg +%%DATADIR%%/pics/gsl_distributions/levy_skew_alpha_stable.jpg +%%DATADIR%%/pics/gsl_distributions/logarithmic.jpg +%%DATADIR%%/pics/gsl_distributions/logistic.jpg +%%DATADIR%%/pics/gsl_distributions/lognormal.jpg +%%DATADIR%%/pics/gsl_distributions/pareto.jpg +%%DATADIR%%/pics/gsl_distributions/pascal.jpg +%%DATADIR%%/pics/gsl_distributions/poisson.jpg +%%DATADIR%%/pics/gsl_distributions/rayleigh.jpg +%%DATADIR%%/pics/gsl_distributions/rayleigh_tail.jpg +%%DATADIR%%/pics/gsl_distributions/t.jpg +%%DATADIR%%/pics/gsl_distributions/weibull.jpg +%%DATADIR%%/splash.png +share/locale/ast/LC_MESSAGES/labplot2.mo +share/locale/bs/LC_MESSAGES/labplot2.mo +share/locale/ca/LC_MESSAGES/labplot2.mo +share/locale/ca@valencia/LC_MESSAGES/labplot2.mo +share/locale/cs/LC_MESSAGES/labplot2.mo +share/locale/da/LC_MESSAGES/labplot2.mo +share/locale/de/LC_MESSAGES/labplot2.mo +share/locale/en_GB/LC_MESSAGES/labplot2.mo +share/locale/es/LC_MESSAGES/labplot2.mo +share/locale/fi/LC_MESSAGES/labplot2.mo +share/locale/fr/LC_MESSAGES/labplot2.mo +share/locale/gl/LC_MESSAGES/labplot2.mo +share/locale/hu/LC_MESSAGES/labplot2.mo +share/locale/ja/LC_MESSAGES/labplot2.mo +share/locale/lt/LC_MESSAGES/labplot2.mo +share/locale/nds/LC_MESSAGES/labplot2.mo +share/locale/nl/LC_MESSAGES/labplot2.mo +share/locale/pl/LC_MESSAGES/labplot2.mo +share/locale/pt/LC_MESSAGES/labplot2.mo +share/locale/pt_BR/LC_MESSAGES/labplot2.mo +share/locale/ru/LC_MESSAGES/labplot2.mo +share/locale/sk/LC_MESSAGES/labplot2.mo +share/locale/sv/LC_MESSAGES/labplot2.mo +share/locale/uk/LC_MESSAGES/labplot2.mo +share/locale/zh_TW/LC_MESSAGES/labplot2.mo share/mime/packages/labplot2.xml