--- /home/makc/porting/ports/math/labplot/Makefile	2008-06-06 17:44:00.000000000 +0400
+++ /home/makc/porting/ports/math/labplot/Makefile	2008-06-15 13:22:51.000000000 +0400
@@ -6,8 +6,7 @@ 
 #
 
 PORTNAME=	LabPlot
-PORTVERSION=	1.5.1.5
-PORTREVISION=	7
+PORTVERSION=	1.6.0.1
 CATEGORIES=	math kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=labplot
@@ -16,46 +15,104 @@ 
 COMMENT=	LabPlot : Data analysis and visualisation
 
 LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff \
+		jasper.4:${PORTSDIR}/graphics/jasper \
 		MagickWand.1:${PORTSDIR}/graphics/ImageMagick \
-		audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		gsl.12:${PORTSDIR}/math/gsl \
-		jasper.4:${PORTSDIR}/graphics/jasper \
 		fftw3.4:${PORTSDIR}/math/fftw3 \
-		netcdf:${PORTSDIR}/science/netcdf \
-		qwtplot3d.0:${PORTSDIR}/math/qwtplot3d
-RUN_DEPENDS=	pstoedit:${PORTSDIR}/graphics/pstoedit
-
-#WRKSRC=		${WRKDIR}/${PORTNAME}-1.5.0
-CONFLICTS=	liborigin-[0-9]*
+		qwtplot3d.0:${PORTSDIR}/math/qwtplot3d \
+		origin.0:${PORTSDIR}/math/liborigin
 
 USE_QT_VER=	3
 USE_KDELIBS_VER=3
-USE_GL=		yes
+USE_GL=		glu
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 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}" \
+CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"
-CONFIGURE_ARGS+=--program-prefix='' --disable-cdf \
-		--enable-system-qwtplot3d --enable-KexiDB=no
+CONFIGURE_ARGS+=--enable-system-qwtplot3d=yes --enable-system-liborigin=yes \
+		--enable-ocaml=no --enable-fftw=no
 
 MAN1=		LabPlot.1 labplot.1
 
-#This needs some more work before enabling this feature
-#.if defined(WITH_VTK)
-#LIB_DEPENDS+=	vtkRendering.1:${PORTSDIR}/math/vtk
-#BUILD_DEPENDS+=	vtkRenderer.h:${PORTSDIR}/math/vtk-headers
-#CFLAGS+=	${PTHREAD_CLAGS} -I${LOCALBASE}/include/vtk
-#LDFLAGS+=	${PTHREAD_LIBS}
-#CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
-#		LDFLAGS="${LDFLAGS}" \
-#		CPPFLAGS="${CPPFLAGS}" \
-#		CXXFLAGS="${CXXFLAGS}" \
-#CONFIGURE_ENV+=	VTK_DIR=${LOCALBASE}
-#CONFIGURE_ARGS+=	--enable-vtk
-#.endif
+OPTIONS+=	R "Statistic analysis using R language" off
+OPTIONS+=	QHULL "Qhull support" off
+OPTIONS+=	PSTOEDIT "Export to vector graphics using pstoedit" off
+OPTIONS+=	NETCDF "netCDF data support" off
+OPTIONS+=	CDF "CDF data support" off
+OPTIONS+=	HDF5 "HDF5 data support" off
+OPTIONS+=	AUDIOFILE "Audio data support" off
+OPTIONS+=	KEXIDB "KexiDB support" off
+OPTIONS+=	QSA "Qt Scripting support" off
+OPTIONS+=	TEXVC "Latex formula editor" off
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_R)
+LIB_DEPENDS+=	R.0:${PORTSDIR}/math/R
+CONFIGURE_ENV+=	R_HOME=${LOCALBASE}/lib/R
+CONFIGURE_ARGS+=--enable-R=yes
+.else
+CONFIGURE_ARGS+=--enable-R=no
+.endif
+
+.if defined(WITH_QHULL)
+LIB_DEPENDS+=	qhull.5:${PORTSDIR}/math/qhull
+CONFIGURE_ARGS+=--enable-qhull=yes
+.else
+CONFIGURE_ARGS+=--enable-qhull=no
+.endif
+
+.if defined(WITH_PSTOEDIT)
+RUN_DEPENDS+=	pstoedit:${PORTSDIR}/graphics/pstoedit
+.endif
+
+.if defined(WITH_NETCDF)
+LIB_DEPENDS+=	netcdf.4:${PORTSDIR}/science/netcdf
+CONFIGURE_ARGS+=--enable-netcdf=yes
+.else
+CONFIGURE_ARGS+=--enable-netcdf=no
+.endif
+
+.if defined(WITH_CDF)
+LIB_DEPENDS+=	cdf.0:${PORTSDIR}/science/cdf
+CONFIGURE_ARGS+=--enable-cdf=yes
+.else
+CONFIGURE_ARGS+=--enable-cdf=no
+.endif
+
+.if defined(WITH_HDF5)
+LIB_DEPENDS+=	hdf5.0:${PORTSDIR}/science/hdf5
+CONFIGURE_ARGS+=--enable-hdf5=yes
+.else
+CONFIGURE_ARGS+=--enable-hdf5=no
+.endif
+
+.if defined(WITH_AUDIOFILE)
+LIB_DEPENDS+=	audiofile.0:${PORTSDIR}/audio/libaudiofile
+CONFIGURE_ARGS+=--enable-audiofile=yes
+.else
+CONFIGURE_ARGS+=--enable-audiofile=no
+.endif
+
+.if defined(WITH_KEXIDB)
+LIB_DEPENDS+=	kexidb.2:${PORTSDIR}/editors/koffice-kde3
+CONFIGURE_ARGS+=--enable-KexiDB=yes
+.else
+CONFIGURE_ARGS+=--enable-KexiDB=no
+.endif
+
+.if defined(WITH_QSA)
+LIB_DEPENDS+=	 qsa.1:${PORTSDIR}/devel/qsa
+CONFIGURE_ARGS+=--enable-qsa=yes
+.else
+CONFIGURE_ARGS+=--enable-qsa=no
+.endif
+
+.if defined(WITH_TEXVC)
+RUN_DEPENDS+=	texvc:${PORTSDIR}/print/texvc
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- /home/makc/porting/ports/math/labplot/distinfo	2006-12-28 20:02:47.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/distinfo	2008-06-14 15:05:33.000000000 +0400
@@ -1,3 +1,3 @@ 
-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
+MD5 (LabPlot-1.6.0.1.tar.gz) = 50dd3033f35003d68d5a4e54336cd6c3
+SHA256 (LabPlot-1.6.0.1.tar.gz) = a3b7cead9100489f0bf55e548a5b21bfb6fef2219d3ed1e3d638bd68c80cfb78
+SIZE (LabPlot-1.6.0.1.tar.gz) = 11903145
--- /home/makc/porting/ports/math/labplot/files/patch-configure	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-configure	2008-06-15 03:13:59.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./configure.orig	2008-06-15 03:01:04.000000000 +0400
++++ ./configure	2008-06-15 03:12:39.000000000 +0400
+@@ -12426,7 +12426,7 @@
+ #error "Your system version of liborigin is too old!"
+ #endif
+ EOF
+-			${CXX} -c liborigin-test.cpp
++			${CXX} ${CPPFLAGS} -c liborigin-test.cpp
+ 			if test $? -eq 0; then
+ 				LIBORIGIN_LDFLAGS="-lorigin"
+ 				LIBORIGIN="yes"
--- /home/makc/porting/ports/math/labplot/files/patch-doc::br::Makefile.in	2005-12-01 04:04:04.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc::br::Makefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@ 
---- doc/br/Makefile.in.orig	Mon Sep 26 18:50:08 2005
-+++ doc/br/Makefile.in	Mon Sep 26 18:51:01 2005
-@@ -481,7 +481,7 @@
- 	fi
- 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/br/LabPlot/index.docbook
- 	rm -f $(DESTDIR)/$(kde_htmldir)/br/LabPlot/small_pics
--	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/br/LabPlot/
-+	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/br/LabPlot/
- 
- uninstall-local:
- #>- 	rm -f $(kde_htmldir)/br/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc::de::Makefile.in	2005-12-01 04:04:04.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc::de::Makefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@ 
---- doc/de/Makefile.in.orig	Mon Sep 26 17:51:35 2005
-+++ doc/de/Makefile.in	Mon Sep 26 17:51:57 2005
-@@ -481,7 +481,7 @@
- 	fi
- 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/de/LabPlot/index.docbook
- 	rm -f $(DESTDIR)/$(kde_htmldir)/de/LabPlot/small_pics
--	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/de/LabPlot/
-+	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/de/LabPlot/
- 
- uninstall-local:
- #>- 	rm -f $(kde_htmldir)/de/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc::fr::Makefile.in	2005-12-01 04:04:04.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc::fr::Makefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@ 
---- doc/fr/Makefile.in.orig	Mon Sep 26 17:52:12 2005
-+++ doc/fr/Makefile.in	Mon Sep 26 17:52:24 2005
-@@ -481,7 +481,7 @@
- 	fi
- 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/index.docbook
- 	rm -f $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/small_pics
--	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/
-+	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/
- 
- uninstall-local:
- #>- 	rm -f $(kde_htmldir)/fr/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc::it::Makefile.in	2005-12-01 04:04:04.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc::it::Makefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@ 
---- doc/it/Makefile.in.orig	Mon Sep 26 18:50:26 2005
-+++ doc/it/Makefile.in	Mon Sep 26 18:51:19 2005
-@@ -481,7 +481,7 @@
- 	fi
- 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/it/LabPlot/index.docbook
- 	rm -f $(DESTDIR)/$(kde_htmldir)/it/LabPlot/small_pics
--	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/it/LabPlot/
-+	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/it/LabPlot/
- 
- uninstall-local:
- #>- 	rm -f $(kde_htmldir)/it/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc::nl::Makefile.in	2006-12-28 20:02:47.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc::nl::Makefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@ 
---- 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
--- /home/makc/porting/ports/math/labplot/files/patch-doc::pl::Makefile.in	2005-12-01 04:04:04.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc::pl::Makefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@ 
---- doc/pl/Makefile.in.orig	Mon Sep 26 18:50:19 2005
-+++ doc/pl/Makefile.in	Mon Sep 26 18:51:32 2005
-@@ -481,7 +481,7 @@
- 	fi
- 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/index.docbook
- 	rm -f $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/small_pics
--	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/
-+	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/
- 
- uninstall-local:
- #>- 	rm -f $(kde_htmldir)/pl/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc::sv::Makefile.in	2005-12-01 04:04:04.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc::sv::Makefile.in	1970-01-01 03:00:00.000000000 +0300
@@ -1,11 +0,0 @@ 
---- doc/sv/Makefile.in.orig	Mon Sep 26 18:49:40 2005
-+++ doc/sv/Makefile.in	Mon Sep 26 18:51:45 2005
-@@ -481,7 +481,7 @@
- 	fi
- 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/index.docbook
- 	rm -f $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/small_pics
--	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/
-+	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/
- 
- uninstall-local:
- #>- 	rm -f $(kde_htmldir)/sv/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc__br__Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc__br__Makefile.in	2008-06-15 03:13:05.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./doc/br/Makefile.in.orig	2008-01-12 12:42:50.000000000 +0300
++++ ./doc/br/Makefile.in	2008-06-15 03:01:03.000000000 +0400
+@@ -496,7 +496,7 @@
+ 	fi
+ 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/br/LabPlot/index.docbook
+ 	rm -f $(DESTDIR)/$(kde_htmldir)/br/LabPlot/small_pics
+-	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/br/LabPlot/
++	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/br/LabPlot/
+ 
+ uninstall-local:
+ #>- 	rm -f $(kde_htmldir)/br/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc__de__Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc__de__Makefile.in	2008-06-15 03:13:05.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./doc/de/Makefile.in.orig	2008-01-12 12:42:50.000000000 +0300
++++ ./doc/de/Makefile.in	2008-06-15 03:01:03.000000000 +0400
+@@ -496,7 +496,7 @@
+ 	fi
+ 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/de/LabPlot/index.docbook
+ 	rm -f $(DESTDIR)/$(kde_htmldir)/de/LabPlot/small_pics
+-	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/de/LabPlot/
++	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/de/LabPlot/
+ 
+ uninstall-local:
+ #>- 	rm -f $(kde_htmldir)/de/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc__fr__Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc__fr__Makefile.in	2008-06-15 03:13:05.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./doc/fr/Makefile.in.orig	2008-01-12 12:42:50.000000000 +0300
++++ ./doc/fr/Makefile.in	2008-06-15 03:01:03.000000000 +0400
+@@ -496,7 +496,7 @@
+ 	fi
+ 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/index.docbook
+ 	rm -f $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/small_pics
+-	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/
++	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/fr/LabPlot/
+ 
+ uninstall-local:
+ #>- 	rm -f $(kde_htmldir)/fr/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc__it__Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc__it__Makefile.in	2008-06-15 03:13:05.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./doc/it/Makefile.in.orig	2008-01-12 12:42:50.000000000 +0300
++++ ./doc/it/Makefile.in	2008-06-15 03:01:03.000000000 +0400
+@@ -496,7 +496,7 @@
+ 	fi
+ 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/it/LabPlot/index.docbook
+ 	rm -f $(DESTDIR)/$(kde_htmldir)/it/LabPlot/small_pics
+-	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/it/LabPlot/
++	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/it/LabPlot/
+ 
+ uninstall-local:
+ #>- 	rm -f $(kde_htmldir)/it/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc__nl__Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc__nl__Makefile.in	2008-06-15 03:13:05.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./doc/nl/Makefile.in.orig	2008-01-12 12:42:50.000000000 +0300
++++ ./doc/nl/Makefile.in	2008-06-15 03:01:03.000000000 +0400
+@@ -496,7 +496,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
--- /home/makc/porting/ports/math/labplot/files/patch-doc__pl__Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc__pl__Makefile.in	2008-06-15 03:13:05.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./doc/pl/Makefile.in.orig	2008-01-12 12:42:50.000000000 +0300
++++ ./doc/pl/Makefile.in	2008-06-15 03:01:03.000000000 +0400
+@@ -496,7 +496,7 @@
+ 	fi
+ 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/index.docbook
+ 	rm -f $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/small_pics
+-	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/
++	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/pl/LabPlot/
+ 
+ uninstall-local:
+ #>- 	rm -f $(kde_htmldir)/pl/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/files/patch-doc__sv__Makefile.in	1970-01-01 03:00:00.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/files/patch-doc__sv__Makefile.in	2008-06-15 03:13:05.000000000 +0400
@@ -0,0 +1,11 @@ 
+--- ./doc/sv/Makefile.in.orig	2008-01-12 12:42:50.000000000 +0300
++++ ./doc/sv/Makefile.in	2008-06-15 03:01:03.000000000 +0400
+@@ -496,7 +496,7 @@
+ 	fi
+ 	$(INSTALL_DATA) index.docbook $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/index.docbook
+ 	rm -f $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/small_pics
+-	ln -fs $(kde_htmldir)/en/LabPlot/small_pics/ $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/
++	ln -fs $(kde_htmldir)/en/LabPlot/small_pics $(DESTDIR)/$(kde_htmldir)/sv/LabPlot/
+ 
+ uninstall-local:
+ #>- 	rm -f $(kde_htmldir)/sv/LabPlot/small_pics
--- /home/makc/porting/ports/math/labplot/pkg-descr	2005-12-01 04:04:04.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/pkg-descr	2008-06-15 02:18:33.000000000 +0400
@@ -1,6 +1,6 @@ 
 LabPlot is a program for two- and three-dimensional graphical
 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.sf.net
+can be produced from data or from functions.
+
+WWW: http://sourceforge.net/projects/labplot/
--- /home/makc/porting/ports/math/labplot/pkg-plist	2006-12-28 20:02:47.000000000 +0300
+++ /home/makc/porting/ports/math/labplot/pkg-plist	2008-06-15 11:23:10.000000000 +0400
@@ -1,118 +1,22 @@ 
-bin/opj2dat
 bin/LabPlot
 bin/labplot
-lib/libLabPlotcephes.so.6
-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
-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
-share/doc/HTML/en/LabPlot/small_pics/analysis-small.png
-share/doc/HTML/en/LabPlot/small_pics/audio-small.png
-share/doc/HTML/en/LabPlot/small_pics/axeslabel-small.png
-share/doc/HTML/en/LabPlot/small_pics/bar-small.png
-share/doc/HTML/en/LabPlot/small_pics/csi-small.png
-share/doc/HTML/en/LabPlot/small_pics/exponential_fit-small.png
-share/doc/HTML/en/LabPlot/small_pics/fft-small.png
-share/doc/HTML/en/LabPlot/small_pics/fileinfo_netcdf-small.png
-share/doc/HTML/en/LabPlot/small_pics/fit-small.png
-share/doc/HTML/en/LabPlot/small_pics/hist-small.png
-share/doc/HTML/en/LabPlot/small_pics/image-small.png
-share/doc/HTML/en/LabPlot/small_pics/konqueror-small.png
-share/doc/HTML/en/LabPlot/small_pics/labplot-small.png
-share/doc/HTML/en/LabPlot/small_pics/log-small.png
-share/doc/HTML/en/LabPlot/small_pics/logfit-small.png
-share/doc/HTML/en/LabPlot/small_pics/marker-small.png
-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
-share/doc/HTML/en/LabPlot/small_pics/spreadsheet-small.png
-share/doc/HTML/en/LabPlot/small_pics/surface-small.png
-share/doc/HTML/en/LabPlot/small_pics/surface2-small.png
-share/doc/HTML/en/LabPlot/small_pics/surfacestyle-small.png
-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/ca/LC_MESSAGES/LabPlot.mo
-share/locale/cs/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/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/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/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
+lib/libLabPlot.la
+lib/libLabPlot.so
+lib/libLabPlot.so.7
+lib/libLabPlotcephes.a
+lib/libLabPlotcephes.la
+lib/libLabPlotcephes.so
+lib/libLabPlotcephes.so.6
+share/applications/kde/LabPlot.desktop
+share/apps/LabPlot/3d.lml.gz
 share/apps/LabPlot/LabPlotui.rc
+share/apps/LabPlot/analysis.lml.gz
+share/apps/LabPlot/attribute.qs
+share/apps/LabPlot/audio.lml.gz
+share/apps/LabPlot/axesdialog.qs
+share/apps/LabPlot/axeslabel.lml.gz
+share/apps/LabPlot/bar.lml.gz
 share/apps/LabPlot/colormaps/3D.MAP
 share/apps/LabPlot/colormaps/4ZEBBOW.MAP
 share/apps/LabPlot/colormaps/4ZEBBOWX.MAP
@@ -236,7 +140,6 @@ 
 share/apps/LabPlot/colormaps/UNKNOWN.MAP
 share/apps/LabPlot/colormaps/VOLCANO.MAP
 share/apps/LabPlot/colormaps/VOLCANO2.MAP
-share/apps/LabPlot/colormaps/YGB.MAP
 share/apps/LabPlot/colormaps/VOLCANO3.MAP
 share/apps/LabPlot/colormaps/VOLCANO4.MAP
 share/apps/LabPlot/colormaps/VOLCANO5.MAP
@@ -249,9 +152,37 @@ 
 share/apps/LabPlot/colormaps/WYBR.MAP
 share/apps/LabPlot/colormaps/Waltz.map
 share/apps/LabPlot/colormaps/YELPURP1.MAP
+share/apps/LabPlot/colormaps/YGB.MAP
 share/apps/LabPlot/colormaps/YOOLS.MAP
 share/apps/LabPlot/colormaps/Zaoud.map
 share/apps/LabPlot/colormaps/_standard.map
+share/apps/LabPlot/datadialog.qs
+share/apps/LabPlot/error-plot.qs
+share/apps/LabPlot/exponential_fit.lml.gz
+share/apps/LabPlot/export.qs
+share/apps/LabPlot/fft.lml.gz
+share/apps/LabPlot/fit.lml.gz
+share/apps/LabPlot/fit.qs
+share/apps/LabPlot/function.qs
+share/apps/LabPlot/hist.lml.gz
+share/apps/LabPlot/image.lml.gz
+share/apps/LabPlot/import-binary.qs
+share/apps/LabPlot/import-opj.qs
+share/apps/LabPlot/import.qs
+share/apps/LabPlot/import2.qs
+share/apps/LabPlot/labplot.png
+share/apps/LabPlot/labplot.qs
+share/apps/LabPlot/legend.qs
+share/apps/LabPlot/log.lml.gz
+share/apps/LabPlot/logfit.lml.gz
+share/apps/LabPlot/marker.lml.gz
+share/apps/LabPlot/multiplot.lml.gz
+share/apps/LabPlot/objects.lml.gz
+share/apps/LabPlot/objects.qs
+share/apps/LabPlot/penguin.png
+share/apps/LabPlot/pie.lml.gz
+share/apps/LabPlot/plot.qs
+share/apps/LabPlot/polar.lml.gz
 share/apps/LabPlot/qsa-icons/d_class.png
 share/apps/LabPlot/qsa-icons/d_editcopy.png
 share/apps/LabPlot/qsa-icons/d_editcut.png
@@ -291,66 +222,137 @@ 
 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
-share/apps/LabPlot/axeslabel.lpl.gz
-share/apps/LabPlot/bar.lpl.gz
-share/apps/LabPlot/exponential_fit.lpl.gz
-share/apps/LabPlot/fft.lpl.gz
-share/apps/LabPlot/fit.lpl.gz
-share/apps/LabPlot/hist.lpl.gz
-share/apps/LabPlot/image.lpl.gz
-share/apps/LabPlot/labplot.lpl.gz
-share/apps/LabPlot/log.lpl.gz
-share/apps/LabPlot/logfit.lpl.gz
-share/apps/LabPlot/marker.lpl.gz
-share/apps/LabPlot/multiplot.lpl.gz
-share/apps/LabPlot/objects.lpl.gz
-share/apps/LabPlot/pie.lpl.gz
-share/apps/LabPlot/polar.lpl.gz
-share/apps/LabPlot/qwt.lpl.gz
-share/apps/LabPlot/rydberg.lpl.gz
-share/apps/LabPlot/surface.lpl.gz
-share/apps/LabPlot/surface2.lpl.gz
-share/apps/LabPlot/surfacestyle.lpl.gz
-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/qwt.lml.gz
 share/apps/LabPlot/result.qs
-share/apps/LabPlot/ylog.qs
+share/apps/LabPlot/rydberg.lml.gz
 share/apps/LabPlot/session.qs
+share/apps/LabPlot/shosho.qs
+share/apps/LabPlot/shosho2.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/surface.lml.gz
+share/apps/LabPlot/surface2.lml.gz
+share/apps/LabPlot/surfacestyle.lml.gz
+share/apps/LabPlot/ternary.lml.gz
 share/apps/LabPlot/ternary.qs
+share/apps/LabPlot/texlabel.lml.gz
 share/apps/LabPlot/title.qs
-share/applications/kde/LabPlot.desktop
+share/apps/LabPlot/ylog.qs
+share/doc/HTML/br/LabPlot/index.docbook
+share/doc/HTML/br/LabPlot/small_pics
+share/doc/HTML/br/labplot
+share/doc/HTML/de/LabPlot/index.docbook
+share/doc/HTML/de/LabPlot/small_pics
+share/doc/HTML/de/labplot
+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
+share/doc/HTML/en/LabPlot/small_pics/analysis-small.png
+share/doc/HTML/en/LabPlot/small_pics/audio-small.png
+share/doc/HTML/en/LabPlot/small_pics/axeslabel-small.png
+share/doc/HTML/en/LabPlot/small_pics/bar-small.png
+share/doc/HTML/en/LabPlot/small_pics/csi-small.png
+share/doc/HTML/en/LabPlot/small_pics/exponential_fit-small.png
+share/doc/HTML/en/LabPlot/small_pics/fft-small.png
+share/doc/HTML/en/LabPlot/small_pics/fileinfo_netcdf-small.png
+share/doc/HTML/en/LabPlot/small_pics/fit-small.png
+share/doc/HTML/en/LabPlot/small_pics/hist-small.png
+share/doc/HTML/en/LabPlot/small_pics/image-small.png
+share/doc/HTML/en/LabPlot/small_pics/konqueror-small.png
+share/doc/HTML/en/LabPlot/small_pics/labplot-small.png
+share/doc/HTML/en/LabPlot/small_pics/log-small.png
+share/doc/HTML/en/LabPlot/small_pics/logfit-small.png
+share/doc/HTML/en/LabPlot/small_pics/marker-small.png
+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
+share/doc/HTML/en/LabPlot/small_pics/spreadsheet-small.png
+share/doc/HTML/en/LabPlot/small_pics/surface-small.png
+share/doc/HTML/en/LabPlot/small_pics/surface2-small.png
+share/doc/HTML/en/LabPlot/small_pics/surfacestyle-small.png
+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/fr/LabPlot/index.docbook
+share/doc/HTML/fr/LabPlot/small_pics
+share/doc/HTML/fr/labplot
+share/doc/HTML/it/LabPlot/index.docbook
+share/doc/HTML/it/LabPlot/small_pics
+share/doc/HTML/it/labplot
+share/doc/HTML/nl/LabPlot/index.docbook
+share/doc/HTML/nl/LabPlot/small_pics
+share/doc/HTML/nl/labplot
+share/doc/HTML/pl/LabPlot/index.docbook
+share/doc/HTML/pl/LabPlot/small_pics
+share/doc/HTML/pl/labplot
+share/doc/HTML/sv/LabPlot/index.docbook
+share/doc/HTML/sv/LabPlot/small_pics
+share/doc/HTML/sv/labplot
+share/icons/hicolor/16x16/apps/LabPlot.png
+share/icons/hicolor/16x16/mimetypes/lpl.png
+share/icons/hicolor/22x22/apps/LabPlot.png
+share/icons/hicolor/22x22/mimetypes/lpl.png
+share/icons/hicolor/32x32/apps/LabPlot.png
+share/icons/hicolor/32x32/mimetypes/lpl.png
+share/icons/hicolor/48x48/apps/LabPlot.png
+share/icons/hicolor/48x48/mimetypes/lpl.png
+share/icons/hicolor/64x64/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/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/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/lt/LC_MESSAGES/LabPlot.mo
+share/locale/nl/LC_MESSAGES/LabPlot.mo
+share/locale/pl/LC_MESSAGES/LabPlot.mo
+share/locale/pt/LC_MESSAGES/LabPlot.mo
+share/locale/ro/LC_MESSAGES/LabPlot.mo
+share/locale/ru/LC_MESSAGES/LabPlot.mo
+share/locale/sr/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/uk/LC_MESSAGES/LabPlot.mo
+share/locale/zh/LC_MESSAGES/LabPlot.mo
+share/mimelnk/application/x-lml.desktop
+share/mimelnk/application/x-lpl.desktop
+@dirrm share/doc/HTML/sv/LabPlot
+@dirrm share/doc/HTML/pl/LabPlot
+@dirrm share/doc/HTML/nl/LabPlot
+@dirrm share/doc/HTML/it/LabPlot
+@dirrm share/doc/HTML/fr/LabPlot
 @dirrm share/doc/HTML/en/LabPlot/small_pics
 @dirrm share/doc/HTML/en/LabPlot
 @dirrm share/doc/HTML/de/LabPlot
-@dirrm share/doc/HTML/fr/LabPlot
-@dirrm share/doc/HTML/sv/LabPlot
 @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/colormaps
 @dirrm share/apps/LabPlot
+@dirrmtry share/applications/kde