Update to 0.9.5:

Noteworthy changes in version 0.9.5 (2015-07-01)
------------------------------------------------

 * Replaced the internal Assuan and gpg-error code by the standard
   libassuan and libgpg-error libraries.

 * Add a new Emacs pinentry and use as fallback for GUI programs.

 * gnome3: The use-password-manager checkbox does now work.

 * Gtk: Improved fallback to curses feature.

 * curses: Recognize DEL as backspace.

4 files changed, 18 insertions, 13 deletions

diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index be454983dab..e171198ce64 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,8 +1,12 @@
-# $NetBSD: Makefile,v 1.44 2015/04/12 14:50:43 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2015/07/06 10:31:00 wiz Exp $
 
 COMMENT=		Applications for entering PINs or Passphrases
 
 CONFIGURE_ARGS+=	--enable-pinentry-tty
+CONFIGURE_ARGS+=        --enable-pinentry-emacs
+CONFIGURE_ARGS+=        --disable-pinentry-qt4
+CONFIGURE_ARGS+=        --disable-pinentry-gnome3
+CONFIGURE_ARGS+=        --disable-pinentry-gtk2
 
 .include		"../../security/pinentry/Makefile.common"
 
@@ -12,9 +16,5 @@ post-install:
 		${LN} -sf pinentry-${PINENTRY_DEFAULT} pinentry
 .endif
 
-BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
-
-.include "../../security/libgpg-error/buildlink3.mk"
 .include "../../security/libksba/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/pinentry/Makefile.common b/security/pinentry/Makefile.common
index 8e4f75cf8ec..eb8e4e3cad3 100644
--- a/security/pinentry/Makefile.common
+++ b/security/pinentry/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.6 2015/06/07 08:46:48 wiz Exp $
+# $NetBSD: Makefile.common,v 1.7 2015/07/06 10:31:00 wiz Exp $
 # -*- Makefile -*-
 # used by security/pinentry/Makefile
 # used by security/pinentry-gtk2/Makefile
 # used by security/pinentry-qt4/Makefile
 
-PINENTRY_VERSION=	0.9.4
+PINENTRY_VERSION=	0.9.5
 DISTNAME=		pinentry-${PINENTRY_VERSION}
 
 CATEGORIES=		security
@@ -15,7 +15,7 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
 LICENSE=		gnu-gpl-v2
 
-PATCHDIR=		${.CURDIR}/../../security/pinentry/patches
+#PATCHDIR=		${.CURDIR}/../../security/pinentry/patches
 DISTINFO_FILE=		${.CURDIR}/../../security/pinentry/distinfo
 
 GNU_CONFIGURE=		yes
@@ -23,6 +23,10 @@ CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 
 INFO_FILES=		yes
 
+BUILDLINK_API_DEPENDS.libassuan+=       libassuan>=2.1.0
+.include "../../security/libassuan2/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.16
+.include "../../security/libgpg-error/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST
index ff214e969d9..511f4b3fa54 100644
--- a/security/pinentry/PLIST
+++ b/security/pinentry/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.9 2015/01/15 20:48:33 wiz Exp $
+@comment $NetBSD: PLIST,v 1.10 2015/07/06 10:31:00 wiz Exp $
 bin/pinentry
 bin/pinentry-curses
+bin/pinentry-emacs
 bin/pinentry-tty
 info/pinentry.info
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index 2af8d3aabc2..ad956213461 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.18 2015/06/07 08:46:48 wiz Exp $
+$NetBSD: distinfo,v 1.19 2015/07/06 10:31:00 wiz Exp $
 
-SHA1 (pinentry-0.9.4.tar.bz2) = 0c47f0ddea4631bcba01ebbeca8bffe0bf43e440
-RMD160 (pinentry-0.9.4.tar.bz2) = f33a69e4808a19ff1f7d58b42f82c2dbc9ff7c89
-Size (pinentry-0.9.4.tar.bz2) = 510034 bytes
+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