roll back to D2011.06.14.22.00.00, i.e. revert to 5.2.1nb4

qwt6 is incompatible, and the update has broken the graphics/scidavis pkg

6 files changed, 304 insertions, 396 deletions

diff --git a/x11/qwt-qt4/Makefile b/x11/qwt-qt4/Makefile
index 57e6c323852..3b4ec3b6531 100644
--- a/x11/qwt-qt4/Makefile
+++ b/x11/qwt-qt4/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2011/11/01 06:03:08 sbd Exp $
+# $NetBSD: Makefile,v 1.12 2011/12/07 13:36:16 drochner Exp $
 
-DISTNAME=	qwt-6.0.0
-PKGREVISION=	2
+DISTNAME=	qwt-5.2.1
+PKGREVISION=	4
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qwt/}
 EXTRACT_SUFX=	.tar.bz2
@@ -9,15 +9,17 @@ EXTRACT_SUFX=	.tar.bz2
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/qwt/
 COMMENT=	Qt widget library for technical purposes
-LICENSE=	gnu-lgpl-v2
 
+MAKE_JOBS_SAFE=		no
+
+USE_X11BASE=	yes
 USE_LANGUAGES=	c++
 USE_TOOLS+=	gmake
 USE_LIBTOOL=	yes
 
 CONFLICTS=	qwtlib-[0-9]*
 
-AUTO_MKDIRS=		yes
+AUTO_MKDIRS=			yes
 PKG_DESTDIR_SUPPORT=	user-destdir
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR}
 
diff --git a/x11/qwt-qt4/PLIST b/x11/qwt-qt4/PLIST
index 0ec5209a904..b6b4b0bc4a9 100644
--- a/x11/qwt-qt4/PLIST
+++ b/x11/qwt-qt4/PLIST
@@ -1,38 +1,35 @@
-@comment $NetBSD: PLIST,v 1.4 2011/06/20 12:43:00 drochner Exp $
-features/qwt.prf
-features/qwtconfig.pri
-features/qwtmathml.prf
+@comment $NetBSD: PLIST,v 1.5 2011/12/07 13:36:16 drochner Exp $
 include/qwt.h
 include/qwt_abstract_scale.h
 include/qwt_abstract_scale_draw.h
 include/qwt_abstract_slider.h
 include/qwt_analog_clock.h
+include/qwt_array.h
 include/qwt_arrow_button.h
 include/qwt_clipper.h
 include/qwt_color_map.h
-include/qwt_column_symbol.h
 include/qwt_compass.h
 include/qwt_compass_rose.h
-include/qwt_compat.h
 include/qwt_counter.h
 include/qwt_curve_fitter.h
+include/qwt_data.h
 include/qwt_dial.h
 include/qwt_dial_needle.h
+include/qwt_double_interval.h
 include/qwt_double_range.h
+include/qwt_double_rect.h
 include/qwt_dyngrid_layout.h
 include/qwt_event_pattern.h
 include/qwt_global.h
-include/qwt_interval.h
-include/qwt_interval_symbol.h
+include/qwt_interval_data.h
 include/qwt_knob.h
+include/qwt_layout_metrics.h
 include/qwt_legend.h
 include/qwt_legend_item.h
 include/qwt_legend_itemmanager.h
 include/qwt_magnifier.h
 include/qwt_math.h
-include/qwt_mathml_text_engine.h
-include/qwt_matrix_raster_data.h
-include/qwt_null_paintdevice.h
+include/qwt_paint_buffer.h
 include/qwt_painter.h
 include/qwt_panner.h
 include/qwt_picker.h
@@ -41,51 +38,135 @@ include/qwt_plot.h
 include/qwt_plot_canvas.h
 include/qwt_plot_curve.h
 include/qwt_plot_dict.h
-include/qwt_plot_directpainter.h
 include/qwt_plot_grid.h
-include/qwt_plot_histogram.h
-include/qwt_plot_intervalcurve.h
 include/qwt_plot_item.h
 include/qwt_plot_layout.h
 include/qwt_plot_magnifier.h
 include/qwt_plot_marker.h
 include/qwt_plot_panner.h
 include/qwt_plot_picker.h
+include/qwt_plot_printfilter.h
 include/qwt_plot_rasteritem.h
-include/qwt_plot_renderer.h
 include/qwt_plot_rescaler.h
 include/qwt_plot_scaleitem.h
-include/qwt_plot_seriesitem.h
-include/qwt_plot_spectrocurve.h
 include/qwt_plot_spectrogram.h
-include/qwt_plot_svgitem.h
 include/qwt_plot_zoomer.h
-include/qwt_point_3d.h
-include/qwt_point_polar.h
+include/qwt_polygon.h
 include/qwt_raster_data.h
 include/qwt_round_scale_draw.h
-include/qwt_sampling_thread.h
 include/qwt_scale_div.h
 include/qwt_scale_draw.h
 include/qwt_scale_engine.h
 include/qwt_scale_map.h
 include/qwt_scale_widget.h
-include/qwt_series_data.h
 include/qwt_slider.h
 include/qwt_spline.h
 include/qwt_symbol.h
-include/qwt_system_clock.h
 include/qwt_text.h
 include/qwt_text_engine.h
 include/qwt_text_label.h
 include/qwt_thermo.h
+include/qwt_valuelist.h
 include/qwt_wheel.h
 lib/libqwt.la
-lib/libqwtmathml.la
+man/man3/QwtAbstractScale.3
+man/man3/QwtAbstractScaleDraw.3
+man/man3/QwtAbstractSlider.3
+man/man3/QwtAlphaColorMap.3
+man/man3/QwtAnalogClock.3
+man/man3/QwtArrayData.3
+man/man3/QwtArrowButton.3
+man/man3/QwtCPointerData.3
+man/man3/QwtClipper.3
+man/man3/QwtColorMap.3
+man/man3/QwtCompass.3
+man/man3/QwtCompassMagnetNeedle.3
+man/man3/QwtCompassRose.3
+man/man3/QwtCompassWindArrow.3
+man/man3/QwtCounter.3
+man/man3/QwtCurveFitter.3
+man/man3/QwtData.3
+man/man3/QwtDial.3
+man/man3/QwtDialNeedle.3
+man/man3/QwtDialScaleDraw.3
+man/man3/QwtDialSimpleNeedle.3
+man/man3/QwtDoubleInterval.3
+man/man3/QwtDoubleRange.3
+man/man3/QwtDynGridLayout.3
+man/man3/QwtEventPattern.3
+man/man3/QwtEventPattern_KeyPattern.3
+man/man3/QwtEventPattern_MousePattern.3
+man/man3/QwtIntervalData.3
+man/man3/QwtKnob.3
+man/man3/QwtLegend.3
+man/man3/QwtLegendItem.3
+man/man3/QwtLegendItemManager.3
+man/man3/QwtLinearColorMap.3
+man/man3/QwtLinearScaleEngine.3
+man/man3/QwtLog10ScaleEngine.3
+man/man3/QwtMagnifier.3
+man/man3/QwtMathMLTextEngine.3
+man/man3/QwtMetricsMap.3
+man/man3/QwtPainter.3
+man/man3/QwtPanner.3
+man/man3/QwtPicker.3
+man/man3/QwtPickerClickPointMachine.3
+man/man3/QwtPickerClickRectMachine.3
+man/man3/QwtPickerDragPointMachine.3
+man/man3/QwtPickerDragRectMachine.3
+man/man3/QwtPickerMachine.3
+man/man3/QwtPickerPolygonMachine.3
+man/man3/QwtPlainTextEngine.3
+man/man3/QwtPlot.3
+man/man3/QwtPlotCanvas.3
+man/man3/QwtPlotCurve.3
+man/man3/QwtPlotDict.3
+man/man3/QwtPlotGrid.3
+man/man3/QwtPlotItem.3
+man/man3/QwtPlotLayout.3
+man/man3/QwtPlotMagnifier.3
+man/man3/QwtPlotMarker.3
+man/man3/QwtPlotPanner.3
+man/man3/QwtPlotPicker.3
+man/man3/QwtPlotPrintFilter.3
+man/man3/QwtPlotRasterItem.3
+man/man3/QwtPlotRescaler.3
+man/man3/QwtPlotScaleItem.3
+man/man3/QwtPlotSpectrogram.3
+man/man3/QwtPlotSvgItem.3
+man/man3/QwtPlotZoomer.3
+man/man3/QwtPolygonFData.3
+man/man3/QwtRasterData.3
+man/man3/QwtRichTextEngine.3
+man/man3/QwtRoundScaleDraw.3
+man/man3/QwtScaleArithmetic.3
+man/man3/QwtScaleDiv.3
+man/man3/QwtScaleDraw.3
+man/man3/QwtScaleEngine.3
+man/man3/QwtScaleMap.3
+man/man3/QwtScaleTransformation.3
+man/man3/QwtScaleWidget.3
+man/man3/QwtSimpleCompassRose.3
+man/man3/QwtSlider.3
+man/man3/QwtSpline.3
+man/man3/QwtSplineCurveFitter.3
+man/man3/QwtSymbol.3
+man/man3/QwtText.3
+man/man3/QwtTextEngine.3
+man/man3/QwtTextLabel.3
+man/man3/QwtThermo.3
+man/man3/QwtWheel.3
+man/man3/controlscreenshots.3
+man/man3/curvescreenshots.3
+man/man3/deprecated.3
+man/man3/histogramscreenshots.3
+man/man3/qwtinstall.3
+man/man3/qwtlicense.3
+man/man3/scatterscreenshots.3
+man/man3/spectrogramscreenshots.3
 qt4/plugins/designer/libqwt_designer_plugin.la
 share/doc/qwt/analogclock.png
 share/doc/qwt/annotated.html
-share/doc/qwt/bc_s.png
 share/doc/qwt/class_qwt_abstract_scale-members.html
 share/doc/qwt/class_qwt_abstract_scale.html
 share/doc/qwt/class_qwt_abstract_scale__inherit__graph.map
@@ -111,11 +192,11 @@ share/doc/qwt/class_qwt_analog_clock.html
 share/doc/qwt/class_qwt_analog_clock__inherit__graph.map
 share/doc/qwt/class_qwt_analog_clock__inherit__graph.md5
 share/doc/qwt/class_qwt_analog_clock__inherit__graph.png
-share/doc/qwt/class_qwt_array_series_data-members.html
-share/doc/qwt/class_qwt_array_series_data.html
-share/doc/qwt/class_qwt_array_series_data__inherit__graph.map
-share/doc/qwt/class_qwt_array_series_data__inherit__graph.md5
-share/doc/qwt/class_qwt_array_series_data__inherit__graph.png
+share/doc/qwt/class_qwt_array_data-members.html
+share/doc/qwt/class_qwt_array_data.html
+share/doc/qwt/class_qwt_array_data__inherit__graph.map
+share/doc/qwt/class_qwt_array_data__inherit__graph.md5
+share/doc/qwt/class_qwt_array_data__inherit__graph.png
 share/doc/qwt/class_qwt_arrow_button-members.html
 share/doc/qwt/class_qwt_arrow_button.html
 share/doc/qwt/class_qwt_c_pointer_data-members.html
@@ -130,10 +211,6 @@ share/doc/qwt/class_qwt_color_map.html
 share/doc/qwt/class_qwt_color_map__inherit__graph.map
 share/doc/qwt/class_qwt_color_map__inherit__graph.md5
 share/doc/qwt/class_qwt_color_map__inherit__graph.png
-share/doc/qwt/class_qwt_column_rect-members.html
-share/doc/qwt/class_qwt_column_rect.html
-share/doc/qwt/class_qwt_column_symbol-members.html
-share/doc/qwt/class_qwt_column_symbol.html
 share/doc/qwt/class_qwt_compass-members.html
 share/doc/qwt/class_qwt_compass.html
 share/doc/qwt/class_qwt_compass__inherit__graph.map
@@ -164,6 +241,11 @@ share/doc/qwt/class_qwt_curve_fitter.html
 share/doc/qwt/class_qwt_curve_fitter__inherit__graph.map
 share/doc/qwt/class_qwt_curve_fitter__inherit__graph.md5
 share/doc/qwt/class_qwt_curve_fitter__inherit__graph.png
+share/doc/qwt/class_qwt_data-members.html
+share/doc/qwt/class_qwt_data.html
+share/doc/qwt/class_qwt_data__inherit__graph.map
+share/doc/qwt/class_qwt_data__inherit__graph.md5
+share/doc/qwt/class_qwt_data__inherit__graph.png
 share/doc/qwt/class_qwt_dial-members.html
 share/doc/qwt/class_qwt_dial.html
 share/doc/qwt/class_qwt_dial__inherit__graph.map
@@ -184,6 +266,8 @@ share/doc/qwt/class_qwt_dial_simple_needle.html
 share/doc/qwt/class_qwt_dial_simple_needle__inherit__graph.map
 share/doc/qwt/class_qwt_dial_simple_needle__inherit__graph.md5
 share/doc/qwt/class_qwt_dial_simple_needle__inherit__graph.png
+share/doc/qwt/class_qwt_double_interval-members.html
+share/doc/qwt/class_qwt_double_interval.html
 share/doc/qwt/class_qwt_double_range-members.html
 share/doc/qwt/class_qwt_double_range.html
 share/doc/qwt/class_qwt_double_range__inherit__graph.map
@@ -200,17 +284,8 @@ share/doc/qwt/class_qwt_event_pattern_1_1_mouse_pattern.html
 share/doc/qwt/class_qwt_event_pattern__inherit__graph.map
 share/doc/qwt/class_qwt_event_pattern__inherit__graph.md5
 share/doc/qwt/class_qwt_event_pattern__inherit__graph.png
-share/doc/qwt/class_qwt_interval-members.html
-share/doc/qwt/class_qwt_interval.html
-share/doc/qwt/class_qwt_interval_sample-members.html
-share/doc/qwt/class_qwt_interval_sample.html
-share/doc/qwt/class_qwt_interval_series_data-members.html
-share/doc/qwt/class_qwt_interval_series_data.html
-share/doc/qwt/class_qwt_interval_series_data__inherit__graph.map
-share/doc/qwt/class_qwt_interval_series_data__inherit__graph.md5
-share/doc/qwt/class_qwt_interval_series_data__inherit__graph.png
-share/doc/qwt/class_qwt_interval_symbol-members.html
-share/doc/qwt/class_qwt_interval_symbol.html
+share/doc/qwt/class_qwt_interval_data-members.html
+share/doc/qwt/class_qwt_interval_data.html
 share/doc/qwt/class_qwt_knob-members.html
 share/doc/qwt/class_qwt_knob.html
 share/doc/qwt/class_qwt_knob__inherit__graph.map
@@ -248,23 +323,13 @@ share/doc/qwt/class_qwt_magnifier.html
 share/doc/qwt/class_qwt_magnifier__inherit__graph.map
 share/doc/qwt/class_qwt_magnifier__inherit__graph.md5
 share/doc/qwt/class_qwt_magnifier__inherit__graph.png
-share/doc/qwt/class_qwt_math_m_l_document-members.html
-share/doc/qwt/class_qwt_math_m_l_document.html
 share/doc/qwt/class_qwt_math_m_l_text_engine-members.html
 share/doc/qwt/class_qwt_math_m_l_text_engine.html
 share/doc/qwt/class_qwt_math_m_l_text_engine__inherit__graph.map
 share/doc/qwt/class_qwt_math_m_l_text_engine__inherit__graph.md5
 share/doc/qwt/class_qwt_math_m_l_text_engine__inherit__graph.png
-share/doc/qwt/class_qwt_matrix_raster_data-members.html
-share/doc/qwt/class_qwt_matrix_raster_data.html
-share/doc/qwt/class_qwt_matrix_raster_data__inherit__graph.map
-share/doc/qwt/class_qwt_matrix_raster_data__inherit__graph.md5
-share/doc/qwt/class_qwt_matrix_raster_data__inherit__graph.png
-share/doc/qwt/class_qwt_null_paint_device-members.html
-share/doc/qwt/class_qwt_null_paint_device.html
-share/doc/qwt/class_qwt_null_paint_device__inherit__graph.map
-share/doc/qwt/class_qwt_null_paint_device__inherit__graph.md5
-share/doc/qwt/class_qwt_null_paint_device__inherit__graph.png
+share/doc/qwt/class_qwt_metrics_map-members.html
+share/doc/qwt/class_qwt_metrics_map.html
 share/doc/qwt/class_qwt_painter-members.html
 share/doc/qwt/class_qwt_painter.html
 share/doc/qwt/class_qwt_panner-members.html
@@ -307,11 +372,6 @@ share/doc/qwt/class_qwt_picker_polygon_machine.html
 share/doc/qwt/class_qwt_picker_polygon_machine__inherit__graph.map
 share/doc/qwt/class_qwt_picker_polygon_machine__inherit__graph.md5
 share/doc/qwt/class_qwt_picker_polygon_machine__inherit__graph.png
-share/doc/qwt/class_qwt_picker_tracker_machine-members.html
-share/doc/qwt/class_qwt_picker_tracker_machine.html
-share/doc/qwt/class_qwt_picker_tracker_machine__inherit__graph.map
-share/doc/qwt/class_qwt_picker_tracker_machine__inherit__graph.md5
-share/doc/qwt/class_qwt_picker_tracker_machine__inherit__graph.png
 share/doc/qwt/class_qwt_plain_text_engine-members.html
 share/doc/qwt/class_qwt_plain_text_engine.html
 share/doc/qwt/class_qwt_plain_text_engine__inherit__graph.map
@@ -322,11 +382,6 @@ share/doc/qwt/class_qwt_plot.html
 share/doc/qwt/class_qwt_plot__inherit__graph.map
 share/doc/qwt/class_qwt_plot__inherit__graph.md5
 share/doc/qwt/class_qwt_plot__inherit__graph.png
-share/doc/qwt/class_qwt_plot_abstract_series_item-members.html
-share/doc/qwt/class_qwt_plot_abstract_series_item.html
-share/doc/qwt/class_qwt_plot_abstract_series_item__inherit__graph.map
-share/doc/qwt/class_qwt_plot_abstract_series_item__inherit__graph.md5
-share/doc/qwt/class_qwt_plot_abstract_series_item__inherit__graph.png
 share/doc/qwt/class_qwt_plot_canvas-members.html
 share/doc/qwt/class_qwt_plot_canvas.html
 share/doc/qwt/class_qwt_plot_curve-members.html
@@ -339,23 +394,11 @@ share/doc/qwt/class_qwt_plot_dict.html
 share/doc/qwt/class_qwt_plot_dict__inherit__graph.map
 share/doc/qwt/class_qwt_plot_dict__inherit__graph.md5
 share/doc/qwt/class_qwt_plot_dict__inherit__graph.png
-share/doc/qwt/class_qwt_plot_direct_painter-members.html
-share/doc/qwt/class_qwt_plot_direct_painter.html
 share/doc/qwt/class_qwt_plot_grid-members.html
 share/doc/qwt/class_qwt_plot_grid.html
 share/doc/qwt/class_qwt_plot_grid__inherit__graph.map
 share/doc/qwt/class_qwt_plot_grid__inherit__graph.md5
 share/doc/qwt/class_qwt_plot_grid__inherit__graph.png
-share/doc/qwt/class_qwt_plot_histogram-members.html
-share/doc/qwt/class_qwt_plot_histogram.html
-share/doc/qwt/class_qwt_plot_histogram__inherit__graph.map
-share/doc/qwt/class_qwt_plot_histogram__inherit__graph.md5
-share/doc/qwt/class_qwt_plot_histogram__inherit__graph.png
-share/doc/qwt/class_qwt_plot_interval_curve-members.html
-share/doc/qwt/class_qwt_plot_interval_curve.html
-share/doc/qwt/class_qwt_plot_interval_curve__inherit__graph.map
-share/doc/qwt/class_qwt_plot_interval_curve__inherit__graph.md5
-share/doc/qwt/class_qwt_plot_interval_curve__inherit__graph.png
 share/doc/qwt/class_qwt_plot_item-members.html
 share/doc/qwt/class_qwt_plot_item.html
 share/doc/qwt/class_qwt_plot_item__inherit__graph.map
@@ -383,13 +426,13 @@ share/doc/qwt/class_qwt_plot_picker.html
 share/doc/qwt/class_qwt_plot_picker__inherit__graph.map
 share/doc/qwt/class_qwt_plot_picker__inherit__graph.md5
 share/doc/qwt/class_qwt_plot_picker__inherit__graph.png
+share/doc/qwt/class_qwt_plot_print_filter-members.html
+share/doc/qwt/class_qwt_plot_print_filter.html
 share/doc/qwt/class_qwt_plot_raster_item-members.html
 share/doc/qwt/class_qwt_plot_raster_item.html
 share/doc/qwt/class_qwt_plot_raster_item__inherit__graph.map
 share/doc/qwt/class_qwt_plot_raster_item__inherit__graph.md5
 share/doc/qwt/class_qwt_plot_raster_item__inherit__graph.png
-share/doc/qwt/class_qwt_plot_renderer-members.html
-share/doc/qwt/class_qwt_plot_renderer.html
 share/doc/qwt/class_qwt_plot_rescaler-members.html
 share/doc/qwt/class_qwt_plot_rescaler.html
 share/doc/qwt/class_qwt_plot_scale_item-members.html
@@ -397,16 +440,6 @@ share/doc/qwt/class_qwt_plot_scale_item.html
 share/doc/qwt/class_qwt_plot_scale_item__inherit__graph.map
 share/doc/qwt/class_qwt_plot_scale_item__inherit__graph.md5
 share/doc/qwt/class_qwt_plot_scale_item__inherit__graph.png
-share/doc/qwt/class_qwt_plot_series_item-members.html
-share/doc/qwt/class_qwt_plot_series_item.html
-share/doc/qwt/class_qwt_plot_series_item__inherit__graph.map
-share/doc/qwt/class_qwt_plot_series_item__inherit__graph.md5
-share/doc/qwt/class_qwt_plot_series_item__inherit__graph.png
-share/doc/qwt/class_qwt_plot_spectro_curve-members.html
-share/doc/qwt/class_qwt_plot_spectro_curve.html
-share/doc/qwt/class_qwt_plot_spectro_curve__inherit__graph.map
-share/doc/qwt/class_qwt_plot_spectro_curve__inherit__graph.md5
-share/doc/qwt/class_qwt_plot_spectro_curve__inherit__graph.png
 share/doc/qwt/class_qwt_plot_spectrogram-members.html
 share/doc/qwt/class_qwt_plot_spectrogram.html
 share/doc/qwt/class_qwt_plot_spectrogram__inherit__graph.map
@@ -422,25 +455,11 @@ share/doc/qwt/class_qwt_plot_zoomer.html
 share/doc/qwt/class_qwt_plot_zoomer__inherit__graph.map
 share/doc/qwt/class_qwt_plot_zoomer__inherit__graph.md5
 share/doc/qwt/class_qwt_plot_zoomer__inherit__graph.png
-share/doc/qwt/class_qwt_point3_d-members.html
-share/doc/qwt/class_qwt_point3_d.html
-share/doc/qwt/class_qwt_point3_d_series_data-members.html
-share/doc/qwt/class_qwt_point3_d_series_data.html
-share/doc/qwt/class_qwt_point3_d_series_data__inherit__graph.map
-share/doc/qwt/class_qwt_point3_d_series_data__inherit__graph.md5
-share/doc/qwt/class_qwt_point3_d_series_data__inherit__graph.png
-share/doc/qwt/class_qwt_point_array_data-members.html
-share/doc/qwt/class_qwt_point_array_data.html
-share/doc/qwt/class_qwt_point_array_data__inherit__graph.map
-share/doc/qwt/class_qwt_point_array_data__inherit__graph.md5
-share/doc/qwt/class_qwt_point_array_data__inherit__graph.png
-share/doc/qwt/class_qwt_point_polar-members.html
-share/doc/qwt/class_qwt_point_polar.html
-share/doc/qwt/class_qwt_point_series_data-members.html
-share/doc/qwt/class_qwt_point_series_data.html
-share/doc/qwt/class_qwt_point_series_data__inherit__graph.map
-share/doc/qwt/class_qwt_point_series_data__inherit__graph.md5
-share/doc/qwt/class_qwt_point_series_data__inherit__graph.png
+share/doc/qwt/class_qwt_polygon_f_data-members.html
+share/doc/qwt/class_qwt_polygon_f_data.html
+share/doc/qwt/class_qwt_polygon_f_data__inherit__graph.map
+share/doc/qwt/class_qwt_polygon_f_data__inherit__graph.md5
+share/doc/qwt/class_qwt_polygon_f_data__inherit__graph.png
 share/doc/qwt/class_qwt_raster_data-members.html
 share/doc/qwt/class_qwt_raster_data.html
 share/doc/qwt/class_qwt_raster_data__inherit__graph.map
@@ -456,8 +475,6 @@ share/doc/qwt/class_qwt_round_scale_draw.html
 share/doc/qwt/class_qwt_round_scale_draw__inherit__graph.map
 share/doc/qwt/class_qwt_round_scale_draw__inherit__graph.md5
 share/doc/qwt/class_qwt_round_scale_draw__inherit__graph.png
-share/doc/qwt/class_qwt_sampling_thread-members.html
-share/doc/qwt/class_qwt_sampling_thread.html
 share/doc/qwt/class_qwt_scale_arithmetic-members.html
 share/doc/qwt/class_qwt_scale_arithmetic.html
 share/doc/qwt/class_qwt_scale_div-members.html
@@ -478,18 +495,6 @@ share/doc/qwt/class_qwt_scale_transformation-members.html
 share/doc/qwt/class_qwt_scale_transformation.html
 share/doc/qwt/class_qwt_scale_widget-members.html
 share/doc/qwt/class_qwt_scale_widget.html
-share/doc/qwt/class_qwt_series_data-members.html
-share/doc/qwt/class_qwt_series_data.html
-share/doc/qwt/class_qwt_series_data__inherit__graph.map
-share/doc/qwt/class_qwt_series_data__inherit__graph.md5
-share/doc/qwt/class_qwt_series_data__inherit__graph.png
-share/doc/qwt/class_qwt_set_sample-members.html
-share/doc/qwt/class_qwt_set_sample.html
-share/doc/qwt/class_qwt_set_series_data-members.html
-share/doc/qwt/class_qwt_set_series_data.html
-share/doc/qwt/class_qwt_set_series_data__inherit__graph.map
-share/doc/qwt/class_qwt_set_series_data__inherit__graph.md5
-share/doc/qwt/class_qwt_set_series_data__inherit__graph.png
 share/doc/qwt/class_qwt_simple_compass_rose-members.html
 share/doc/qwt/class_qwt_simple_compass_rose.html
 share/doc/qwt/class_qwt_simple_compass_rose__inherit__graph.map
@@ -509,13 +514,6 @@ share/doc/qwt/class_qwt_spline_curve_fitter__inherit__graph.md5
 share/doc/qwt/class_qwt_spline_curve_fitter__inherit__graph.png
 share/doc/qwt/class_qwt_symbol-members.html
 share/doc/qwt/class_qwt_symbol.html
-share/doc/qwt/class_qwt_synthetic_point_data-members.html
-share/doc/qwt/class_qwt_synthetic_point_data.html
-share/doc/qwt/class_qwt_synthetic_point_data__inherit__graph.map
-share/doc/qwt/class_qwt_synthetic_point_data__inherit__graph.md5
-share/doc/qwt/class_qwt_synthetic_point_data__inherit__graph.png
-share/doc/qwt/class_qwt_system_clock-members.html
-share/doc/qwt/class_qwt_system_clock.html
 share/doc/qwt/class_qwt_text-members.html
 share/doc/qwt/class_qwt_text.html
 share/doc/qwt/class_qwt_text_engine-members.html
@@ -533,22 +531,17 @@ share/doc/qwt/class_qwt_thermo.html
 share/doc/qwt/class_qwt_thermo__inherit__graph.map
 share/doc/qwt/class_qwt_thermo__inherit__graph.md5
 share/doc/qwt/class_qwt_thermo__inherit__graph.png
-share/doc/qwt/class_qwt_weeding_curve_fitter-members.html
-share/doc/qwt/class_qwt_weeding_curve_fitter.html
-share/doc/qwt/class_qwt_weeding_curve_fitter__inherit__graph.map
-share/doc/qwt/class_qwt_weeding_curve_fitter__inherit__graph.md5
-share/doc/qwt/class_qwt_weeding_curve_fitter__inherit__graph.png
 share/doc/qwt/class_qwt_wheel-members.html
 share/doc/qwt/class_qwt_wheel.html
 share/doc/qwt/class_qwt_wheel__inherit__graph.map
 share/doc/qwt/class_qwt_wheel__inherit__graph.md5
 share/doc/qwt/class_qwt_wheel__inherit__graph.png
 share/doc/qwt/classes.html
-share/doc/qwt/closed.png
 share/doc/qwt/controlscreenshots.html
 share/doc/qwt/cpuplot.png
 share/doc/qwt/curves.png
 share/doc/qwt/curvescreenshots.html
+share/doc/qwt/deprecated.html
 share/doc/qwt/dials1.png
 share/doc/qwt/dials2.png
 share/doc/qwt/doxygen.css
@@ -558,8 +551,6 @@ share/doc/qwt/form_0.png
 share/doc/qwt/form_1.png
 share/doc/qwt/form_2.png
 share/doc/qwt/form_3.png
-share/doc/qwt/form_4.png
-share/doc/qwt/form_5.png
 share/doc/qwt/formula.repository
 share/doc/qwt/functions.html
 share/doc/qwt/functions_0x62.html
@@ -587,28 +578,6 @@ share/doc/qwt/functions_0x79.html
 share/doc/qwt/functions_0x7a.html
 share/doc/qwt/functions_0x7e.html
 share/doc/qwt/functions_enum.html
-share/doc/qwt/functions_eval.html
-share/doc/qwt/functions_eval_0x62.html
-share/doc/qwt/functions_eval_0x63.html
-share/doc/qwt/functions_eval_0x64.html
-share/doc/qwt/functions_eval_0x65.html
-share/doc/qwt/functions_eval_0x66.html
-share/doc/qwt/functions_eval_0x67.html
-share/doc/qwt/functions_eval_0x68.html
-share/doc/qwt/functions_eval_0x69.html
-share/doc/qwt/functions_eval_0x6b.html
-share/doc/qwt/functions_eval_0x6c.html
-share/doc/qwt/functions_eval_0x6d.html
-share/doc/qwt/functions_eval_0x6e.html
-share/doc/qwt/functions_eval_0x6f.html
-share/doc/qwt/functions_eval_0x70.html
-share/doc/qwt/functions_eval_0x72.html
-share/doc/qwt/functions_eval_0x73.html
-share/doc/qwt/functions_eval_0x74.html
-share/doc/qwt/functions_eval_0x75.html
-share/doc/qwt/functions_eval_0x76.html
-share/doc/qwt/functions_eval_0x78.html
-share/doc/qwt/functions_eval_0x79.html
 share/doc/qwt/functions_func.html
 share/doc/qwt/functions_func_0x62.html
 share/doc/qwt/functions_func_0x63.html
@@ -634,214 +603,167 @@ share/doc/qwt/functions_func_0x78.html
 share/doc/qwt/functions_func_0x79.html
 share/doc/qwt/functions_func_0x7a.html
 share/doc/qwt/functions_func_0x7e.html
-share/doc/qwt/functions_type.html
-share/doc/qwt/functions_vars.html
 share/doc/qwt/graph.png
+share/doc/qwt/graph_legend.dot
 share/doc/qwt/graph_legend.html
-share/doc/qwt/graph_legend.md5
 share/doc/qwt/graph_legend.png
 share/doc/qwt/hierarchy.html
 share/doc/qwt/histogram.png
 share/doc/qwt/histogramscreenshots.html
 share/doc/qwt/index.html
 share/doc/qwt/index.qhp
-share/doc/qwt/inherit_graph_0.map
-share/doc/qwt/inherit_graph_0.md5
-share/doc/qwt/inherit_graph_0.png
-share/doc/qwt/inherit_graph_1.map
-share/doc/qwt/inherit_graph_1.md5
-share/doc/qwt/inherit_graph_1.png
-share/doc/qwt/inherit_graph_10.map
-share/doc/qwt/inherit_graph_10.md5
-share/doc/qwt/inherit_graph_10.png
-share/doc/qwt/inherit_graph_11.map
-share/doc/qwt/inherit_graph_11.md5
-share/doc/qwt/inherit_graph_11.png
-share/doc/qwt/inherit_graph_12.map
-share/doc/qwt/inherit_graph_12.md5
-share/doc/qwt/inherit_graph_12.png
-share/doc/qwt/inherit_graph_13.map
-share/doc/qwt/inherit_graph_13.md5
-share/doc/qwt/inherit_graph_13.png
-share/doc/qwt/inherit_graph_14.map
-share/doc/qwt/inherit_graph_14.md5
-share/doc/qwt/inherit_graph_14.png
-share/doc/qwt/inherit_graph_15.map
-share/doc/qwt/inherit_graph_15.md5
-share/doc/qwt/inherit_graph_15.png
-share/doc/qwt/inherit_graph_16.map
-share/doc/qwt/inherit_graph_16.md5
-share/doc/qwt/inherit_graph_16.png
-share/doc/qwt/inherit_graph_17.map
-share/doc/qwt/inherit_graph_17.md5
-share/doc/qwt/inherit_graph_17.png
-share/doc/qwt/inherit_graph_18.map
-share/doc/qwt/inherit_graph_18.md5
-share/doc/qwt/inherit_graph_18.png
-share/doc/qwt/inherit_graph_19.map
-share/doc/qwt/inherit_graph_19.md5
-share/doc/qwt/inherit_graph_19.png
-share/doc/qwt/inherit_graph_2.map
-share/doc/qwt/inherit_graph_2.md5
-share/doc/qwt/inherit_graph_2.png
-share/doc/qwt/inherit_graph_20.map
-share/doc/qwt/inherit_graph_20.md5
-share/doc/qwt/inherit_graph_20.png
-share/doc/qwt/inherit_graph_21.map
-share/doc/qwt/inherit_graph_21.md5
-share/doc/qwt/inherit_graph_21.png
-share/doc/qwt/inherit_graph_22.map
-share/doc/qwt/inherit_graph_22.md5
-share/doc/qwt/inherit_graph_22.png
-share/doc/qwt/inherit_graph_23.map
-share/doc/qwt/inherit_graph_23.md5
-share/doc/qwt/inherit_graph_23.png
-share/doc/qwt/inherit_graph_24.map
-share/doc/qwt/inherit_graph_24.md5
-share/doc/qwt/inherit_graph_24.png
-share/doc/qwt/inherit_graph_25.map
-share/doc/qwt/inherit_graph_25.md5
-share/doc/qwt/inherit_graph_25.png
-share/doc/qwt/inherit_graph_26.map
-share/doc/qwt/inherit_graph_26.md5
-share/doc/qwt/inherit_graph_26.png
-share/doc/qwt/inherit_graph_27.map
-share/doc/qwt/inherit_graph_27.md5
-share/doc/qwt/inherit_graph_27.png
-share/doc/qwt/inherit_graph_28.map
-share/doc/qwt/inherit_graph_28.md5
-share/doc/qwt/inherit_graph_28.png
-share/doc/qwt/inherit_graph_29.map
-share/doc/qwt/inherit_graph_29.md5
-share/doc/qwt/inherit_graph_29.png
-share/doc/qwt/inherit_graph_3.map
-share/doc/qwt/inherit_graph_3.md5
-share/doc/qwt/inherit_graph_3.png
-share/doc/qwt/inherit_graph_30.map
-share/doc/qwt/inherit_graph_30.md5
-share/doc/qwt/inherit_graph_30.png
-share/doc/qwt/inherit_graph_31.map
-share/doc/qwt/inherit_graph_31.md5
-share/doc/qwt/inherit_graph_31.png
-share/doc/qwt/inherit_graph_32.map
-share/doc/qwt/inherit_graph_32.md5
-share/doc/qwt/inherit_graph_32.png
-share/doc/qwt/inherit_graph_33.map
-share/doc/qwt/inherit_graph_33.md5
-share/doc/qwt/inherit_graph_33.png
-share/doc/qwt/inherit_graph_34.map
-share/doc/qwt/inherit_graph_34.md5
-share/doc/qwt/inherit_graph_34.png
-share/doc/qwt/inherit_graph_35.map
-share/doc/qwt/inherit_graph_35.md5
-share/doc/qwt/inherit_graph_35.png
-share/doc/qwt/inherit_graph_36.map
-share/doc/qwt/inherit_graph_36.md5
-share/doc/qwt/inherit_graph_36.png
-share/doc/qwt/inherit_graph_37.map
-share/doc/qwt/inherit_graph_37.md5
-share/doc/qwt/inherit_graph_37.png
-share/doc/qwt/inherit_graph_38.map
-share/doc/qwt/inherit_graph_38.md5
-share/doc/qwt/inherit_graph_38.png
-share/doc/qwt/inherit_graph_39.map
-share/doc/qwt/inherit_graph_39.md5
-share/doc/qwt/inherit_graph_39.png
-share/doc/qwt/inherit_graph_4.map
-share/doc/qwt/inherit_graph_4.md5
-share/doc/qwt/inherit_graph_4.png
-share/doc/qwt/inherit_graph_40.map
-share/doc/qwt/inherit_graph_40.md5
-share/doc/qwt/inherit_graph_40.png
-share/doc/qwt/inherit_graph_41.map
-share/doc/qwt/inherit_graph_41.md5
-share/doc/qwt/inherit_graph_41.png
-share/doc/qwt/inherit_graph_42.map
-share/doc/qwt/inherit_graph_42.md5
-share/doc/qwt/inherit_graph_42.png
-share/doc/qwt/inherit_graph_43.map
-share/doc/qwt/inherit_graph_43.md5
-share/doc/qwt/inherit_graph_43.png
-share/doc/qwt/inherit_graph_44.map
-share/doc/qwt/inherit_graph_44.md5
-share/doc/qwt/inherit_graph_44.png
-share/doc/qwt/inherit_graph_45.map
-share/doc/qwt/inherit_graph_45.md5
-share/doc/qwt/inherit_graph_45.png
-share/doc/qwt/inherit_graph_46.map
-share/doc/qwt/inherit_graph_46.md5
-share/doc/qwt/inherit_graph_46.png
-share/doc/qwt/inherit_graph_47.map
-share/doc/qwt/inherit_graph_47.md5
-share/doc/qwt/inherit_graph_47.png
-share/doc/qwt/inherit_graph_48.map
-share/doc/qwt/inherit_graph_48.md5
-share/doc/qwt/inherit_graph_48.png
-share/doc/qwt/inherit_graph_49.map
-share/doc/qwt/inherit_graph_49.md5
-share/doc/qwt/inherit_graph_49.png
-share/doc/qwt/inherit_graph_5.map
-share/doc/qwt/inherit_graph_5.md5
-share/doc/qwt/inherit_graph_5.png
-share/doc/qwt/inherit_graph_50.map
-share/doc/qwt/inherit_graph_50.md5
-share/doc/qwt/inherit_graph_50.png
-share/doc/qwt/inherit_graph_51.map
-share/doc/qwt/inherit_graph_51.md5
-share/doc/qwt/inherit_graph_51.png
-share/doc/qwt/inherit_graph_52.map
-share/doc/qwt/inherit_graph_52.md5
-share/doc/qwt/inherit_graph_52.png
-share/doc/qwt/inherit_graph_6.map
-share/doc/qwt/inherit_graph_6.md5
-share/doc/qwt/inherit_graph_6.png
-share/doc/qwt/inherit_graph_7.map
-share/doc/qwt/inherit_graph_7.md5
-share/doc/qwt/inherit_graph_7.png
-share/doc/qwt/inherit_graph_8.map
-share/doc/qwt/inherit_graph_8.md5
-share/doc/qwt/inherit_graph_8.png
-share/doc/qwt/inherit_graph_9.map
-share/doc/qwt/inherit_graph_9.md5
-share/doc/qwt/inherit_graph_9.png
+share/doc/qwt/inherit__graph__0.map
+share/doc/qwt/inherit__graph__0.md5
+share/doc/qwt/inherit__graph__0.png
+share/doc/qwt/inherit__graph__1.map
+share/doc/qwt/inherit__graph__1.md5
+share/doc/qwt/inherit__graph__1.png
+share/doc/qwt/inherit__graph__10.map
+share/doc/qwt/inherit__graph__10.md5
+share/doc/qwt/inherit__graph__10.png
+share/doc/qwt/inherit__graph__11.map
+share/doc/qwt/inherit__graph__11.md5
+share/doc/qwt/inherit__graph__11.png
+share/doc/qwt/inherit__graph__12.map
+share/doc/qwt/inherit__graph__12.md5
+share/doc/qwt/inherit__graph__12.png
+share/doc/qwt/inherit__graph__13.map
+share/doc/qwt/inherit__graph__13.md5
+share/doc/qwt/inherit__graph__13.png
+share/doc/qwt/inherit__graph__14.map
+share/doc/qwt/inherit__graph__14.md5
+share/doc/qwt/inherit__graph__14.png
+share/doc/qwt/inherit__graph__15.map
+share/doc/qwt/inherit__graph__15.md5
+share/doc/qwt/inherit__graph__15.png
+share/doc/qwt/inherit__graph__16.map
+share/doc/qwt/inherit__graph__16.md5
+share/doc/qwt/inherit__graph__16.png
+share/doc/qwt/inherit__graph__17.map
+share/doc/qwt/inherit__graph__17.md5
+share/doc/qwt/inherit__graph__17.png
+share/doc/qwt/inherit__graph__18.map
+share/doc/qwt/inherit__graph__18.md5
+share/doc/qwt/inherit__graph__18.png
+share/doc/qwt/inherit__graph__19.map
+share/doc/qwt/inherit__graph__19.md5
+share/doc/qwt/inherit__graph__19.png
+share/doc/qwt/inherit__graph__2.map
+share/doc/qwt/inherit__graph__2.md5
+share/doc/qwt/inherit__graph__2.png
+share/doc/qwt/inherit__graph__20.map
+share/doc/qwt/inherit__graph__20.md5
+share/doc/qwt/inherit__graph__20.png
+share/doc/qwt/inherit__graph__21.map
+share/doc/qwt/inherit__graph__21.md5
+share/doc/qwt/inherit__graph__21.png
+share/doc/qwt/inherit__graph__22.map
+share/doc/qwt/inherit__graph__22.md5
+share/doc/qwt/inherit__graph__22.png
+share/doc/qwt/inherit__graph__23.map
+share/doc/qwt/inherit__graph__23.md5
+share/doc/qwt/inherit__graph__23.png
+share/doc/qwt/inherit__graph__24.map
+share/doc/qwt/inherit__graph__24.md5
+share/doc/qwt/inherit__graph__24.png
+share/doc/qwt/inherit__graph__25.map
+share/doc/qwt/inherit__graph__25.md5
+share/doc/qwt/inherit__graph__25.png
+share/doc/qwt/inherit__graph__26.map
+share/doc/qwt/inherit__graph__26.md5
+share/doc/qwt/inherit__graph__26.png
+share/doc/qwt/inherit__graph__27.map
+share/doc/qwt/inherit__graph__27.md5
+share/doc/qwt/inherit__graph__27.png
+share/doc/qwt/inherit__graph__28.map
+share/doc/qwt/inherit__graph__28.md5
+share/doc/qwt/inherit__graph__28.png
+share/doc/qwt/inherit__graph__29.map
+share/doc/qwt/inherit__graph__29.md5
+share/doc/qwt/inherit__graph__29.png
+share/doc/qwt/inherit__graph__3.map
+share/doc/qwt/inherit__graph__3.md5
+share/doc/qwt/inherit__graph__3.png
+share/doc/qwt/inherit__graph__30.map
+share/doc/qwt/inherit__graph__30.md5
+share/doc/qwt/inherit__graph__30.png
+share/doc/qwt/inherit__graph__31.map
+share/doc/qwt/inherit__graph__31.md5
+share/doc/qwt/inherit__graph__31.png
+share/doc/qwt/inherit__graph__32.map
+share/doc/qwt/inherit__graph__32.md5
+share/doc/qwt/inherit__graph__32.png
+share/doc/qwt/inherit__graph__33.map
+share/doc/qwt/inherit__graph__33.md5
+share/doc/qwt/inherit__graph__33.png
+share/doc/qwt/inherit__graph__34.map
+share/doc/qwt/inherit__graph__34.md5
+share/doc/qwt/inherit__graph__34.png
+share/doc/qwt/inherit__graph__35.map
+share/doc/qwt/inherit__graph__35.md5
+share/doc/qwt/inherit__graph__35.png
+share/doc/qwt/inherit__graph__36.map
+share/doc/qwt/inherit__graph__36.md5
+share/doc/qwt/inherit__graph__36.png
+share/doc/qwt/inherit__graph__37.map
+share/doc/qwt/inherit__graph__37.md5
+share/doc/qwt/inherit__graph__37.png
+share/doc/qwt/inherit__graph__38.map
+share/doc/qwt/inherit__graph__38.md5
+share/doc/qwt/inherit__graph__38.png
+share/doc/qwt/inherit__graph__4.map
+share/doc/qwt/inherit__graph__4.md5
+share/doc/qwt/inherit__graph__4.png
+share/doc/qwt/inherit__graph__5.map
+share/doc/qwt/inherit__graph__5.md5
+share/doc/qwt/inherit__graph__5.png
+share/doc/qwt/inherit__graph__6.map
+share/doc/qwt/inherit__graph__6.md5
+share/doc/qwt/inherit__graph__6.png
+share/doc/qwt/inherit__graph__7.map
+share/doc/qwt/inherit__graph__7.md5
+share/doc/qwt/inherit__graph__7.png
+share/doc/qwt/inherit__graph__8.map
+share/doc/qwt/inherit__graph__8.md5
+share/doc/qwt/inherit__graph__8.png
+share/doc/qwt/inherit__graph__9.map
+share/doc/qwt/inherit__graph__9.md5
+share/doc/qwt/inherit__graph__9.png
 share/doc/qwt/inherits.html
 share/doc/qwt/knob.png
-share/doc/qwt/nav_f.png
-share/doc/qwt/nav_h.png
-share/doc/qwt/open.png
 share/doc/qwt/pages.html
 share/doc/qwt/plot.png
 share/doc/qwt/qwt__abstract__scale_8h_source.html
 share/doc/qwt/qwt__abstract__scale__draw_8h_source.html
 share/doc/qwt/qwt__abstract__slider_8h_source.html
 share/doc/qwt/qwt__analog__clock_8h_source.html
+share/doc/qwt/qwt__array_8h_source.html
 share/doc/qwt/qwt__arrow__button_8h_source.html
 share/doc/qwt/qwt__clipper_8h_source.html
 share/doc/qwt/qwt__color__map_8h_source.html
-share/doc/qwt/qwt__column__symbol_8h_source.html
 share/doc/qwt/qwt__compass_8h_source.html
 share/doc/qwt/qwt__compass__rose_8h_source.html
-share/doc/qwt/qwt__compat_8h_source.html
 share/doc/qwt/qwt__counter_8h_source.html
 share/doc/qwt/qwt__curve__fitter_8h_source.html
+share/doc/qwt/qwt__data_8h_source.html
 share/doc/qwt/qwt__dial_8h_source.html
 share/doc/qwt/qwt__dial__needle_8h_source.html
+share/doc/qwt/qwt__double__interval_8h_source.html
 share/doc/qwt/qwt__double__range_8h_source.html
+share/doc/qwt/qwt__double__rect_8h_source.html
 share/doc/qwt/qwt__dyngrid__layout_8h_source.html
 share/doc/qwt/qwt__event__pattern_8h_source.html
 share/doc/qwt/qwt__global_8h_source.html
-share/doc/qwt/qwt__interval_8h_source.html
-share/doc/qwt/qwt__interval__symbol_8h_source.html
+share/doc/qwt/qwt__interval__data_8h_source.html
 share/doc/qwt/qwt__knob_8h_source.html
+share/doc/qwt/qwt__layout__metrics_8h_source.html
 share/doc/qwt/qwt__legend_8h_source.html
 share/doc/qwt/qwt__legend__item_8h_source.html
 share/doc/qwt/qwt__legend__itemmanager_8h_source.html
 share/doc/qwt/qwt__magnifier_8h_source.html
 share/doc/qwt/qwt__math_8h_source.html
 share/doc/qwt/qwt__mathml__text__engine_8h_source.html
-share/doc/qwt/qwt__matrix__raster__data_8h_source.html
-share/doc/qwt/qwt__mml__document_8h_source.html
-share/doc/qwt/qwt__null__paintdevice_8h_source.html
+share/doc/qwt/qwt__paint__buffer_8h_source.html
 share/doc/qwt/qwt__painter_8h_source.html
 share/doc/qwt/qwt__panner_8h_source.html
 share/doc/qwt/qwt__picker_8h_source.html
@@ -850,44 +772,36 @@ share/doc/qwt/qwt__plot_8h_source.html
 share/doc/qwt/qwt__plot__canvas_8h_source.html
 share/doc/qwt/qwt__plot__curve_8h_source.html
 share/doc/qwt/qwt__plot__dict_8h_source.html
-share/doc/qwt/qwt__plot__directpainter_8h_source.html
 share/doc/qwt/qwt__plot__grid_8h_source.html
-share/doc/qwt/qwt__plot__histogram_8h_source.html
-share/doc/qwt/qwt__plot__intervalcurve_8h_source.html
 share/doc/qwt/qwt__plot__item_8h_source.html
 share/doc/qwt/qwt__plot__layout_8h_source.html
 share/doc/qwt/qwt__plot__magnifier_8h_source.html
 share/doc/qwt/qwt__plot__marker_8h_source.html
 share/doc/qwt/qwt__plot__panner_8h_source.html
 share/doc/qwt/qwt__plot__picker_8h_source.html
+share/doc/qwt/qwt__plot__printfilter_8h_source.html
 share/doc/qwt/qwt__plot__rasteritem_8h_source.html
-share/doc/qwt/qwt__plot__renderer_8h_source.html
 share/doc/qwt/qwt__plot__rescaler_8h_source.html
 share/doc/qwt/qwt__plot__scaleitem_8h_source.html
-share/doc/qwt/qwt__plot__seriesitem_8h_source.html
-share/doc/qwt/qwt__plot__spectrocurve_8h_source.html
 share/doc/qwt/qwt__plot__spectrogram_8h_source.html
 share/doc/qwt/qwt__plot__svgitem_8h_source.html
 share/doc/qwt/qwt__plot__zoomer_8h_source.html
-share/doc/qwt/qwt__point__3d_8h_source.html
-share/doc/qwt/qwt__point__polar_8h_source.html
+share/doc/qwt/qwt__polygon_8h_source.html
 share/doc/qwt/qwt__raster__data_8h_source.html
 share/doc/qwt/qwt__round__scale__draw_8h_source.html
-share/doc/qwt/qwt__sampling__thread_8h_source.html
 share/doc/qwt/qwt__scale__div_8h_source.html
 share/doc/qwt/qwt__scale__draw_8h_source.html
 share/doc/qwt/qwt__scale__engine_8h_source.html
 share/doc/qwt/qwt__scale__map_8h_source.html
 share/doc/qwt/qwt__scale__widget_8h_source.html
-share/doc/qwt/qwt__series__data_8h_source.html
 share/doc/qwt/qwt__slider_8h_source.html
 share/doc/qwt/qwt__spline_8h_source.html
 share/doc/qwt/qwt__symbol_8h_source.html
-share/doc/qwt/qwt__system__clock_8h_source.html
 share/doc/qwt/qwt__text_8h_source.html
 share/doc/qwt/qwt__text__engine_8h_source.html
 share/doc/qwt/qwt__text__label_8h_source.html
 share/doc/qwt/qwt__thermo_8h_source.html
+share/doc/qwt/qwt__valuelist_8h_source.html
 share/doc/qwt/qwt__wheel_8h_source.html
 share/doc/qwt/qwtinstall.html
 share/doc/qwt/qwtlicense.html
@@ -901,8 +815,7 @@ share/doc/qwt/spectrogram2.png
 share/doc/qwt/spectrogram3.png
 share/doc/qwt/spectrogramscreenshots.html
 share/doc/qwt/sysinfo.png
-share/doc/qwt/tab_a.png
-share/doc/qwt/tab_b.png
-share/doc/qwt/tab_h.png
-share/doc/qwt/tab_s.png
+share/doc/qwt/tab_b.gif
+share/doc/qwt/tab_l.gif
+share/doc/qwt/tab_r.gif
 share/doc/qwt/tabs.css
diff --git a/x11/qwt-qt4/buildlink3.mk b/x11/qwt-qt4/buildlink3.mk
index 525c48e57a6..1bfd1aaf202 100644
--- a/x11/qwt-qt4/buildlink3.mk
+++ b/x11/qwt-qt4/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2011/11/01 06:03:08 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2011/12/07 13:36:16 drochner Exp $
 
 BUILDLINK_TREE+=	qwt
 
 .if !defined(QWT_BUILDLINK3_MK)
 QWT_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qwt+=	qwt>=6.0.0
-BUILDLINK_ABI_DEPENDS.qwt+=	qwt>=6.0.0nb2
+BUILDLINK_API_DEPENDS.qwt+=	qwt>=5.2.0
+BUILDLINK_ABI_DEPENDS.qwt?=	qwt>=5.2.1nb4
 BUILDLINK_PKGSRCDIR.qwt?=	../../x11/qwt-qt4
 
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/x11/qwt-qt4/distinfo b/x11/qwt-qt4/distinfo
index 8030a9d2505..a32cf3d7b24 100644
--- a/x11/qwt-qt4/distinfo
+++ b/x11/qwt-qt4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2011/06/20 12:43:00 drochner Exp $
+$NetBSD: distinfo,v 1.5 2011/12/07 13:36:16 drochner Exp $
 
-SHA1 (qwt-6.0.0.tar.bz2) = 306957fc06c90f2049aec57e13a971f54c3cb21a
-RMD160 (qwt-6.0.0.tar.bz2) = c0e3c31fcc39e6f9a33b23e91d5f8c8125fb4f69
-Size (qwt-6.0.0.tar.bz2) = 2723203 bytes
-SHA1 (patch-pri) = cb1fa1b13318ca3afb038bcffb6a0c9b608e33f4
-SHA1 (patch-srcpro) = 1addda2225949b5a0abd0eadf6032b9486877307
+SHA1 (qwt-5.2.1.tar.bz2) = 89de7a90b7eddad2989470627baa19d59e348df1
+RMD160 (qwt-5.2.1.tar.bz2) = 28e07ea12323a5217118a38e1a7d730a8ce50fee
+Size (qwt-5.2.1.tar.bz2) = 1926453 bytes
+SHA1 (patch-pri) = 13b2c9d496796a233ea41f8a2b104e3d7e127685
+SHA1 (patch-srcpro) = 14311e4ee2a64ea0afc5932e974b3555d6f9e3b2
diff --git a/x11/qwt-qt4/patches/patch-pri b/x11/qwt-qt4/patches/patch-pri
index c5b22d0ed19..aa022fa9438 100644
--- a/x11/qwt-qt4/patches/patch-pri
+++ b/x11/qwt-qt4/patches/patch-pri
@@ -1,30 +1,23 @@
-$NetBSD: patch-pri,v 1.4 2011/06/20 12:43:00 drochner Exp $
+$NetBSD: patch-pri,v 1.5 2011/12/07 13:36:16 drochner Exp $
 
---- qwtconfig.pri.orig	2011-04-15 10:48:51.000000000 +0000
+--- qwtconfig.pri.orig	2010-04-11 09:55:06.000000000 +0000
 +++ qwtconfig.pri
-@@ -19,14 +19,14 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
- QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
+@@ -8,7 +8,7 @@ VER_PAT      = 1
+ VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
  unix {
--    QWT_INSTALL_PREFIX    = /usr/local/qwt-$$QWT_VERSION
-+    QWT_INSTALL_PREFIX    = $$(PREFIX)
+-    INSTALLBASE    = /usr/local/qwt-5.2.1
++    INSTALLBASE    = $$(PREFIX)
  }
  
  win32 {
-     QWT_INSTALL_PREFIX    = C:/Qwt-$$QWT_VERSION
- }
- 
--QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/doc
-+QWT_INSTALL_DOCS      = $${QWT_INSTALL_PREFIX}/share/doc/qwt
- QWT_INSTALL_HEADERS   = $${QWT_INSTALL_PREFIX}/include
- QWT_INSTALL_LIBS      = $${QWT_INSTALL_PREFIX}/lib
- 
-@@ -34,7 +34,7 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_P
- # Designer plugin
- ######################################################################
+@@ -17,7 +17,8 @@ win32 {
  
--QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/plugins/designer
-+QWT_INSTALL_PLUGINS   = $${QWT_INSTALL_PREFIX}/qt4/plugins/designer
- # QWT_INSTALL_PLUGINS   = $${QT_INSTALL_PREFIX}/plugins/designer
+ target.path    = $$INSTALLBASE/lib
+ headers.path   = $$INSTALLBASE/include
+-doc.path       = $$INSTALLBASE/doc
++doc.path       = $$INSTALLBASE/share/doc/qwt
++man.path       = $$INSTALLBASE/${PKGMANDIR}
  
  ######################################################################
+ # qmake internal options
diff --git a/x11/qwt-qt4/patches/patch-srcpro b/x11/qwt-qt4/patches/patch-srcpro
index 2078c54019e..7b914dcf2e7 100644
--- a/x11/qwt-qt4/patches/patch-srcpro
+++ b/x11/qwt-qt4/patches/patch-srcpro
@@ -1,19 +1,19 @@
-$NetBSD: patch-srcpro,v 1.2 2011/06/16 15:21:34 adam Exp $
+$NetBSD: patch-srcpro,v 1.3 2011/12/07 13:36:16 drochner Exp $
 
---- src/src.pro.orig	2011-04-15 10:48:51.000000000 +0000
+--- src/src.pro.orig	2009-03-22 16:41:05.000000000 +0100
 +++ src/src.pro
-@@ -216,11 +216,11 @@ contains(QWT_CONFIG, QwtWidgets) {
+@@ -216,9 +216,10 @@ contains(CONFIG, QwtWidgets) {
+ # Install directives
  
- target.path    = $${QWT_INSTALL_LIBS}
- 
--doc.files      = $${QWT_ROOT}/doc/html 
--unix:doc.files += $${QWT_ROOT}/doc/man
+ headers.files  = $$HEADERS
+-doc.files      = $${QWT_ROOT}/doc/html $${QWT_ROOT}/doc/qwt-5.2.0.qch
+-unix {
+-    doc.files      += $${QWT_ROOT}/doc/man
+-}
 +doc.files      = $${QWT_ROOT}/doc/html/*
-+man.files      = $${QWT_ROOT}/doc/man/*
- doc.path       = $${QWT_INSTALL_DOCS}
- 
--INSTALLS       = target doc
-+INSTALLS       = target doc man
- 
- CONFIG(lib_bundle) {
++man.files	= $${QWT_ROOT}/doc/man/*
  
+ INSTALLS       = target headers doc
++unix {
++	INSTALLS += man
++}