Update to 2.0.6. Add support for idea option. From Blair Sadewitz

on tech-pkg.

Noteworthy changes in version 2.0.6 (2007-08-16)
------------------------------------------------

 * GPGSM does now grok --default-key.

 * GPGCONF is now aware of --default-key and --encrypt-to.

 * GPGSM does again correctly print the serial number as well the the
   various keyids.  This was broken since 2.0.4.

 * New option --validation-model and support for the chain-model.

 * Improved Windows support.

4 files changed, 57 insertions, 25 deletions

diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index ca8578733aa..bc87442a509 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2007/08/10 15:46:23 gdt Exp $
+# $NetBSD: Makefile,v 1.14 2007/08/29 23:19:06 wiz Exp $
 #
 
-DISTNAME=		gnupg-2.0.5
+DISTNAME=		gnupg-2.0.6
 PKGNAME=		${DISTNAME:S/gnupg/gnupg2/}
 CATEGORIES=		security
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/gnupg/
@@ -41,24 +41,7 @@ CONFIGURE_ENV+=		gnupg_cv_pth_is_sane=yes
 
 TEST_TARGET=		check
 
-# XXX It looks like that gpgsm support could be split into its own package,
-# according to the configure script.  If that's true, this use of the options
-# framework is incorrect and should be fixed.
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
-PKG_SUPPORTED_OPTIONS=	gpgsm
-.include "../../mk/bsd.options.mk"
-
-## If no options are specified, only gpg-agent is built. This
-## is sufficient for OpenPGP/MIME support in Kmail
-## SMIME support is provided by gpgsm. This support is
-## in the alpha stage of development.
-PLIST_SRC=	${.CURDIR}/PLIST
-.if empty(PKG_OPTIONS:Mgpgsm)
-CONFIGURE_ARGS+=	--enable-agent-only
-.else
-PLIST_SRC+=	${.CURDIR}/PLIST.gpgsm
-.  include "../../security/dirmngr/buildlink3.mk"
-.endif
+.include "options.mk"
 
 # We are building a static pth library and linking against it
 # While this is not very satisfying, gpgme hangs in it's gpgsm tests if we depend on the shared (pkgsrc) pth library
diff --git a/security/gnupg2/buildlink3.mk b/security/gnupg2/buildlink3.mk
index 4bb0800eecc..2a87b9fe654 100644
--- a/security/gnupg2/buildlink3.mk
+++ b/security/gnupg2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/11/17 12:13:11 shannonjr Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2007/08/29 23:19:06 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GNUPG2_BUILDLINK3_MK:=	${GNUPG2_BUILDLINK3_MK}+
@@ -15,6 +15,17 @@ BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}gnupg2
 BUILDLINK_API_DEPENDS.gnupg2+=	gnupg2>=2.0.0
 BUILDLINK_PKGSRCDIR.gnupg2?=	../../security/gnupg2
 BUILDLINK_PREFIX.gnupg2?=	${LOCALBASE}
+
+pkgbase:=	gnupg2
+.include "../../mk/pkg-build-options.mk"
+
+.   if !empty(PKG_BUILD_OPTIONS.gnupg2:Midea)
+pkgbase:=	libgcrypt
+.   	include "../../mk/pkg-build-options.mk"
+.   	if empty(PKG_BUILD_OPTIONS.libgcrypt:Midea)
+PKGSRC_MAKE_ENV+=	PKG_OPTIONS.libgcrypt+=	idea
+.   	endif
+.   endif
 .endif	# GNUPG2_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
diff --git a/security/gnupg2/distinfo b/security/gnupg2/distinfo
index 6b3c960223b..beab6771bad 100644
--- a/security/gnupg2/distinfo
+++ b/security/gnupg2/distinfo
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.8 2007/08/04 12:00:02 shannonjr Exp $
+$NetBSD: distinfo,v 1.9 2007/08/29 23:19:07 wiz Exp $
 
-SHA1 (gnupg-2.0.5.tar.bz2) = 9435e7fabe525ce943a5818008d412ecad244018
-RMD160 (gnupg-2.0.5.tar.bz2) = f026dacee15b1b4dc5f7c2ecd287d65f49f1064e
-Size (gnupg-2.0.5.tar.bz2) = 3513529 bytes
+SHA1 (gnupg-2.0.4-idea.patch) = 0f56a3d656d8ec3227c1b597bee010b8dbe1d7cd
+RMD160 (gnupg-2.0.4-idea.patch) = df2f628ee03880ff5b0916185cffe0b28316d08b
+Size (gnupg-2.0.4-idea.patch) = 906 bytes
+SHA1 (gnupg-2.0.6.tar.bz2) = 4aa9a3ecc954126cfc0a30bef94ec6e1fbbc7009
+RMD160 (gnupg-2.0.6.tar.bz2) = 6b6bb3455a996d558d1a664f3267cd151388f230
+Size (gnupg-2.0.6.tar.bz2) = 3566190 bytes
 SHA1 (libassuan-1.0.2.tar.bz2) = 6f9bbee22719cd75fae6a5a5c38d557b971fe8fe
 RMD160 (libassuan-1.0.2.tar.bz2) = a445757e6a3bbaf9c5d010cba22368923dcc522b
 Size (libassuan-1.0.2.tar.bz2) = 275499 bytes
diff --git a/security/gnupg2/options.mk b/security/gnupg2/options.mk
new file mode 100644
index 00000000000..d597e6d0b1c
--- /dev/null
+++ b/security/gnupg2/options.mk
@@ -0,0 +1,35 @@
+# $NetBSD: options.mk,v 1.1 2007/08/29 23:19:07 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gnupg2
+PKG_SUPPORTED_OPTIONS=	gpgsm idea
+
+.include "../../mk/bsd.options.mk"
+
+## If no options are specified, only gpg-agent is built. This
+## is sufficient for OpenPGP/MIME support in Kmail
+## SMIME support is provided by gpgsm. This support is
+## in the alpha stage of development.
+PLIST_SRC=      ${.CURDIR}/PLIST
+
+# XXX It looks like that gpgsm support could be split into its own package,
+# according to the configure script.  If that's true, this use of the options
+# framework is incorrect and should be fixed.
+.if empty(PKG_OPTIONS:Mgpgsm)
+CONFIGURE_ARGS+=        --enable-agent-only
+.else
+PLIST_SRC+=     ${.CURDIR}/PLIST.gpgsm
+.  include "../../security/dirmngr/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Midea)
+LICENSE=        idea-license
+RESTRICTED=     Commercial distribution is claimed to require a license.
+NO_SRC_ON_CDROM=        ${RESTRICTED}
+NO_BIN_ON_CDROM=        ${RESTRICTED}
+
+PATCH_SITES=		http://www.kfwebs.com/
+PATCHFILES+=		gnupg-2.0.4-idea.patch
+PATCH_DIST_STRIP=	-p1
+
+PKGSRC_MAKE_ENV+=	PKG_OPTIONS.libgcrypt+=idea
+.endif