Update pinentry* to 0.9.6:

Noteworthy changes in version 0.9.6 (2015-09-10)
------------------------------------------------

 * Many improvements for the dump tty pinentry.

 * Use the standard GTK+-2 text entry widget instead of our outdated
   and back-then-it-was-more-secure text widget.

 * Use the standard Qt text widget.

 * Allow for building a static Qt variant.

 * Fix regression in w32 pinentry.

6 files changed, 13 insertions, 21 deletions

diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile
index 341f3dfcccc..a26eb172280 100644
--- a/security/pinentry-gtk2/Makefile
+++ b/security/pinentry-gtk2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.36 2015/08/17 17:11:28 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2015/09/30 19:56:42 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/pinentry-/pinentry-gtk2-/}
-PKGREVISION=		1
 COMMENT=		Applications for entering PINs or Passphrases, gtk2 enabled
 
 .include		"../../security/pinentry/Makefile.common"
diff --git a/security/pinentry-qt4/Makefile b/security/pinentry-qt4/Makefile
index 5b337abc0f7..b20d67a1871 100644
--- a/security/pinentry-qt4/Makefile
+++ b/security/pinentry-qt4/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.35 2015/08/17 17:11:29 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2015/09/30 19:56:42 wiz Exp $
 
 PKGNAME=		${DISTNAME:S/pinentry-/pinentry-qt4-/}
-PKGREVISION=		1
 COMMENT=		Applications for entering PINs or Passphrases, qt4 enabled
 
 .include		"../../security/pinentry/Makefile.common"
 
-CONFIGURE_ARGS+=	--enable-pinentry-qt4
+CONFIGURE_ARGS+=	--enable-pinentry-qt
 CONFIGURE_ARGS+=	--disable-pinentry-curses
 CONFIGURE_ARGS+=	--disable-pinentry-emacs
 #CONFIGURE_ARGS+=	--disable-fallback-curses
@@ -16,12 +15,7 @@ CONFIGURE_ARGS+=	--disable-pinentry-gtk2
 USE_LANGUAGES+=		c c++
 USE_TOOLS+=		pkg-config gmake
 
-INSTALL_DIRS=		qt4
-
-post-configure:
-	cd $(WRKSRC)/qt4 && \
-	$(QTDIR)/bin/moc pinentrydialog.h -o pinentrydialog.moc && \
-	$(QTDIR)/bin/moc qsecurelineedit.h -o qsecurelineedit.moc
+INSTALL_DIRS=		qt
 
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 .include "../../x11/qt4-libs/buildlink3.mk"
diff --git a/security/pinentry-qt4/PLIST b/security/pinentry-qt4/PLIST
index 206e440f6ab..e40cf66bf79 100644
--- a/security/pinentry-qt4/PLIST
+++ b/security/pinentry-qt4/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1 2010/02/25 11:30:03 drochner Exp $
-bin/pinentry-qt4
+@comment $NetBSD: PLIST,v 1.2 2015/09/30 19:56:42 wiz Exp $
+bin/pinentry-qt
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 3a29ea26cc3..53f02ab12a0 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2015/08/18 07:31:17 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2015/09/30 19:56:42 wiz Exp $
 
 COMMENT=		Applications for entering PINs or Passphrases
-PKGREVISION=		2
 
 CONFIGURE_ARGS+=	--enable-pinentry-tty
 CONFIGURE_ARGS+=        --enable-pinentry-emacs
diff --git a/security/pinentry/Makefile.common b/security/pinentry/Makefile.common
index eb8e4e3cad3..af8db6d5329 100644
--- a/security/pinentry/Makefile.common
+++ b/security/pinentry/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.7 2015/07/06 10:31:00 wiz Exp $
+# $NetBSD: Makefile.common,v 1.8 2015/09/30 19:56:42 wiz Exp $
 # -*- Makefile -*-
 # used by security/pinentry/Makefile
 # used by security/pinentry-gtk2/Makefile
 # used by security/pinentry-qt4/Makefile
 
-PINENTRY_VERSION=	0.9.5
+PINENTRY_VERSION=	0.9.6
 DISTNAME=		pinentry-${PINENTRY_VERSION}
 
 CATEGORIES=		security
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index ad956213461..2deaea92a3e 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.19 2015/07/06 10:31:00 wiz Exp $
+$NetBSD: distinfo,v 1.20 2015/09/30 19:56:42 wiz Exp $
 
-SHA1 (pinentry-0.9.5.tar.bz2) = 11979a6826ef5de73b52fd8c5b84f8321a133e53
-RMD160 (pinentry-0.9.5.tar.bz2) = 526cce33b4178fe86d64a6f48b01e90ec964dd10
-Size (pinentry-0.9.5.tar.bz2) = 514677 bytes
+SHA1 (pinentry-0.9.6.tar.bz2) = 296992d7b26ba2a517b093ccae26bc00b88b3bb5
+RMD160 (pinentry-0.9.6.tar.bz2) = 1f2eb6ececac9c952ffb46b85b869300a4b27cd3
+Size (pinentry-0.9.6.tar.bz2) = 432889 bytes