Update to 0.9.8.8

9 files changed, 34 insertions, 49 deletions

diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 44c645cb4c49..e4207c18df13 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.8.6
+DISTVERSION=	0.9.8.8
 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 6ac61354e6ed..d82e54c18fd9 100644
--- a/math/qtiplot-doc/distinfo
+++ b/math/qtiplot-doc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qtiplot-0.9.8.6.tar.bz2) = 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
-SIZE (qtiplot-0.9.8.6.tar.bz2) = 10415560
+SHA256 (qtiplot-0.9.8.8.tar.bz2) = cc4c96aff68dd6124374f228eb3866c2f6d0cd478cfb9242b43fca012ecbb0c3
+SIZE (qtiplot-0.9.8.8.tar.bz2) = 10437325
diff --git a/math/qtiplot-doc/pkg-plist b/math/qtiplot-doc/pkg-plist
index dd8d4cec52e6..a99ecf61fb17 100644
--- a/math/qtiplot-doc/pkg-plist
+++ b/math/qtiplot-doc/pkg-plist
@@ -5,7 +5,7 @@
 %%DATADIR%%/c5768.html
 %%DATADIR%%/c6039.html
 %%DATADIR%%/c686.html
-%%DATADIR%%/c7646.html
+%%DATADIR%%/c7659.html
 %%DATADIR%%/common/fond-titre-chapitre.png
 %%DATADIR%%/common/fond-titre-chapitre.xcf
 %%DATADIR%%/common/fond-titre.png
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index 6cc539fa2882..d11d3a5a70a6 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.8.6
+DISTVERSION=	0.9.8.8
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
@@ -81,7 +81,7 @@ post-patch:
 		${WRKSRC}/build.conf
 .endif
 	@${REINPLACE_CMD} -e \
-		's|/usr/lib/qtiplot/plugins|${DATADIR}/fitPlugins|' \
+		's|/usr/local/qtiplot/fitPlugins|${DATADIR}/fitPlugins|' \
 		${WRKSRC}/qtiplot/src/core/ApplicationWindow.cpp
 	@${REINPLACE_CMD} -e \
 		's|target.path=.*|target.path=${DATADIR}/fitPlugins|g' \
@@ -91,7 +91,7 @@ post-patch:
 .if defined(WITH_DEBUG)
 	@${REINPLACE_CMD} -e \
 		"/^CONFIG.*release/s|release|debug|" \
-		${WRKSRC}/${PORTNAME}/qtiplot.pro
+		${WRKSRC}/build.conf
 .endif
 .if defined(WITHOUT_NLS)
 	@${REINPLACE_CMD} -e \
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index 6ac61354e6ed..d82e54c18fd9 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qtiplot-0.9.8.6.tar.bz2) = 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
-SIZE (qtiplot-0.9.8.6.tar.bz2) = 10415560
+SHA256 (qtiplot-0.9.8.8.tar.bz2) = cc4c96aff68dd6124374f228eb3866c2f6d0cd478cfb9242b43fca012ecbb0c3
+SIZE (qtiplot-0.9.8.8.tar.bz2) = 10437325
diff --git a/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro b/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro
index 30e13e6c664e..145515c4f917 100644
--- a/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro
+++ b/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro
@@ -1,15 +1,6 @@
---- ./3rdparty/qwtplot3d/qwtplot3d.pro.orig	2011-01-25 08:07:31.000000000 +0300
-+++ ./3rdparty/qwtplot3d/qwtplot3d.pro	2011-03-19 00:18:59.395290422 +0300
-@@ -10,7 +10,7 @@
- DEPENDPATH       = include src
- QT              += opengl
- 
--CONFIG          += dll
-+CONFIG          += static
- win32:CONFIG    += exceptions
- win32:dll:DEFINES    += QT_DLL QWT3D_DLL QWT3D_MAKEDLL
- win32:QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_STL
-@@ -39,4 +39,3 @@
+--- ./3rdparty/qwtplot3d/qwtplot3d.pro.orig	2011-10-15 23:30:37.027086494 +0000
++++ ./3rdparty/qwtplot3d/qwtplot3d.pro	2011-10-15 23:30:37.069086007 +0000
+@@ -37,4 +37,3 @@
  
  # install
  target.path = lib
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
index e49f2080a91c..56f38e312926 100644
--- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
@@ -1,5 +1,5 @@
---- ./qtiplot/qtiplot.pro.orig	2011-02-14 14:21:47.000000000 +0300
-+++ ./qtiplot/qtiplot.pro	2011-03-19 00:32:55.867883769 +0300
+--- ./qtiplot/qtiplot.pro.orig	2011-10-15 23:30:36.976081538 +0000
++++ ./qtiplot/qtiplot.pro	2011-10-15 23:31:17.153088752 +0000
 @@ -45,14 +45,14 @@
  	INSTALLS        += documentation
  	unix:INSTALLS        += man
@@ -10,32 +10,34 @@
  
  	unix: target.path = $$INSTALLBASE/bin
  	unix: translations.path = $$INSTALLBASE/share/qtiplot/translations
- 	unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
+-	unix: manual.path = $$INSTALLBASE/share/doc/qtiplot/manual
++	unix: manual.path = $$INSTALLBASE/share/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
-@@ -94,16 +94,7 @@
- 				  translations/qtiplot_ja.ts \
- 				  translations/qtiplot_sv.ts
+@@ -101,17 +101,7 @@
+ 		  translations/qtiplot_ja.ts \
+ 		  translations/qtiplot_sv.ts
  
 -translations.files += translations/qtiplot_cn.qm \
--					translations/qtiplot_cz.qm \
--					translations/qtiplot_de.qm \
--					translations/qtiplot_es.qm \
--					translations/qtiplot_fr.qm \
--					translations/qtiplot_pt.qm \
--					translations/qtiplot_ro.qm \
--					translations/qtiplot_ru.qm \
--					translations/qtiplot_ja.qm \
--					translations/qtiplot_sv.qm
+-		translations/qtiplot_cz.qm \
+-		translations/qtiplot_de.qm \
+-		translations/qtiplot_es.qm \
+-		translations/qtiplot_el.qm \
+-		translations/qtiplot_fr.qm \
+-		translations/qtiplot_pt.qm \
+-		translations/qtiplot_ro.qm \
+-		translations/qtiplot_ru.qm \
+-		translations/qtiplot_ja.qm \
+-		translations/qtiplot_sv.qm
 +translations.files += $$replace(TRANSLATIONS,".ts",".qm")
  
  isEmpty(LUPDATE): LUPDATE = lupdate
  #system($$LUPDATE -verbose qtiplot.pro)
-@@ -112,11 +103,7 @@
+@@ -120,11 +110,7 @@
  
  ###################### DOCUMENTATION ########################################
  
@@ -47,7 +49,7 @@
  
  unix: man.files += ../qtiplot.1
  
-@@ -151,18 +138,19 @@
+@@ -159,18 +145,19 @@
    				    qtiUtil.py \
    				    qti_wordlist.txt \
  
diff --git a/math/qtiplot/files/patch-qtiplot__src__plot2D__Graph.cpp b/math/qtiplot/files/patch-qtiplot__src__plot2D__Graph.cpp
deleted file mode 100644
index bd53caf01634..000000000000
--- a/math/qtiplot/files/patch-qtiplot__src__plot2D__Graph.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./qtiplot/src/plot2D/Graph.cpp.orig	2011-05-04 12:24:28.000000000 +0400
-+++ ./qtiplot/src/plot2D/Graph.cpp	2011-07-09 01:31:13.780302807 +0400
-@@ -84,6 +84,7 @@
- #include <QMessageBox>
- #include <QPixmap>
- #include <QPainter>
-+#include <QPaintEngine>
- #include <QMenu>
- #include <QTextStream>
- #include <QLocale>
diff --git a/math/qtiplot/pkg-plist b/math/qtiplot/pkg-plist
index 1186cdf27d01..88087bbd72cd 100644
--- a/math/qtiplot/pkg-plist
+++ b/math/qtiplot/pkg-plist
@@ -28,8 +28,10 @@ bin/qtiplot
 %%NLS%%%%DATADIR%%/translations/qtiplot_cn.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_cz.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_de.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_el.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_es.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_fr.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_it.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_ja.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_pt.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_ro.qm
@@ -37,4 +39,4 @@ bin/qtiplot
 %%NLS%%%%DATADIR%%/translations/qtiplot_sv.qm
 %%NLS%%@dirrm %%DATADIR%%/translations
 @dirrm %%DATADIR%%/fitPlugins
-@dirrm %%DATADIR%%
+@dirrmtry %%DATADIR%%