Update to 0.9.1.

Noteworthy changes in version 0.9.1 (2015-03-18)
------------------------------------------------

 * Fixed build problems for systems without ncurses.

 * Reworked the option parser to allow building on systems without
   getopt_long.

 * Fixed Qt4 build problems.

5 files changed, 8 insertions, 65 deletions

diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index f44070ad930..be454983dab 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.43 2015/01/15 20:48:33 wiz Exp $
-#
-#PKGNAME=		${DISTNAME}
-PKGREVISION=		1
+# $NetBSD: Makefile,v 1.44 2015/04/12 14:50:43 wiz Exp $
+
 COMMENT=		Applications for entering PINs or Passphrases
 
 CONFIGURE_ARGS+=	--enable-pinentry-tty
 
 .include		"../../security/pinentry/Makefile.common"
 
-.include "options.mk"
-
 .if defined(PINENTRY_DEFAULT)
 post-install:
 	cd ${DESTDIR}${PREFIX}/bin && \
diff --git a/security/pinentry/Makefile.common b/security/pinentry/Makefile.common
index f47bc705fe9..9a7b9d0061d 100644
--- a/security/pinentry/Makefile.common
+++ b/security/pinentry/Makefile.common
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.common,v 1.3 2014/12/12 15:04:16 mef Exp $
+# $NetBSD: Makefile.common,v 1.4 2015/04/12 14:50:43 wiz Exp $
 # -*- Makefile -*-
 # used by security/pinentry/Makefile
 # used by security/pinentry-gtk2/Makefile
 # used by security/pinentry-qt4/Makefile
 
-PINENTRY_VERSION=	0.9.0
+PINENTRY_VERSION=	0.9.1
 DISTNAME=		pinentry-${PINENTRY_VERSION}
 
 CATEGORIES=		security
diff --git a/security/pinentry/distinfo b/security/pinentry/distinfo
index 74f5433b522..7c68de835fa 100644
--- a/security/pinentry/distinfo
+++ b/security/pinentry/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.15 2014/12/12 15:04:16 mef Exp $
+$NetBSD: distinfo,v 1.16 2015/04/12 14:50:43 wiz Exp $
 
-SHA1 (pinentry-0.9.0.tar.bz2) = f8e5c774c35fbb91d84e82559baf76f6b4513236
-RMD160 (pinentry-0.9.0.tar.bz2) = 957284ded6dcc9a3302b498bfdf95d2378e8f6e0
-Size (pinentry-0.9.0.tar.bz2) = 464272 bytes
-SHA1 (patch-qt4_pinentryconfirm_moc) = b48ed080f78a4a465d3e56139d69c9fbfcb8fcc2
+SHA1 (pinentry-0.9.1.tar.bz2) = 01e62c45435496ff0e011255fb0ac1879a3bc177
+RMD160 (pinentry-0.9.1.tar.bz2) = 8e66b4d96b918a6c9abf5fd8a62852dffa8203a5
+Size (pinentry-0.9.1.tar.bz2) = 482295 bytes
diff --git a/security/pinentry/options.mk b/security/pinentry/options.mk
deleted file mode 100644
index f024782c5de..00000000000
--- a/security/pinentry/options.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: options.mk,v 1.8 2010/02/25 11:30:03 drochner Exp $
-#
-
-# XXX This usage of bsd.options.mk is incorrect.  The package should
-# to be split into three packages
-#   pinentry-curses
-#   pinentry-gtk
-#   pinentry-qt
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.pinentry
-PKG_SUPPORTED_OPTIONS=	gtk gtk2 qt qt4
-.include "../../mk/bsd.options.mk"
-
-CONFIGURE_ARGS+=	--disable-pinentry-gtk
-.if !empty(PKG_OPTIONS:Mgtk)
-DEPENDS+=		pinentry-gtk-[0-9]*:../../security/pinentry-gtk
-PINENTRY_DEFAULT=	gtk
-.endif
-
-CONFIGURE_ARGS+=	--disable-pinentry-gtk2
-.if !empty(PKG_OPTIONS:Mgtk2)
-DEPENDS+=		pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2
-PINENTRY_DEFAULT=	gtk-2
-.endif
-
-CONFIGURE_ARGS+=	--disable-pinentry-qt
-.if !empty(PKG_OPTIONS:Mqt)
-DEPENDS+=		pinentry-qt-[0-9]*:../../security/pinentry-qt
-PINENTRY_DEFAULT=	qt
-.endif
-
-CONFIGURE_ARGS+=	--disable-pinentry-qt4
-.if !empty(PKG_OPTIONS:Mqt4)
-DEPENDS+=		pinentry-qt4-[0-9]*:../../security/pinentry-qt4
-PINENTRY_DEFAULT=	qt4
-.endif
diff --git a/security/pinentry/patches/patch-qt4_pinentryconfirm_moc b/security/pinentry/patches/patch-qt4_pinentryconfirm_moc
deleted file mode 100644
index f651f5ee99a..00000000000
--- a/security/pinentry/patches/patch-qt4_pinentryconfirm_moc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-qt4_pinentryconfirm_moc,v 1.1 2014/12/10 10:24:21 mef Exp $
-
-Although, this is said generated file, it seems to me the path is 
-wrong. (only pinentry-qt4 needs this patch)
-
---- qt4/pinentryconfirm.moc~	2014-12-10 17:40:26.000000000 +0900
-+++ qt4/pinentryconfirm.moc	2014-12-10 17:41:41.000000000 +0900
-@@ -6,7 +6,7 @@
- ** WARNING! All changes made in this file will be lost!
- *****************************************************************************/
- 
--#include "../../../s/pinentry/qt4/pinentryconfirm.h"
-+#include "../qt4/pinentryconfirm.h"
- #if !defined(Q_MOC_OUTPUT_REVISION)
- #error "The header file 'pinentryconfirm.h' doesn't include <QObject>."
- #elif Q_MOC_OUTPUT_REVISION != 63