1) Updated to gpgme-1.0.1. This is a bug fix release.

2) Added optional support for OpenPGP/MIME and SMIME via gnupg-devel
   as described here: http://www.gnupg.org/aegypten2/

6 files changed, 78 insertions, 15 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index b0e073c7ded..9bb752d1086 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2004/10/20 19:09:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/10/23 15:00:48 shannonjr Exp $
 #
 
-DISTNAME=	gpgme-1.0.0
+DISTNAME=	gpgme-1.0.1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/ \
 		ftp://ftp.gnupg.org/gcrypt/alpha/gpgme/
@@ -10,13 +10,17 @@ MAINTAINER=	oishi@ims.ac.jp
 HOMEPAGE=	http://www.gnupg.org/gpgme.html
 COMMENT=	GnuPG Made Easy
 
-DEPENDS+=	gnupg>=1.2.2:../../security/gnupg
+#DEPENDS+=	gnupg>=1.2.2:../../security/gnupg
 
 USE_BUILDLINK3=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 
+PKG_OPTIONS_VAR=        PKG_OPTIONS.gpgme
+PKG_SUPPORTED_OPTIONS=	gpgsm
+.include "../../mk/bsd.options.mk"
+
 LIBS.SunOS+=		-lnsl -lsocket
 
 # Avoid an ICE in gcc2 on sparc64
@@ -33,4 +37,13 @@ CONFIGURE_ARGS+=	--without-pth --without-pth-test
 INFO_FILES=		gpgme.info
 
 .include "../../security/libgpg-error/buildlink3.mk"
+.include "../../devel/librfuncs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
+
+##
+## Option to build with gpgsm. This provides SMIME support
+##
+.if !empty(PKG_OPTIONS:Mgpgsm)
+.include "../../security/gnupg-devel/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-gpgsm=${BUILDLINK_PREFIX.gnupg-devel}/bin/gpgsm
+.endif
diff --git a/security/gpgme/buildlink3.mk b/security/gpgme/buildlink3.mk
index f8e354fa11e..597436950c5 100644
--- a/security/gpgme/buildlink3.mk
+++ b/security/gpgme/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/10/03 00:18:09 tv Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/10/23 15:00:48 shannonjr Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 GPGME_BUILDLINK3_MK:=	${GPGME_BUILDLINK3_MK}+
@@ -12,10 +12,11 @@ BUILDLINK_PACKAGES+=	gpgme
 
 .if !empty(GPGME_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.gpgme+=	gpgme>=0.9.0
-BUILDLINK_RECOMMENDED.gpgme+=	gpgme>=0.9.0nb1
+BUILDLINK_RECOMMENDED.gpgme+=	gpgme>=1.0.1
 BUILDLINK_PKGSRCDIR.gpgme?=	../../security/gpgme
 .endif	# GPGME_BUILDLINK3_MK
 
 .include "../../security/libgpg-error/buildlink3.mk"
+.include "../../devel/librfuncs/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index c5b08a0e1f7..426a850f653 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.10 2004/10/20 19:09:12 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2004/10/23 15:00:48 shannonjr Exp $
 
-SHA1 (gpgme-1.0.0.tar.gz) = 812b66971ded42baf7828d0c6380850e7691b577
-Size (gpgme-1.0.0.tar.gz) = 810646 bytes
+SHA1 (gpgme-1.0.1.tar.gz) = d35fa8fc20783ea853d9e4d01fed7e1a9d3160f6
+Size (gpgme-1.0.1.tar.gz) = 815046 bytes
 SHA1 (patch-aa) = 27f98c23d89a0a030398e1e5cfefff84b23d2658
 SHA1 (patch-ab) = d73b151c643d6ae5b2a321e58291a6b48892fd03
-SHA1 (patch-ac) = b63a3da29b94531ead9e9b2dc54d1b7e1868ad17
+SHA1 (patch-ac) = 0405907ddcece65ed4016ed12208f610f4dca32f
+SHA1 (patch-ae) = a18cea1e79954b860141d07e347f65538bd8d50c
+SHA1 (patch-af) = 86bed86f73d3da500c4c0dc03cf47fbea28c6962
diff --git a/security/gpgme/patches/patch-ac b/security/gpgme/patches/patch-ac
index 64c3ff0ce74..418df6b3c2d 100644
--- a/security/gpgme/patches/patch-ac
+++ b/security/gpgme/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2004/10/20 19:09:12 jmmv Exp $
+$NetBSD: patch-ac,v 1.2 2004/10/23 15:00:48 shannonjr Exp $
 
---- configure.orig	2004-09-30 04:44:16.000000000 +0200
+--- configure.orig	2004-10-22 12:52:27.000000000 -0600
 +++ configure
-@@ -21872,7 +21872,7 @@ _ACEOF
+@@ -21876,7 +21876,7 @@ esac
  fi
- 
+ GPGSM=$ac_cv_path_GPGSM
  
 -if test -n "$GPGSM"; then
 +if test "$GPGSM" != no; then
-   HAVE_GPGSM_TRUE=
-   HAVE_GPGSM_FALSE='#'
+   echo "$as_me:$LINENO: result: $GPGSM" >&5
+ echo "${ECHO_T}$GPGSM" >&6
  else
diff --git a/security/gpgme/patches/patch-ae b/security/gpgme/patches/patch-ae
new file mode 100644
index 00000000000..af6d53a7fd4
--- /dev/null
+++ b/security/gpgme/patches/patch-ae
@@ -0,0 +1,14 @@
+$NetBSD: patch-ae,v 1.1 2004/10/23 15:00:48 shannonjr Exp $
+
+--- gpgme/engine-gpgsm.c.orig	2004-04-19 08:12:02.000000000 -0600
++++ gpgme/engine-gpgsm.c
+@@ -448,7 +448,8 @@ gpgsm_new (void **engine, const char *lc
+ 
+   if (isatty (1))
+     {
+-      if (ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
++      /* ttyname_r() return numeric status */
++      if (err = ttyname_r (1, dft_ttyname, sizeof (dft_ttyname)))
+ 	{
+ 	  err = gpg_error_from_errno (errno);
+ 	  goto leave;
diff --git a/security/gpgme/patches/patch-af b/security/gpgme/patches/patch-af
new file mode 100644
index 00000000000..b12651e4020
--- /dev/null
+++ b/security/gpgme/patches/patch-af
@@ -0,0 +1,33 @@
+$NetBSD: patch-af,v 1.1 2004/10/23 15:00:48 shannonjr Exp $
+
+--- ./gpgme/get-env.c.orig	2003-09-13 11:45:04.000000000 -0600
++++ ./gpgme/get-env.c
+@@ -52,7 +52,26 @@ _gpgme_getenv (const char *name, char **
+ 
+ #else
+ 
+-/* FIXME: Implement this when we have the specification for it.  */
+-#error Use of getenv_r not implemented.
++/* Retrieve the environment variable NAME and return a copy of it in a
++   malloc()'ed buffer in *VALUE.  If the environment variable is not
++   set, return NULL in *VALUE.  */
++gpgme_error_t
++_gpgme_getenv (const char *name, char **value)
++{
++  char env_value[256];
++  int err;
++  if (err = getenv_r (name, env_value, 256))
++      *value = NULL;
++  else
++    {
++      *value = strdup (env_value);
++      if (!*value)
++        err = ENOMEM;
++    }
++  if (err)
++      return gpg_error_from_errno (err);
++  else
++      return (0);
++}
+ 
+ #endif