5 files changed, 73 insertions, 252 deletions

diff --git a/x11-toolkits/qwt6/Makefile b/x11-toolkits/qwt6/Makefile
index a9fe10ac5fb2..472f2d30bc86 100644
--- a/x11-toolkits/qwt6/Makefile
+++ b/x11-toolkits/qwt6/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	qwt
-PORTVERSION=	5.1.1
-PORTREVISION=	1
+PORTVERSION=	5.2.0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	SF
 
@@ -21,18 +20,20 @@ USE_GMAKE=	yes
 QMAKE_ARGS+=	-unix -recursive PREFIX=${PREFIX}
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+MAKE_JOBS_SAFE=	yes
 
 OPTIONS=	DESIGNER_PLUGIN "Install plugin for Qt Designer" on
 
+STRIP_FILES=	lib/libqwt.so.${PORTVERSION}
+
 .include <bsd.port.pre.mk>
 .include <${FILESDIR}/Makefile.man>
 
 .if !defined(WITHOUT_DESIGNER_PLUGIN)
-#QT_COMPONENTS+=	designer rcc_build
-BUILD_DEPENDS+=	${LOCALBASE}/bin/rcc:${PORTSDIR}/devel/qt4-rcc
-LIB_DEPENDS+=	QtDesigner:${PORTSDIR}/devel/qt4-designer
-QMAKE_ARGS+=	CONFIG+=QwtDesigner PLUGINDIR=${PREFIX}/lib/qt4/plugins
+QT_COMPONENTS+=	designer rcc_build
+QMAKE_ARGS+=	CONFIG+=QwtDesigner PLUGINDIR=${PREFIX}/${QT_PLUGINDIR_REL}
 PLIST_SUB+=	DESIGNER_PLUGIN=""
+STRIP_FILES+=	${QT_PLUGINDIR_REL}/designer/libqwt_designer_plugin.so
 .else
 PLIST_SUB+=	DESIGNER_PLUGIN="@comment "
 .endif
@@ -46,6 +47,7 @@ post-configure:
 
 post-install:
 	${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
diff --git a/x11-toolkits/qwt6/distinfo b/x11-toolkits/qwt6/distinfo
index f7400f810ee3..111b015d7090 100644
--- a/x11-toolkits/qwt6/distinfo
+++ b/x11-toolkits/qwt6/distinfo
@@ -1,3 +1,3 @@
-MD5 (qwt-5.1.1.tar.bz2) = 218cef1a39ebda6cfa440a0727464275
-SHA256 (qwt-5.1.1.tar.bz2) = 153e538e46d690991e777f0cdc0db8a7eaff80fc78fee30a7391f1149411743e
-SIZE (qwt-5.1.1.tar.bz2) = 1686166
+MD5 (qwt-5.2.0.tar.bz2) = c60b4cfac271a41524402b3ae5197890
+SHA256 (qwt-5.2.0.tar.bz2) = 2b431a6e04cb939f71cdc03a343975162bd6f94bfc11b85227bdb44e9576f5ba
+SIZE (qwt-5.2.0.tar.bz2) = 1371877
diff --git a/x11-toolkits/qwt6/files/Makefile.man b/x11-toolkits/qwt6/files/Makefile.man
index b240915c0984..3a5658873815 100644
--- a/x11-toolkits/qwt6/files/Makefile.man
+++ b/x11-toolkits/qwt6/files/Makefile.man
@@ -59,13 +59,13 @@ MAN3=	QwtAbstractScale.3 \
 	QwtPlotPicker.3 \
 	QwtPlotPrintFilter.3 \
 	QwtPlotRasterItem.3 \
+	QwtPlotRescaler.3 \
 	QwtPlotScaleItem.3 \
 	QwtPlotSpectrogram.3 \
 	QwtPlotSvgItem.3 \
 	QwtPlotZoomer.3 \
 	QwtPolygonFData.3 \
 	QwtRasterData.3 \
-	QwtRect.3 \
 	QwtRichTextEngine.3 \
 	QwtRoundScaleDraw.3 \
 	QwtScaleArithmetic.3 \
diff --git a/x11-toolkits/qwt6/files/patch-qwtconfig.pri b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
index d0738fd4375d..8c4bf49f75f7 100644
--- a/x11-toolkits/qwt6/files/patch-qwtconfig.pri
+++ b/x11-toolkits/qwt6/files/patch-qwtconfig.pri
@@ -1,10 +1,10 @@
---- ./qwtconfig.pri.orig	2008-05-01 17:43:56.000000000 +0400
-+++ ./qwtconfig.pri	2008-05-03 02:21:17.000000000 +0400
+--- ./qwtconfig.pri.orig	2009-03-22 18:41:05.000000000 +0300
++++ ./qwtconfig.pri	2009-03-25 23:02:54.000000000 +0300
 @@ -8,7 +8,7 @@
- VERSION      = $$VER_MAJ.$$VER_MIN.$$VER_PAT
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
  unix {
--    INSTALLBASE    = /usr/local/qwt-5.1.1
+-    INSTALLBASE    = /usr/local/qwt-5.2.0
 +    INSTALLBASE    = $$PREFIX
  }
  
diff --git a/x11-toolkits/qwt6/pkg-plist b/x11-toolkits/qwt6/pkg-plist
index 66606ff21c1a..fa0e49ca9713 100644
--- a/x11-toolkits/qwt6/pkg-plist
+++ b/x11-toolkits/qwt6/pkg-plist
@@ -46,13 +46,13 @@ 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_rect.h
 include/qwt/qwt_round_scale_draw.h
 include/qwt/qwt_scale_div.h
 include/qwt/qwt_scale_draw.h
@@ -70,8 +70,8 @@ include/qwt/qwt_valuelist.h
 include/qwt/qwt_wheel.h
 lib/libqwt.so
 lib/libqwt.so.5
-lib/libqwt.so.5.1
-lib/libqwt.so.5.1.1
+lib/libqwt.so.5.2
+lib/libqwt.so.5.2.0
 %%DESIGNER_PLUGIN%%lib/qt4/plugins/designer/libqwt_designer_plugin.so
 %%PORTDOCS%%%%DOCSDIR%%/analogclock.png
 %%PORTDOCS%%%%DOCSDIR%%/annotated.html
@@ -87,33 +87,21 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_scale_draw__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_abstract_slider__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_alpha_color_map__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_analog_clock__coll__graph.png
 %%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__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_data__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_array_data__coll__graph.png
 %%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
@@ -121,9 +109,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_arrow_button.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_c_pointer_data__inherit__graph.png
@@ -136,17 +121,11 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_color_map__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_magnet_needle__inherit__graph.png
@@ -157,17 +136,11 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_rose__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_compass_wind_arrow__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_counter__inherit__graph.png
@@ -183,9 +156,6 @@ lib/libqwt.so.5.1.1
 %%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__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial__inherit__graph.png
@@ -196,17 +166,11 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_needle__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_scale_draw__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_dial_simple_needle__coll__graph.png
 %%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
@@ -232,9 +196,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_interval_data.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_knob__inherit__graph.png
@@ -242,9 +203,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item__inherit__graph.png
@@ -255,25 +213,16 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_legend_item_manager__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_color_map__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_linear_scale_engine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_log10_scale_engine__inherit__graph.png
@@ -284,9 +233,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_magnifier__inherit__graph.png
 %%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__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_text_engine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_math_m_l_text_engine__coll__graph.png
 %%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
@@ -294,9 +240,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_metrics_map.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_painter-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_painter.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_painter__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_painter__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_painter__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_panner-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_panner.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_panner__inherit__graph.map
@@ -304,41 +247,26 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_panner__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_point_machine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_click_rect_machine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_point_machine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_drag_rect_machine__inherit__graph.png
@@ -349,25 +277,16 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_machine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_picker_polygon_machine__coll__graph.png
 %%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_plain_text_engine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plain_text_engine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot__inherit__graph.png
@@ -375,9 +294,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_canvas.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_curve__inherit__graph.png
@@ -388,17 +304,11 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_dict__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_grid__coll__graph.png
 %%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_item-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_item__inherit__graph.png
@@ -406,33 +316,21 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_layout.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_magnifier__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_marker__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_panner__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_picker__coll__graph.png
 %%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
@@ -440,49 +338,33 @@ lib/libqwt.so.5.1.1
 %%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__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_raster_item__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_raster_item__coll__graph.png
 %%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_rescaler-members.html
+%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_rescaler.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_scale_item__coll__graph.png
 %%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_spectrogram-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_spectrogram__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_svg_item__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_plot_zoomer__coll__graph.png
 %%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__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_polygon_f_data__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_polygon_f_data__coll__graph.png
 %%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
@@ -491,21 +373,13 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_raster_data__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_raster_data__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_raster_data__inherit__graph.png
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_rect-members.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_rect.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_rich_text_engine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_round_scale_draw__coll__graph.png
 %%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
@@ -515,9 +389,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_div.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_draw__inherit__graph.png
@@ -528,26 +399,17 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_engine__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_map-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_map.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_map__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_map__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_map__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_scale_transformation-members.html
 %%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_simple_compass_rose-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_simple_compass_rose__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_slider__inherit__graph.png
@@ -555,9 +417,6 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_spline_curve_fitter__inherit__graph.png
@@ -577,17 +436,11 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_text_label__inherit__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_thermo__coll__graph.png
 %%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_wheel-members.html
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel.html
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel__coll__graph.map
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel__coll__graph.md5
-%%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel__coll__graph.png
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel__inherit__graph.map
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel__inherit__graph.md5
 %%PORTDOCS%%%%DOCSDIR%%/class_qwt_wheel__inherit__graph.png
@@ -605,15 +458,59 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/form_0.png
 %%PORTDOCS%%%%DOCSDIR%%/form_1.png
 %%PORTDOCS%%%%DOCSDIR%%/form_2.png
+%%PORTDOCS%%%%DOCSDIR%%/form_3.png
 %%PORTDOCS%%%%DOCSDIR%%/formula.repository
 %%PORTDOCS%%%%DOCSDIR%%/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x62.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x63.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x65.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x68.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x6b.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x6e.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x6f.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x72.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x76.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x77.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x78.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x79.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x7a.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_enum.html
 %%PORTDOCS%%%%DOCSDIR%%/functions_func.html
-%%PORTDOCS%%%%DOCSDIR%%/functions_rela.html
-%%PORTDOCS%%%%DOCSDIR%%/functions_type.html
-%%PORTDOCS%%%%DOCSDIR%%/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x62.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x63.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x64.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x65.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x68.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x69.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x6b.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x6c.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x6d.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x6e.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x6f.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x70.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x72.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x73.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x74.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x75.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x76.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x77.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x78.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x79.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x7a.html
+%%PORTDOCS%%%%DOCSDIR%%/functions_func_0x7e.html
 %%PORTDOCS%%%%DOCSDIR%%/graph.png
 %%PORTDOCS%%%%DOCSDIR%%/graph_legend.dot
 %%PORTDOCS%%%%DOCSDIR%%/graph_legend.html
@@ -743,151 +640,75 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/knob.png
 %%PORTDOCS%%%%DOCSDIR%%/pages.html
 %%PORTDOCS%%%%DOCSDIR%%/plot.png
-%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale__draw_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__scale__draw_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__slider_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__abstract__slider_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__analog__clock_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__analog__clock_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__array_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__arrow__button_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__arrow__button_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__clipper_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__clipper_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__color__map_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__color__map_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__compass_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__compass_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__compass__rose_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__compass__rose_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__counter_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__counter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__curve__fitter_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__curve__fitter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__data_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__data_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__dial_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__dial_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__dial__needle_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__dial__needle_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__interval_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__double__interval_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__range_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__double__range_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/qwt__double__rect_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/qwt__dyngrid__layout_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__dyngrid__layout_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__event__pattern_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__event__pattern_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__global_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__interval__data_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__interval__data_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__knob_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__knob_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__layout__metrics_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__layout__metrics_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__legend_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__legend_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__legend__item_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__legend__item_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__legend__itemmanager_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__magnifier_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__magnifier_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__math_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__math_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__mathml__text__engine_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__mathml__text__engine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__paint__buffer_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__paint__buffer_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__painter_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__painter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__panner_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__panner_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__picker_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__picker_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__picker__machine_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__picker__machine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__axis_8cpp-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__canvas_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__canvas_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__curve_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__curve_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h__incl.map
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h__incl.md5
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__dict_8h__incl.png
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__grid_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__grid_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__item_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__item_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__layout_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__layout_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__magnifier_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__magnifier_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__marker_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__marker_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__panner_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__panner_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__picker_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__picker_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__print_8cpp-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__printfilter_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__printfilter_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rasteritem_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rasteritem_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__scaleitem_8cpp-source.html
+%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__rescaler_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__scaleitem_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__spectrogram_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__spectrogram_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__svgitem_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__svgitem_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__xml_8cpp-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__plot__zoomer_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__plot__zoomer_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__polygon_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__raster__data_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__raster__data_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__rect_8cpp-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__rect_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__round__scale__draw_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__round__scale__draw_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__div_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__div_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__draw_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__draw_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__engine_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__engine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__map_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__map_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__scale__widget_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__scale__widget_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__slider_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__slider_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__spline_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__spline_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__symbol_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__symbol_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__text_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__text_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__text__engine_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__text__engine_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__text__label_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__text__label_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__thermo_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__thermo_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__valuelist_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/qwt__wheel_8cpp-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwt__wheel_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/qwtinstall.html
 %%PORTDOCS%%%%DOCSDIR%%/qwtlicense.html
@@ -905,9 +726,7 @@ lib/libqwt.so.5.1.1
 %%PORTDOCS%%%%DOCSDIR%%/tab_l.gif
 %%PORTDOCS%%%%DOCSDIR%%/tab_r.gif
 %%PORTDOCS%%%%DOCSDIR%%/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/todo.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%DESIGNER_PLUGIN%%@dirrmtry lib/qt4/plugins/designer
-%%DESIGNER_PLUGIN%%@dirrmtry lib/qt4/plugins
-%%DESIGNER_PLUGIN%%@dirrmtry lib/qt4
+%%DESIGNER_PLUGIN%%@dirrmtry %%QT_PLUGINDIR_REL%%/designer
+%%DESIGNER_PLUGIN%%@dirrmtry %%QT_PLUGINDIR_REL%%
 @dirrm include/qwt