8 files changed, 23 insertions, 31 deletions

diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 234bbc899748..44c645cb4c49 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.8.5
+DISTVERSION=	0.9.8.6
 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 e5a19d629956..6ac61354e6ed 100644
--- a/math/qtiplot-doc/distinfo
+++ b/math/qtiplot-doc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qtiplot-0.9.8.5.tar.bz2) = 5bc297e236551a0e8a23719f3f08438700215eb82cf320bbc1d4c037e6d9cf33
-SIZE (qtiplot-0.9.8.5.tar.bz2) = 10399116
+SHA256 (qtiplot-0.9.8.6.tar.bz2) = 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
+SIZE (qtiplot-0.9.8.6.tar.bz2) = 10415560
diff --git a/math/qtiplot-doc/pkg-plist b/math/qtiplot-doc/pkg-plist
index 757c887f1f62..dd8d4cec52e6 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%%/c7642.html
+%%DATADIR%%/c7646.html
 %%DATADIR%%/common/fond-titre-chapitre.png
 %%DATADIR%%/common/fond-titre-chapitre.xcf
 %%DATADIR%%/common/fond-titre.png
@@ -52,6 +52,10 @@
 %%DATADIR%%/icons/add_inset_layer.png
 %%DATADIR%%/icons/add_zoom_plot.png
 %%DATADIR%%/icons/adjust_col_width.png
+%%DATADIR%%/icons/align_bottom.png
+%%DATADIR%%/icons/align_left.png
+%%DATADIR%%/icons/align_right.png
+%%DATADIR%%/icons/align_top.png
 %%DATADIR%%/icons/append_drag_curves.png
 %%DATADIR%%/icons/append_file.png
 %%DATADIR%%/icons/area.png
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index ee2e46a06ac9..6cc539fa2882 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.8.5
-PORTREVISION=	1
+DISTVERSION=	0.9.8.6
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
@@ -15,8 +14,7 @@ MAINTAINER=	makc@FreeBSD.org
 COMMENT=	An Origin clone for data analysis and scientific plotting
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmuparser.a:${PORTSDIR}/math/muparser
-LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl \
-		boost_date_time:${PORTSDIR}/devel/boost-libs
+LIB_DEPENDS=	gsl.16:${PORTSDIR}/math/gsl
 # use bundled modified libraries
 # 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5 \
 # 		qwtplot3d-qt4:${PORTSDIR}/math/qwtplot3d-qt4
@@ -27,7 +25,7 @@ USE_QT_VER=	4
 QT_COMPONENTS=	gui opengl svg qt3support network assistantclient \
 		moc_build qmake_build rcc_build
 HAS_CONFIGURE=	yes
-QMAKE_ARGS+=	-unix -recursive PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
+QMAKE_ARGS+=	-recursive PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} \
 		PYTHON_CMD=${PYTHON_CMD}
 USE_DOS2UNIX=	*.pro
 MAKE_JOBS_SAFE=	yes
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index e5a19d629956..6ac61354e6ed 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qtiplot-0.9.8.5.tar.bz2) = 5bc297e236551a0e8a23719f3f08438700215eb82cf320bbc1d4c037e6d9cf33
-SIZE (qtiplot-0.9.8.5.tar.bz2) = 10399116
+SHA256 (qtiplot-0.9.8.6.tar.bz2) = 3fef0e8796e6045aad5404b156bf1e125e9732a034cb3e61c58dcebd5079985f
+SIZE (qtiplot-0.9.8.6.tar.bz2) = 10415560
diff --git a/math/qtiplot/files/build.conf b/math/qtiplot/files/build.conf
index 0d492b3ea6ce..526c23e3b00b 100644
--- a/math/qtiplot/files/build.conf
+++ b/math/qtiplot/files/build.conf
@@ -11,9 +11,6 @@ MUPARSER_LIBS = -lmuparser
 GSL_INCLUDEPATH =
 GSL_LIBS = -lgsl -lgslcblas
 
-BOOST_INCLUDEPATH = $$LOCALBASE/include/boost
-BOOST_LIBS = -lboost_date_time -lboost_thread
-
 QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
 QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
 
diff --git a/math/qtiplot/files/patch-qtiplot__qtiplot.pro b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
index ed2d82b688e9..e49f2080a91c 100644
--- a/math/qtiplot/files/patch-qtiplot__qtiplot.pro
+++ b/math/qtiplot/files/patch-qtiplot__qtiplot.pro
@@ -71,20 +71,3 @@
    }
  
    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__plot2D__Graph.cpp b/math/qtiplot/files/patch-qtiplot__src__plot2D__Graph.cpp
new file mode 100644
index 000000000000..bd53caf01634
--- /dev/null
+++ b/math/qtiplot/files/patch-qtiplot__src__plot2D__Graph.cpp
@@ -0,0 +1,10 @@
+--- ./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>