update to 5.2.2

changes:
-bugfixes
-documentation cleanup

also minor pkg Makefile cleanup

4 files changed, 140 insertions, 136 deletions

diff --git a/x11/qwt-qt4/Makefile b/x11/qwt-qt4/Makefile
index 3b4ec3b6531..f96d1f841fb 100644
--- a/x11/qwt-qt4/Makefile
+++ b/x11/qwt-qt4/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2011/12/07 13:36:16 drochner Exp $
+# $NetBSD: Makefile,v 1.13 2011/12/07 16:05:09 drochner Exp $
 
-DISTNAME=	qwt-5.2.1
-PKGREVISION=	4
+DISTNAME=	qwt-5.2.2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=qwt/}
 EXTRACT_SUFX=	.tar.bz2
@@ -9,10 +8,9 @@ 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
diff --git a/x11/qwt-qt4/PLIST b/x11/qwt-qt4/PLIST
index b6b4b0bc4a9..a88673eab8b 100644
--- a/x11/qwt-qt4/PLIST
+++ b/x11/qwt-qt4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/12/07 13:36:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/12/07 16:05:09 drochner Exp $
 include/qwt.h
 include/qwt_abstract_scale.h
 include/qwt_abstract_scale_draw.h
@@ -167,6 +167,7 @@ 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
@@ -537,6 +538,7 @@ 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
@@ -604,133 +606,136 @@ share/doc/qwt/functions_func_0x79.html
 share/doc/qwt/functions_func_0x7a.html
 share/doc/qwt/functions_func_0x7e.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__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/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
@@ -815,7 +820,8 @@ share/doc/qwt/spectrogram2.png
 share/doc/qwt/spectrogram3.png
 share/doc/qwt/spectrogramscreenshots.html
 share/doc/qwt/sysinfo.png
-share/doc/qwt/tab_b.gif
-share/doc/qwt/tab_l.gif
-share/doc/qwt/tab_r.gif
+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/tabs.css
diff --git a/x11/qwt-qt4/distinfo b/x11/qwt-qt4/distinfo
index a32cf3d7b24..6246d5c5175 100644
--- a/x11/qwt-qt4/distinfo
+++ b/x11/qwt-qt4/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2011/12/07 13:36:16 drochner Exp $
+$NetBSD: distinfo,v 1.6 2011/12/07 16:05:09 drochner Exp $
 
-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 (qwt-5.2.2.tar.bz2) = 77de405c5f9867a001f0e0a668154023faccb0a0
+RMD160 (qwt-5.2.2.tar.bz2) = 74df9ac3bfa56a06979b5298287f0dd359f2bc69
+Size (qwt-5.2.2.tar.bz2) = 2083193 bytes
+SHA1 (patch-pri) = 4ccf8b5088da336398542e947d43480bfe874945
 SHA1 (patch-srcpro) = 14311e4ee2a64ea0afc5932e974b3555d6f9e3b2
diff --git a/x11/qwt-qt4/patches/patch-pri b/x11/qwt-qt4/patches/patch-pri
index aa022fa9438..5d3821c2f05 100644
--- a/x11/qwt-qt4/patches/patch-pri
+++ b/x11/qwt-qt4/patches/patch-pri
@@ -1,12 +1,12 @@
-$NetBSD: patch-pri,v 1.5 2011/12/07 13:36:16 drochner Exp $
+$NetBSD: patch-pri,v 1.6 2011/12/07 16:05:09 drochner Exp $
 
---- qwtconfig.pri.orig	2010-04-11 09:55:06.000000000 +0000
+--- qwtconfig.pri.orig	2011-08-01 09:28:22.000000000 +0000
 +++ qwtconfig.pri
-@@ -8,7 +8,7 @@ VER_PAT      = 1
+@@ -8,7 +8,7 @@ VER_PAT      = 2
  VERSION      = $${VER_MAJ}.$${VER_MIN}.$${VER_PAT}
  
  unix {
--    INSTALLBASE    = /usr/local/qwt-5.2.1
+-    INSTALLBASE    = /usr/local/qwt-$$VERSION
 +    INSTALLBASE    = $$(PREFIX)
  }