pinentry-qt5: Package is now usable

[Michael Baeuerle <micha%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Jan 29 18:27:49 2021 +0100
Changeset:	c22a2b9e8627f20c79cc4c5fd91ce19b05b32866

Modified Files:
	pinentry-qt5/Makefile
	pinentry-qt5/TODO
Added Files:
	pinentry-qt5/distinfo
	pinentry-qt5/patches/patch-m4_qt.m4

Log Message:
pinentry-qt5: Package is now usable

- Patch for "-rpath" option added (missing '=')
- Fix CONFLICTS declaration
  Thanks to wiz@ for pointing out

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c22a2b9e8627f20c79cc4c5fd91ce19b05b32866

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 pinentry-qt5/Makefile               | 13 +++++++++----
 pinentry-qt5/TODO                   |  3 ++-
 pinentry-qt5/distinfo               |  7 +++++++
 pinentry-qt5/patches/patch-m4_qt.m4 | 15 +++++++++++++++
 4 files changed, 33 insertions(+), 5 deletions(-)

diffs:
diff --git a/pinentry-qt5/Makefile b/pinentry-qt5/Makefile
index 3863e9b7bd..64c312e7c8 100644
--- a/pinentry-qt5/Makefile
+++ b/pinentry-qt5/Makefile
@@ -2,10 +2,14 @@
 
 PKGNAME=		${DISTNAME:S/pinentry-/pinentry-qt5-/}
 COMMENT=		Applications for entering PINs or Passphrases, qt5 enabled
-CONFLICTS=		pinentry-qt4
+CONFLICTS=		pinentry-qt4-[0-9]*
 
 .include		"../../wip/pinentry/Makefile.common"
 
+DISTINFO_FILE=		${.CURDIR}/distinfo
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		pkg-config gmake autoconf
+
 CONFIGURE_ARGS+=	--enable-pinentry-qt
 CONFIGURE_ARGS+=	--disable-pinentry-curses
 CONFIGURE_ARGS+=	--disable-pinentry-emacs
@@ -13,12 +17,13 @@ CONFIGURE_ARGS+=	--disable-pinentry-emacs
 CONFIGURE_ARGS+=	--disable-pinentry-gnome3
 CONFIGURE_ARGS+=	--disable-pinentry-gtk2
 CONFIGURE_ARGS+=	--disable-pinentry-fltk
-
-USE_LANGUAGES+=		c c++
-USE_TOOLS+=		pkg-config gmake
+CONFIGURE_ARGS+=	--disable-libsecret
 
 INSTALL_DIRS=		qt
 
+pre-configure:
+	cd ${WRKSRC} && autoreconf -i -f
+
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 
diff --git a/pinentry-qt5/TODO b/pinentry-qt5/TODO
index 82439e87cd..4e095e3b32 100644
--- a/pinentry-qt5/TODO
+++ b/pinentry-qt5/TODO
@@ -1,5 +1,6 @@
 [ ] Fix buildlink dependency for moc
     x11/qt5-qtbase should make moc visible
     Manually adding a symlink "work/.buildlink/bin/moc" works
-[ ] Fix malformed -rpath option
+[X] Fix malformed -rpath option
     Looks like an equal sign is missing
+    => Patch for "m4/qt.m4" added
diff --git a/pinentry-qt5/distinfo b/pinentry-qt5/distinfo
new file mode 100644
index 0000000000..a2a92e97e9
--- /dev/null
+++ b/pinentry-qt5/distinfo
@@ -0,0 +1,7 @@
+$NetBSD$
+
+SHA1 (pinentry-1.1.1.tar.bz2) = b8b88cab4fd844e3616d55aeba8f084f2b98fb0f
+RMD160 (pinentry-1.1.1.tar.bz2) = 1b1a42245564b57c0fc0695d1c3c2d68e1cbf3ba
+SHA512 (pinentry-1.1.1.tar.bz2) = d6ab5af8ac2f3c9c05e09703e95d8e2676f9b2b7ceb97f6a31d101d0e9da7a1e106a6d3eabe86cab1bb35a4b119a7cba1380ac64bf13c61af0b3c48803116c12
+Size (pinentry-1.1.1.tar.bz2) = 515723 bytes
+SHA1 (patch-m4_qt.m4) = 70e9386c86e96e97ad2fd12312bd167005eeda65
diff --git a/pinentry-qt5/patches/patch-m4_qt.m4 b/pinentry-qt5/patches/patch-m4_qt.m4
new file mode 100644
index 0000000000..b592420b31
--- /dev/null
+++ b/pinentry-qt5/patches/patch-m4_qt.m4
@@ -0,0 +1,15 @@
+$NetBSD$
+
+The "-rpath" option requires an equal sign.
+
+--- m4/qt.m4.orig	2020-03-11 20:06:21.000000000 +0000
++++ m4/qt.m4
+@@ -59,7 +59,7 @@ AC_DEFUN([FIND_QT],
+ 
+     qtlibdir=`"$PKG_CONFIG" --variable libdir Qt5Core`
+     if test -n "$qtlibdir"; then
+-        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath \"$qtlibdir\""
++        PINENTRY_QT_LDFLAGS="$PINENTRY_QT_LDFLAGS -Wl,-rpath=\"$qtlibdir\""
+     fi
+ 
+     AC_CHECK_TOOL(MOC, moc)