14 files changed, 257 insertions, 149 deletions

diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 943443857524..a5e65cc390f1 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.7.2
+DISTVERSION=	0.9.7.5
 CATEGORIES=	math
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 PKGNAMESUFFIX=	-doc
diff --git a/math/qtiplot-doc/distinfo b/math/qtiplot-doc/distinfo
index 067f6f7a14ab..fde5856c4c6f 100644
--- a/math/qtiplot-doc/distinfo
+++ b/math/qtiplot-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.7.2.tar.bz2) = ff1bea2f8b3e7722ae75820c3dc33b78
-SHA256 (qtiplot-0.9.7.2.tar.bz2) = 2cd4b9ee4fc84ce1c5c73efdfa8a909ae129a0f04ad9995ebae818e12a879f87
-SIZE (qtiplot-0.9.7.2.tar.bz2) = 6584563
+MD5 (qtiplot-0.9.7.5.tar.bz2) = 8ca64ee66d1a843828b7cfda3d1a7b00
+SHA256 (qtiplot-0.9.7.5.tar.bz2) = 5f71ac4c5b2a343a0d4ad264cbc333480074de1c89821b170a022eb9d382c3dd
+SIZE (qtiplot-0.9.7.5.tar.bz2) = 7536802
diff --git a/math/qtiplot-doc/files/patch-qtiplot.dsl b/math/qtiplot-doc/files/patch-qtiplot.dsl
index f414282d9737..044c1c81db1d 100644
--- a/math/qtiplot-doc/files/patch-qtiplot.dsl
+++ b/math/qtiplot-doc/files/patch-qtiplot.dsl
@@ -1,10 +1,10 @@
---- ./qtiplot.dsl.orig	2008-02-13 10:55:14.000000000 +0300
-+++ ./qtiplot.dsl	2008-04-20 17:16:32.000000000 +0400
+--- ./qtiplot.dsl.orig	2009-03-05 15:57:29.000000000 +0300
++++ ./qtiplot.dsl	2009-03-26 22:18:49.000000000 +0300
 @@ -6,7 +6,7 @@
  <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
  
  <!-- Path to main Docbook->html stylesheet. You have to adapt this to your installation. -->
--<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/dsssl-stylesheets-1.79/html/docbook.dsl" CDATA DSSSL>
+-<!ENTITY docbook-html-stylesheet SYSTEM "/usr/share/sgml/docbook/stylesheet/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
 +<!ENTITY docbook-html-stylesheet SYSTEM "/usr/local/share/sgml/docbook/dsssl/modular/html/docbook.dsl" CDATA DSSSL>
  
  <!-- Stylesheet function library for creating Windows HTML help and Qt Assistant profiles. -->
diff --git a/math/qtiplot-doc/pkg-plist b/math/qtiplot-doc/pkg-plist
index 5341916f38b8..835136de1059 100644
--- a/math/qtiplot-doc/pkg-plist
+++ b/math/qtiplot-doc/pkg-plist
@@ -1,13 +1,13 @@
-%%DATADIR%%/a5992.html
-%%DATADIR%%/c2438.html
-%%DATADIR%%/c350.html
-%%DATADIR%%/c3654.html
-%%DATADIR%%/c4646.html
-%%DATADIR%%/c4917.html
+%%DATADIR%%/a6097.html
+%%DATADIR%%/c2440.html
+%%DATADIR%%/c352.html
+%%DATADIR%%/c3656.html
+%%DATADIR%%/c4638.html
+%%DATADIR%%/c4909.html
 %%DATADIR%%/c55.html
-%%DATADIR%%/c5907.html
-%%DATADIR%%/c6078.html
-%%DATADIR%%/c669.html
+%%DATADIR%%/c6012.html
+%%DATADIR%%/c6185.html
+%%DATADIR%%/c671.html
 %%DATADIR%%/common/fond-titre-chapitre.png
 %%DATADIR%%/common/fond-titre-chapitre.xcf
 %%DATADIR%%/common/fond-titre.png
@@ -18,7 +18,6 @@
 %%DATADIR%%/common/top-right.png
 %%DATADIR%%/common/top-right.xcf
 %%DATADIR%%/equations/equation_bolzmann.png
-%%DATADIR%%/equations/equation_couleur.png
 %%DATADIR%%/equations/equation_covariance.png
 %%DATADIR%%/equations/equation_fourier.png
 %%DATADIR%%/equations/equation_gauss.png
@@ -229,7 +228,6 @@
 %%DATADIR%%/pics/add-layer.png
 %%DATADIR%%/pics/add-remove-curve.png
 %%DATADIR%%/pics/arrange-layers-dialog.png
-%%DATADIR%%/pics/color-scheme-1.png
 %%DATADIR%%/pics/column-options.png
 %%DATADIR%%/pics/column-toolbar.png
 %%DATADIR%%/pics/contour-curve-dialog-1.png
@@ -255,7 +253,6 @@
 %%DATADIR%%/pics/custom-curves-pie-3.png
 %%DATADIR%%/pics/custom-layer-geometry.png
 %%DATADIR%%/pics/data-display-toolbar.png
-%%DATADIR%%/pics/default-color-scheme.png
 %%DATADIR%%/pics/define-layout-3.png
 %%DATADIR%%/pics/define-param-surface-plot.png
 %%DATADIR%%/pics/define-surface-plot.png
@@ -373,6 +370,7 @@
 %%DATADIR%%/pics/preferences-dialog12.png
 %%DATADIR%%/pics/preferences-dialog13.png
 %%DATADIR%%/pics/preferences-dialog14.png
+%%DATADIR%%/pics/preferences-dialog15.png
 %%DATADIR%%/pics/preferences-dialog2.png
 %%DATADIR%%/pics/preferences-dialog3.png
 %%DATADIR%%/pics/preferences-dialog4.png
@@ -421,66 +419,66 @@
 %%DATADIR%%/tutorial/simple-2dplot.qti
 %%DATADIR%%/tutorial/table-function-plot1.png
 %%DATADIR%%/tutorial/table-function-plot2.png
-%%DATADIR%%/x1079.html
-%%DATADIR%%/x1338.html
+%%DATADIR%%/x1081.html
+%%DATADIR%%/x1340.html
 %%DATADIR%%/x137.html
-%%DATADIR%%/x1427.html
-%%DATADIR%%/x1484.html
-%%DATADIR%%/x1802.html
-%%DATADIR%%/x1940.html
-%%DATADIR%%/x2067.html
-%%DATADIR%%/x2117.html
-%%DATADIR%%/x2155.html
-%%DATADIR%%/x2207.html
-%%DATADIR%%/x2528.html
-%%DATADIR%%/x2751.html
-%%DATADIR%%/x3068.html
-%%DATADIR%%/x3271.html
-%%DATADIR%%/x3382.html
-%%DATADIR%%/x3670.html
-%%DATADIR%%/x3703.html
-%%DATADIR%%/x3737.html
-%%DATADIR%%/x3752.html
-%%DATADIR%%/x3776.html
-%%DATADIR%%/x3802.html
-%%DATADIR%%/x3837.html
-%%DATADIR%%/x3857.html
-%%DATADIR%%/x3899.html
-%%DATADIR%%/x4008.html
-%%DATADIR%%/x4031.html
-%%DATADIR%%/x4048.html
-%%DATADIR%%/x4072.html
-%%DATADIR%%/x4097.html
-%%DATADIR%%/x4110.html
-%%DATADIR%%/x4210.html
-%%DATADIR%%/x4243.html
-%%DATADIR%%/x4260.html
-%%DATADIR%%/x4268.html
-%%DATADIR%%/x4386.html
-%%DATADIR%%/x4398.html
-%%DATADIR%%/x4428.html
-%%DATADIR%%/x4443.html
-%%DATADIR%%/x4471.html
-%%DATADIR%%/x4481.html
-%%DATADIR%%/x4504.html
-%%DATADIR%%/x4561.html
-%%DATADIR%%/x4676.html
-%%DATADIR%%/x4711.html
-%%DATADIR%%/x4714.html
-%%DATADIR%%/x4717.html
-%%DATADIR%%/x4731.html
-%%DATADIR%%/x4826.html
-%%DATADIR%%/x4837.html
-%%DATADIR%%/x4902.html
-%%DATADIR%%/x511.html
-%%DATADIR%%/x5135.html
-%%DATADIR%%/x599.html
-%%DATADIR%%/x5998.html
-%%DATADIR%%/x6015.html
+%%DATADIR%%/x1429.html
+%%DATADIR%%/x1486.html
+%%DATADIR%%/x1804.html
+%%DATADIR%%/x1942.html
+%%DATADIR%%/x2069.html
+%%DATADIR%%/x2119.html
+%%DATADIR%%/x2157.html
+%%DATADIR%%/x2209.html
+%%DATADIR%%/x2530.html
+%%DATADIR%%/x2753.html
+%%DATADIR%%/x3070.html
+%%DATADIR%%/x3273.html
+%%DATADIR%%/x3384.html
+%%DATADIR%%/x3672.html
+%%DATADIR%%/x3705.html
+%%DATADIR%%/x3739.html
+%%DATADIR%%/x3754.html
+%%DATADIR%%/x3778.html
+%%DATADIR%%/x3804.html
+%%DATADIR%%/x3839.html
+%%DATADIR%%/x3859.html
+%%DATADIR%%/x3901.html
+%%DATADIR%%/x4010.html
+%%DATADIR%%/x4033.html
+%%DATADIR%%/x4050.html
+%%DATADIR%%/x4074.html
+%%DATADIR%%/x4099.html
+%%DATADIR%%/x4112.html
+%%DATADIR%%/x4212.html
+%%DATADIR%%/x4245.html
+%%DATADIR%%/x4262.html
+%%DATADIR%%/x4270.html
+%%DATADIR%%/x4394.html
+%%DATADIR%%/x4406.html
+%%DATADIR%%/x4436.html
+%%DATADIR%%/x4451.html
+%%DATADIR%%/x4479.html
+%%DATADIR%%/x4489.html
+%%DATADIR%%/x4512.html
+%%DATADIR%%/x4552.html
+%%DATADIR%%/x4668.html
+%%DATADIR%%/x4703.html
+%%DATADIR%%/x4706.html
+%%DATADIR%%/x4709.html
+%%DATADIR%%/x4723.html
+%%DATADIR%%/x4818.html
+%%DATADIR%%/x4829.html
+%%DATADIR%%/x4894.html
+%%DATADIR%%/x5127.html
+%%DATADIR%%/x513.html
+%%DATADIR%%/x601.html
+%%DATADIR%%/x6103.html
+%%DATADIR%%/x6117.html
 %%DATADIR%%/x82.html
-%%DATADIR%%/x907.html
-%%DATADIR%%/x957.html
-%%DATADIR%%/x992.html
+%%DATADIR%%/x909.html
+%%DATADIR%%/x959.html
+%%DATADIR%%/x994.html
 @dirrm %%DATADIR%%/tutorial
 @dirrm %%DATADIR%%/pics
 @dirrm %%DATADIR%%/icons
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index e32775b89d1b..be7c31685987 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,27 +6,27 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.7.2
-PORTREVISION=	1
+DISTVERSION=	0.9.7.5
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	An Origin clone for data analysis and scientific plotting
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser \
-		${LOCALBASE}/lib/libboost_date_time.a:${PORTSDIR}/devel/boost
+BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
 LIB_DEPENDS=	gsl.13:${PORTSDIR}/math/gsl \
-		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4 \
-		qwt.5:${PORTSDIR}/x11-toolkits/qwt5
+		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
+		boost_date_time:${PORTSDIR}/devel/boost
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	gui moc_build qmake_build opengl svg qt3support network assistantclient
 HAS_CONFIGURE=	yes
-QMAKE_ARGS+=	-unix -recursive LOCALBASE=${LOCALBASE} PYTHON_CMD=${PYTHON_CMD}
+QMAKE_ARGS+=	-unix -recursive PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
+		PYTHON_CMD=${PYTHON_CMD}
 USE_DOS2UNIX=	*.pro
+MAKE_JOBS_SAFE=	yes
 MAN1=		qtiplot.1
 
 DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
@@ -34,15 +34,14 @@ DESKTOP_ENTRIES="QtiPlot" "Data analysis and plotting" \
 		"qtiplot" "" false
 
 OPTIONS=	DOCS "Install the QtiPlot Handbook" on \
-		PYTHON "Python scripting support" off
+		PYTHON "Python scripting support" on
 
-.include <bsd.port.pre.mk>
+STRIP_FILES=	bin/qtiplot share/qtiplot/fitPlugins/*.so.1.0.0
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_PYTHON)
 USE_PYTHON=	yes
-# manually include this, because USE_PYTHON is defined
-# after including bsd.port.pre.mk
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 BUILD_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui
 PLIST_SUB+=	PYTHON=""
@@ -63,6 +62,8 @@ PLIST_SUB+=	NLS=""
 PLIST_SUB+=	NLS="@comment "
 .endif
 
+.include <bsd.port.pre.mk>
+
 post-patch:
 .if defined(WITH_PYTHON)
 	@${REINPLACE_CMD} -e \
@@ -78,7 +79,7 @@ post-patch:
 .endif
 	@${REINPLACE_CMD} -e \
 		's|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
-		${WRKSRC}/qtiplot/src/ApplicationWindow.cpp
+		${WRKSRC}/qtiplot/src/core/ApplicationWindow.cpp
 	@${REINPLACE_CMD} -e '/^system(lupdate/d; /^system(lrelease/d' \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .if defined(WITH_DEBUG)
@@ -86,39 +87,30 @@ post-patch:
 		"/^CONFIG.*release/s|release|debug|" \
 		${WRKSRC}/${PORTNAME}/qtiplot.pro
 .endif
+.if defined(WITHOUT_NLS)
+	@${REINPLACE_CMD} -e \
+		"/INSTALLS.*translations/d" \
+		${WRKSRC}/${PORTNAME}/qtiplot.pro
+.endif
 
 do-configure:
 .if !defined(WITHOUT_NLS)
-	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 qtiplot.pro)
+	@(cd ${WRKSRC}/qtiplot && ${LOCALBASE}/bin/lrelease-qt4 -compress qtiplot.pro)
 .endif
 	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKE_ARGS})
 
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		's|^CC .*|CC=${CC}|; s|^CXX .*|CXX=${CXX}|; s|^LINK .*|LINK=${CXX}|'
-	@${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin|' ${WRKSRC}/qtiplot/Makefile
-
-do-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/qtiplot/qtiplot ${DATADIR}/qtiplot
-	${LN} -fs ${DATADIR}/qtiplot ${PREFIX}/bin/qtiplot
-	${INSTALL_MAN} ${WRKSRC}/qtiplot.1 ${PREFIX}/man/man1
-	${MKDIR} ${DATADIR}/fitPlugins
-	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational0.so.1.0.0 \
-				${DATADIR}/fitPlugins/libfitRational0.so
-	${INSTALL_PROGRAM} ${WRKSRC}/fitPlugins/libfitRational1.so.1.0.0 \
-				${DATADIR}/fitPlugins/libfitRational1.so
-	${INSTALL_DATA} ${WRKSRC}/qtiplot_logo.png ${DATADIR}/qtiplot.png
-	${INSTALL_DATA} ${WRKSRC}/qtiplot/qti_wordlist.txt ${DATADIR}
+	@${REINPLACE_CMD} -e 's|^\(INCPATH.*=\)|\1-I../3rdparty/liborigin -I../3rdparty/qwtplot3d/include|' ${WRKSRC}/qtiplot/Makefile
+
+post-install:
+	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
 .if defined(WITH_PYTHON)
 .for s in qtiplotrc.py qtiUtil.py
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s} ${DATADIR}/${s}
 	@(cd ${WRKSRC}/qtiplot && ${PYTHON_CMD} -c "import py_compile; py_compile.compile('${s}')")
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}/${s}c ${DATADIR}/${s}c
 .endfor
 .endif
-.if !defined(WITHOUT_NLS)
-	@(cd ${WRKSRC}/qtiplot/translations/ && ${COPYTREE_SHARE} '*.qm' ${DATADIR}/translations)
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index 067f6f7a14ab..fde5856c4c6f 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.7.2.tar.bz2) = ff1bea2f8b3e7722ae75820c3dc33b78
-SHA256 (qtiplot-0.9.7.2.tar.bz2) = 2cd4b9ee4fc84ce1c5c73efdfa8a909ae129a0f04ad9995ebae818e12a879f87
-SIZE (qtiplot-0.9.7.2.tar.bz2) = 6584563
+MD5 (qtiplot-0.9.7.5.tar.bz2) = 8ca64ee66d1a843828b7cfda3d1a7b00
+SHA256 (qtiplot-0.9.7.5.tar.bz2) = 5f71ac4c5b2a343a0d4ad264cbc333480074de1c89821b170a022eb9d382c3dd
+SIZE (qtiplot-0.9.7.5.tar.bz2) = 7536802
diff --git a/math/qtiplot/files/patch-fitPlugins__exp_saturation__exp_saturation.pro b/math/qtiplot/files/patch-fitPlugins__exp_saturation__exp_saturation.pro
new file mode 100644
index 000000000000..991efca2f86e
--- /dev/null
+++ b/math/qtiplot/files/patch-fitPlugins__exp_saturation__exp_saturation.pro
@@ -0,0 +1,20 @@
+--- ./fitPlugins/exp_saturation/exp_saturation.pro.orig	2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/exp_saturation/exp_saturation.pro	2009-03-26 23:10:24.000000000 +0300
+@@ -12,14 +12,13 @@
+ DESTDIR           = ../
+  
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++unix:INCLUDEPATH += $$(LOCALBASE)/include
++unix:LIBS        += -lgsl -lgslcblas
+ 
+ #dynamically link against GSL installed system-wide
+ #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+ 
+ SOURCES += exp_saturation.c
diff --git a/math/qtiplot/files/patch-fitPlugins__explin__explin.pro b/math/qtiplot/files/patch-fitPlugins__explin__explin.pro
new file mode 100644
index 000000000000..1613e2e50c69
--- /dev/null
+++ b/math/qtiplot/files/patch-fitPlugins__explin__explin.pro
@@ -0,0 +1,20 @@
+--- ./fitPlugins/explin/explin.pro.orig	2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/explin/explin.pro	2009-03-26 23:10:01.000000000 +0300
+@@ -12,14 +12,13 @@
+ DESTDIR           = ../
+  
+ # statically link against GSL in 3rdparty
+-INCLUDEPATH += ../../3rdparty/gsl/include/
+-LIBS        += ../../3rdparty/gsl/lib/libgsl.a
+-LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
++unix:INCLUDEPATH += $$(LOCALBASE)/include
++unix:LIBS        += -lgsl -lgslcblas
+ 
+ #dynamically link against GSL installed system-wide
+ #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+ 
+ SOURCES += explin.c
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
index 0ffbc3335d20..a9aef9e6c738 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational0__fitRational0.pro
@@ -1,6 +1,6 @@
---- fitPlugins/fitRational0/fitRational0.pro.orig	2007-10-27 00:15:32.000000000 +0200
-+++ fitPlugins/fitRational0/fitRational0.pro	2007-12-15 12:14:56.000000000 +0100
-@@ -12,9 +12,8 @@
+--- ./fitPlugins/fitRational0/fitRational0.pro.orig	2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/fitRational0/fitRational0.pro	2009-03-26 23:11:59.000000000 +0300
+@@ -12,14 +12,13 @@
  DESTDIR           = ../
   
  # statically link against GSL in 3rdparty
@@ -12,3 +12,9 @@
  
  #dynamically link against GSL installed system-wide
  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+ 
+ SOURCES += fitRational0.cpp
diff --git a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
index f8859274de00..87e4d8cbe4d7 100644
--- a/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
+++ b/math/qtiplot/files/patch-fitPlugins__fitRational1__fitRational1.pro
@@ -1,6 +1,6 @@
---- ./fitPlugins/fitRational1/fitRational1.pro.orig	2007-10-27 02:15:18.000000000 +0400
-+++ ./fitPlugins/fitRational1/fitRational1.pro	2007-11-14 20:19:55.000000000 +0300
-@@ -12,9 +12,8 @@
+--- ./fitPlugins/fitRational1/fitRational1.pro.orig	2009-03-05 15:56:56.000000000 +0300
++++ ./fitPlugins/fitRational1/fitRational1.pro	2009-03-26 23:09:59.000000000 +0300
+@@ -12,14 +12,13 @@
  DESTDIR           = ../
   
  # statically link against GSL in 3rdparty
@@ -8,7 +8,13 @@
 -LIBS        += ../../3rdparty/gsl/lib/libgsl.a
 -LIBS        += ../../3rdparty/gsl/lib/libgslcblas.a
 +unix:INCLUDEPATH += $$(LOCALBASE)/include
-+unix:LIBS         += -lgsl -lgslcblas
++unix:LIBS        += -lgsl -lgslcblas
  
  #dynamically link against GSL installed system-wide
  #unix:LIBS += -L /usr/lib$${libsuff} -lgsl -lgslcblas
+ 
+-target.path=/usr/lib$${libsuff}/qtiplot/plugins
++target.path=$$PREFIX/share/qtiplot/fitPlugins
+ INSTALLS += target
+ 
+ SOURCES += fitRational1.cpp
diff --git a/math/qtiplot/files/patch-qtiplot.pro b/math/qtiplot/files/patch-qtiplot.pro
index 3e0e5c8373b6..7350271662ef 100644
--- a/math/qtiplot/files/patch-qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot.pro
@@ -1,9 +1,9 @@
---- ./qtiplot.pro.orig	2008-04-20 19:16:15.000000000 +0400
-+++ ./qtiplot.pro	2008-04-20 19:18:10.000000000 +0400
-@@ -2,6 +2,4 @@
+--- ./qtiplot.pro.orig	2009-03-05 15:57:29.000000000 +0300
++++ ./qtiplot.pro	2009-03-26 22:57:57.000000000 +0300
+@@ -1,6 +1,4 @@
+ TEMPLATE = subdirs
  
- SUBDIRS = fitPlugins/fitRational0\
-           fitPlugins/fitRational1\
--          3rdparty/qwt\
--	      manual\
+ SUBDIRS = fitPlugins \
+-	    manual \
+-	    3rdparty/qwt \
            qtiplot
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
index 39ebb1239b5c..f5d3a2447809 100644
--- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
@@ -1,6 +1,15 @@
---- ./qtiplot/qtiplot.pro.orig	2008-03-29 10:43:50.000000000 +0300
-+++ ./qtiplot/qtiplot.pro	2008-03-29 10:46:00.000000000 +0300
-@@ -45,13 +45,9 @@
+--- ./qtiplot/qtiplot.pro.orig	2009-03-27 00:45:43.000000000 +0300
++++ ./qtiplot/qtiplot.pro	2009-03-27 00:46:10.000000000 +0300
+@@ -18,7 +18,7 @@
+ CONFIG          += HAVE_LIBPNG
+ 
+ # Uncomment the following line if you want to perform a custom installation using the *.path variables defined bellow.
+-#CONFIG          += CustomInstall
++CONFIG          += CustomInstall
+ 
+ CONFIG          += release
+ #CONFIG          += debug
+@@ -28,13 +28,9 @@
  #!!! Warning: You must modify these paths according to your computer settings
  #############################################################################
  
@@ -9,7 +18,7 @@
 -INCLUDEPATH       += ../3rdparty/qwt/src
 -INCLUDEPATH       += ../3rdparty/liborigin
 -INCLUDEPATH       += ../3rdparty/gsl/include
--INCLUDEPATH       += ../3rdparty/zlib123/include
+-INCLUDEPATH       += ../3rdparty/zlib
 -INCLUDEPATH       += ../3rdparty/boost_1_36_0
 +unix:INCLUDEPATH += $$LOCALBASE/include/qwt
 +unix:INCLUDEPATH += $$LOCALBASE/include/qwtplot3d-qt4
@@ -17,37 +26,60 @@
  
  ##################### 3rd PARTY LIBRARIES SECTION ###########################
  #!!! Warning: You must modify these paths according to your computer settings
-@@ -59,17 +55,13 @@
+@@ -43,17 +39,14 @@
  ##################### Linux (Mac OS X) ######################################
  
  # statically link against libraries in 3rdparty
 -unix:LIBS         += ../3rdparty/muparser/lib/libmuparser.a
--unix:LIBS         += ../3rdparty/qwtplot3d/lib/libqwtplot3d.a
 -unix:LIBS         += ../3rdparty/qwt/lib/libqwt.a
 -unix:LIBS         += ../3rdparty/gsl/lib/libgsl.a
 -unix:LIBS         += ../3rdparty/gsl/lib/libgslcblas.a
+-unix:LIBS         += ../3rdparty/boost_1_36_0/lib/libboost_date_time-gcc43-mt-1_36.a
+-unix:LIBS         += ../3rdparty/boost_1_36_0/lib/libboost_thread-gcc43-mt-1_36.a
  
  # dynamically link against dependencies if they are installed system-wide
- #unix:LIBS         += -lmuparser
- #unix:LIBS         += -lqwtplot3d
+-#unix:LIBS         += -lmuparser
 -#unix:LIBS         += -lqwt
 -#unix:LIBS         += -lgsl -lgslcblas
++unix:LIBS         += -lmuparser
 +unix:LIBS         += -lqwt
 +unix:LIBS         += -lgsl -lgslcblas
-+unix:LIBS         += -L$$LOCALBASE/lib -lqwtplot3d-qt4 -lz
++unix:LIBS         += -L$$LOCALBASE/lib -lz
++unix:LIBS         += -lboost_date_time
++unix:LIBS         += -lboost_thread
  
  ##################### Windows ###############################################
  
-@@ -435,6 +427,7 @@
- ##################### Default: muParser v1.28 #################
+@@ -80,18 +73,16 @@
+ contains(CONFIG, CustomInstall){
+ 	INSTALLS        += target
+ 	INSTALLS        += translations
+-	INSTALLS        += manual
+-	INSTALLS        += documentation
+ 	unix:INSTALLS        += man
  
- contains(SCRIPTING_LANGS, muParser) {
-+  unix:LIBS         += -lmuparser
-   DEFINES += SCRIPTING_MUPARSER
+-	unix: INSTALLBASE = /usr
++	unix: INSTALLBASE = $$PREFIX
+ 	win32: INSTALLBASE = C:/QtiPlot
  
-   HEADERS += src/muParserScript.h \
-@@ -461,11 +454,12 @@
-   SOURCES += src/PythonScript.cpp src/PythonScripting.cpp
+ 	unix: target.path = $$INSTALLBASE/bin
+ 	unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
+ 	unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
+ 	unix: documentation.path = $$INSTALLBASE/share/doc/qtiplot
+-	unix: man.path = $$INSTALLBASE/share/man/man1/
++	unix: man.path = $$INSTALLBASE/man/man1/
+ 
+ 	win32: target.path = $$INSTALLBASE
+ 	win32: translations.path = $$INSTALLBASE/translations
+@@ -186,17 +177,18 @@
+   				    qtiUtil.py \
+   				    qti_wordlist.txt \
+ 
+-  	unix: pythonconfig.path = /usr/local/qtiplot
++  	unix: pythonconfig.path = $$INSTALLBASE/share/qtiplot
+   	win32: pythonconfig.path = $$INSTALLBASE
+   	DEFINES += PYTHON_CONFIG_PATH="\\\"$$replace(pythonconfig.path," ","\ ")\\\"
+   }
  
    unix {
 -    INCLUDEPATH += $$system(python python-includepath.py)
@@ -56,9 +88,20 @@
 +    LIBS        += -l$$(PYTHON_VERSION)
      LIBS        += -lm
      system(mkdir -p $${SIP_DIR})
--    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/qti.sip)
+-    system($$system(python python-sipcmd.py) -c $${SIP_DIR} src/scripting/qti.sip)
 +    SIPCMD = $$PYTHON_CMD python-sipcmd.py
-+    system($$system($$SIPCMD) -c $${SIP_DIR} src/qti.sip)
++    system($$system($$SIPCMD) -c $${SIP_DIR} src/scripting/qti.sip)
    }
  
    win32 {
+@@ -210,8 +202,8 @@
+ 
+ contains(CONFIG, HAVE_LIBPNG){
+ 	DEFINES += GL2PS_HAVE_LIBPNG
+-	INCLUDEPATH += ../3rdparty/libpng/
+-	LIBS        += ../3rdparty/libpng/libpng.a
++	INCLUDEPATH += $$LOCALBASE/include/libpng
++	LIBS        += -lpng
+ }
+ 
+ ###############################################################
diff --git a/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp b/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp
new file mode 100644
index 000000000000..e3158a561415
--- /dev/null
+++ b/math/qtiplot/files/patch-qtiplot__src__analysis__dialogs__FitDialog.cpp
@@ -0,0 +1,11 @@
+--- ./qtiplot/src/analysis/dialogs/FitDialog.cpp.orig	2009-03-05 15:57:04.000000000 +0300
++++ ./qtiplot/src/analysis/dialogs/FitDialog.cpp	2009-03-27 14:20:44.000000000 +0300
+@@ -119,7 +119,7 @@
+ 	ApplicationWindow *app = (ApplicationWindow *)parent;

+ 	QString pluginsPath = app->fitPluginsPath;

+ 	QFileInfo fi(pluginsPath);

+-	if (pluginsPath.isEmpty() || !fi.isDir() || !fi.isWritable())

++	if (pluginsPath.isEmpty() || !fi.isDir())

+ 		choosePluginsFolder();

+ 	else

+     	loadPlugins();

diff --git a/math/qtiplot/pkg-plist b/math/qtiplot/pkg-plist
index f90aa6d62b23..080888399457 100644
--- a/math/qtiplot/pkg-plist
+++ b/math/qtiplot/pkg-plist
@@ -1,11 +1,23 @@
 bin/qtiplot
+%%DATADIR%%/fitPlugins/libexp_saturation.so
+%%DATADIR%%/fitPlugins/libexp_saturation.so.1
+%%DATADIR%%/fitPlugins/libexp_saturation.so.1.0
+%%DATADIR%%/fitPlugins/libexp_saturation.so.1.0.0
+%%DATADIR%%/fitPlugins/libexplin.so
+%%DATADIR%%/fitPlugins/libexplin.so.1
+%%DATADIR%%/fitPlugins/libexplin.so.1.0
+%%DATADIR%%/fitPlugins/libexplin.so.1.0.0
 %%DATADIR%%/fitPlugins/libfitRational0.so
+%%DATADIR%%/fitPlugins/libfitRational0.so.1
+%%DATADIR%%/fitPlugins/libfitRational0.so.1.0
+%%DATADIR%%/fitPlugins/libfitRational0.so.1.0.0
 %%DATADIR%%/fitPlugins/libfitRational1.so
-%%DATADIR%%/qti_wordlist.txt
-%%DATADIR%%/qtiplot
-%%DATADIR%%/qtiplot.png
+%%DATADIR%%/fitPlugins/libfitRational1.so.1
+%%DATADIR%%/fitPlugins/libfitRational1.so.1.0
+%%DATADIR%%/fitPlugins/libfitRational1.so.1.0.0
 %%PYTHON%%%%DATADIR%%/qtiUtil.py
 %%PYTHON%%%%DATADIR%%/qtiUtil.pyc
+%%PYTHON%%%%DATADIR%%/qti_wordlist.txt
 %%PYTHON%%%%DATADIR%%/qtiplotrc.py
 %%PYTHON%%%%DATADIR%%/qtiplotrc.pyc
 %%NLS%%%%DATADIR%%/translations/qtiplot_de.qm
@@ -16,4 +28,4 @@ bin/qtiplot
 %%NLS%%%%DATADIR%%/translations/qtiplot_sv.qm
 %%NLS%%@dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%/fitPlugins
-@dirrmtry %%DATADIR%%
+@dirrm %%DATADIR%%