6 files changed, 55 insertions, 55 deletions

diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 3565723549b0..79fcdefe39a4 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.7.11
-PORTREVISION=	1
+DISTVERSION=	0.9.7.12
 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 34b8fb0bafa2..4bacc0d81fcd 100644
--- a/math/qtiplot-doc/distinfo
+++ b/math/qtiplot-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.7.11.tar.bz2) = 4473d9f747353080f0b4e34ae6c1e725
-SHA256 (qtiplot-0.9.7.11.tar.bz2) = dd6c1c832eed89cd8bab55d73f77549338faf4e10f4dbf534df597b39bb2f52f
-SIZE (qtiplot-0.9.7.11.tar.bz2) = 8015168
+MD5 (qtiplot-0.9.7.12.tar.bz2) = 2620bf8a520967d2a58d5f290da745de
+SHA256 (qtiplot-0.9.7.12.tar.bz2) = 29cf8e3dbd5539019b3351893c8b2fafa1e1283333d4b055b711b3a7ea85d935
+SIZE (qtiplot-0.9.7.12.tar.bz2) = 8221079
diff --git a/math/qtiplot-doc/pkg-plist b/math/qtiplot-doc/pkg-plist
index 5fa49484bd7e..faed821b6a9a 100644
--- a/math/qtiplot-doc/pkg-plist
+++ b/math/qtiplot-doc/pkg-plist
@@ -1,12 +1,12 @@
-%%DATADIR%%/a6563.html
+%%DATADIR%%/a6578.html
 %%DATADIR%%/c2489.html
 %%DATADIR%%/c354.html
 %%DATADIR%%/c3716.html
-%%DATADIR%%/c4746.html
-%%DATADIR%%/c5017.html
+%%DATADIR%%/c4748.html
+%%DATADIR%%/c5019.html
 %%DATADIR%%/c55.html
-%%DATADIR%%/c6478.html
-%%DATADIR%%/c6661.html
+%%DATADIR%%/c6493.html
+%%DATADIR%%/c6676.html
 %%DATADIR%%/c673.html
 %%DATADIR%%/common/fond-titre-chapitre.png
 %%DATADIR%%/common/fond-titre-chapitre.xcf
@@ -278,6 +278,7 @@
 %%DATADIR%%/pics/add-function-dialog1.png
 %%DATADIR%%/pics/add-function-dialog2.png
 %%DATADIR%%/pics/add-function-dialog3.png
+%%DATADIR%%/pics/add-function-dialog4.png
 %%DATADIR%%/pics/add-layer.png
 %%DATADIR%%/pics/add-remove-curve.png
 %%DATADIR%%/pics/arrange-layers-dialog.png
@@ -431,6 +432,7 @@
 %%DATADIR%%/pics/preferences-dialog14.png
 %%DATADIR%%/pics/preferences-dialog15.png
 %%DATADIR%%/pics/preferences-dialog16.png
+%%DATADIR%%/pics/preferences-dialog17.png
 %%DATADIR%%/pics/preferences-dialog2.png
 %%DATADIR%%/pics/preferences-dialog3.png
 %%DATADIR%%/pics/preferences-dialog4.png
@@ -452,6 +454,8 @@
 %%DATADIR%%/pics/surface-plot-options-dialog3.png
 %%DATADIR%%/pics/surface-plot-options-dialog4.png
 %%DATADIR%%/pics/surface-plot-options-dialog5.png
+%%DATADIR%%/pics/surface-plot-options-dialog6.png
+%%DATADIR%%/pics/surface-plot-options-dialog7.png
 %%DATADIR%%/pics/table-toolbar.png
 %%DATADIR%%/pics/table.png
 %%DATADIR%%/pics/template1.png
@@ -500,44 +504,43 @@
 %%DATADIR%%/x3444.html
 %%DATADIR%%/x3732.html
 %%DATADIR%%/x3765.html
-%%DATADIR%%/x3799.html
-%%DATADIR%%/x3814.html
-%%DATADIR%%/x3838.html
-%%DATADIR%%/x3864.html
-%%DATADIR%%/x3899.html
-%%DATADIR%%/x3919.html
-%%DATADIR%%/x3983.html
-%%DATADIR%%/x4105.html
-%%DATADIR%%/x4128.html
-%%DATADIR%%/x4145.html
-%%DATADIR%%/x4169.html
-%%DATADIR%%/x4194.html
-%%DATADIR%%/x4209.html
-%%DATADIR%%/x4309.html
+%%DATADIR%%/x3806.html
+%%DATADIR%%/x3821.html
+%%DATADIR%%/x3845.html
+%%DATADIR%%/x3871.html
+%%DATADIR%%/x3906.html
+%%DATADIR%%/x3926.html
+%%DATADIR%%/x3990.html
+%%DATADIR%%/x4112.html
+%%DATADIR%%/x4135.html
+%%DATADIR%%/x4152.html
+%%DATADIR%%/x4177.html
+%%DATADIR%%/x4192.html
+%%DATADIR%%/x4292.html
+%%DATADIR%%/x4325.html
 %%DATADIR%%/x4342.html
-%%DATADIR%%/x4359.html
-%%DATADIR%%/x4367.html
-%%DATADIR%%/x4497.html
-%%DATADIR%%/x4509.html
-%%DATADIR%%/x4542.html
-%%DATADIR%%/x4557.html
-%%DATADIR%%/x4581.html
-%%DATADIR%%/x4591.html
-%%DATADIR%%/x4614.html
-%%DATADIR%%/x4654.html
-%%DATADIR%%/x4776.html
-%%DATADIR%%/x4811.html
-%%DATADIR%%/x4814.html
-%%DATADIR%%/x4817.html
-%%DATADIR%%/x4831.html
-%%DATADIR%%/x4926.html
-%%DATADIR%%/x4937.html
-%%DATADIR%%/x5002.html
+%%DATADIR%%/x4350.html
+%%DATADIR%%/x4486.html
+%%DATADIR%%/x4498.html
+%%DATADIR%%/x4531.html
+%%DATADIR%%/x4546.html
+%%DATADIR%%/x4570.html
+%%DATADIR%%/x4580.html
+%%DATADIR%%/x4603.html
+%%DATADIR%%/x4656.html
+%%DATADIR%%/x4778.html
+%%DATADIR%%/x4813.html
+%%DATADIR%%/x4816.html
+%%DATADIR%%/x4819.html
+%%DATADIR%%/x4833.html
+%%DATADIR%%/x4928.html
+%%DATADIR%%/x4939.html
+%%DATADIR%%/x5004.html
 %%DATADIR%%/x515.html
-%%DATADIR%%/x5278.html
+%%DATADIR%%/x5280.html
 %%DATADIR%%/x603.html
-%%DATADIR%%/x6569.html
-%%DATADIR%%/x6583.html
+%%DATADIR%%/x6584.html
+%%DATADIR%%/x6598.html
 %%DATADIR%%/x82.html
 %%DATADIR%%/x945.html
 @dirrm %%DATADIR%%/tutorial
diff --git a/math/qtiplot/Makefile b/math/qtiplot/Makefile
index db32946eae10..400f1abc4b3f 100644
--- a/math/qtiplot/Makefile
+++ b/math/qtiplot/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qtiplot
-DISTVERSION=	0.9.7.11
-PORTREVISION=	1
+DISTVERSION=	0.9.7.12
 CATEGORIES=	math science
 MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
 
@@ -105,11 +104,7 @@ do-configure:
 .if !defined(WITHOUT_NLS)
 	@(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}|'
+	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS} )
 
 post-install:
 	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
diff --git a/math/qtiplot/distinfo b/math/qtiplot/distinfo
index 34b8fb0bafa2..4bacc0d81fcd 100644
--- a/math/qtiplot/distinfo
+++ b/math/qtiplot/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.7.11.tar.bz2) = 4473d9f747353080f0b4e34ae6c1e725
-SHA256 (qtiplot-0.9.7.11.tar.bz2) = dd6c1c832eed89cd8bab55d73f77549338faf4e10f4dbf534df597b39bb2f52f
-SIZE (qtiplot-0.9.7.11.tar.bz2) = 8015168
+MD5 (qtiplot-0.9.7.12.tar.bz2) = 2620bf8a520967d2a58d5f290da745de
+SHA256 (qtiplot-0.9.7.12.tar.bz2) = 29cf8e3dbd5539019b3351893c8b2fafa1e1283333d4b055b711b3a7ea85d935
+SIZE (qtiplot-0.9.7.12.tar.bz2) = 8221079
diff --git a/math/qtiplot/files/build.conf b/math/qtiplot/files/build.conf
index 3f19e1d33205..0d492b3ea6ce 100644
--- a/math/qtiplot/files/build.conf
+++ b/math/qtiplot/files/build.conf
@@ -17,6 +17,9 @@ BOOST_LIBS = -lboost_date_time -lboost_thread
 QWT_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwt/src
 QWT_LIBS = $$QTI_ROOT/3rdparty/qwt/lib/libqwt.a
 
+QWT3D_INCLUDEPATH = $$QTI_ROOT/3rdparty/qwtplot3d/include
+QWT3D_LIBS = $$QTI_ROOT/3rdparty/qwtplot3d/lib/libqwtplot3d.a
+
 LIBPNG_INCLUDEPATH =
 LIBPNG_LIBS = -lpng