[pkgsrc/trunk]: pkgsrc/security/pinentry Latest pinentry has new GTK+-2 Pinen...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cb47a5f13354
branches:  trunk
changeset: 519864:cb47a5f13354
user:      shannonjr <shannonjr%pkgsrc.org@localhost>
date:      Wed Oct 11 18:53:38 2006 +0000

description:
Latest pinentry has new GTK+-2 Pinentry option. Enable or disable
according to build options.

diffstat:

 security/pinentry/Makefile   |   3 ++-
 security/pinentry/PLIST      |   3 ++-
 security/pinentry/options.mk |  13 +++++++++++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diffs (59 lines):

diff -r 7dd4d1eabde6 -r cb47a5f13354 security/pinentry/Makefile
--- a/security/pinentry/Makefile        Wed Oct 11 18:47:28 2006 +0000
+++ b/security/pinentry/Makefile        Wed Oct 11 18:53:38 2006 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.15 2006/10/11 14:55:59 shannonjr Exp $
+# $NetBSD: Makefile,v 1.16 2006/10/11 18:53:38 shannonjr Exp $
 #
 
 DISTNAME=              pinentry-0.7.2
+PKGREVISION=           1
 CATEGORIES=            security
 MASTER_SITES=          ftp://ftp.gnupg.org/gcrypt/pinentry/
 
diff -r 7dd4d1eabde6 -r cb47a5f13354 security/pinentry/PLIST
--- a/security/pinentry/PLIST   Wed Oct 11 18:47:28 2006 +0000
+++ b/security/pinentry/PLIST   Wed Oct 11 18:53:38 2006 +0000
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2006/10/11 14:55:59 shannonjr Exp $
+@comment $NetBSD: PLIST,v 1.5 2006/10/11 18:53:38 shannonjr Exp $
 bin/pinentry
 bin/pinentry-curses
 info/pinentry.info
 ${USE_GTK}bin/pinentry-gtk
+${USE_GTK2}bin/pinentry-gtk2
 ${USE_QT}bin/pinentry-qt
diff -r 7dd4d1eabde6 -r cb47a5f13354 security/pinentry/options.mk
--- a/security/pinentry/options.mk      Wed Oct 11 18:47:28 2006 +0000
+++ b/security/pinentry/options.mk      Wed Oct 11 18:53:38 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2006/10/11 14:55:59 shannonjr Exp $
+# $NetBSD: options.mk,v 1.4 2006/10/11 18:53:38 shannonjr Exp $
 #
 
 # XXX This usage of bsd.options.mk is incorrect.  The package should
@@ -8,7 +8,7 @@
 #   pinentry-qt
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.pinentry
-PKG_SUPPORTED_OPTIONS= gtk qt
+PKG_SUPPORTED_OPTIONS= gtk gtk2 qt
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mgtk)
@@ -20,6 +20,15 @@
 PLIST_SUBST+=          USE_GTK='@comment '
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtk2)
+CONFIGURE_ARGS+=       --enable-pinentry-gtk2
+PLIST_SUBST+=          USE_GTK2=
+.  include "../../x11/gtk2/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-pinentry-gtk2
+PLIST_SUBST+=          USE_GTK2='@comment '
+.endif
+
 .if !empty(PKG_OPTIONS:Mqt)
 USE_LANGUAGES+=                c c++
 USE_TOOLS+=            gmake