 @@ -1,75 +1,74 @@
-# $NetBSD: Makefile,v 1.56 2009/02/17 13:02:20 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2009/11/15 18:41:55 drochner Exp $
+#
-DISTNAME=	gpgme-1.1.4
+DISTNAME=	gpgme-1.1.8
 PKGREVISION=	2
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnupg.org/related_software/gpgme/
 COMMENT=	GnuPG Made Easy
 PKG_DESTDIR_SUPPORT=	user-destdir
 PKG_OPTIONS_VAR=        PKG_OPTIONS.gpgme
 PKG_SUPPORTED_OPTIONS=	gpgsm
 .include "../../mk/bsd.options.mk"
 .if empty(PKG_OPTIONS:Mgpgsm)
 DEPENDS+=		gnupg>=1.4.2:../../security/gnupg
 .endif
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 INFO_FILES=		YES
 SUBST_CLASSES+=		pthread
 SUBST_FILES.pthread=	gpgme/gpgme-config.in
 SUBST_SED.pthread+=	-e 's,@PTHREAD_LIBS@,${PTHREAD_LDFLAGS} ${PTHREAD_LIBS},g'
 SUBST_SED.pthread+=	-e 's,@PTHREAD_CFLAGS@,${PTHREAD_CFLAGS},g'
 SUBST_STAGE.pthread=	post-patch
 LIBS.SunOS+=		-lnsl -lsocket
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE:Q}
 # getenv_r is not detected correctly. It will be found
 # in either base system or librfuncs
 CONFIGURE_ENV+=		ac_cv_func_getenv_r=yes
 CONFIGURE_ENV+=		ac_cv_func_funopen=yes
 TEST_TARGET=		check
 .include "../../mk/pthread.buildlink3.mk"
 .if ${PTHREAD_TYPE} == "native"
 CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .endif
 BUILDLINK_API_DEPENDS.libgpg-error+=	libgpg-error>=1.4
 .include "../../security/libgpg-error/buildlink3.mk"
 # we want the getenv_r() semantics of NetBSD-current
 BUILDLINK_API_DEPENDS.librfuncs+=	librfuncs>=1.0.7nb1
 .include "../../devel/librfuncs/buildlink3.mk"
 ##
 ## Option to build with gpgsm. This provides SMIME support
 ##
 .if !empty(PKG_OPTIONS:Mgpgsm)
 .  include "../../security/gnupg2/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-gpgsm=${BUILDLINK_PREFIX.gnupg2}/bin/gpgsm
 CONFIGURE_ARGS+=	--with-gpg=${BUILDLINK_PREFIX.gnupg2}/bin/gpg2
 .else
 CONFIGURE_ARGS+=	--without-gpgsm
 .endif
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "HPUX"
 CONFIGURE_ENV+=		ac_cv_lib_pthread_pthread_create=yes
 .endif
 .include "../../mk/bsd.pkg.mk"

 @@ -1,19 +1,16 @@
-$NetBSD: distinfo,v 1.26 2007/03/25 00:48:08 joerg Exp $
+$NetBSD: distinfo,v 1.27 2009/11/15 18:41:55 drochner Exp $
-SHA1 (gpgme-1.1.4.tar.gz) = c5f9fe3a4479cc90ee33eff7a0669482b2f8cbe5
+SHA1 (gpgme-1.1.8.tar.gz) = 5f119d57009f1b8682d7665ae985325d0885ec9b
-RMD160 (gpgme-1.1.4.tar.gz) = 894fc39079addaf91d661ab5cf3d41b30454a873
+RMD160 (gpgme-1.1.8.tar.gz) = 6ee8856956cc8082fd19da457456b84d21d94841
-Size (gpgme-1.1.4.tar.gz) = 943219 bytes
+Size (gpgme-1.1.8.tar.gz) = 1085576 bytes
-SHA1 (patch-aa) = ef43e7f40642a4b7a6d70bd381144c495ebc9345
+SHA1 (patch-aa) = 4ef6915a2f8e062fcd2ffac83a4424c8897f734c
 SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb
 SHA1 (patch-ac) = f10902e1f14f4d32443a591da5f4bb955895598e
-SHA1 (patch-ad) = 8da36b8f7b07873b5dc3a04c3cfe1dae65ecadce
+SHA1 (patch-ae) = 19acb330da9bce61ab7aed0037fd3cc9d4e4efa4
-SHA1 (patch-ae) = f2b77e5f72ecae72f869afe968f77fb0f0d84c3f
+SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b
 SHA1 (patch-af) = ac1d130c31c1893a7c70e84580b8b4464eb3954a
 SHA1 (patch-ag) = 9d48fa3679f895d7395ef9e07ea294079ed89b17
-SHA1 (patch-ah) = 90bc8b33658ce3ce03fd3d7c015cfec53d0bd1d3
+SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48
 SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5
-SHA1 (patch-aj) = fc2b13f8400c250493d9ac7583eb3e79e6175b0f
+SHA1 (patch-aj) = 312c7f74b2fd092cbd24e94b3e3798702c8209a4
 SHA1 (patch-ak) = 1618e3ad2c1933ba019d966b83d3bd3aa5cc070a
 SHA1 (patch-ba) = 0ab37246319860acb8b96679ac58c6b0ef01d3ed
 SHA1 (patch-bb) = b9e099f39a1cc88e45858ddc547be509692d44ca
 SHA1 (patch-bc) = 071a4df142ff789cd65f487e0bda763e2e5c74b0

 @@ -1,24 +1,24 @@
-$NetBSD: patch-aa,v 1.7 2007/03/23 20:04:13 drochner Exp $
+$NetBSD: patch-aa,v 1.8 2009/11/15 18:41:55 drochner Exp $
---- gpgme/gpgme-config.in.orig	2007-01-26 06:28:37.000000000 +0100
+--- src/gpgme-config.in.orig	2007-01-26 06:28:37.000000000 +0100
-+++ gpgme/gpgme-config.in
++++ src/gpgme-config.in
 @@ -29,8 +29,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
  cflags_pth="@PTH_CFLAGS@"
  @HAVE_PTHREAD_TRUE@thread_modules="$thread_modules pthread"
 -libs_pthread="-lpthread"
 -cflags_pthread=""
 +libs_pthread="@PTHREAD_LIBS@"
 +cflags_pthread="@PTHREAD_CFLAGS@"
  # Configure glib.
  libs_glib="@GLIB_LIBS@"
 @@ -114,7 +114,7 @@ while test $# -gt 0; do
  	    ;;
  	--libs)
  	    if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
 -		output="$output -L$libdir"
 +		output="$output -Wl,-R$libdir -L$libdir"
  	    fi
  	    case "$thread_module" in
  		pthread)

 @@ -1,24 +1,14 @@
-$NetBSD: patch-ae,v 1.3 2006/07/19 22:59:59 wiz Exp $
+$NetBSD: patch-ae,v 1.4 2009/11/15 18:41:55 drochner Exp $
---- gpgme/engine-gpgsm.c.orig	2005-10-01 20:14:48.000000000 +0000
+--- src/engine-gpgsm.c.orig	2008-11-03 17:50:12.000000000 +0100
-+++ gpgme/engine-gpgsm.c
++++ src/engine-gpgsm.c
-@@ -30,6 +30,9 @@
+@@ -28,6 +28,9 @@
  #include <sys/types.h>
  #include <assert.h>
  #include <unistd.h>
 +#if HAVE_RFUNCS_H
 +#include <rfuncs.h>
 +#endif
  #include <locale.h>
  #include <fcntl.h> /* FIXME */
  #include <errno.h>
@@ -457,7 +460,8 @@ gpgsm_new (void **engine, const char *fi
    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;

 @@ -1,13 +1,13 @@
-$NetBSD: patch-aj,v 1.3 2007/03/23 20:04:13 drochner Exp $
+$NetBSD: patch-aj,v 1.4 2009/11/15 18:41:55 drochner Exp $
---- gpgme/Makefile.in.orig	2007-03-05 11:14:44.000000000 +0100
+--- src/Makefile.in.orig	2007-03-05 11:14:44.000000000 +0100
-+++ gpgme/Makefile.in
++++ src/Makefile.in
 @@ -438,7 +438,7 @@ libgpgme_pthread_la_DEPENDENCIES = $(ass
  	@LTLIBOBJS@ $(srcdir)/libgpgme.vers
  libgpgme_pthread_la_LIBADD = $(assuan_libobjs) @LTLIBOBJS@ \
 -	-lpthread @GPG_ERROR_LIBS@ @NETLIBS@
 +	$(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) @GPG_ERROR_LIBS@ @NETLIBS@
  libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \
  	$(libgpgme_version_script_cmd) -version-info \

 @@ -1,42 +1,42 @@
-$NetBSD: patch-af,v 1.5 2006/03/01 16:22:21 drochner Exp $
+$NetBSD: patch-af,v 1.6 2009/11/15 18:41:55 drochner Exp $
---- gpgme/get-env.c.orig	2004-12-07 21:47:40.000000000 +0100
+--- src/get-env.c.orig	2004-12-07 21:47:40.000000000 +0100
-+++ gpgme/get-env.c
++++ src/get-env.c
 @@ -22,6 +22,9 @@
  #include <config.h>
  #endif
  #include <stdlib.h>
 +#if HAVE_RFUNCS_H
 +#include <rfuncs.h>
 +#endif
  #include <errno.h>
  #include <string.h>
 @@ -53,7 +56,25 @@ _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];
 +  if (getenv_r (name, env_value, 256) < 0)
 +      *value = NULL;
 +  else
 +    {
 +      *value = strdup (env_value);
 +      if (!*value)
 +        errno = ENOMEM;
 +    }
 +  if (!*value && errno != ENOENT)
 +      return gpg_error_from_errno (errno);
 +  else
 +      return (0);
 +}
  #endif

 @@ -1,24 +1,24 @@
-$NetBSD: patch-ah,v 1.2 2006/07/19 22:59:59 wiz Exp $
+$NetBSD: patch-ah,v 1.3 2009/11/15 18:41:55 drochner Exp $
---- gpgme/error.c.orig	2005-09-08 14:42:31.000000000 +0000
+--- src/error.c.orig	2005-09-08 14:42:31.000000000 +0000
-+++ gpgme/error.c
++++ src/error.c
 @@ -22,6 +22,10 @@
  #include <config.h>
  #endif
 +#if HAVE_RFUNCS_H
 +#include <rfuncs.h>
 +#endif
++
  #include <gpgme.h>
  /* Return a pointer to a string containing a description of the error
 @@ -43,7 +47,7 @@ gpgme_strerror (gpgme_error_t err)
  int
  gpgme_strerror_r (gpg_error_t err, char *buf, size_t buflen)
+ {
 -  return gpg_strerror_r (err, buf, buflen);
 +  return strerror_r (err, buf, buflen);
+ }