Update to 0.9.8.5

7 files changed, 114 insertions, 10 deletions

diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index ddaabb832e55..f0dabe039bd8 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.8
+DISTVERSION=	0.9.8.5
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index 18a0f5ada66f..e5a19d629956 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qtiplot-0.9.8.tar.bz2) = 21998c27afc76e5185c727223910c5107c9590d3fa0eefbdab3af2dee1e5cc44
-SIZE (qtiplot-0.9.8.tar.bz2) = 8142801
+SHA256 (qtiplot-0.9.8.5.tar.bz2) = 5bc297e236551a0e8a23719f3f08438700215eb82cf320bbc1d4c037e6d9cf33
+SIZE (qtiplot-0.9.8.5.tar.bz2) = 10399116
diff --git a/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro b/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro
new file mode 100644
index 000000000000..30e13e6c664e
--- /dev/null
+++ b/math/qtiplot/files/patch-3rdparty__qwtplot3d__qwtplot3d.pro
@@ -0,0 +1,16 @@
+--- ./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 @@
+ 
+ # install
+ target.path = lib
+-INSTALLS += target
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
index f228ad2ecb48..ed2d82b688e9 100644
--- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
@@ -1,6 +1,6 @@
---- ./qtiplot/qtiplot.pro.orig	2009-10-31 13:47:20.000000000 +0300
-+++ ./qtiplot/qtiplot.pro	2009-10-31 13:49:42.000000000 +0300
-@@ -47,14 +47,14 @@
+--- ./qtiplot/qtiplot.pro.orig	2011-02-14 14:21:47.000000000 +0300
++++ ./qtiplot/qtiplot.pro	2011-03-19 00:32:55.867883769 +0300
+@@ -45,14 +45,14 @@
  	INSTALLS        += documentation
  	unix:INSTALLS        += man
  
@@ -17,7 +17,7 @@
  
  	win32: target.path = $$INSTALLBASE
  	win32: translations.path = $$INSTALLBASE/translations
-@@ -97,16 +97,7 @@
+@@ -94,16 +94,7 @@
  				  translations/qtiplot_ja.ts \
  				  translations/qtiplot_sv.ts
  
@@ -26,7 +26,7 @@
 -					translations/qtiplot_de.qm \
 -					translations/qtiplot_es.qm \
 -					translations/qtiplot_fr.qm \
--					#translations/qtiplot_pt.qm \
+-					translations/qtiplot_pt.qm \
 -					translations/qtiplot_ro.qm \
 -					translations/qtiplot_ru.qm \
 -					translations/qtiplot_ja.qm \
@@ -35,7 +35,7 @@
  
  isEmpty(LUPDATE): LUPDATE = lupdate
  #system($$LUPDATE -verbose qtiplot.pro)
-@@ -115,11 +109,7 @@
+@@ -112,11 +103,7 @@
  
  ###################### DOCUMENTATION ########################################
  
@@ -47,7 +47,7 @@
  
  unix: man.files += ../qtiplot.1
  
-@@ -164,18 +154,19 @@
+@@ -151,18 +138,19 @@
    				    qtiUtil.py \
    				    qti_wordlist.txt \
  
@@ -71,3 +71,20 @@
    }
  
    win32 {
+@@ -228,16 +216,3 @@
+ 	RC_FILE	= qtiplot.rc
+ 	include(../3rdparty/QtSolutions/qtbrowserplugin/src/qtbrowserplugin.pri)
+ }
+-
+-QT          += sql
+-LIBS        += src/plugins/libQtiPlotdBasePlugin.a
+-LIBS        += src/plugins/libQtiPlotDatabasePlugin.a
+-LIBS        += src/plugins/libQtiPlotCsvPlugin.a
+-LIBS        += src/plugins/libQtiPlotTexPlugin.a
+-LIBS        += src/plugins/libQtiPlotOdsPlugin.a
+-LIBS        += src/plugins/libQtiPlotExcelPlugin.a
+-LIBS        += src/plugins/libQtiPlotOriginPlugin.a
+-LIBS        += src/plugins/libQtiPlotEmfExportPlugin.a
+-LIBS        += ../3rdparty/quazip/lib/libquazip.a
+-LIBS        += ../3rdparty/EmfEngine/libEmfEngine.a
+-LIBS        += -lgdiplus
diff --git a/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip b/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip
new file mode 100644
index 000000000000..d211639967db
--- /dev/null
+++ b/math/qtiplot/files/patch-qtiplot__src__scripting__qti.sip
@@ -0,0 +1,60 @@
+--- ./qtiplot/src/scripting/qti.sip.orig	2011-02-08 15:33:02.000000000 +0300
++++ ./qtiplot/src/scripting/qti.sip	2011-03-19 00:06:07.578146696 +0300
+@@ -3390,57 +3390,6 @@
+   double pValue();
+ };
+ 
+-class Anova : StatisticTest
+-{
+-%TypeHeaderCode
+-#include <Anova.h>
+-%End
+-public:
+-  Anova(ApplicationWindow * /TransferThis/, bool twoWay = false, double level = 0.05);
+-  Anova(bool twoWay = false, double level = 0.05) /NoDerived/;
+-%MethodCode
+-  SIPQTI_APP(new sipAnova(app, a0, a1))
+-%End
+-
+-  bool run();
+-  bool addSample(const QString& colName, int aLevel = 1, int bLevel = 1);
+-  void setAnovaTwoWayModel(int);
+-
+-  virtual QString logInfo();
+-  double fStat();
+-  double statistic();
+-  double pValue();
+-  //! Sum of squares
+-  double ssm();
+-  double sse();
+-  double sst();
+-  //! Mean square value
+-  double mse();
+-  //! F statistic for factor A
+-  double fStatA();
+-  //! F statistic for factor B
+-  double fStatB();
+-  //! F statistic for the interaction
+-  double fStatAB();
+-  //! P value for factor A
+-  double pValueA();
+-  //! P value for factor B
+-  double pValueB();
+-  //! P value for the interaction
+-  double pValueAB();
+-  //! Sum of squares for factor A
+-  double ssa();
+-  //! Sum of squares for factor B
+-  double ssb();
+-  //! Sum of squares for the interaction
+-  double ssab();
+-  //! Mean square value for factor A
+-  double msa();
+-  //! Mean square value for factor B
+-  double msb();
+-  //! Mean square value for the interaction
+-  double msab();
+-};
+ 
+ // used for output redirection
+ class PythonScripting
diff --git a/math/qtiplot/files/patch-qtiplot__src__scripting__scripting.pri b/math/qtiplot/files/patch-qtiplot__src__scripting__scripting.pri
new file mode 100644
index 000000000000..a73948349446
--- /dev/null
+++ b/math/qtiplot/files/patch-qtiplot__src__scripting__scripting.pri
@@ -0,0 +1,10 @@
+--- ./qtiplot/src/scripting/scripting.pri.orig	2010-11-16 13:42:07.000000000 +0300
++++ ./qtiplot/src/scripting/scripting.pri	2011-03-19 00:09:38.182155936 +0300
+@@ -115,7 +115,6 @@
+ 			 $${SIP_DIR}/sipqtitTest.cpp \
+ 			 $${SIP_DIR}/sipqtiShapiroWilkTest.cpp \
+ 			 $${SIP_DIR}/sipqtiChiSquareTest.cpp \
+-			 $${SIP_DIR}/sipqtiAnova.cpp \
+ 
+ exists(../../$${SIP_DIR}/sipqtiQList.cpp) {
+   # SIP < 4.9
diff --git a/math/qtiplot/pkg-plist b/math/qtiplot/pkg-plist
index 8cd035921c7f..1186cdf27d01 100644
--- a/math/qtiplot/pkg-plist
+++ b/math/qtiplot/pkg-plist
@@ -31,6 +31,7 @@ bin/qtiplot
 %%NLS%%%%DATADIR%%/translations/qtiplot_es.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_fr.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_ja.qm
+%%NLS%%%%DATADIR%%/translations/qtiplot_pt.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_ro.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_ru.qm
 %%NLS%%%%DATADIR%%/translations/qtiplot_sv.qm