update to 5.2.1

changes:
-bugfixes
-qwt.pro:
 CONFIG += ordered added for using make -j
 CONFIG += silent added

4 files changed, 85 insertions, 83 deletions

diff --git a/x11/qwt-qt4/Makefile b/x11/qwt-qt4/Makefile
index 6972bc1ebae..578c77a8cc1 100644
--- a/x11/qwt-qt4/Makefile
+++ b/x11/qwt-qt4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2010/06/13 22:45:52 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2010/09/07 16:42:08 drochner Exp $
 
-DISTNAME=	qwt-5.2.0
-PKGREVISION=	2
+DISTNAME=	qwt-5.2.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qwt/}
 EXTRACT_SUFX=	.tar.bz2
@@ -27,5 +26,7 @@ do-configure:
 	cd ${WRKSRC} && env ${CONFIGURE_ENV} ${QTDIR}/bin/qmake
 
 .include "../../x11/qt4-libs/buildlink3.mk"
+# needs fix for "silent" qmake feature flag
+BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.6.3nb1
 .include "../../x11/qt4-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qwt-qt4/PLIST b/x11/qwt-qt4/PLIST
index 9440d0442c1..f881f56d03a 100644
--- a/x11/qwt-qt4/PLIST
+++ b/x11/qwt-qt4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/24 19:22:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2010/09/07 16:42:08 drochner Exp $
 include/qwt.h
 include/qwt_abstract_scale.h
 include/qwt_abstract_scale_draw.h
@@ -611,6 +611,7 @@ 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
@@ -732,76 +733,76 @@ share/doc/qwt/inherits.html
 share/doc/qwt/knob.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__compass_8h-source.html
-share/doc/qwt/qwt__compass__rose_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__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__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
-share/doc/qwt/qwt__picker__machine_8h-source.html
-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__grid_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__rescaler_8h-source.html
-share/doc/qwt/qwt__plot__scaleitem_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__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__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__slider_8h-source.html
-share/doc/qwt/qwt__spline_8h-source.html
-share/doc/qwt/qwt__symbol_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/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__compass_8h_source.html
+share/doc/qwt/qwt__compass__rose_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__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__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
+share/doc/qwt/qwt__picker__machine_8h_source.html
+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__grid_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__rescaler_8h_source.html
+share/doc/qwt/qwt__plot__scaleitem_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__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__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__slider_8h_source.html
+share/doc/qwt/qwt__spline_8h_source.html
+share/doc/qwt/qwt__symbol_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
 share/doc/qwt/radio.png
diff --git a/x11/qwt-qt4/distinfo b/x11/qwt-qt4/distinfo
index 82474a5cf5f..47dd9dca59d 100644
--- a/x11/qwt-qt4/distinfo
+++ b/x11/qwt-qt4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/11/24 19:22:32 drochner Exp $
+$NetBSD: distinfo,v 1.2 2010/09/07 16:42:09 drochner Exp $
 
-SHA1 (qwt-5.2.0.tar.bz2) = 8830498b87d99d4b7e95ee643f1f7ff178204ba9
-RMD160 (qwt-5.2.0.tar.bz2) = 061319c7b4821c366fd05b68bbc3e134351f9110
-Size (qwt-5.2.0.tar.bz2) = 1371877 bytes
-SHA1 (patch-pri) = 39953707ecf5253571d94d1425136ac6b12d5c1c
+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 4ae4a065a28..a4e9c55b9ab 100644
--- a/x11/qwt-qt4/patches/patch-pri
+++ b/x11/qwt-qt4/patches/patch-pri
@@ -1,12 +1,12 @@
-$NetBSD: patch-pri,v 1.1.1.1 2009/11/24 19:22:33 drochner Exp $
+$NetBSD: patch-pri,v 1.2 2010/09/07 16:42:09 drochner Exp $
 
---- qwtconfig.pri.orig	2009-03-22 16:41:05.000000000 +0100
+--- qwtconfig.pri.orig	2010-04-11 09:55:06.000000000 +0000
 +++ qwtconfig.pri
-@@ -8,7 +8,7 @@ VER_PAT      = 0
+@@ -8,7 +8,7 @@ VER_PAT      = 1
  VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
  unix {
--    INSTALLBASE    = /usr/local/qwt-5.2.0
+-    INSTALLBASE    = /usr/local/qwt-5.2.1
 +    INSTALLBASE    = $$(PREFIX)
  }