[pkgsrc/trunk]: pkgsrc/x11/qwt6-qt5 qwt6-qt5: ship the optional pkg-config fi...

[tnn <tnn%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/40c3505832d1
branches:  trunk
changeset: 437698:40c3505832d1
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Aug 30 08:19:06 2020 +0000

description:
qwt6-qt5: ship the optional pkg-config file, gnuradio wants it. Bump.

diffstat:

 x11/qwt6-qt5/Makefile                    |   3 ++-
 x11/qwt6-qt5/PLIST                       |   3 ++-
 x11/qwt6-qt5/distinfo                    |   4 ++--
 x11/qwt6-qt5/patches/patch-qwtconfig.pri |  18 +++++++++++++-----
 4 files changed, 19 insertions(+), 9 deletions(-)

diffs (80 lines):

diff -r 2841279c0218 -r 40c3505832d1 x11/qwt6-qt5/Makefile
--- a/x11/qwt6-qt5/Makefile     Sun Aug 30 08:06:57 2020 +0000
+++ b/x11/qwt6-qt5/Makefile     Sun Aug 30 08:19:06 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2020/08/30 08:05:57 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2020/08/30 08:19:06 tnn Exp $
 
 DISTNAME=      qwt-6.1.5
 PKGNAME=       qwt6-qt5-6.1.5
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=qwt/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 2841279c0218 -r 40c3505832d1 x11/qwt6-qt5/PLIST
--- a/x11/qwt6-qt5/PLIST        Sun Aug 30 08:06:57 2020 +0000
+++ b/x11/qwt6-qt5/PLIST        Sun Aug 30 08:19:06 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2020/08/30 08:05:57 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2020/08/30 08:19:06 tnn Exp $
 qt5/plugins/designer/libqwt_designer_plugin.so
 qwt-${VERSION}/doc/html/analogclock.png
 qwt-${VERSION}/doc/html/annotated.html
@@ -1653,3 +1653,4 @@
 qwt-${VERSION}/lib/libqwt.so.6
 qwt-${VERSION}/lib/libqwt.so.6.1
 qwt-${VERSION}/lib/libqwt.so.6.1.5
+qwt-${VERSION}/lib/pkgconfig/Qt5Qwt6.pc
diff -r 2841279c0218 -r 40c3505832d1 x11/qwt6-qt5/distinfo
--- a/x11/qwt6-qt5/distinfo     Sun Aug 30 08:06:57 2020 +0000
+++ b/x11/qwt6-qt5/distinfo     Sun Aug 30 08:19:06 2020 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2020/08/30 08:05:57 tnn Exp $
+$NetBSD: distinfo,v 1.4 2020/08/30 08:19:06 tnn Exp $
 
 SHA1 (qwt-6.1.5.tar.bz2) = 07c71427f1f4bbd0354b3a98965943ce2f220766
 RMD160 (qwt-6.1.5.tar.bz2) = 37bf5b741cbf9c760879b88cdfae741c0c6dc9ce
 SHA512 (qwt-6.1.5.tar.bz2) = 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22
 Size (qwt-6.1.5.tar.bz2) = 4408268 bytes
 SHA1 (patch-qwt.prf) = f952dfc68909a24c847a8c33ea4b2cd21591fd31
-SHA1 (patch-qwtconfig.pri) = c1fae28cc33d35445c772f32da55ba20b20fe40a
+SHA1 (patch-qwtconfig.pri) = a39ab75ac32fe47b60c9c913abac6d0a8d27fa28
diff -r 2841279c0218 -r 40c3505832d1 x11/qwt6-qt5/patches/patch-qwtconfig.pri
--- a/x11/qwt6-qt5/patches/patch-qwtconfig.pri  Sun Aug 30 08:06:57 2020 +0000
+++ b/x11/qwt6-qt5/patches/patch-qwtconfig.pri  Sun Aug 30 08:19:06 2020 +0000
@@ -1,10 +1,11 @@
-$NetBSD: patch-qwtconfig.pri,v 1.1 2020/08/30 08:05:57 tnn Exp $
+$NetBSD: patch-qwtconfig.pri,v 1.2 2020/08/30 08:19:06 tnn Exp $
 
 Don't hardcode PREFIX.
+Ship the pkg-config file. Needed by gnuradio-qtgui.
 
---- qwtconfig.pri.orig 2019-01-02 17:21:31.556467499 +0100
-+++ qwtconfig.pri      2019-10-25 18:51:20.912266571 +0200
-@@ -19,7 +19,7 @@
+--- qwtconfig.pri.orig 2020-06-01 16:48:07.325112226 +0000
++++ qwtconfig.pri
+@@ -19,7 +19,7 @@ QWT_VERSION      = $${QWT_VER_MAJ}.$${QW
  QWT_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX]
  
  unix {
@@ -13,7 +14,7 @@
      # QWT_INSTALL_PREFIX = /usr/local/qwt-$$QWT_VERSION-qt-$$QT_VERSION
  }
  
-@@ -42,14 +42,14 @@
+@@ -42,14 +42,14 @@ QWT_INSTALL_LIBS      = $${QWT_INSTALL_P
  # runtime environment of designer/creator.
  ######################################################################
  
@@ -30,3 +31,10 @@
  
  ######################################################################
  # Features
+@@ -171,5 +171,5 @@ macx:!static:CONFIG(qt_framework, qt_fra
+ 
+ unix {
+ 
+-    #QWT_CONFIG     += QwtPkgConfig
++    QWT_CONFIG     += QwtPkgConfig
+ }