3 files changed, 94 insertions, 78 deletions

diff --git a/math/qtiplot-doc/Makefile b/math/qtiplot-doc/Makefile
index 36985aaaff64..522ab43f93bf 100644
--- a/math/qtiplot-doc/Makefile
+++ b/math/qtiplot-doc/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	qtiplot-doc
-PORTVERSION=	0.9
+PORTVERSION=	0.9.4
 CATEGORIES=	math
-MASTER_SITES=	http://soft.proindependent.com/doc/
-DISTNAME=	manual-en
+MASTER_SITES=	BERLIOS
+MASTER_SITE_SUBDIR=	qtiplot
+DISTNAME=	qtiplot-manual-en
 
 MAINTAINER=	makc@issp.ac.ru
 COMMENT=	The QtiPlot Handbook
diff --git a/math/qtiplot-doc/distinfo b/math/qtiplot-doc/distinfo
index 7ca95367e63c..e3693f4d3c58 100644
--- a/math/qtiplot-doc/distinfo
+++ b/math/qtiplot-doc/distinfo
@@ -1,3 +1,3 @@
-MD5 (manual-en.tar.bz2) = 724e6c654725c038cccf71a710c57cd7
-SHA256 (manual-en.tar.bz2) = 9ed16fb99d66c98d1b5837a817f57ea393125d7327a2c52096a7a2a863011675
-SIZE (manual-en.tar.bz2) = 5608766
+MD5 (qtiplot-manual-en.tar.bz2) = dfd931bad4d1371300d17a95ff1772b4
+SHA256 (qtiplot-manual-en.tar.bz2) = f779d83a82982748ee4426e5f9eda25a2e23a10fb5b8c7fc21ef0446ec844ac6
+SIZE (qtiplot-manual-en.tar.bz2) = 5378862
diff --git a/math/qtiplot-doc/pkg-plist b/math/qtiplot-doc/pkg-plist
index 200ff797d734..cf3850a6e6f6 100644
--- a/math/qtiplot-doc/pkg-plist
+++ b/math/qtiplot-doc/pkg-plist
@@ -1,72 +1,13 @@
-%%DATADIR%%/apa.html
-%%DATADIR%%/apas02.html
-%%DATADIR%%/apas03.html
-%%DATADIR%%/apas04.html
-%%DATADIR%%/ch01.html
-%%DATADIR%%/ch01s02.html
-%%DATADIR%%/ch01s03.html
-%%DATADIR%%/ch02.html
-%%DATADIR%%/ch02s02.html
-%%DATADIR%%/ch02s03.html
-%%DATADIR%%/ch03.html
-%%DATADIR%%/ch03s02.html
-%%DATADIR%%/ch03s03.html
-%%DATADIR%%/ch03s04.html
-%%DATADIR%%/ch03s05.html
-%%DATADIR%%/ch03s06.html
-%%DATADIR%%/ch03s07.html
-%%DATADIR%%/ch03s08.html
-%%DATADIR%%/ch03s09.html
-%%DATADIR%%/ch03s10.html
-%%DATADIR%%/ch03s11.html
-%%DATADIR%%/ch03s12.html
-%%DATADIR%%/ch03s13.html
-%%DATADIR%%/ch04.html
-%%DATADIR%%/ch04s02.html
-%%DATADIR%%/ch04s03.html
-%%DATADIR%%/ch04s04.html
-%%DATADIR%%/ch04s05.html
-%%DATADIR%%/ch05.html
-%%DATADIR%%/ch05s02.html
-%%DATADIR%%/ch05s03.html
-%%DATADIR%%/ch05s04.html
-%%DATADIR%%/ch05s05.html
-%%DATADIR%%/ch05s06.html
-%%DATADIR%%/ch05s07.html
-%%DATADIR%%/ch05s08.html
-%%DATADIR%%/ch05s09.html
-%%DATADIR%%/ch05s10.html
-%%DATADIR%%/ch05s11.html
-%%DATADIR%%/ch05s12.html
-%%DATADIR%%/ch05s13.html
-%%DATADIR%%/ch05s14.html
-%%DATADIR%%/ch05s15.html
-%%DATADIR%%/ch05s16.html
-%%DATADIR%%/ch05s17.html
-%%DATADIR%%/ch05s18.html
-%%DATADIR%%/ch05s19.html
-%%DATADIR%%/ch05s20.html
-%%DATADIR%%/ch05s21.html
-%%DATADIR%%/ch05s22.html
-%%DATADIR%%/ch05s23.html
-%%DATADIR%%/ch05s24.html
-%%DATADIR%%/ch05s25.html
-%%DATADIR%%/ch05s26.html
-%%DATADIR%%/ch05s27.html
-%%DATADIR%%/ch05s28.html
-%%DATADIR%%/ch06.html
-%%DATADIR%%/ch06s02.html
-%%DATADIR%%/ch06s03.html
-%%DATADIR%%/ch06s04.html
-%%DATADIR%%/ch06s05.html
-%%DATADIR%%/ch06s06.html
-%%DATADIR%%/ch06s07.html
-%%DATADIR%%/ch06s08.html
-%%DATADIR%%/ch06s09.html
-%%DATADIR%%/ch07.html
-%%DATADIR%%/ch07s02.html
-%%DATADIR%%/ch08.html
-%%DATADIR%%/ch09.html
+%%DATADIR%%/a5775.html
+%%DATADIR%%/c2430.html
+%%DATADIR%%/c347.html
+%%DATADIR%%/c3543.html
+%%DATADIR%%/c4473.html
+%%DATADIR%%/c4744.html
+%%DATADIR%%/c55.html
+%%DATADIR%%/c5690.html
+%%DATADIR%%/c5856.html
+%%DATADIR%%/c666.html
 %%DATADIR%%/common/fond-titre-chapitre.png
 %%DATADIR%%/common/fond-titre-chapitre.xcf
 %%DATADIR%%/common/fond-titre.png
@@ -118,6 +59,7 @@
 %%DATADIR%%/icons/curves.png
 %%DATADIR%%/icons/cut.png
 %%DATADIR%%/icons/down.png
+%%DATADIR%%/icons/draw_points.png
 %%DATADIR%%/icons/dropLines.png
 %%DATADIR%%/icons/duplicate.png
 %%DATADIR%%/icons/erase.png
@@ -170,6 +112,10 @@
 %%DATADIR%%/icons/lpPlot.png
 %%DATADIR%%/icons/matrix.png
 %%DATADIR%%/icons/monalisa.png
+%%DATADIR%%/icons/move_col_first.png
+%%DATADIR%%/icons/move_col_last.png
+%%DATADIR%%/icons/move_col_left.png
+%%DATADIR%%/icons/move_col_right.png
 %%DATADIR%%/icons/movie.png
 %%DATADIR%%/icons/new.png
 %%DATADIR%%/icons/newF.png
@@ -213,11 +159,16 @@
 %%DATADIR%%/icons/save_template.png
 %%DATADIR%%/icons/scatter.png
 %%DATADIR%%/icons/select.png
+%%DATADIR%%/icons/set_none_col.png
+%%DATADIR%%/icons/set_x_col.png
+%%DATADIR%%/icons/set_y_col.png
+%%DATADIR%%/icons/set_z_col.png
 %%DATADIR%%/icons/spline.png
 %%DATADIR%%/icons/stacked.png
 %%DATADIR%%/icons/stacked_hist.png
 %%DATADIR%%/icons/stat_rows.png
 %%DATADIR%%/icons/steps.png
+%%DATADIR%%/icons/swap_columns.png
 %%DATADIR%%/icons/table.png
 %%DATADIR%%/icons/text.png
 %%DATADIR%%/icons/top_scl.png
@@ -259,6 +210,7 @@
 %%DATADIR%%/pics/3d-gallery-ribbons.png
 %%DATADIR%%/pics/3d-gallery-trajectory.png
 %%DATADIR%%/pics/3d-options1.png
+%%DATADIR%%/pics/add-custom-action.png
 %%DATADIR%%/pics/add-error-bars-1.png
 %%DATADIR%%/pics/add-error-bars-2.png
 %%DATADIR%%/pics/add-errorbars.png
@@ -267,7 +219,6 @@
 %%DATADIR%%/pics/add-function-dialog3.png
 %%DATADIR%%/pics/add-layer.png
 %%DATADIR%%/pics/add-remove-curve.png
-%%DATADIR%%/pics/add-text-dialog.png
 %%DATADIR%%/pics/arrange-layers-dialog.png
 %%DATADIR%%/pics/color-scheme-1.png
 %%DATADIR%%/pics/column-options.png
@@ -280,17 +231,22 @@
 %%DATADIR%%/pics/custom-curves-1.png
 %%DATADIR%%/pics/custom-curves-2.png
 %%DATADIR%%/pics/custom-curves-3.png
+%%DATADIR%%/pics/custom-curves-axes.png
 %%DATADIR%%/pics/custom-curves-box-1.png
 %%DATADIR%%/pics/custom-curves-box-2.png
 %%DATADIR%%/pics/custom-curves-box-3.png
 %%DATADIR%%/pics/custom-curves-histogram-1.png
 %%DATADIR%%/pics/custom-curves-histogram-2.png
 %%DATADIR%%/pics/custom-curves-histogram-3.png
+%%DATADIR%%/pics/custom-curves-labels.png
 %%DATADIR%%/pics/custom-curves-pie-1.png
 %%DATADIR%%/pics/custom-curves-pie-2.png
+%%DATADIR%%/pics/custom-curves-pie-3.png
+%%DATADIR%%/pics/custom-layer-geometry.png
 %%DATADIR%%/pics/data-display-toolbar.png
 %%DATADIR%%/pics/default-color-scheme.png
 %%DATADIR%%/pics/define-layout-3.png
+%%DATADIR%%/pics/define-param-surface-plot.png
 %%DATADIR%%/pics/define-surface-plot.png
 %%DATADIR%%/pics/dialog-print-setup-plot.png
 %%DATADIR%%/pics/direct-function-plot.png
@@ -309,7 +265,6 @@
 %%DATADIR%%/pics/explorer.png
 %%DATADIR%%/pics/explorer1.png
 %%DATADIR%%/pics/export-ascii.png
-%%DATADIR%%/pics/export-graph-bmp.png
 %%DATADIR%%/pics/export-graph-eps.png
 %%DATADIR%%/pics/export-graph-png.png
 %%DATADIR%%/pics/fft-dialog-curve.png
@@ -321,7 +276,6 @@
 %%DATADIR%%/pics/filter-fft-block-dialog.png
 %%DATADIR%%/pics/filter-fft-block-power.png
 %%DATADIR%%/pics/filter-fft-block-signal.png
-%%DATADIR%%/pics/filter-fft-high-dialog.png
 %%DATADIR%%/pics/filter-fft-high-power.png
 %%DATADIR%%/pics/filter-fft-high-signal.png
 %%DATADIR%%/pics/filter-fft-low-curves.png
@@ -406,6 +360,7 @@
 %%DATADIR%%/pics/preferences-dialog10.png
 %%DATADIR%%/pics/preferences-dialog11.png
 %%DATADIR%%/pics/preferences-dialog12.png
+%%DATADIR%%/pics/preferences-dialog13.png
 %%DATADIR%%/pics/preferences-dialog2.png
 %%DATADIR%%/pics/preferences-dialog3.png
 %%DATADIR%%/pics/preferences-dialog4.png
@@ -454,6 +409,66 @@
 %%DATADIR%%/tutorial/simple-2dplot.qti
 %%DATADIR%%/tutorial/table-function-plot1.png
 %%DATADIR%%/tutorial/table-function-plot2.png
+%%DATADIR%%/x1076.html
+%%DATADIR%%/x1330.html
+%%DATADIR%%/x135.html
+%%DATADIR%%/x1419.html
+%%DATADIR%%/x1476.html
+%%DATADIR%%/x1794.html
+%%DATADIR%%/x1932.html
+%%DATADIR%%/x2059.html
+%%DATADIR%%/x2109.html
+%%DATADIR%%/x2147.html
+%%DATADIR%%/x2199.html
+%%DATADIR%%/x2520.html
+%%DATADIR%%/x2743.html
+%%DATADIR%%/x2977.html
+%%DATADIR%%/x3160.html
+%%DATADIR%%/x3271.html
+%%DATADIR%%/x3559.html
+%%DATADIR%%/x3592.html
+%%DATADIR%%/x3626.html
+%%DATADIR%%/x3641.html
+%%DATADIR%%/x3665.html
+%%DATADIR%%/x3691.html
+%%DATADIR%%/x3726.html
+%%DATADIR%%/x3746.html
+%%DATADIR%%/x3788.html
+%%DATADIR%%/x3897.html
+%%DATADIR%%/x3920.html
+%%DATADIR%%/x3937.html
+%%DATADIR%%/x3961.html
+%%DATADIR%%/x3986.html
+%%DATADIR%%/x3999.html
+%%DATADIR%%/x4057.html
+%%DATADIR%%/x4090.html
+%%DATADIR%%/x4107.html
+%%DATADIR%%/x4115.html
+%%DATADIR%%/x4221.html
+%%DATADIR%%/x4233.html
+%%DATADIR%%/x4263.html
+%%DATADIR%%/x4278.html
+%%DATADIR%%/x4302.html
+%%DATADIR%%/x4312.html
+%%DATADIR%%/x4335.html
+%%DATADIR%%/x4392.html
+%%DATADIR%%/x4503.html
+%%DATADIR%%/x4538.html
+%%DATADIR%%/x4541.html
+%%DATADIR%%/x4544.html
+%%DATADIR%%/x4558.html
+%%DATADIR%%/x4653.html
+%%DATADIR%%/x4664.html
+%%DATADIR%%/x4729.html
+%%DATADIR%%/x4953.html
+%%DATADIR%%/x508.html
+%%DATADIR%%/x5781.html
+%%DATADIR%%/x5798.html
+%%DATADIR%%/x596.html
+%%DATADIR%%/x82.html
+%%DATADIR%%/x904.html
+%%DATADIR%%/x954.html
+%%DATADIR%%/x989.html
 @dirrm %%DATADIR%%/tutorial
 @dirrm %%DATADIR%%/pics
 @dirrm %%DATADIR%%/icons