Update to the latest stable version.

PR:		ports/107284:
Submitted by:	Kay Lehmann (maintainer)

4 files changed, 141 insertions, 56 deletions

diff --git a/math/labplot/Makefile b/math/labplot/Makefile
index 3086cfe2797b..02e2173735aa 100644
--- a/math/labplot/Makefile
+++ b/math/labplot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	LabPlot
-PORTVERSION=	1.5.0.5
-PORTREVISION=	5
+PORTVERSION=	1.5.1.5
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=labplot
@@ -25,14 +24,16 @@ LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
 		qwtplot3d.0:${PORTSDIR}/math/qwtplot3d
 RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.5.0
+#WRKSRC=		${WRKDIR}/${PORTNAME}-1.5.0
 
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
 USE_GL=		yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
+INSTALLS_ICONS=	yes
+USE_GETTEXT=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include -I${LOCALBASE}/include/kexidb ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
diff --git a/math/labplot/distinfo b/math/labplot/distinfo
index e1b3bed41b82..28f6111a8399 100644
--- a/math/labplot/distinfo
+++ b/math/labplot/distinfo
@@ -1,3 +1,3 @@
-MD5 (LabPlot-1.5.0.5.tar.gz) = aa5b7ae0c10a3a75bb100cacb2a53bf3
-SHA256 (LabPlot-1.5.0.5.tar.gz) = a01b18c512d70bbb255fbfbee27d34eb9a2411404f0e84228d2e2936fb01a26a
-SIZE (LabPlot-1.5.0.5.tar.gz) = 10304752
+MD5 (LabPlot-1.5.1.5.tar.gz) = 3fe889f86a059fbbfb873dec50080ac9
+SHA256 (LabPlot-1.5.1.5.tar.gz) = dd79f58d758379e52e618160c49bdee862faf4823c3c3d4864e975102c8c457a
+SIZE (LabPlot-1.5.1.5.tar.gz) = 10792596
diff --git a/math/labplot/files/patch-doc::nl::Makefile.in b/math/labplot/files/patch-doc::nl::Makefile.in
new file mode 100644
index 000000000000..70613eae60d6
--- /dev/null
+++ b/math/labplot/files/patch-doc::nl::Makefile.in
@@ -0,0 +1,11 @@
+--- doc/nl/Makefile.in.orig	Wed Aug 23 10:33:58 2006
++++ doc/nl/Makefile.in	Wed Aug 23 10:34:15 2006
+@@ -489,7 +489,7 @@
+ 	fi
+ 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/nl/LabPlot/index.docbook
+ 	rm -f $(DESTDIR)/$(kde_htmldir)/nl/LabPlot/small_pics
+-	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/nl/LabPlot/
++	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/nl/LabPlot/
+ 
+ uninstall-local:
+ #>- 	rm -f $(kde_htmldir)/nl/LabPlot/small_pics
diff --git a/math/labplot/pkg-plist b/math/labplot/pkg-plist
index a6d73845c4c2..4e66c8666644 100644
--- a/math/labplot/pkg-plist
+++ b/math/labplot/pkg-plist
@@ -1,31 +1,18 @@
+bin/opj2dat
 bin/LabPlot
 bin/labplot
-lib/libLabPlotcephes.a
-lib/libLabPlotcephes.la
-lib/libLabPlotcephes.so
 lib/libLabPlotcephes.so.6
-lib/libLabPlot.a
-lib/libLabPlot.la
-lib/libLabPlot.so
+lib/libLabPlotcephes.so
+lib/libLabPlotcephes.la
+lib/libLabPlotcephes.a
+lib/liborigin.so.0
+lib/liborigin.so
+lib/liborigin.la
+lib/liborigin.a
 lib/libLabPlot.so.6
-share/doc/HTML/de/LabPlot/index.docbook
-share/doc/HTML/de/LabPlot/small_pics
-share/doc/HTML/de/labplot
-share/doc/HTML/fr/LabPlot/index.docbook
-share/doc/HTML/fr/LabPlot/small_pics
-share/doc/HTML/fr/labplot
-share/doc/HTML/sv/LabPlot/index.docbook
-share/doc/HTML/sv/LabPlot/small_pics
-share/doc/HTML/sv/labplot
-share/doc/HTML/br/LabPlot/index.docbook
-share/doc/HTML/br/LabPlot/small_pics
-share/doc/HTML/br/labplot
-share/doc/HTML/it/LabPlot/index.docbook
-share/doc/HTML/it/LabPlot/small_pics
-share/doc/HTML/it/labplot
-share/doc/HTML/pl/LabPlot/index.docbook
-share/doc/HTML/pl/LabPlot/small_pics
-share/doc/HTML/pl/labplot
+lib/libLabPlot.so
+lib/libLabPlot.la
+lib/libLabPlot.a
 share/doc/HTML/en/LabPlot/index.docbook
 share/doc/HTML/en/LabPlot/small_pics/3d-small.png
 share/doc/HTML/en/LabPlot/small_pics/VTK-small.png
@@ -49,6 +36,10 @@ share/doc/HTML/en/LabPlot/small_pics/multiplot-small.png
 share/doc/HTML/en/LabPlot/small_pics/objects-small.png
 share/doc/HTML/en/LabPlot/small_pics/pie-small.png
 share/doc/HTML/en/LabPlot/small_pics/polar-small.png
+share/doc/HTML/en/LabPlot/small_pics/qsa-green.png
+share/doc/HTML/en/LabPlot/small_pics/qsa-import.png
+share/doc/HTML/en/LabPlot/small_pics/qsa-plot.png
+share/doc/HTML/en/LabPlot/small_pics/qsa-session.png
 share/doc/HTML/en/LabPlot/small_pics/qwt3d-small.png
 share/doc/HTML/en/LabPlot/small_pics/rydberg-small.png
 share/doc/HTML/en/LabPlot/small_pics/sfi-small.png
@@ -60,47 +51,66 @@ share/doc/HTML/en/LabPlot/small_pics/ternary-small.png
 share/doc/HTML/en/LabPlot/small_pics/texlabel-small.png
 share/doc/HTML/en/LabPlot/small_pics/worksheet-small.png
 share/doc/HTML/en/labplot
+share/doc/HTML/de/LabPlot/index.docbook
+share/doc/HTML/de/LabPlot/small_pics
+share/doc/HTML/de/labplot
+share/doc/HTML/fr/LabPlot/index.docbook
+share/doc/HTML/fr/LabPlot/small_pics
+share/doc/HTML/fr/labplot
+share/doc/HTML/sv/LabPlot/index.docbook
+share/doc/HTML/sv/LabPlot/small_pics
+share/doc/HTML/sv/labplot
+share/doc/HTML/br/LabPlot/index.docbook
+share/doc/HTML/br/LabPlot/small_pics
+share/doc/HTML/br/labplot
+share/doc/HTML/it/LabPlot/index.docbook
+share/doc/HTML/it/LabPlot/small_pics
+share/doc/HTML/it/labplot
+share/doc/HTML/pl/LabPlot/index.docbook
+share/doc/HTML/pl/LabPlot/small_pics
+share/doc/HTML/pl/labplot
+share/doc/HTML/nl/LabPlot/index.docbook
+share/doc/HTML/nl/LabPlot/small_pics
+share/doc/HTML/nl/labplot
+share/locale/br/LC_MESSAGES/LabPlot.mo
+share/locale/cy/LC_MESSAGES/LabPlot.mo
 share/locale/da/LC_MESSAGES/LabPlot.mo
 share/locale/de/LC_MESSAGES/LabPlot.mo
 share/locale/es/LC_MESSAGES/LabPlot.mo
 share/locale/et/LC_MESSAGES/LabPlot.mo
 share/locale/fr/LC_MESSAGES/LabPlot.mo
+share/locale/ga/LC_MESSAGES/LabPlot.mo
+share/locale/is/LC_MESSAGES/LabPlot.mo
 share/locale/it/LC_MESSAGES/LabPlot.mo
 share/locale/ja/LC_MESSAGES/LabPlot.mo
 share/locale/nl/LC_MESSAGES/LabPlot.mo
 share/locale/ru/LC_MESSAGES/LabPlot.mo
 share/locale/sv/LC_MESSAGES/LabPlot.mo
+share/locale/ta/LC_MESSAGES/LabPlot.mo
 share/locale/tr/LC_MESSAGES/LabPlot.mo
+share/locale/zh/LC_MESSAGES/LabPlot.mo
 share/locale/pl/LC_MESSAGES/LabPlot.mo
-share/locale/br/LC_MESSAGES/LabPlot.mo
 share/locale/ca/LC_MESSAGES/LabPlot.mo
 share/locale/cs/LC_MESSAGES/LabPlot.mo
-share/locale/cy/LC_MESSAGES/LabPlot.mo
-share/locale/ga/LC_MESSAGES/LabPlot.mo
-share/locale/is/LC_MESSAGES/LabPlot.mo
 share/locale/pt/LC_MESSAGES/LabPlot.mo
 share/locale/ro/LC_MESSAGES/LabPlot.mo
 share/locale/sr/LC_MESSAGES/LabPlot.mo
-share/locale/ta/LC_MESSAGES/LabPlot.mo
-share/locale/zh/LC_MESSAGES/LabPlot.mo
-share/icons/hicolor/22x22/apps/LabPlot.png
-share/icons/hicolor/22x22/mimetypes/lpl.png
-share/icons/hicolor/32x32/mimetypes/lpl.png
-share/icons/hicolor/32x32/apps/LabPlot.png
-share/icons/hicolor/64x64/mimetypes/lpl.png
+share/icons/locolor/16x16/apps/LabPlot.png
+share/icons/locolor/16x16/mimetypes/lpl.png
+share/icons/locolor/22x22/apps/LabPlot.png
+share/icons/locolor/22x22/mimetypes/lpl.png
+share/icons/locolor/32x32/apps/LabPlot.png
+share/icons/locolor/32x32/mimetypes/lpl.png
 share/icons/hicolor/64x64/apps/LabPlot.png
-share/icons/hicolor/16x16/apps/LabPlot.png
-share/icons/hicolor/16x16/mimetypes/lpl.png
-share/icons/hicolor/48x48/apps/LabPlot.png
+share/icons/hicolor/64x64/mimetypes/lpl.png
+share/icons/hicolor/32x32/apps/LabPlot.png
+share/icons/hicolor/32x32/mimetypes/lpl.png
 share/icons/hicolor/48x48/mimetypes/lpl.png
-share/icons/locolor/32x32/mimetypes/lpl.png
-share/icons/locolor/32x32/apps/LabPlot.png
-share/icons/locolor/22x22/mimetypes/lpl.png
-share/icons/locolor/22x22/apps/LabPlot.png
-share/icons/locolor/16x16/mimetypes/lpl.png
-share/icons/locolor/16x16/apps/LabPlot.png
-share/applnk/Applications/LabPlot.desktop
-share/applnk/Applications/labplot.desktop
+share/icons/hicolor/48x48/apps/LabPlot.png
+share/icons/hicolor/16x16/mimetypes/lpl.png
+share/icons/hicolor/16x16/apps/LabPlot.png
+share/icons/hicolor/22x22/mimetypes/lpl.png
+share/icons/hicolor/22x22/apps/LabPlot.png
 share/mimelnk/application/x-lpl.desktop
 share/apps/LabPlot/LabPlotui.rc
 share/apps/LabPlot/colormaps/3D.MAP
@@ -156,7 +166,7 @@ share/apps/LabPlot/colormaps/GREENOUT.MAP
 share/apps/LabPlot/colormaps/GREY.MAP
 share/apps/LabPlot/colormaps/Globule.map
 share/apps/LabPlot/colormaps/Grange.map
-share/apps/LabPlot/colormaps/Green Grass.map
+share/apps/LabPlot/colormaps/Green-Grass.map
 share/apps/LabPlot/colormaps/HAWAII.MAP
 share/apps/LabPlot/colormaps/HAYSTACK.MAP
 share/apps/LabPlot/colormaps/HORNS.MAP
@@ -209,7 +219,7 @@ share/apps/LabPlot/colormaps/ROYAL.MAP
 share/apps/LabPlot/colormaps/RW.MAP
 share/apps/LabPlot/colormaps/RYB1.MAP
 share/apps/LabPlot/colormaps/Regal.map
-share/apps/LabPlot/colormaps/Rose Petals.map
+share/apps/LabPlot/colormaps/Rose-Petals.map
 share/apps/LabPlot/colormaps/SEA.MAP
 share/apps/LabPlot/colormaps/SMOOTH.MAP
 share/apps/LabPlot/colormaps/SPIRAL.MAP
@@ -222,7 +232,7 @@ share/apps/LabPlot/colormaps/TOPO.MAP
 share/apps/LabPlot/colormaps/TOPO2.MAP
 share/apps/LabPlot/colormaps/TROPIC.MAP
 share/apps/LabPlot/colormaps/TURQOISE.MAP
-share/apps/LabPlot/colormaps/Touch of Blues.map
+share/apps/LabPlot/colormaps/Touch-of-Blues.map
 share/apps/LabPlot/colormaps/UNKNOWN.MAP
 share/apps/LabPlot/colormaps/VOLCANO.MAP
 share/apps/LabPlot/colormaps/VOLCANO2.MAP
@@ -242,6 +252,45 @@ share/apps/LabPlot/colormaps/YELPURP1.MAP
 share/apps/LabPlot/colormaps/YOOLS.MAP
 share/apps/LabPlot/colormaps/Zaoud.map
 share/apps/LabPlot/colormaps/_standard.map
+share/apps/LabPlot/qsa-icons/d_class.png
+share/apps/LabPlot/qsa-icons/d_editcopy.png
+share/apps/LabPlot/qsa-icons/d_editcut.png
+share/apps/LabPlot/qsa-icons/d_editdelete.png
+share/apps/LabPlot/qsa-icons/d_editpaste.png
+share/apps/LabPlot/qsa-icons/d_filenew.png
+share/apps/LabPlot/qsa-icons/d_fileopen.png
+share/apps/LabPlot/qsa-icons/d_filesave.png
+share/apps/LabPlot/qsa-icons/d_function.png
+share/apps/LabPlot/qsa-icons/d_help.png
+share/apps/LabPlot/qsa-icons/d_play.png
+share/apps/LabPlot/qsa-icons/d_playprev.png
+share/apps/LabPlot/qsa-icons/d_project.png
+share/apps/LabPlot/qsa-icons/d_redo.png
+share/apps/LabPlot/qsa-icons/d_searchfind.png
+share/apps/LabPlot/qsa-icons/d_stop.png
+share/apps/LabPlot/qsa-icons/d_undo.png
+share/apps/LabPlot/qsa-icons/editcopy.png
+share/apps/LabPlot/qsa-icons/editcut.png
+share/apps/LabPlot/qsa-icons/editdelete.png
+share/apps/LabPlot/qsa-icons/editpaste.png
+share/apps/LabPlot/qsa-icons/filenew.png
+share/apps/LabPlot/qsa-icons/fileopen.png
+share/apps/LabPlot/qsa-icons/filesave.png
+share/apps/LabPlot/qsa-icons/function.png
+share/apps/LabPlot/qsa-icons/help.png
+share/apps/LabPlot/qsa-icons/object.png
+share/apps/LabPlot/qsa-icons/play.png
+share/apps/LabPlot/qsa-icons/playprev.png
+share/apps/LabPlot/qsa-icons/project.png
+share/apps/LabPlot/qsa-icons/qsa.png
+share/apps/LabPlot/qsa-icons/redo.png
+share/apps/LabPlot/qsa-icons/script.png
+share/apps/LabPlot/qsa-icons/scriptnew.png
+share/apps/LabPlot/qsa-icons/scriptobject.png
+share/apps/LabPlot/qsa-icons/searchfind.png
+share/apps/LabPlot/qsa-icons/splash.png
+share/apps/LabPlot/qsa-icons/stop.png
+share/apps/LabPlot/qsa-icons/undo.png
 share/apps/LabPlot/3d.lpl.gz
 share/apps/LabPlot/analysis.lpl.gz
 share/apps/LabPlot/audio.lpl.gz
@@ -269,7 +318,29 @@ share/apps/LabPlot/ternary.lpl.gz
 share/apps/LabPlot/texlabel.lpl.gz
 share/apps/LabPlot/penguin.png
 share/apps/LabPlot/labplot.png
+share/apps/LabPlot/attribute.qs
+share/apps/LabPlot/axesdialog.qs
+share/apps/LabPlot/datadialog.qs
+share/apps/LabPlot/error-plot.qs
+share/apps/LabPlot/export.qs
+share/apps/LabPlot/fit.qs
+share/apps/LabPlot/function.qs
+share/apps/LabPlot/import.qs
+share/apps/LabPlot/import2.qs
 share/apps/LabPlot/labplot.qs
+share/apps/LabPlot/legend.qs
+share/apps/LabPlot/objects.qs
+share/apps/LabPlot/plot.qs
+share/apps/LabPlot/result.qs
+share/apps/LabPlot/ylog.qs
+share/apps/LabPlot/session.qs
+share/apps/LabPlot/simple.qs
+share/apps/LabPlot/spreadsheet.qs
+share/apps/LabPlot/surface-image.qs
+share/apps/LabPlot/surface-plot.qs
+share/apps/LabPlot/ternary.qs
+share/apps/LabPlot/title.qs
+share/applications/kde/LabPlot.desktop
 @dirrm share/doc/HTML/en/LabPlot/small_pics
 @dirrm share/doc/HTML/en/LabPlot
 @dirrm share/doc/HTML/de/LabPlot
@@ -278,6 +349,8 @@ share/apps/LabPlot/labplot.qs
 @dirrm share/doc/HTML/br/LabPlot
 @dirrm share/doc/HTML/br
 @dirrm share/doc/HTML/it/LabPlot
+@dirrm share/doc/HTML/nl/LabPlot
 @dirrm share/doc/HTML/pl/LabPlot
 @dirrm share/apps/LabPlot/colormaps
+@dirrm share/apps/LabPlot/qsa-icons
 @dirrm share/apps/LabPlot