10 files changed, 27 insertions, 95 deletions
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 85ad06a86a7..596474d01c6 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,8 +1,7 @@
-# $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
-PKGREVISION=	2
+DISTNAME=	gpgme-1.1.8
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/gpgme/
 
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index 50d3eaf48d9..2e477684233 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -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
-RMD160 (gpgme-1.1.4.tar.gz) = 894fc39079addaf91d661ab5cf3d41b30454a873
-Size (gpgme-1.1.4.tar.gz) = 943219 bytes
-SHA1 (patch-aa) = ef43e7f40642a4b7a6d70bd381144c495ebc9345
+SHA1 (gpgme-1.1.8.tar.gz) = 5f119d57009f1b8682d7665ae985325d0885ec9b
+RMD160 (gpgme-1.1.8.tar.gz) = 6ee8856956cc8082fd19da457456b84d21d94841
+Size (gpgme-1.1.8.tar.gz) = 1085576 bytes
+SHA1 (patch-aa) = 4ef6915a2f8e062fcd2ffac83a4424c8897f734c
 SHA1 (patch-ab) = 1dced26dc46f89b601171574115b6e36a0b880fb
 SHA1 (patch-ac) = f10902e1f14f4d32443a591da5f4bb955895598e
-SHA1 (patch-ad) = 8da36b8f7b07873b5dc3a04c3cfe1dae65ecadce
-SHA1 (patch-ae) = f2b77e5f72ecae72f869afe968f77fb0f0d84c3f
-SHA1 (patch-af) = ac1d130c31c1893a7c70e84580b8b4464eb3954a
+SHA1 (patch-ae) = 19acb330da9bce61ab7aed0037fd3cc9d4e4efa4
+SHA1 (patch-af) = 99787938b677f291a84eae57fa29be60890f444b
 SHA1 (patch-ag) = 9d48fa3679f895d7395ef9e07ea294079ed89b17
-SHA1 (patch-ah) = 90bc8b33658ce3ce03fd3d7c015cfec53d0bd1d3
+SHA1 (patch-ah) = 84c9ad8c0c0e16584261cbb9c92e3073ce94da48
 SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5
-SHA1 (patch-aj) = fc2b13f8400c250493d9ac7583eb3e79e6175b0f
-SHA1 (patch-ak) = 1618e3ad2c1933ba019d966b83d3bd3aa5cc070a
+SHA1 (patch-aj) = 312c7f74b2fd092cbd24e94b3e3798702c8209a4
 SHA1 (patch-ba) = 0ab37246319860acb8b96679ac58c6b0ef01d3ed
 SHA1 (patch-bb) = b9e099f39a1cc88e45858ddc547be509692d44ca
-SHA1 (patch-bc) = 071a4df142ff789cd65f487e0bda763e2e5c74b0
diff --git a/security/gpgme/patches/patch-aa b/security/gpgme/patches/patch-aa
index 991b1016c12..c41cd7d2bed 100644
--- a/security/gpgme/patches/patch-aa
+++ b/security/gpgme/patches/patch-aa
@@ -1,7 +1,7 @@
-$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
-+++ gpgme/gpgme-config.in
+--- src/gpgme-config.in.orig	2007-01-26 06:28:37.000000000 +0100
++++ src/gpgme-config.in
 @@ -29,8 +29,8 @@ libs_pth="@PTH_LDFLAGS@ @PTH_LIBS@"
  cflags_pth="@PTH_CFLAGS@"
  
diff --git a/security/gpgme/patches/patch-ad b/security/gpgme/patches/patch-ad
deleted file mode 100644
index 688f57eba4f..00000000000
--- a/security/gpgme/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2007/03/25 00:48:08 joerg Exp $
-
---- gpgme/posix-io.c.orig	2007-03-25 00:25:10.000000000 +0000
-+++ gpgme/posix-io.c
-@@ -33,6 +33,7 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/wait.h>
-+#include <sys/uio.h>
- 
- #include "util.h"
- #include "priv-io.h"
diff --git a/security/gpgme/patches/patch-ae b/security/gpgme/patches/patch-ae
index 6e6814c43d4..bff6732ada6 100644
--- a/security/gpgme/patches/patch-ae
+++ b/security/gpgme/patches/patch-ae
@@ -1,8 +1,8 @@
-$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
-+++ gpgme/engine-gpgsm.c
-@@ -30,6 +30,9 @@
+--- src/engine-gpgsm.c.orig	2008-11-03 17:50:12.000000000 +0100
++++ src/engine-gpgsm.c
+@@ -28,6 +28,9 @@
  #include <sys/types.h>
  #include <assert.h>
  #include <unistd.h>
@@ -12,13 +12,3 @@ $NetBSD: patch-ae,v 1.3 2006/07/19 22:59:59 wiz Exp $
  #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;
diff --git a/security/gpgme/patches/patch-af b/security/gpgme/patches/patch-af
index 11779070d7e..74192f83bf7 100644
--- a/security/gpgme/patches/patch-af
+++ b/security/gpgme/patches/patch-af
@@ -1,7 +1,7 @@
-$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
-+++ gpgme/get-env.c
+--- src/get-env.c.orig	2004-12-07 21:47:40.000000000 +0100
++++ src/get-env.c
 @@ -22,6 +22,9 @@
  #include <config.h>
  #endif
diff --git a/security/gpgme/patches/patch-ah b/security/gpgme/patches/patch-ah
index 7e2d2c6ce82..436d23e688f 100644
--- a/security/gpgme/patches/patch-ah
+++ b/security/gpgme/patches/patch-ah
@@ -1,7 +1,7 @@
-$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
-+++ gpgme/error.c
+--- src/error.c.orig	2005-09-08 14:42:31.000000000 +0000
++++ src/error.c
 @@ -22,6 +22,10 @@
  #include <config.h>
  #endif
diff --git a/security/gpgme/patches/patch-aj b/security/gpgme/patches/patch-aj
index 5ac52c71903..41286299a91 100644
--- a/security/gpgme/patches/patch-aj
+++ b/security/gpgme/patches/patch-aj
@@ -1,7 +1,7 @@
-$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
-+++ gpgme/Makefile.in
+--- src/Makefile.in.orig	2007-03-05 11:14:44.000000000 +0100
++++ src/Makefile.in
 @@ -438,7 +438,7 @@ libgpgme_pthread_la_DEPENDENCIES = $(ass
  	@LTLIBOBJS@ $(srcdir)/libgpgme.vers
  
diff --git a/security/gpgme/patches/patch-ak b/security/gpgme/patches/patch-ak
deleted file mode 100644
index b8c47909485..00000000000
--- a/security/gpgme/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.1 2007/03/23 20:04:13 drochner Exp $
-
---- autogen.sh.orig	2007-03-06 18:12:50.000000000 +0100
-+++ autogen.sh
-@@ -31,7 +31,7 @@ check_version () {
- 
- DIE=no
- FORCE=
--if test "$1" == "--force"; then
-+if test "$1" = "--force"; then
-   FORCE=" --force"
-   shift
- fi
diff --git a/security/gpgme/patches/patch-bc b/security/gpgme/patches/patch-bc
deleted file mode 100644
index 85f339afa39..00000000000
--- a/security/gpgme/patches/patch-bc
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-bc,v 1.2 2007/03/23 20:04:13 drochner Exp $
-
---- assuan/Makefile.in.orig	2007-03-05 11:14:43.000000000 +0100
-+++ assuan/Makefile.in
-@@ -74,7 +74,7 @@ am_libassuan_la_OBJECTS = assuan-util.lo
- 	assuan-listen.lo assuan-connect.lo assuan-client.lo \
- 	assuan-pipe-server.lo assuan-socket-server.lo \
- 	assuan-pipe-connect.lo assuan-socket-connect.lo assuan-uds.lo \
--	funopen.lo assuan-io.lo assuan-logging.lo assuan-socket.lo
-+	assuan-io.lo assuan-logging.lo assuan-socket.lo
- libassuan_la_OBJECTS = $(am_libassuan_la_OBJECTS)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
-@@ -275,7 +275,6 @@ libassuan_la_SOURCES = \
- 	assuan-pipe-connect.c \
- 	assuan-socket-connect.c  \
- 	assuan-uds.c \
--	funopen.c \
- 	assuan-io.c \
- 	assuan-logging.c \
- 	assuan-socket.c
-@@ -348,7 +347,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-uds.Plo@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-util.Plo@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/funopen.Plo@am__quote@
- 
- .c.o:
- @am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \