Update to 6.0.1

8 files changed, 364 insertions, 236 deletions

diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index bc340c19b821..aea9a681616a 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	qwt
-PORTVERSION=	5.2.2
+PORTVERSION=	6.0.1
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 
@@ -17,26 +17,28 @@ USE_QT_VER=	4
 QT_COMPONENTS=	gui svg moc_build qmake_build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-QMAKE_ARGS+=	-unix -recursive PREFIX=${PREFIX}
+QMAKE_ARGS+=	-recursive PREFIX=${PREFIX}
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 MAKE_JOBS_SAFE=	yes
-PORTSCOUT=	limit:^5\.
+DOCSDIR=	${PREFIX}/share/doc/${LATEST_LINK}
 
-STRIP_FILES=	lib/libqwt.so.${PORTVERSION}
+LATEST_LINK=	qwt6
 
-.include <bsd.port.pre.mk>
-.include <${FILESDIR}/Makefile.man>
+PLIST_SUB=	INCLUDEDIR=include/${LATEST_LINK} \
+		SHLIB_VER=${PORTVERSION} \
+		SHLIB_SHVER=${PORTVERSION:R}
+
+STRIP_FILES=	lib/libqwt6.so.${PORTVERSION} \
+		lib/libqwtmathml.so.${PORTVERSION}
 
 do-configure:
 	(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS})
 
 post-install:
-	${MKDIR} ${PREFIX}/man/man3
-	${INSTALL_MAN} ${WRKSRC}/doc/man/man3/Qwt* ${PREFIX}/man/man3
 	${STRIP_CMD} ${STRIP_FILES:S,^,${PREFIX}/,}
 .if !defined(NOPORTDOCS)
 	(cd ${WRKSRC}/doc/html/ && ${COPYTREE_SHARE} \* ${DOCSDIR})
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/qwt6/distinfo b/x11-toolkits/qwt6/distinfo
index 0f837a9b9013..53a6de37c2f9 100644
--- a/x11-toolkits/qwt6/distinfo
+++ b/x11-toolkits/qwt6/distinfo
@@ -1,2 +1,2 @@
-SHA256 (qwt-5.2.2.tar.bz2) = 36bf2ee51ca9c74fde1322510ffd39baac0db60d5d410bb157968a78d9c1464b
-SIZE (qwt-5.2.2.tar.bz2) = 2083193
+SHA256 (qwt-6.0.1.tar.bz2) = 3fe19dd5962d705632fc2ef616b009299de6cf1e702538296924dbfdc8003cb2
+SIZE (qwt-6.0.1.tar.bz2) = 2437570
diff --git a/x11-toolkits/qwt6/files/Makefile.man b/x11-toolkits/qwt6/files/Makefile.man
deleted file mode 100644
index 3a5658873815..000000000000
--- a/x11-toolkits/qwt6/files/Makefile.man
+++ /dev/null
@@ -1,87 +0,0 @@
-MAN3=	QwtAbstractScale.3 \
-	QwtAbstractScaleDraw.3 \
-	QwtAbstractSlider.3 \
-	QwtAlphaColorMap.3 \
-	QwtAnalogClock.3 \
-	QwtArrayData.3 \
-	QwtArrowButton.3 \
-	QwtCPointerData.3 \
-	QwtClipper.3 \
-	QwtColorMap.3 \
-	QwtCompass.3 \
-	QwtCompassMagnetNeedle.3 \
-	QwtCompassRose.3 \
-	QwtCompassWindArrow.3 \
-	QwtCounter.3 \
-	QwtCurveFitter.3 \
-	QwtData.3 \
-	QwtDial.3 \
-	QwtDialNeedle.3 \
-	QwtDialScaleDraw.3 \
-	QwtDialSimpleNeedle.3 \
-	QwtDoubleInterval.3 \
-	QwtDoubleRange.3 \
-	QwtDynGridLayout.3 \
-	QwtEventPattern.3 \
-	QwtEventPattern_KeyPattern.3 \
-	QwtEventPattern_MousePattern.3 \
-	QwtIntervalData.3 \
-	QwtKnob.3 \
-	QwtLegend.3 \
-	QwtLegendItem.3 \
-	QwtLegendItemManager.3 \
-	QwtLinearColorMap.3 \
-	QwtLinearScaleEngine.3 \
-	QwtLog10ScaleEngine.3 \
-	QwtMagnifier.3 \
-	QwtMathMLTextEngine.3 \
-	QwtMetricsMap.3 \
-	QwtPainter.3 \
-	QwtPanner.3 \
-	QwtPicker.3 \
-	QwtPickerClickPointMachine.3 \
-	QwtPickerClickRectMachine.3 \
-	QwtPickerDragPointMachine.3 \
-	QwtPickerDragRectMachine.3 \
-	QwtPickerMachine.3 \
-	QwtPickerPolygonMachine.3 \
-	QwtPlainTextEngine.3 \
-	QwtPlot.3 \
-	QwtPlotCanvas.3 \
-	QwtPlotCurve.3 \
-	QwtPlotDict.3 \
-	QwtPlotGrid.3 \
-	QwtPlotItem.3 \
-	QwtPlotLayout.3 \
-	QwtPlotMagnifier.3 \
-	QwtPlotMarker.3 \
-	QwtPlotPanner.3 \
-	QwtPlotPicker.3 \
-	QwtPlotPrintFilter.3 \
-	QwtPlotRasterItem.3 \
-	QwtPlotRescaler.3 \
-	QwtPlotScaleItem.3 \
-	QwtPlotSpectrogram.3 \
-	QwtPlotSvgItem.3 \
-	QwtPlotZoomer.3 \
-	QwtPolygonFData.3 \
-	QwtRasterData.3 \
-	QwtRichTextEngine.3 \
-	QwtRoundScaleDraw.3 \
-	QwtScaleArithmetic.3 \
-	QwtScaleDiv.3 \
-	QwtScaleDraw.3 \
-	QwtScaleEngine.3 \
-	QwtScaleMap.3 \
-	QwtScaleTransformation.3 \
-	QwtScaleWidget.3 \
-	QwtSimpleCompassRose.3 \
-	QwtSlider.3 \
-	QwtSpline.3 \
-	QwtSplineCurveFitter.3 \
-	QwtSymbol.3 \
-	QwtText.3 \
-	QwtTextEngine.3 \
-	QwtTextLabel.3 \
-	QwtThermo.3 \
-	QwtWheel.3
diff --git a/x11-toolkits/qwt6/files/patch-qwt.prf b/x11-toolkits/qwt6/files/patch-qwt.prf
new file mode 100644
index 000000000000..0f3f0c8b887f
--- /dev/null
+++ b/x11-toolkits/qwt6/files/patch-qwt.prf
@@ -0,0 +1,11 @@
+--- ./qwt.prf.orig	2011-08-01 14:33:51.000000000 +0000
++++ ./qwt.prf	2011-08-19 09:33:42.262331890 +0000
+@@ -35,7 +35,7 @@
+ }   
+ 
+ INCLUDEPATH_QWT = $${INCLUDEPATH}
+-qtAddLibrary(qwt)
++qtAddLibrary(qwt6)
+ 
+ # we don't want qtAddLibrary to expand the 
+ # include path, with directories, that might
diff --git a/x11-toolkits/qwt6/files/patch-qwtconfig.pri b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
index b5366a1af1f4..969f1b53d6b4 100644
--- a/x11-toolkits/qwt6/files/patch-qwtconfig.pri
+++ b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
@@ -1,39 +1,38 @@
---- qwtconfig.pri.orig	2011-08-08 08:09:26.000000000 +0000
-+++ qwtconfig.pri	2011-08-08 08:11:17.000000000 +0000
-@@ -8,7 +8,7 @@
- VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
+--- ./qwtconfig.pri.orig	2011-08-01 14:33:53.000000000 +0000
++++ ./qwtconfig.pri	2011-08-19 09:57:08.979331152 +0000
+@@ -19,7 +19,7 @@
+ QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
  
  unix {
--    INSTALLBASE    = /usr/local/qwt-$$VERSION
-+    INSTALLBASE    = $$PREFIX
+-    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
++    QWT_INSTALL_PREFIX    = $$PREFIX
  }
  
  win32 {
-@@ -16,8 +16,7 @@
+@@ -27,7 +27,7 @@
  }
  
- target.path    = $$INSTALLBASE/lib
--headers.path   = $$INSTALLBASE/include
--doc.path       = $$INSTALLBASE/doc
-+headers.path   = $$INSTALLBASE/include/qwt
+ QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
+-QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
++QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include/qwt6/
+ QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
  
  ######################################################################
- # qmake internal options
-@@ -98,7 +97,7 @@
- # QwtSVGItem.
+@@ -49,7 +49,7 @@
+ # with every Qt upgrade. 
  ######################################################################
  
--#CONFIG     += QwtSVGItem
-+CONFIG     += QwtSVGItem
+-QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/features
++QWT_INSTALL_FEATURES  = $${QWT_INSTALL_PREFIX}/share/qt4/mkspecs/features
+ # QWT_INSTALL_FEATURES  = $${QT_INSTALL_PREFIX}/features
  
  ######################################################################
- # You can use the MathML renderer of the Qt solutions package to 
-@@ -115,7 +114,7 @@
+@@ -98,7 +98,7 @@
  # Otherwise you have to build it from the designer directory.
  ######################################################################
  
--CONFIG     += QwtDesigner
-+#CONFIG     += QwtDesigner
+-QWT_CONFIG     += QwtDesigner
++# QWT_CONFIG     += QwtDesigner
  
  ######################################################################
  # If you want to auto build the examples, enable the line below
diff --git a/x11-toolkits/qwt6/files/patch-src__src.pro b/x11-toolkits/qwt6/files/patch-src__src.pro
index 0c3ddbf32695..0f04b61f082c 100644
--- a/x11-toolkits/qwt6/files/patch-src__src.pro
+++ b/x11-toolkits/qwt6/files/patch-src__src.pro
@@ -1,8 +1,20 @@
---- ./src/src.pro.orig	2008-05-01 17:43:56.000000000 +0400
-+++ ./src/src.pro	2008-05-03 02:23:43.000000000 +0400
-@@ -221,4 +221,4 @@
-     doc.files      += $${QWT_ROOT}/doc/man
- }
- 
--INSTALLS       = target headers doc
-+INSTALLS       = target headers
+--- ./src/src.pro.orig	2011-08-01 14:33:53.000000000 +0000
++++ ./src/src.pro	2011-08-19 09:33:07.161341857 +0000
+@@ -14,7 +14,7 @@
+ include( $${QWT_ROOT}/qwtbuild.pri )
+ 
+ TEMPLATE          = lib
+-TARGET            = $$qtLibraryTarget(qwt)
++TARGET            = $$qtLibraryTarget(qwt$${QWT_VER_MAJ})
+ 
+ DESTDIR           = $${QWT_ROOT}/lib
+ 
+@@ -220,7 +220,7 @@
+ unix:doc.files += $${QWT_ROOT}/doc/man
+ doc.path       = $${QWT_INSTALL_DOCS}
+ 
+-INSTALLS       = target doc
++INSTALLS       = target
+ 
+ CONFIG(lib_bundle) {
+ 
diff --git a/x11-toolkits/qwt6/files/patch-textengines__textengines.pri b/x11-toolkits/qwt6/files/patch-textengines__textengines.pri
new file mode 100644
index 000000000000..d25cb5b649e7
--- /dev/null
+++ b/x11-toolkits/qwt6/files/patch-textengines__textengines.pri
@@ -0,0 +1,11 @@
+--- ./textengines/textengines.pri.orig	2011-08-01 14:33:53.000000000 +0000
++++ ./textengines/textengines.pri	2011-08-19 09:34:56.246332690 +0000
+@@ -37,7 +37,7 @@
+ }
+ 
+ IPATH       = $${INCLUDEPATH}
+-qtAddLibrary(qwt)
++qtAddLibrary(qwt6)
+ INCLUDEPATH = $${IPATH}
+ 
+ # Install directives
diff --git a/x11-toolkits/qwt6/pkg-plist b/x11-toolkits/qwt6/pkg-plist
index b9d0d46ba162..3c3a4f69119d 100644
--- a/x11-toolkits/qwt6/pkg-plist
+++ b/x11-toolkits/qwt6/pkg-plist
@@ -1,77 +1,89 @@
-include/qwt/qwt.h
-include/qwt/qwt_abstract_scale.h
-include/qwt/qwt_abstract_scale_draw.h
-include/qwt/qwt_abstract_slider.h
-include/qwt/qwt_analog_clock.h
-include/qwt/qwt_array.h
-include/qwt/qwt_arrow_button.h
-include/qwt/qwt_clipper.h
-include/qwt/qwt_color_map.h
-include/qwt/qwt_compass.h
-include/qwt/qwt_compass_rose.h
-include/qwt/qwt_counter.h
-include/qwt/qwt_curve_fitter.h
-include/qwt/qwt_data.h
-include/qwt/qwt_dial.h
-include/qwt/qwt_dial_needle.h
-include/qwt/qwt_double_interval.h
-include/qwt/qwt_double_range.h
-include/qwt/qwt_double_rect.h
-include/qwt/qwt_dyngrid_layout.h
-include/qwt/qwt_event_pattern.h
-include/qwt/qwt_global.h
-include/qwt/qwt_interval_data.h
-include/qwt/qwt_knob.h
-include/qwt/qwt_layout_metrics.h
-include/qwt/qwt_legend.h
-include/qwt/qwt_legend_item.h
-include/qwt/qwt_legend_itemmanager.h
-include/qwt/qwt_magnifier.h
-include/qwt/qwt_math.h
-include/qwt/qwt_paint_buffer.h
-include/qwt/qwt_painter.h
-include/qwt/qwt_panner.h
-include/qwt/qwt_picker.h
-include/qwt/qwt_picker_machine.h
-include/qwt/qwt_plot.h
-include/qwt/qwt_plot_canvas.h
-include/qwt/qwt_plot_curve.h
-include/qwt/qwt_plot_dict.h
-include/qwt/qwt_plot_grid.h
-include/qwt/qwt_plot_item.h
-include/qwt/qwt_plot_layout.h
-include/qwt/qwt_plot_magnifier.h
-include/qwt/qwt_plot_marker.h
-include/qwt/qwt_plot_panner.h
-include/qwt/qwt_plot_picker.h
-include/qwt/qwt_plot_printfilter.h
-include/qwt/qwt_plot_rasteritem.h
-include/qwt/qwt_plot_rescaler.h
-include/qwt/qwt_plot_scaleitem.h
-include/qwt/qwt_plot_spectrogram.h
-include/qwt/qwt_plot_svgitem.h
-include/qwt/qwt_plot_zoomer.h
-include/qwt/qwt_polygon.h
-include/qwt/qwt_raster_data.h
-include/qwt/qwt_round_scale_draw.h
-include/qwt/qwt_scale_div.h
-include/qwt/qwt_scale_draw.h
-include/qwt/qwt_scale_engine.h
-include/qwt/qwt_scale_map.h
-include/qwt/qwt_scale_widget.h
-include/qwt/qwt_slider.h
-include/qwt/qwt_spline.h
-include/qwt/qwt_symbol.h
-include/qwt/qwt_text.h
-include/qwt/qwt_text_engine.h
-include/qwt/qwt_text_label.h
-include/qwt/qwt_thermo.h
-include/qwt/qwt_valuelist.h
-include/qwt/qwt_wheel.h
-lib/libqwt.so
-lib/libqwt.so.5
-lib/libqwt.so.5.2
-lib/libqwt.so.5.2.2
+%%INCLUDEDIR%%/qwt.h
+%%INCLUDEDIR%%/qwt_abstract_scale.h
+%%INCLUDEDIR%%/qwt_abstract_scale_draw.h
+%%INCLUDEDIR%%/qwt_abstract_slider.h
+%%INCLUDEDIR%%/qwt_analog_clock.h
+%%INCLUDEDIR%%/qwt_arrow_button.h
+%%INCLUDEDIR%%/qwt_clipper.h
+%%INCLUDEDIR%%/qwt_color_map.h
+%%INCLUDEDIR%%/qwt_column_symbol.h
+%%INCLUDEDIR%%/qwt_compass.h
+%%INCLUDEDIR%%/qwt_compass_rose.h
+%%INCLUDEDIR%%/qwt_compat.h
+%%INCLUDEDIR%%/qwt_counter.h
+%%INCLUDEDIR%%/qwt_curve_fitter.h
+%%INCLUDEDIR%%/qwt_dial.h
+%%INCLUDEDIR%%/qwt_dial_needle.h
+%%INCLUDEDIR%%/qwt_double_range.h
+%%INCLUDEDIR%%/qwt_dyngrid_layout.h
+%%INCLUDEDIR%%/qwt_event_pattern.h
+%%INCLUDEDIR%%/qwt_global.h
+%%INCLUDEDIR%%/qwt_interval.h
+%%INCLUDEDIR%%/qwt_interval_symbol.h
+%%INCLUDEDIR%%/qwt_knob.h
+%%INCLUDEDIR%%/qwt_legend.h
+%%INCLUDEDIR%%/qwt_legend_item.h
+%%INCLUDEDIR%%/qwt_legend_itemmanager.h
+%%INCLUDEDIR%%/qwt_magnifier.h
+%%INCLUDEDIR%%/qwt_math.h
+%%INCLUDEDIR%%/qwt_mathml_text_engine.h
+%%INCLUDEDIR%%/qwt_matrix_raster_data.h
+%%INCLUDEDIR%%/qwt_null_paintdevice.h
+%%INCLUDEDIR%%/qwt_painter.h
+%%INCLUDEDIR%%/qwt_panner.h
+%%INCLUDEDIR%%/qwt_picker.h
+%%INCLUDEDIR%%/qwt_picker_machine.h
+%%INCLUDEDIR%%/qwt_plot.h
+%%INCLUDEDIR%%/qwt_plot_canvas.h
+%%INCLUDEDIR%%/qwt_plot_curve.h
+%%INCLUDEDIR%%/qwt_plot_dict.h
+%%INCLUDEDIR%%/qwt_plot_directpainter.h
+%%INCLUDEDIR%%/qwt_plot_grid.h
+%%INCLUDEDIR%%/qwt_plot_histogram.h
+%%INCLUDEDIR%%/qwt_plot_intervalcurve.h
+%%INCLUDEDIR%%/qwt_plot_item.h
+%%INCLUDEDIR%%/qwt_plot_layout.h
+%%INCLUDEDIR%%/qwt_plot_magnifier.h
+%%INCLUDEDIR%%/qwt_plot_marker.h
+%%INCLUDEDIR%%/qwt_plot_panner.h
+%%INCLUDEDIR%%/qwt_plot_picker.h
+%%INCLUDEDIR%%/qwt_plot_rasteritem.h
+%%INCLUDEDIR%%/qwt_plot_renderer.h
+%%INCLUDEDIR%%/qwt_plot_rescaler.h
+%%INCLUDEDIR%%/qwt_plot_scaleitem.h
+%%INCLUDEDIR%%/qwt_plot_seriesitem.h
+%%INCLUDEDIR%%/qwt_plot_spectrocurve.h
+%%INCLUDEDIR%%/qwt_plot_spectrogram.h
+%%INCLUDEDIR%%/qwt_plot_svgitem.h
+%%INCLUDEDIR%%/qwt_plot_zoomer.h
+%%INCLUDEDIR%%/qwt_point_3d.h
+%%INCLUDEDIR%%/qwt_point_polar.h
+%%INCLUDEDIR%%/qwt_raster_data.h
+%%INCLUDEDIR%%/qwt_round_scale_draw.h
+%%INCLUDEDIR%%/qwt_sampling_thread.h
+%%INCLUDEDIR%%/qwt_scale_div.h
+%%INCLUDEDIR%%/qwt_scale_draw.h
+%%INCLUDEDIR%%/qwt_scale_engine.h
+%%INCLUDEDIR%%/qwt_scale_map.h
+%%INCLUDEDIR%%/qwt_scale_widget.h
+%%INCLUDEDIR%%/qwt_series_data.h
+%%INCLUDEDIR%%/qwt_slider.h
+%%INCLUDEDIR%%/qwt_spline.h
+%%INCLUDEDIR%%/qwt_symbol.h
+%%INCLUDEDIR%%/qwt_system_clock.h
+%%INCLUDEDIR%%/qwt_text.h
+%%INCLUDEDIR%%/qwt_text_engine.h
+%%INCLUDEDIR%%/qwt_text_label.h
+%%INCLUDEDIR%%/qwt_thermo.h
+%%INCLUDEDIR%%/qwt_wheel.h
+lib/libqwt6.so
+lib/libqwt6.so.6
+lib/libqwt6.so.%%SHLIB_VER%%
+lib/libqwt6.so.%%SHLIB_SHVER%%
+lib/libqwtmathml.so
+lib/libqwtmathml.so.6
+lib/libqwtmathml.so.%%SHLIB_VER%%
+lib/libqwtmathml.so.%%SHLIB_SHVER%%
 %%PORTDOCS%%%%DOCSDIR%%/analogclock.png
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/bc_s.png
@@ -100,11 +112,11 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_data-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_data.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_data__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_data__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_series_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_series_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_series_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_series_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_series_data__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_arrow_button-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_arrow_button.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data-members.html
@@ -119,6 +131,10 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_color_map__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_color_map__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_color_map__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_column_rect-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_column_rect.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_column_symbol-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_column_symbol.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass__inherit__graph.map
@@ -149,11 +165,6 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_curve_fitter__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_curve_fitter__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_curve_fitter__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_data-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_data.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_data__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_data__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_data__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial__inherit__graph.map
@@ -174,8 +185,6 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_double_interval-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_double_interval.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_double_range-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_double_range.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_double_range__inherit__graph.map
@@ -192,8 +201,17 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_event_pattern__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_event_pattern__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_event_pattern__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_data-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_sample-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_sample.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_series_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_series_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_series_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_series_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_series_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_symbol-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_symbol.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob__inherit__graph.map
@@ -231,13 +249,23 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_magnifier__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_magnifier__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_magnifier__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_document-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_document.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_text_engine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_text_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_text_engine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_text_engine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_text_engine__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_metrics_map-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_metrics_map.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_matrix_raster_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_matrix_raster_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_matrix_raster_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_matrix_raster_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_matrix_raster_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_null_paint_device-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_null_paint_device.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_null_paint_device__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_null_paint_device__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_null_paint_device__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_painter-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_painter.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_panner-members.html
@@ -280,6 +308,11 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_tracker_machine-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_tracker_machine.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_tracker_machine__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_tracker_machine__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_tracker_machine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine__inherit__graph.map
@@ -290,6 +323,11 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_abstract_series_item-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_abstract_series_item.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_abstract_series_item__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_abstract_series_item__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_abstract_series_item__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_canvas-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_canvas.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve-members.html
@@ -302,11 +340,23 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_dict__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_dict__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_dict__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_direct_painter-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_direct_painter.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_histogram-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_histogram.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_histogram__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_histogram__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_histogram__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_interval_curve-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_interval_curve.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_interval_curve__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_interval_curve__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_interval_curve__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item__inherit__graph.map
@@ -334,13 +384,13 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_print_filter-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_print_filter.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_raster_item-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_raster_item.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_raster_item__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_raster_item__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_raster_item__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_renderer-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_renderer.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_rescaler-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_rescaler.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item-members.html
@@ -348,6 +398,16 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_series_item-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_series_item.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_series_item__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_series_item__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_series_item__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectro_curve-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectro_curve.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectro_curve__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectro_curve__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectro_curve__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram__inherit__graph.map
@@ -363,11 +423,25 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_polygon_f_data-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_polygon_f_data.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_polygon_f_data__inherit__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_polygon_f_data__inherit__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_polygon_f_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point3_d-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point3_d.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point3_d_series_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point3_d_series_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point3_d_series_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point3_d_series_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point3_d_series_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_array_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_array_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_array_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_array_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_array_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_polar-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_polar.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_series_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_series_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_series_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_series_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_point_series_data__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_raster_data-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_raster_data.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_raster_data__inherit__graph.map
@@ -383,6 +457,8 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_sampling_thread-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_sampling_thread.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_arithmetic-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_arithmetic.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_div-members.html
@@ -403,6 +479,18 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_transformation.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_widget-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_widget.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_series_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_series_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_series_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_series_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_series_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_set_sample-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_set_sample.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_set_series_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_set_series_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_set_series_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_set_series_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_set_series_data__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose__inherit__graph.map
@@ -422,6 +510,13 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_symbol-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_symbol.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_synthetic_point_data-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_synthetic_point_data.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_synthetic_point_data__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_synthetic_point_data__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_synthetic_point_data__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_system_clock-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_system_clock.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_text-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_text.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_text_engine-members.html
@@ -439,6 +534,11 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo__inherit__graph.png
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_weeding_curve_fitter-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_weeding_curve_fitter.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_weeding_curve_fitter__inherit__graph.map
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_weeding_curve_fitter__inherit__graph.md5
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_weeding_curve_fitter__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel__inherit__graph.map
@@ -450,7 +550,6 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/cpuplot.png
 %%PORTDOCS%%%%DOCSDIR%%/curves.png
 %%PORTDOCS%%%%DOCSDIR%%/curvescreenshots.html
-%%PORTDOCS%%%%DOCSDIR%%/deprecated.html
 %%PORTDOCS%%%%DOCSDIR%%/dials1.png
 %%PORTDOCS%%%%DOCSDIR%%/dials2.png
 %%PORTDOCS%%%%DOCSDIR%%/doxygen.css
@@ -460,6 +559,8 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/form_1.png
 %%PORTDOCS%%%%DOCSDIR%%/form_2.png
 %%PORTDOCS%%%%DOCSDIR%%/form_3.png
+%%PORTDOCS%%%%DOCSDIR%%/form_4.png
+%%PORTDOCS%%%%DOCSDIR%%/form_5.png
 %%PORTDOCS%%%%DOCSDIR%%/formula.repository
 %%PORTDOCS%%%%DOCSDIR%%/functions.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_0x62.html
@@ -487,6 +588,28 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/functions_0x7a.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x62.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x63.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x65.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x68.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x6b.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x6e.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x6f.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x72.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x76.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x78.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_eval_0x79.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_func.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_func_0x62.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_func_0x63.html
@@ -512,6 +635,8 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/functions_func_0x79.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_func_0x7a.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_func_0x7e.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_type.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/graph.png
 %%PORTDOCS%%%%DOCSDIR%%/graph_legend.html
 %%PORTDOCS%%%%DOCSDIR%%/graph_legend.md5
@@ -520,7 +645,6 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/histogram.png
 %%PORTDOCS%%%%DOCSDIR%%/histogramscreenshots.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/index.qhp
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_0.map
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_0.md5
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_0.png
@@ -620,12 +744,54 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_38.map
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_38.md5
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_38.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_39.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_39.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_39.png
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_4.map
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_4.md5
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_4.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_40.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_40.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_40.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_41.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_41.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_41.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_42.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_42.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_42.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_43.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_43.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_43.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_44.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_44.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_44.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_45.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_45.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_45.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_46.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_46.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_46.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_47.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_47.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_47.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_48.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_48.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_48.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_49.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_49.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_49.png
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_5.map
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_5.md5
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_5.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_50.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_50.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_50.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_51.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_51.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_51.png
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_52.map
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_52.md5
+%%PORTDOCS%%%%DOCSDIR%%/inherit_graph_52.png
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_6.map
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_6.md5
 %%PORTDOCS%%%%DOCSDIR%%/inherit_graph_6.png
@@ -649,33 +815,33 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale__draw_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__slider_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__analog__clock_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__array_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__arrow__button_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__clipper_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__color__map_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__column__symbol_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__compass_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__compass__rose_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__compat_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__counter_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__curve__fitter_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__data_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__dial_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__dial__needle_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__interval_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__double__range_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__dyngrid__layout_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__event__pattern_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__global_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__interval__data_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__interval_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__interval__symbol_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__knob_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__layout__metrics_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__legend_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__legend__item_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__legend__itemmanager_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__magnifier_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__math_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__mathml__text__engine_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__paint__buffer_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__matrix__raster__data_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__mml__document_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__null__paintdevice_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__painter_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__panner_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__picker_8h_source.html
@@ -684,36 +850,44 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__canvas_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__curve_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__directpainter_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__grid_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__histogram_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__intervalcurve_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__item_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__layout_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__magnifier_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__marker_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__panner_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__picker_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__printfilter_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rasteritem_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__renderer_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rescaler_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__scaleitem_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__seriesitem_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__spectrocurve_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__spectrogram_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__svgitem_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__zoomer_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__polygon_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__point__3d_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__point__polar_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__raster__data_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__round__scale__draw_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__sampling__thread_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__div_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__draw_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__engine_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__map_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__widget_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__series__data_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__slider_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__spline_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__symbol_8h_source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__system__clock_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__text_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__text__engine_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__text__label_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__thermo_8h_source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__valuelist_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__wheel_8h_source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwtinstall.html
 %%PORTDOCS%%%%DOCSDIR%%/qwtlicense.html
@@ -732,5 +906,11 @@ lib/libqwt.so.5.2.2
 %%PORTDOCS%%%%DOCSDIR%%/tab_h.png
 %%PORTDOCS%%%%DOCSDIR%%/tab_s.png
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
+share/qt4/mkspecs/features/qwt.prf
+share/qt4/mkspecs/features/qwtconfig.pri
+share/qt4/mkspecs/features/qwtmathml.prf
+@dirrmtry share/qt4/mkspecs/features
+@dirrmtry share/qt4/mkspecs
+@dirrmtry share/qt4
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm include/qwt
+@dirrm %%INCLUDEDIR%%