put the pinentry variants which depend on a toolkit into seperate

pkgs rather than having their build controlled by options
(no change in the default case)

16 files changed, 162 insertions, 29 deletions

diff --git a/security/Makefile b/security/Makefile
index 174f58216a7..acedc016fa1 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.371 2010/01/27 10:32:20 sno Exp $
+# $NetBSD: Makefile,v 1.372 2010/02/07 15:36:58 drochner Exp $
 #
 
 COMMENT=	Security tools
@@ -249,6 +249,9 @@ SUBDIR+=	php-mcrypt
 SUBDIR+=	php-mhash
 SUBDIR+=	php-suhosin
 SUBDIR+=	pinentry
+SUBDIR+=	pinentry-gtk
+SUBDIR+=	pinentry-gtk2
+SUBDIR+=	pinentry-qt
 SUBDIR+=	pinepgp
 SUBDIR+=	pkcs11-helper
 SUBDIR+=	pks
diff --git a/security/pinentry-gtk/DESCR b/security/pinentry-gtk/DESCR
new file mode 100644
index 00000000000..eca2e9c1210
--- /dev/null
+++ b/security/pinentry-gtk/DESCR
@@ -0,0 +1,4 @@
+This is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+It provides programs for several graphical toolkits, such as GTK+ and
+QT, as well as for the console, using curses.
diff --git a/security/pinentry-gtk/Makefile b/security/pinentry-gtk/Makefile
new file mode 100644
index 00000000000..aa0dd47df71
--- /dev/null
+++ b/security/pinentry-gtk/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2010/02/07 15:36:58 drochner Exp $
+#
+
+DISTNAME=		pinentry-0.7.6
+PKGNAME=		pinentry-gtk-0.7.6
+CATEGORIES=		security
+MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/
+
+MAINTAINER=		shannonjr@NetBSD.org
+HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
+COMMENT=		Applications for entering PINs or Passphrases
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--enable-pinentry-gtk
+CONFIGURE_ARGS+=	--disable-pinentry-curses
+#CONFIGURE_ARGS+=	--disable-fallback-curses
+CONFIGURE_ARGS+=	--disable-pinentry-gtk2
+CONFIGURE_ARGS+=	--disable-pinentry-qt
+CONFIGURE_ARGS+=	--disable-pinentry-qt4
+
+INFO_FILES=		yes
+
+INSTALL_DIRS=		gtk
+
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+.include "../../x11/gtk/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+#.include "../../security/libgpg-error/buildlink3.mk"
+#.include "../../security/libksba/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/pinentry-gtk/PLIST b/security/pinentry-gtk/PLIST
new file mode 100644
index 00000000000..c7cf1ac3170
--- /dev/null
+++ b/security/pinentry-gtk/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
+bin/pinentry-gtk
diff --git a/security/pinentry-gtk/distinfo b/security/pinentry-gtk/distinfo
new file mode 100644
index 00000000000..6b1c3b8928c
--- /dev/null
+++ b/security/pinentry-gtk/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2010/02/07 15:36:58 drochner Exp $
+
+SHA1 (pinentry-0.7.6.tar.gz) = 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9
+RMD160 (pinentry-0.7.6.tar.gz) = 6e69eee88b5cbb919ced79971cd4794f5e659023
+Size (pinentry-0.7.6.tar.gz) = 475101 bytes
diff --git a/security/pinentry-gtk2/DESCR b/security/pinentry-gtk2/DESCR
new file mode 100644
index 00000000000..eca2e9c1210
--- /dev/null
+++ b/security/pinentry-gtk2/DESCR
@@ -0,0 +1,4 @@
+This is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+It provides programs for several graphical toolkits, such as GTK+ and
+QT, as well as for the console, using curses.
diff --git a/security/pinentry-gtk2/Makefile b/security/pinentry-gtk2/Makefile
new file mode 100644
index 00000000000..055fa682f1b
--- /dev/null
+++ b/security/pinentry-gtk2/Makefile
@@ -0,0 +1,34 @@
+# $NetBSD: Makefile,v 1.1 2010/02/07 15:36:58 drochner Exp $
+#
+
+DISTNAME=		pinentry-0.7.6
+PKGNAME=		pinentry-gtk2-0.7.6
+CATEGORIES=		security
+MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/
+
+MAINTAINER=		shannonjr@NetBSD.org
+HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
+COMMENT=		Applications for entering PINs or Passphrases
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--enable-pinentry-gtk2
+CONFIGURE_ARGS+=	--disable-pinentry-curses
+#CONFIGURE_ARGS+=	--disable-fallback-curses
+CONFIGURE_ARGS+=	--disable-pinentry-gtk
+CONFIGURE_ARGS+=	--disable-pinentry-qt
+CONFIGURE_ARGS+=	--disable-pinentry-qt4
+
+INFO_FILES=		yes
+
+INSTALL_DIRS=		gtk+-2
+
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+#.include "../../security/libgpg-error/buildlink3.mk"
+#.include "../../security/libksba/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/pinentry-gtk2/PLIST b/security/pinentry-gtk2/PLIST
new file mode 100644
index 00000000000..0f1d4e0065e
--- /dev/null
+++ b/security/pinentry-gtk2/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
+bin/pinentry-gtk-2
diff --git a/security/pinentry-gtk2/distinfo b/security/pinentry-gtk2/distinfo
new file mode 100644
index 00000000000..6b1c3b8928c
--- /dev/null
+++ b/security/pinentry-gtk2/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2010/02/07 15:36:58 drochner Exp $
+
+SHA1 (pinentry-0.7.6.tar.gz) = 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9
+RMD160 (pinentry-0.7.6.tar.gz) = 6e69eee88b5cbb919ced79971cd4794f5e659023
+Size (pinentry-0.7.6.tar.gz) = 475101 bytes
diff --git a/security/pinentry-qt/DESCR b/security/pinentry-qt/DESCR
new file mode 100644
index 00000000000..eca2e9c1210
--- /dev/null
+++ b/security/pinentry-qt/DESCR
@@ -0,0 +1,4 @@
+This is a collection of simple PIN or passphrase entry dialogs which
+utilize the Assuan protocol as described by the aegypten project.
+It provides programs for several graphical toolkits, such as GTK+ and
+QT, as well as for the console, using curses.
diff --git a/security/pinentry-qt/Makefile b/security/pinentry-qt/Makefile
new file mode 100644
index 00000000000..1326dbb0a4c
--- /dev/null
+++ b/security/pinentry-qt/Makefile
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.1 2010/02/07 15:36:58 drochner Exp $
+#
+
+DISTNAME=		pinentry-0.7.6
+PKGNAME=		pinentry-qt-0.7.6
+CATEGORIES=		security
+MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/pinentry/
+
+MAINTAINER=		shannonjr@NetBSD.org
+HOMEPAGE=		ftp://ftp.gnupg.org/gcrypt/pinentry/
+COMMENT=		Applications for entering PINs or Passphrases
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
+CONFIGURE_ARGS+=	--enable-pinentry-qt
+CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR:Q}
+CONFIGURE_ARGS+=	--with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include
+CONFIGURE_ARGS+=	--with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib
+CONFIGURE_ARGS+=	--disable-pinentry-curses
+#CONFIGURE_ARGS+=	--disable-fallback-curses
+CONFIGURE_ARGS+=	--disable-pinentry-gtk
+CONFIGURE_ARGS+=	--disable-pinentry-gtk2
+CONFIGURE_ARGS+=	--disable-pinentry-qt4
+
+USE_LANGUAGES+=		c c++
+USE_TOOLS+=		gmake
+INFO_FILES=		yes
+
+INSTALL_DIRS=		qt
+
+BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
+.include "../../x11/qt3-libs/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
+#.include "../../security/libgpg-error/buildlink3.mk"
+#.include "../../security/libksba/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/security/pinentry-qt/PLIST b/security/pinentry-qt/PLIST
new file mode 100644
index 00000000000..2ee15b44c89
--- /dev/null
+++ b/security/pinentry-qt/PLIST
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST,v 1.1 2010/02/07 15:36:58 drochner Exp $
+bin/pinentry-qt
diff --git a/security/pinentry-qt/distinfo b/security/pinentry-qt/distinfo
new file mode 100644
index 00000000000..6b1c3b8928c
--- /dev/null
+++ b/security/pinentry-qt/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2010/02/07 15:36:58 drochner Exp $
+
+SHA1 (pinentry-0.7.6.tar.gz) = 0c525ce81e5589bc9a4f2eb72705bed2b3e9a8b9
+RMD160 (pinentry-0.7.6.tar.gz) = 6e69eee88b5cbb919ced79971cd4794f5e659023
+Size (pinentry-0.7.6.tar.gz) = 475101 bytes
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 6b66a064e36..3e60fe27cce 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/12/15 19:50:47 drochner Exp $
+# $NetBSD: Makefile,v 1.23 2010/02/07 15:36:58 drochner Exp $
 #
 
 DISTNAME=		pinentry-0.7.6
@@ -18,6 +18,12 @@ INFO_FILES=		yes
 
 .include "options.mk"
 
+.if defined(PINENTRY_DEFAULT)
+post-install:
+	${LN} -sf ${DESTDIR}${PREFIX}/bin/pinentry-${PINENTRY_DEFAULT} \
+		${DESTDIR}${PREFIX}/bin/pinentry
+.endif
+
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.0.0
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/security/pinentry/PLIST b/security/pinentry/PLIST
index 70a6f2a73b3..a2d7ac30731 100644
--- a/security/pinentry/PLIST
+++ b/security/pinentry/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/12 22:43:12 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2010/02/07 15:36:58 drochner Exp $
 bin/pinentry
 bin/pinentry-curses
 info/pinentry.info
-${PLIST.gtk}bin/pinentry-gtk
-${PLIST.gtk2}bin/pinentry-gtk-2
-${PLIST.qt}bin/pinentry-qt
diff --git a/security/pinentry/options.mk b/security/pinentry/options.mk
index f950d2ccaff..9f4c9e41aa8 100644
--- a/security/pinentry/options.mk
+++ b/security/pinentry/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.5 2008/04/12 22:43:12 jlam Exp $
+# $NetBSD: options.mk,v 1.6 2010/02/07 15:36:58 drochner Exp $
 #
 
 # XXX This usage of bsd.options.mk is incorrect.  The package should
@@ -11,33 +11,20 @@ PKG_OPTIONS_VAR=	PKG_OPTIONS.pinentry
 PKG_SUPPORTED_OPTIONS=	gtk gtk2 qt
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=		${PKG_SUPPORTED_OPTIONS}
-
-.if !empty(PKG_OPTIONS:Mgtk)
-CONFIGURE_ARGS+=	--enable-pinentry-gtk
-PLIST.gtk=		yes
-.  include "../../x11/gtk/buildlink3.mk"
-.else
 CONFIGURE_ARGS+=	--disable-pinentry-gtk
+.if !empty(PKG_OPTIONS:Mgtk)
+DEPENDS+=		pinentry-gtk-[0-9]*:../../security/pinentry-gtk
+PINENTRY_DEFAULT=	gtk
 .endif
 
-.if !empty(PKG_OPTIONS:Mgtk2)
-CONFIGURE_ARGS+=	--enable-pinentry-gtk2
-PLIST.gtk2=		yes
-.  include "../../x11/gtk2/buildlink3.mk"
-.else
 CONFIGURE_ARGS+=	--disable-pinentry-gtk2
+.if !empty(PKG_OPTIONS:Mgtk2)
+DEPENDS+=		pinentry-gtk2-[0-9]*:../../security/pinentry-gtk2
+PINENTRY_DEFAULT=	gtk2
 .endif
 
-.if !empty(PKG_OPTIONS:Mqt)
-USE_LANGUAGES+=		c c++
-USE_TOOLS+=		gmake
-CONFIGURE_ARGS+=	--enable-pinentry-qt
-CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR:Q}
-CONFIGURE_ARGS+=	--with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include
-CONFIGURE_ARGS+=	--with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib
-PLIST.qt=		yes
-.  include "../../x11/qt3-libs/buildlink3.mk"
-.else
 CONFIGURE_ARGS+=	--disable-pinentry-qt
+.if !empty(PKG_OPTIONS:Mqt)
+DEPENDS+=		pinentry-qt-[0-9]*:../../security/pinentry-qt
+PINENTRY_DEFAULT=	qt
 .endif