Fix gpgsm option so that it builds and works.

5 files changed, 57 insertions, 2 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 673971ee8fb..072066ac186 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2006/10/04 21:58:13 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2006/10/20 15:25:22 shannonjr Exp $
 #
 
 DISTNAME=	gpgme-1.1.0
@@ -35,6 +35,7 @@ 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
 
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index d9899dc16db..435517168ee 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.23 2006/07/19 22:59:59 wiz Exp $
+$NetBSD: distinfo,v 1.24 2006/10/20 15:25:22 shannonjr Exp $
 
 SHA1 (gpgme-1.1.0.tar.gz) = 2b4f6a8eb4bbc3bc8ad049840c8cbe695ad379f9
 RMD160 (gpgme-1.1.0.tar.gz) = f29903597e74ae637001a73ba9ae4cfd20802bf2
@@ -12,3 +12,6 @@ SHA1 (patch-ag) = b499aba9894e24470b7ebb60643a3db5d36b7fd5
 SHA1 (patch-ah) = 90bc8b33658ce3ce03fd3d7c015cfec53d0bd1d3
 SHA1 (patch-ai) = 290f5ff4375dd0e9c4ba09747357b335784daab5
 SHA1 (patch-aj) = 4568d37ebca320ebb87da83000a98b2891ee9bec
+SHA1 (patch-ba) = de6c60af5e3ad426d51695a99d320f10528d2d7d
+SHA1 (patch-bb) = b9e099f39a1cc88e45858ddc547be509692d44ca
+SHA1 (patch-bc) = af66585e1b0c3eb8bbf7c319d08c307fff5aaa62
diff --git a/security/gpgme/patches/patch-ba b/security/gpgme/patches/patch-ba
new file mode 100644
index 00000000000..483734df1c8
--- /dev/null
+++ b/security/gpgme/patches/patch-ba
@@ -0,0 +1,13 @@
+$NetBSD: patch-ba,v 1.3 2006/10/20 15:25:22 shannonjr Exp $
+
+--- assuan/assuan.h.orig	2005-10-01 14:14:48.000000000 -0600
++++ assuan/assuan.h
+@@ -24,6 +24,8 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
++#include <sys/time.h>
++#include <sys/socket.h>
+ 
+ 
+ /* To use this file with libraries the following macros are often
diff --git a/security/gpgme/patches/patch-bb b/security/gpgme/patches/patch-bb
new file mode 100644
index 00000000000..866a138456f
--- /dev/null
+++ b/security/gpgme/patches/patch-bb
@@ -0,0 +1,9 @@
+$NetBSD: patch-bb,v 1.1 2006/10/20 15:25:22 shannonjr Exp $
+
+--- assuan/assuan-errors.c.orig	2005-10-01 15:15:12.000000000 -0600
++++ assuan/assuan-errors.c
+@@ -107,4 +107,3 @@ assuan_strerror (AssuanError err)
+ 
+   return s;
+ }
+-
diff --git a/security/gpgme/patches/patch-bc b/security/gpgme/patches/patch-bc
new file mode 100644
index 00000000000..58a535f07e9
--- /dev/null
+++ b/security/gpgme/patches/patch-bc
@@ -0,0 +1,29 @@
+$NetBSD: patch-bc,v 1.1 2006/10/20 15:25:22 shannonjr Exp $
+
+--- assuan/Makefile.in.orig	2005-10-01 15:13:44.000000000 -0600
++++ 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-socket.lo funopen.lo assuan-io.lo \
++	assuan-socket.lo assuan-io.lo \
+ 	assuan-domain-connect.lo assuan-domain-server.lo \
+ 	assuan-logging.lo
+ libassuan_la_OBJECTS = $(am_libassuan_la_OBJECTS)
+@@ -260,7 +260,6 @@ libassuan_la_SOURCES = \
+ 	assuan-pipe-connect.c \
+ 	assuan-socket-connect.c  \
+ 	assuan-socket.c \
+-	funopen.c \
+ 	assuan-io.c \
+ 	assuan-domain-connect.c \
+ 	assuan-domain-server.c \
+@@ -335,7 +334,6 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket-server.Plo@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/assuan-socket.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 $@ $<; \