Update gpgme to 1.1.2, chase dependencies.

7 files changed, 45 insertions, 38 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index d377b13d5c6..52c99da5263 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gpgme
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	1.1.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -42,6 +41,7 @@ PLIST_SUB+=	WITH_PTH='@comment '
 .endif
 
 post-patch:
+	@${REINPLACE_CMD} -e 's|EOF||g' ${WRKSRC}/assuan/assuan-errors.c
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 					${WRKSRC}/${CONFIGURE_SCRIPT} \
 					${WRKSRC}/gpgme/Makefile.in \
diff --git a/security/gpgme/distinfo b/security/gpgme/distinfo
index e7c610c4e2e..4ed9db0a3a6 100644
--- a/security/gpgme/distinfo
+++ b/security/gpgme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gpgme-1.0.3.tar.gz) = 4d33cbdf844fcee1c724e4cf2a32dd11
-SHA256 (gpgme-1.0.3.tar.gz) = 376796ba50ee251af63c1fe2aa17603aaac04b64527ba3bc89e4fa023322282f
-SIZE (gpgme-1.0.3.tar.gz) = 837866
+MD5 (gpgme-1.1.2.tar.gz) = c712ca39c3553573f15cd01e6edb8b68
+SHA256 (gpgme-1.1.2.tar.gz) = 644f7391887d9d63462d4137c21f333409ce0ccdd52daab9806a98ca6dfbecc5
+SIZE (gpgme-1.1.2.tar.gz) = 881432
diff --git a/security/gpgme/files/patch-assuan-Makefile.in b/security/gpgme/files/patch-assuan-Makefile.in
new file mode 100644
index 00000000000..bf43881aa66
--- /dev/null
+++ b/security/gpgme/files/patch-assuan-Makefile.in
@@ -0,0 +1,27 @@
+--- assuan/Makefile.in.orig	Wed Sep 13 16:14:57 2006
++++ assuan/Makefile.in	Wed Sep 13 16:15:11 2006
+@@ -74,7 +74,7 @@
+ 	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)
+@@ -273,7 +273,6 @@
+ 	assuan-pipe-connect.c \
+ 	assuan-socket-connect.c  \
+ 	assuan-socket.c \
+-	funopen.c \
+ 	assuan-io.c \
+ 	assuan-domain-connect.c \
+ 	assuan-domain-server.c \
+@@ -348,7 +347,6 @@
+ @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 $@ $<; \
diff --git a/security/gpgme/files/patch-assuan-assuan.h b/security/gpgme/files/patch-assuan-assuan.h
new file mode 100644
index 00000000000..b34e4b5ea7c
--- /dev/null
+++ b/security/gpgme/files/patch-assuan-assuan.h
@@ -0,0 +1,10 @@
+--- assuan/assuan.h.orig	Wed Sep 13 15:55:53 2006
++++ assuan/assuan.h	Wed Sep 13 15:56:59 2006
+@@ -23,6 +23,7 @@
+ 
+ #include <stdio.h>
+ #include <sys/types.h>
++#include <sys/socket.h>
+ #include <unistd.h>
+ 
+ 
diff --git a/security/gpgme/files/patch-configure b/security/gpgme/files/patch-configure
deleted file mode 100644
index f14d46e20fe..00000000000
--- a/security/gpgme/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	Tue Dec 28 12:35:39 2004
-+++ configure	Mon Aug  8 16:26:11 2005
-@@ -19723,7 +19723,6 @@
- #define HAVE_PTH
- _ACEOF
- 
--	  CFLAGS="$CFLAGS $PTH_CFLAGS"
- 	fi
- 	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
- echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-@@ -22575,7 +22574,7 @@
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
--eval "$as_ac_var=no"
-+eval "$as_ac_var=yes"
- fi
- rm -f conftest.err conftest.$ac_objext \
-       conftest$ac_exeext conftest.$ac_ext
diff --git a/security/gpgme/files/patch-gpgme-ath-pthread-compat.c b/security/gpgme/files/patch-gpgme-ath-pthread-compat.c
deleted file mode 100644
index 7fec8e8c55a..00000000000
--- a/security/gpgme/files/patch-gpgme-ath-pthread-compat.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gpgme/ath-pth-compat.c.orig	Tue Nov  1 10:25:41 2005
-+++ gpgme/ath-pth-compat.c	Tue Nov  1 10:25:55 2005
-@@ -20,7 +20,7 @@
- 
- #include <stdlib.h>
- #include <errno.h>
--#include <pth.h>
-+#include <pth/pth.h>
- 
- #include "ath.h"
- 
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index bb8b55eb666..bf9c32badaa 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -3,14 +3,14 @@ include/gpgme/gpgme.h
 %%WITH_PTH%%lib/libgpgme-pth.a
 %%WITH_PTH%%lib/libgpgme-pth.la
 %%WITH_PTH%%lib/libgpgme-pth.so
-%%WITH_PTH%%lib/libgpgme-pth.so.15
+%%WITH_PTH%%lib/libgpgme-pth.so.17
 lib/libgpgme-pthread.a
 lib/libgpgme-pthread.la
 lib/libgpgme-pthread.so
-lib/libgpgme-pthread.so.15
+lib/libgpgme-pthread.so.17
 lib/libgpgme.a
 lib/libgpgme.la
 lib/libgpgme.so
-lib/libgpgme.so.15
+lib/libgpgme.so.17
 share/aclocal/gpgme.m4
 @dirrm include/gpgme