Sun Aug 30 08:19:06 2020 UTC ()
qwt6-qt5: ship the optional pkg-config file, gnuradio wants it. Bump.


(tnn)
diff -r1.11 -r1.12 pkgsrc/x11/qwt6-qt5/Makefile
diff -r1.2 -r1.3 pkgsrc/x11/qwt6-qt5/PLIST
diff -r1.3 -r1.4 pkgsrc/x11/qwt6-qt5/distinfo
diff -r1.1 -r1.2 pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri
cvs diff -r1.11 -r1.12 pkgsrc/x11/qwt6-qt5/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qwt6-qt5/Makefile 2020/08/30 08:05:57 1.11
+++ pkgsrc/x11/qwt6-qt5/Makefile 2020/08/30 08:19:06 1.12
@@ -1,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.11 2020/08/30 08:05:57 tnn Exp $ 1# $NetBSD: Makefile,v 1.12 2020/08/30 08:19:06 tnn Exp $
2 2
3DISTNAME= qwt-6.1.5 3DISTNAME= qwt-6.1.5
4PKGNAME= qwt6-qt5-6.1.5 4PKGNAME= qwt6-qt5-6.1.5
 5PKGREVISION= 1
5CATEGORIES= x11 6CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=qwt/}
7EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
8 9
9MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://sourceforge.net/projects/qwt/ 11HOMEPAGE= https://sourceforge.net/projects/qwt/
11COMMENT= Qt widget library for technical purposes 12COMMENT= Qt widget library for technical purposes
12LICENSE= gnu-lgpl-v2 13LICENSE= gnu-lgpl-v2
13 14
14EXTRACT_USING= bsdtar 15EXTRACT_USING= bsdtar
15USE_LANGUAGES= c++ 16USE_LANGUAGES= c++
16USE_TOOLS+= gmake 17USE_TOOLS+= gmake
17USE_LIBTOOL= yes 18USE_LIBTOOL= yes
cvs diff -r1.2 -r1.3 pkgsrc/x11/qwt6-qt5/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/qwt6-qt5/PLIST 2020/08/30 08:05:57 1.2
+++ pkgsrc/x11/qwt6-qt5/PLIST 2020/08/30 08:19:06 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2020/08/30 08:05:57 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.3 2020/08/30 08:19:06 tnn Exp $
2qt5/plugins/designer/libqwt_designer_plugin.so 2qt5/plugins/designer/libqwt_designer_plugin.so
3qwt-${VERSION}/doc/html/analogclock.png 3qwt-${VERSION}/doc/html/analogclock.png
4qwt-${VERSION}/doc/html/annotated.html 4qwt-${VERSION}/doc/html/annotated.html
5qwt-${VERSION}/doc/html/annotated_dup.js 5qwt-${VERSION}/doc/html/annotated_dup.js
6qwt-${VERSION}/doc/html/barchart-grouped-600x400.png 6qwt-${VERSION}/doc/html/barchart-grouped-600x400.png
7qwt-${VERSION}/doc/html/barchart-stacked-600x400.png 7qwt-${VERSION}/doc/html/barchart-stacked-600x400.png
8qwt-${VERSION}/doc/html/barchartscreenshots.html 8qwt-${VERSION}/doc/html/barchartscreenshots.html
9qwt-${VERSION}/doc/html/bc_s.png 9qwt-${VERSION}/doc/html/bc_s.png
10qwt-${VERSION}/doc/html/bdwn.png 10qwt-${VERSION}/doc/html/bdwn.png
11qwt-${VERSION}/doc/html/bode-blue-600x400.png 11qwt-${VERSION}/doc/html/bode-blue-600x400.png
12qwt-${VERSION}/doc/html/bode-rosy-600x400.png 12qwt-${VERSION}/doc/html/bode-rosy-600x400.png
13qwt-${VERSION}/doc/html/class_qwt_abstract_legend-members.html 13qwt-${VERSION}/doc/html/class_qwt_abstract_legend-members.html
14qwt-${VERSION}/doc/html/class_qwt_abstract_legend.html 14qwt-${VERSION}/doc/html/class_qwt_abstract_legend.html
@@ -1643,13 +1643,14 @@ qwt-${VERSION}/include/qwt_spline.h @@ -1643,13 +1643,14 @@ qwt-${VERSION}/include/qwt_spline.h
1643qwt-${VERSION}/include/qwt_symbol.h 1643qwt-${VERSION}/include/qwt_symbol.h
1644qwt-${VERSION}/include/qwt_system_clock.h 1644qwt-${VERSION}/include/qwt_system_clock.h
1645qwt-${VERSION}/include/qwt_text.h 1645qwt-${VERSION}/include/qwt_text.h
1646qwt-${VERSION}/include/qwt_text_engine.h 1646qwt-${VERSION}/include/qwt_text_engine.h
1647qwt-${VERSION}/include/qwt_text_label.h 1647qwt-${VERSION}/include/qwt_text_label.h
1648qwt-${VERSION}/include/qwt_thermo.h 1648qwt-${VERSION}/include/qwt_thermo.h
1649qwt-${VERSION}/include/qwt_transform.h 1649qwt-${VERSION}/include/qwt_transform.h
1650qwt-${VERSION}/include/qwt_wheel.h 1650qwt-${VERSION}/include/qwt_wheel.h
1651qwt-${VERSION}/include/qwt_widget_overlay.h 1651qwt-${VERSION}/include/qwt_widget_overlay.h
1652qwt-${VERSION}/lib/libqwt.so 1652qwt-${VERSION}/lib/libqwt.so
1653qwt-${VERSION}/lib/libqwt.so.6 1653qwt-${VERSION}/lib/libqwt.so.6
1654qwt-${VERSION}/lib/libqwt.so.6.1 1654qwt-${VERSION}/lib/libqwt.so.6.1
1655qwt-${VERSION}/lib/libqwt.so.6.1.5 1655qwt-${VERSION}/lib/libqwt.so.6.1.5
 1656qwt-${VERSION}/lib/pkgconfig/Qt5Qwt6.pc
cvs diff -r1.3 -r1.4 pkgsrc/x11/qwt6-qt5/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/qwt6-qt5/distinfo 2020/08/30 08:05:57 1.3
+++ pkgsrc/x11/qwt6-qt5/distinfo 2020/08/30 08:19:06 1.4
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.3 2020/08/30 08:05:57 tnn Exp $ 1$NetBSD: distinfo,v 1.4 2020/08/30 08:19:06 tnn Exp $
2 2
3SHA1 (qwt-6.1.5.tar.bz2) = 07c71427f1f4bbd0354b3a98965943ce2f220766 3SHA1 (qwt-6.1.5.tar.bz2) = 07c71427f1f4bbd0354b3a98965943ce2f220766
4RMD160 (qwt-6.1.5.tar.bz2) = 37bf5b741cbf9c760879b88cdfae741c0c6dc9ce 4RMD160 (qwt-6.1.5.tar.bz2) = 37bf5b741cbf9c760879b88cdfae741c0c6dc9ce
5SHA512 (qwt-6.1.5.tar.bz2) = 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22 5SHA512 (qwt-6.1.5.tar.bz2) = 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
6Size (qwt-6.1.5.tar.bz2) = 4408268 bytes 6Size (qwt-6.1.5.tar.bz2) = 4408268 bytes
7SHA1 (patch-qwt.prf) = f952dfc68909a24c847a8c33ea4b2cd21591fd31 7SHA1 (patch-qwt.prf) = f952dfc68909a24c847a8c33ea4b2cd21591fd31
8SHA1 (patch-qwtconfig.pri) = c1fae28cc33d35445c772f32da55ba20b20fe40a 8SHA1 (patch-qwtconfig.pri) = a39ab75ac32fe47b60c9c913abac6d0a8d27fa28
cvs diff -r1.1 -r1.2 pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri (expand / switch to unified diff)

--- pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri 2020/08/30 08:05:57 1.1
+++ pkgsrc/x11/qwt6-qt5/patches/patch-qwtconfig.pri 2020/08/30 08:19:06 1.2
@@ -1,32 +1,40 @@ @@ -1,32 +1,40 @@
1$NetBSD: patch-qwtconfig.pri,v 1.1 2020/08/30 08:05:57 tnn Exp $ 1$NetBSD: patch-qwtconfig.pri,v 1.2 2020/08/30 08:19:06 tnn Exp $
2 2
3Don't hardcode PREFIX. 3Don't hardcode PREFIX.
 4Ship the pkg-config file. Needed by gnuradio-qtgui.
4 5
5--- qwtconfig.pri.orig 2019-01-02 17:21:31.556467499 +0100 6--- qwtconfig.pri.orig 2020-06-01 16:48:07.325112226 +0000
6+++ qwtconfig.pri 2019-10-25 18:51:20.912266571 +0200 7+++ qwtconfig.pri
7@@ -19,7 +19,7 @@ 8@@ -19,7 +19,7 @@ QWT_VERSION = $${QWT_VER_MAJ}.$${QW
8 QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] 9 QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
9  10
10 unix { 11 unix {
11- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION 12- QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION
12+ QWT_INSTALL_PREFIX = $$(PREFIX)/qwt-$$QWT_VERSION 13+ QWT_INSTALL_PREFIX = $$(PREFIX)/qwt-$$QWT_VERSION
13 # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION 14 # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
14 } 15 }
15  16
16@@ -42,14 +42,14 @@ 17@@ -42,14 +42,14 @@ QWT_INSTALL_LIBS = $${QWT_INSTALL_P
17 # runtime environment of designer/creator. 18 # runtime environment of designer/creator.
18 ###################################################################### 19 ######################################################################
19  20
20-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer 21-QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
21+#QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer 22+#QWT_INSTALL_PLUGINS = $${QWT_INSTALL_PREFIX}/plugins/designer
22  23
23 # linux distributors often organize the Qt installation 24 # linux distributors often organize the Qt installation
24 # their way and QT_INSTALL_PREFIX doesn't offer a good 25 # their way and QT_INSTALL_PREFIX doesn't offer a good
25 # path. Also QT_INSTALL_PREFIX is only one of the default 26 # path. Also QT_INSTALL_PREFIX is only one of the default
26 # search paths of the designer - not the Qt creator 27 # search paths of the designer - not the Qt creator
27  28
28-#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer 29-#QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer
29+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer 30+QWT_INSTALL_PLUGINS = $$[QT_INSTALL_PREFIX]/plugins/designer
30  31
31 ###################################################################### 32 ######################################################################
32 # Features 33 # Features
 34@@ -171,5 +171,5 @@ macx:!static:CONFIG(qt_framework, qt_fra
 35
 36 unix {
 37
 38- #QWT_CONFIG += QwtPkgConfig
 39+ QWT_CONFIG += QwtPkgConfig
 40 }