7 files changed, 124 insertions, 138 deletions

diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 8276263615b4..df71775afc09 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -2,9 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	labplot
-PORTVERSION=	2.4.0
-PORTREVISION=	5
-DISTVERSIONSUFFIX=-kf5
+PORTVERSION=	2.5.0
 CATEGORIES=	math kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 
@@ -16,8 +14,26 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgsl.so:math/gsl
 
-OPTIONS_DEFINE=		FITS FFTW3 HDF5 NETCDF
+USES=		bison cmake:outsource desktop-file-utils kde:5 qt:5 shared-mime-info tar:xz
+USE_KDE=	archive auth bookmarks codecs completion config configwidgets \
+		coreaddons crash ecm_build guiaddons i18n iconthemes itemviews \
+		jobwidgets kdelibs4support kio newstuff notifications parts \
+		service solid sonnet syntaxhighlighting textwidgets unitconversion \
+		widgetsaddons windowsystem xmlgui
+USE_QT=		concurrent core dbus gui network printsupport serialport \
+		sql svg widgets xml \
+		buildtools_build qmake_build
+
+CMAKE_OFF=	ENABLE_LIBCERF
+
+DATADIR=	${PREFIX}/share/labplot2
+
+OPTIONS_DEFINE=		CANTOR FITS FFTW3 HDF5 NETCDF
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE}
+
+CANTOR_DESC=		Build with Cantor support
+CANTOR_CMAKE_BOOL=	ENABLE_CANTOR
+CANTOR_LIB_DEPENDS=	libcantorlibs.so:math/cantor
 FITS_DESC=		Flexible Image Transport System Data Format (FITS) Library
 FITS_CMAKE_BOOL=	ENABLE_FITS
 FITS_LIB_DEPENDS=	libcfitsio.so:astro/cfitsio
@@ -31,15 +47,7 @@ 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 qt: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 newstuff notifications parts \
-		service solid sonnet textwidgets unitconversion widgetsaddons \
-		windowsystem xmlgui
-USE_QT=		core dbus gui network printsupport svg widgets xml \
-		buildtools_build qmake_build
-
-DATADIR=	${PREFIX}/share/labplot2
+post-patch:
+	${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/math/labplot/distinfo b/math/labplot/distinfo
index 79d601f9f4f3..6bede619af0e 100644
--- a/math/labplot/distinfo
+++ b/math/labplot/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1492976438
-SHA256 (labplot-2.4.0-kf5.tar.xz) = 86198247ff0d274c85607cdb07a0c4ef19149e4f4bf6c9d2e6e8249134e26bb2
-SIZE (labplot-2.4.0-kf5.tar.xz) = 6038072
+TIMESTAMP = 1535923258
+SHA256 (labplot-2.5.0.tar.xz) = f1ef2d95a4d4f18902e38cd1f2f79d041d4eeed1eb7f6284ec9a6a6954792225
+SIZE (labplot-2.5.0.tar.xz) = 11831656
diff --git a/math/labplot/files/patch-src_backend_gsl_parser.tab.c b/math/labplot/files/patch-src_backend_gsl_parser.tab.c
deleted file mode 100644
index 7650f2a7d36f..000000000000
--- a/math/labplot/files/patch-src_backend_gsl_parser.tab.c
+++ /dev/null
@@ -1,13 +0,0 @@
-The function strtod_l is defined in xlocale.h .
-
---- src/backend/gsl/parser.tab.c.orig	2017-04-23 19:52:39 UTC
-+++ src/backend/gsl/parser.tab.c
-@@ -67,7 +67,7 @@
-
- #include <string.h>
- #include <ctype.h>
--#include <locale.h>
-+#include <xlocale.h>
- #include "parser.h"
- #include "constants.h"
- #include "functions.h"
diff --git a/math/labplot/files/patch-src_backend_gsl_parser.y b/math/labplot/files/patch-src_backend_gsl_parser.y
deleted file mode 100644
index 33a3ba41605b..000000000000
--- a/math/labplot/files/patch-src_backend_gsl_parser.y
+++ /dev/null
@@ -1,13 +0,0 @@
-The function strtod_l is defined in xlocale.h .
-
---- src/backend/gsl/parser.y.orig	2017-04-02 07:47:32 UTC
-+++ src/backend/gsl/parser.y
-@@ -30,7 +30,7 @@
- %{
- #include <string.h>
- #include <ctype.h>
--#include <locale.h>
-+#include <xlocale.h>
- #include "parser.h"
- #include "constants.h"
- #include "functions.h"
diff --git a/math/labplot/files/patch-src_backend_gsl_parser__parallel.y b/math/labplot/files/patch-src_backend_gsl_parser__parallel.y
deleted file mode 100644
index 7b3e0be0ba39..000000000000
--- a/math/labplot/files/patch-src_backend_gsl_parser__parallel.y
+++ /dev/null
@@ -1,13 +0,0 @@
-The function strtod_l is defined in xlocale.h .
-
---- src/backend/gsl/parser_parallel.y.orig	2017-04-23 19:52:52 UTC
-+++ src/backend/gsl/parser_parallel.y
-@@ -34,7 +34,7 @@
- #include <string.h>
- #include <strings.h>	/* bzero */
- #include <ctype.h>
--#include <locale.h>
-+#include <xlocale.h>
- #include "constants.h"
- #include "functions.h"
- #include "parser.h"
diff --git a/math/labplot/pkg-descr b/math/labplot/pkg-descr
index 06d8135d55eb..84047fe3cfcb 100644
--- a/math/labplot/pkg-descr
+++ b/math/labplot/pkg-descr
@@ -3,4 +3,4 @@ presentation of data sets and functions. LabPlot allows you to work
 with multiple plots which each can have multiple graphs. The graphs
 can be produced from data or from functions.
 
-WWW: http://labplot.sourceforge.net/
+WWW: https://labplot.kde.org/
diff --git a/math/labplot/pkg-plist b/math/labplot/pkg-plist
index 984b7ef913bf..7ed54eafd54a 100644
--- a/math/labplot/pkg-plist
+++ b/math/labplot/pkg-plist
@@ -46,14 +46,8 @@ 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
@@ -93,6 +87,7 @@ share/doc/HTML/uk/labplot2/tutorial-xy-function9.png
 share/doc/HTML/uk/labplot2/workbook.png
 share/doc/HTML/uk/labplot2/worksheet.png
 share/icons/hicolor/128x128/apps/labplot2.png
+share/icons/hicolor/16x16/apps/labplot2.png
 share/icons/hicolor/22x22/apps/labplot2.png
 share/icons/hicolor/256x256/apps/labplot2.png
 share/icons/hicolor/32x32/apps/labplot2.png
@@ -149,85 +144,104 @@ 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%%/color-schemes/Breeze.colors
+%%DATADIR%%/color-schemes/BreezeDark.colors
+%%DATADIR%%/color-schemes/BreezeHighContrast.colors
+%%DATADIR%%/color-schemes/Honeycomb.colors
+%%DATADIR%%/color-schemes/Norway.colors
+%%DATADIR%%/color-schemes/ObsidianCoast.colors
+%%DATADIR%%/color-schemes/Oxygen.colors
+%%DATADIR%%/color-schemes/OxygenCold.colors
+%%DATADIR%%/color-schemes/Steel.colors
+%%DATADIR%%/color-schemes/WontonSoup.colors
+%%DATADIR%%/color-schemes/Zion.colors
+%%DATADIR%%/color-schemes/ZionReversed.colors
 %%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/fit_models/alg_sigmoid.jpg
-%%DATADIR%%/pics/fit_models/atan.jpg
-%%DATADIR%%/pics/fit_models/cauchy_lorentz1.jpg
-%%DATADIR%%/pics/fit_models/cauchy_lorentz2.jpg
-%%DATADIR%%/pics/fit_models/cauchy_lorentz3.jpg
-%%DATADIR%%/pics/fit_models/cauchy_lorentz4.jpg
-%%DATADIR%%/pics/fit_models/erf.jpg
-%%DATADIR%%/pics/fit_models/exponential1.jpg
-%%DATADIR%%/pics/fit_models/exponential2.jpg
-%%DATADIR%%/pics/fit_models/exponential3.jpg
-%%DATADIR%%/pics/fit_models/exponential4.jpg
-%%DATADIR%%/pics/fit_models/fourier1.jpg
-%%DATADIR%%/pics/fit_models/fourier2.jpg
-%%DATADIR%%/pics/fit_models/fourier3.jpg
-%%DATADIR%%/pics/fit_models/fourier4.jpg
-%%DATADIR%%/pics/fit_models/gaussian1.jpg
-%%DATADIR%%/pics/fit_models/gaussian2.jpg
-%%DATADIR%%/pics/fit_models/gaussian3.jpg
-%%DATADIR%%/pics/fit_models/gaussian4.jpg
-%%DATADIR%%/pics/fit_models/gd.jpg
-%%DATADIR%%/pics/fit_models/gompertz.jpg
-%%DATADIR%%/pics/fit_models/hill.jpg
-%%DATADIR%%/pics/fit_models/inv_exponential1.jpg
-%%DATADIR%%/pics/fit_models/logistic1.jpg
-%%DATADIR%%/pics/fit_models/logistic2.jpg
-%%DATADIR%%/pics/fit_models/logistic3.jpg
-%%DATADIR%%/pics/fit_models/logistic4.jpg
-%%DATADIR%%/pics/fit_models/logistic_function.jpg
-%%DATADIR%%/pics/fit_models/polynom1.jpg
-%%DATADIR%%/pics/fit_models/polynom2.jpg
-%%DATADIR%%/pics/fit_models/polynom3.jpg
-%%DATADIR%%/pics/fit_models/polynom4.jpg
-%%DATADIR%%/pics/fit_models/power1.jpg
-%%DATADIR%%/pics/fit_models/power2.jpg
-%%DATADIR%%/pics/fit_models/sech1.jpg
-%%DATADIR%%/pics/fit_models/sech2.jpg
-%%DATADIR%%/pics/fit_models/sech3.jpg
-%%DATADIR%%/pics/fit_models/sech4.jpg
-%%DATADIR%%/pics/fit_models/tanh.jpg
-%%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_lorentz.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/frechet.jpg
-%%DATADIR%%/pics/gsl_distributions/gamma.jpg
-%%DATADIR%%/pics/gsl_distributions/gaussian.jpg
-%%DATADIR%%/pics/gsl_distributions/gaussian_tail.jpg
-%%DATADIR%%/pics/gsl_distributions/geometric.jpg
-%%DATADIR%%/pics/gsl_distributions/gumbel1.jpg
-%%DATADIR%%/pics/gsl_distributions/gumbel2.jpg
-%%DATADIR%%/pics/gsl_distributions/hypergeometric.jpg
-%%DATADIR%%/pics/gsl_distributions/landau.jpg
-%%DATADIR%%/pics/gsl_distributions/laplace.jpg
-%%DATADIR%%/pics/gsl_distributions/levy.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/maxwell_boltzmann.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/sech.jpg
-%%DATADIR%%/pics/gsl_distributions/t.jpg
-%%DATADIR%%/pics/gsl_distributions/weibull.jpg
+%%DATADIR%%/pics/fit_models/alg_sigmoid.png
+%%DATADIR%%/pics/fit_models/atan.png
+%%DATADIR%%/pics/fit_models/cauchy_lorentz1.png
+%%DATADIR%%/pics/fit_models/cauchy_lorentz2.png
+%%DATADIR%%/pics/fit_models/cauchy_lorentz3.png
+%%DATADIR%%/pics/fit_models/cauchy_lorentz4.png
+%%DATADIR%%/pics/fit_models/erf.png
+%%DATADIR%%/pics/fit_models/exponential1.png
+%%DATADIR%%/pics/fit_models/exponential2.png
+%%DATADIR%%/pics/fit_models/exponential3.png
+%%DATADIR%%/pics/fit_models/exponential4.png
+%%DATADIR%%/pics/fit_models/fourier1.png
+%%DATADIR%%/pics/fit_models/fourier2.png
+%%DATADIR%%/pics/fit_models/fourier3.png
+%%DATADIR%%/pics/fit_models/fourier4.png
+%%DATADIR%%/pics/fit_models/gaussian1.png
+%%DATADIR%%/pics/fit_models/gaussian2.png
+%%DATADIR%%/pics/fit_models/gaussian3.png
+%%DATADIR%%/pics/fit_models/gaussian4.png
+%%DATADIR%%/pics/fit_models/gd.png
+%%DATADIR%%/pics/fit_models/gompertz.png
+%%DATADIR%%/pics/fit_models/hill.png
+%%DATADIR%%/pics/fit_models/inv_exponential1.png
+%%DATADIR%%/pics/fit_models/logistic1.png
+%%DATADIR%%/pics/fit_models/logistic2.png
+%%DATADIR%%/pics/fit_models/logistic3.png
+%%DATADIR%%/pics/fit_models/logistic4.png
+%%DATADIR%%/pics/fit_models/logistic_function.png
+%%DATADIR%%/pics/fit_models/polynom1.png
+%%DATADIR%%/pics/fit_models/polynom2.png
+%%DATADIR%%/pics/fit_models/polynom3.png
+%%DATADIR%%/pics/fit_models/polynom4.png
+%%DATADIR%%/pics/fit_models/power1.png
+%%DATADIR%%/pics/fit_models/power2.png
+%%DATADIR%%/pics/fit_models/pseudovoigt11.png
+%%DATADIR%%/pics/fit_models/pseudovoigt12.png
+%%DATADIR%%/pics/fit_models/pseudovoigt13.png
+%%DATADIR%%/pics/fit_models/pseudovoigt14.png
+%%DATADIR%%/pics/fit_models/sech1.png
+%%DATADIR%%/pics/fit_models/sech2.png
+%%DATADIR%%/pics/fit_models/sech3.png
+%%DATADIR%%/pics/fit_models/sech4.png
+%%DATADIR%%/pics/fit_models/tanh.png
+%%DATADIR%%/pics/fit_models/voigt1.png
+%%DATADIR%%/pics/fit_models/voigt2.png
+%%DATADIR%%/pics/fit_models/voigt3.png
+%%DATADIR%%/pics/fit_models/voigt4.png
+%%DATADIR%%/pics/gsl_distributions/bernoulli.png
+%%DATADIR%%/pics/gsl_distributions/beta.png
+%%DATADIR%%/pics/gsl_distributions/binomial.png
+%%DATADIR%%/pics/gsl_distributions/cauchy_lorentz.png
+%%DATADIR%%/pics/gsl_distributions/chi_squared.png
+%%DATADIR%%/pics/gsl_distributions/exponential.png
+%%DATADIR%%/pics/gsl_distributions/exponential_power.png
+%%DATADIR%%/pics/gsl_distributions/fdist.png
+%%DATADIR%%/pics/gsl_distributions/flat.png
+%%DATADIR%%/pics/gsl_distributions/frechet.png
+%%DATADIR%%/pics/gsl_distributions/gamma.png
+%%DATADIR%%/pics/gsl_distributions/gaussian.png
+%%DATADIR%%/pics/gsl_distributions/gaussian_tail.png
+%%DATADIR%%/pics/gsl_distributions/geometric.png
+%%DATADIR%%/pics/gsl_distributions/gumbel1.png
+%%DATADIR%%/pics/gsl_distributions/gumbel2.png
+%%DATADIR%%/pics/gsl_distributions/hypergeometric.png
+%%DATADIR%%/pics/gsl_distributions/landau.png
+%%DATADIR%%/pics/gsl_distributions/laplace.png
+%%DATADIR%%/pics/gsl_distributions/levy.png
+%%DATADIR%%/pics/gsl_distributions/levy_alpha_stable.png
+%%DATADIR%%/pics/gsl_distributions/levy_skew_alpha_stable.png
+%%DATADIR%%/pics/gsl_distributions/logarithmic.png
+%%DATADIR%%/pics/gsl_distributions/logistic.png
+%%DATADIR%%/pics/gsl_distributions/lognormal.png
+%%DATADIR%%/pics/gsl_distributions/maxwell_boltzmann.png
+%%DATADIR%%/pics/gsl_distributions/negative_binomial.png
+%%DATADIR%%/pics/gsl_distributions/pareto.png
+%%DATADIR%%/pics/gsl_distributions/pascal.png
+%%DATADIR%%/pics/gsl_distributions/poisson.png
+%%DATADIR%%/pics/gsl_distributions/rayleigh.png
+%%DATADIR%%/pics/gsl_distributions/rayleigh_tail.png
+%%DATADIR%%/pics/gsl_distributions/sech.png
+%%DATADIR%%/pics/gsl_distributions/students_t.png
+%%DATADIR%%/pics/gsl_distributions/weibull.png
 %%DATADIR%%/splash.png
 %%DATADIR%%/themes/BlackOnLightYellow
 %%DATADIR%%/themes/BlackOnWhite
@@ -263,6 +277,7 @@ 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/el/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
@@ -280,7 +295,9 @@ 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/tr/LC_MESSAGES/labplot2.mo
 share/locale/uk/LC_MESSAGES/labplot2.mo
+share/locale/zh_CN/LC_MESSAGES/labplot2.mo
 share/locale/zh_TW/LC_MESSAGES/labplot2.mo
 share/metainfo/org.kde.labplot2.appdata.xml
 share/mime/packages/labplot2.xml