3 files changed, 72 insertions, 63 deletions

diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index f3c84f8fcea4..fa0e7249eb52 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -5,11 +5,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qtiplot-doc
-DISTVERSION=	0.9.6
+PORTNAME=	qtiplot
+DISTVERSION=	0.9.7
 CATEGORIES=	math
-MASTER_SITES=	http://soft.proindependent.com/src/
-DISTNAME=	qtiplot-${DISTVERSION}
+MASTER_SITES=	BERLIOS http://soft.proindependent.com/src/
+PKGNAMESUFFIX=	-doc
 
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	The QtiPlot Handbook
diff --git a/math/qtiplot-doc/distinfo b/math/qtiplot-doc/distinfo
index f3bbc38b4c9e..fc3969716434 100644
--- a/math/qtiplot-doc/distinfo
+++ b/math/qtiplot-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (qtiplot-0.9.6.tar.bz2) = a0e35d674fdf76eeb86c921e26caec1a
-SHA256 (qtiplot-0.9.6.tar.bz2) = 9892f48eaf08f7e9f9932156c755a37a3570f5028e1777263706cd1fb688c7c1
-SIZE (qtiplot-0.9.6.tar.bz2) = 6431763
+MD5 (qtiplot-0.9.7.tar.bz2) = 1a5c13bcaa81b15c2d152f2d47c04a5f
+SHA256 (qtiplot-0.9.7.tar.bz2) = e5e7a5d9a8010245041a38f2c20be6dd254832b588be73ed3718e063c201a4c1
+SIZE (qtiplot-0.9.7.tar.bz2) = 6446993
diff --git a/math/qtiplot-doc/pkg-plist b/math/qtiplot-doc/pkg-plist
index ce36a9d82652..f51e30b8ae7b 100644
--- a/math/qtiplot-doc/pkg-plist
+++ b/math/qtiplot-doc/pkg-plist
@@ -1,12 +1,12 @@
-%%DATADIR%%/a5796.html
-%%DATADIR%%/c2434.html
+%%DATADIR%%/a5933.html
+%%DATADIR%%/c2439.html
 %%DATADIR%%/c351.html
-%%DATADIR%%/c3547.html
-%%DATADIR%%/c4494.html
-%%DATADIR%%/c4765.html
+%%DATADIR%%/c3655.html
+%%DATADIR%%/c4609.html
+%%DATADIR%%/c4880.html
 %%DATADIR%%/c55.html
-%%DATADIR%%/c5711.html
-%%DATADIR%%/c5877.html
+%%DATADIR%%/c5848.html
+%%DATADIR%%/c6014.html
 %%DATADIR%%/c670.html
 %%DATADIR%%/common/fond-titre-chapitre.png
 %%DATADIR%%/common/fond-titre-chapitre.xcf
@@ -32,6 +32,9 @@
 %%DATADIR%%/equations/savitzky-golay.png
 %%DATADIR%%/icons/add.png
 %%DATADIR%%/icons/addCol.png
+%%DATADIR%%/icons/add_inset_curve_layer.png
+%%DATADIR%%/icons/add_inset_layer.png
+%%DATADIR%%/icons/add_zoom_plot.png
 %%DATADIR%%/icons/area.png
 %%DATADIR%%/icons/arrangeLayers.png
 %%DATADIR%%/icons/arrow.png
@@ -62,9 +65,12 @@
 %%DATADIR%%/icons/draw_points.png
 %%DATADIR%%/icons/dropLines.png
 %%DATADIR%%/icons/duplicate.png
+%%DATADIR%%/icons/equation.png
 %%DATADIR%%/icons/erase.png
 %%DATADIR%%/icons/errors.png
 %%DATADIR%%/icons/exp.png
+%%DATADIR%%/icons/extract_graphs.png
+%%DATADIR%%/icons/extract_layers.png
 %%DATADIR%%/icons/fileopen.png
 %%DATADIR%%/icons/fileprint.png
 %%DATADIR%%/icons/filesave.png
@@ -141,6 +147,7 @@
 %%DATADIR%%/icons/pie.png
 %%DATADIR%%/icons/pixelProfile.png
 %%DATADIR%%/icons/plot_bars.png
+%%DATADIR%%/icons/plot_double_y.png
 %%DATADIR%%/icons/pointer.png
 %%DATADIR%%/icons/pointsMesh.png
 %%DATADIR%%/icons/prev.png
@@ -148,8 +155,10 @@
 %%DATADIR%%/icons/qtiplot_logo.png
 %%DATADIR%%/icons/quit.png
 %%DATADIR%%/icons/randomNumbers.png
+%%DATADIR%%/icons/rectangle.png
 %%DATADIR%%/icons/redo.png
 %%DATADIR%%/icons/remove.png
+%%DATADIR%%/icons/rescale.png
 %%DATADIR%%/icons/reset_rotation.png
 %%DATADIR%%/icons/resize.png
 %%DATADIR%%/icons/ribbon.png
@@ -412,60 +421,60 @@
 %%DATADIR%%/tutorial/table-function-plot1.png
 %%DATADIR%%/tutorial/table-function-plot2.png
 %%DATADIR%%/x1080.html
-%%DATADIR%%/x1334.html
+%%DATADIR%%/x1339.html
 %%DATADIR%%/x135.html
-%%DATADIR%%/x1423.html
-%%DATADIR%%/x1480.html
-%%DATADIR%%/x1798.html
-%%DATADIR%%/x1936.html
-%%DATADIR%%/x2063.html
-%%DATADIR%%/x2113.html
-%%DATADIR%%/x2151.html
-%%DATADIR%%/x2203.html
-%%DATADIR%%/x2524.html
-%%DATADIR%%/x2747.html
-%%DATADIR%%/x2981.html
-%%DATADIR%%/x3164.html
-%%DATADIR%%/x3275.html
-%%DATADIR%%/x3563.html
-%%DATADIR%%/x3596.html
-%%DATADIR%%/x3630.html
-%%DATADIR%%/x3645.html
-%%DATADIR%%/x3669.html
-%%DATADIR%%/x3695.html
-%%DATADIR%%/x3730.html
-%%DATADIR%%/x3750.html
-%%DATADIR%%/x3792.html
-%%DATADIR%%/x3901.html
-%%DATADIR%%/x3924.html
-%%DATADIR%%/x3941.html
-%%DATADIR%%/x3965.html
-%%DATADIR%%/x3990.html
-%%DATADIR%%/x4003.html
+%%DATADIR%%/x1428.html
+%%DATADIR%%/x1485.html
+%%DATADIR%%/x1803.html
+%%DATADIR%%/x1941.html
+%%DATADIR%%/x2068.html
+%%DATADIR%%/x2118.html
+%%DATADIR%%/x2156.html
+%%DATADIR%%/x2208.html
+%%DATADIR%%/x2529.html
+%%DATADIR%%/x2752.html
+%%DATADIR%%/x3069.html
+%%DATADIR%%/x3272.html
+%%DATADIR%%/x3383.html
+%%DATADIR%%/x3671.html
+%%DATADIR%%/x3704.html
+%%DATADIR%%/x3738.html
+%%DATADIR%%/x3753.html
+%%DATADIR%%/x3777.html
+%%DATADIR%%/x3803.html
+%%DATADIR%%/x3838.html
+%%DATADIR%%/x3858.html
+%%DATADIR%%/x3900.html
+%%DATADIR%%/x4009.html
+%%DATADIR%%/x4032.html
+%%DATADIR%%/x4049.html
 %%DATADIR%%/x4073.html
-%%DATADIR%%/x4106.html
-%%DATADIR%%/x4123.html
-%%DATADIR%%/x4131.html
-%%DATADIR%%/x4242.html
-%%DATADIR%%/x4254.html
-%%DATADIR%%/x4284.html
-%%DATADIR%%/x4299.html
-%%DATADIR%%/x4323.html
-%%DATADIR%%/x4333.html
-%%DATADIR%%/x4356.html
-%%DATADIR%%/x4413.html
+%%DATADIR%%/x4098.html
+%%DATADIR%%/x4111.html
+%%DATADIR%%/x4181.html
+%%DATADIR%%/x4214.html
+%%DATADIR%%/x4231.html
+%%DATADIR%%/x4239.html
+%%DATADIR%%/x4349.html
+%%DATADIR%%/x4361.html
+%%DATADIR%%/x4391.html
+%%DATADIR%%/x4406.html
+%%DATADIR%%/x4434.html
+%%DATADIR%%/x4444.html
+%%DATADIR%%/x4467.html
 %%DATADIR%%/x4524.html
-%%DATADIR%%/x4559.html
-%%DATADIR%%/x4562.html
-%%DATADIR%%/x4565.html
-%%DATADIR%%/x4579.html
+%%DATADIR%%/x4639.html
 %%DATADIR%%/x4674.html
-%%DATADIR%%/x4685.html
-%%DATADIR%%/x4750.html
-%%DATADIR%%/x4974.html
+%%DATADIR%%/x4677.html
+%%DATADIR%%/x4680.html
+%%DATADIR%%/x4694.html
+%%DATADIR%%/x4789.html
+%%DATADIR%%/x4800.html
+%%DATADIR%%/x4865.html
+%%DATADIR%%/x5089.html
 %%DATADIR%%/x512.html
-%%DATADIR%%/x5802.html
-%%DATADIR%%/x5819.html
+%%DATADIR%%/x5939.html
+%%DATADIR%%/x5956.html
 %%DATADIR%%/x600.html
 %%DATADIR%%/x82.html
 %%DATADIR%%/x908.html