o Fix gpgsm support so that conditional WITH_GPGSM really works

o Bump PORTREVISION

PR:		52459
Submitted by:	Michael Nottebrock <michaelnottebrock@gmx.net>
Approved by:	maintainer

8 files changed, 96 insertions, 2 deletions

diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 1e73b84d0a9d..2150478d916e 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	0.3.15
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -18,7 +19,6 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-gpgsm
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/security/gpgme/files/patch-assuan::assuan-handler.c b/security/gpgme/files/patch-assuan::assuan-handler.c
new file mode 100644
index 000000000000..3c73877a6b13
--- /dev/null
+++ b/security/gpgme/files/patch-assuan::assuan-handler.c
@@ -0,0 +1,27 @@
+--- assuan/assuan-handler.c.orig	Thu Jan 30 07:58:09 2003
++++ assuan/assuan-handler.c	Thu Jan 30 07:58:27 2003
+@@ -29,6 +29,24 @@
+ #define digitp(a) ((a) >= '0' && (a) <= '9')
+ 
+ 
++#if !HAVE_FOPENCOOKIE
++/* Provide structure for our dummy replacement function.  Usually this
++   is defined in ../common/util.h but assuan should be self
++   contained. */
++/* Fixme: Remove fopencoookie :-(( */
++typedef struct
++{
++  ssize_t (*read)(void*,char*,size_t);
++  ssize_t (*write)(void*,const char*,size_t);
++  int (*seek)(void*,off_t*,int);
++  int (*close)(void*);
++} _IO_cookie_io_functions_t;
++typedef _IO_cookie_io_functions_t cookie_io_functions_t;
++FILE *fopencookie (void *cookie, const char *opentype,
++                   cookie_io_functions_t funclist);
++#endif /*!HAVE_FOPENCOOKIE*/
++
++
+ static int
+ dummy_handler (ASSUAN_CONTEXT ctx, char *line)
+ {
diff --git a/security/gpgme/files/patch-assuan::assuan-socket-connect.c b/security/gpgme/files/patch-assuan::assuan-socket-connect.c
new file mode 100644
index 000000000000..74acc38ea626
--- /dev/null
+++ b/security/gpgme/files/patch-assuan::assuan-socket-connect.c
@@ -0,0 +1,10 @@
+--- assuan/assuan-socket-connect.c.orig	Wed Jan 29 15:30:12 2003
++++ assuan/assuan-socket-connect.c	Wed Jan 29 15:30:28 2003
+@@ -23,6 +23,7 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/security/gpgme/files/patch-assuan::assuan-socket-server.c b/security/gpgme/files/patch-assuan::assuan-socket-server.c
new file mode 100644
index 000000000000..af8a39751c34
--- /dev/null
+++ b/security/gpgme/files/patch-assuan::assuan-socket-server.c
@@ -0,0 +1,10 @@
+--- assuan/assuan-socket-server.c.orig	Wed Jan 29 15:27:13 2003
++++ assuan/assuan-socket-server.c	Wed Jan 29 15:27:38 2003
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 1e73b84d0a9d..2150478d916e 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	0.3.15
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	gpgme
@@ -18,7 +19,6 @@ BUILD_DEPENDS=	gpg:${PORTSDIR}/security/gnupg
 LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
 
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--without-gpgsm
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
diff --git a/security/gpgme03/files/patch-assuan::assuan-handler.c b/security/gpgme03/files/patch-assuan::assuan-handler.c
new file mode 100644
index 000000000000..3c73877a6b13
--- /dev/null
+++ b/security/gpgme03/files/patch-assuan::assuan-handler.c
@@ -0,0 +1,27 @@
+--- assuan/assuan-handler.c.orig	Thu Jan 30 07:58:09 2003
++++ assuan/assuan-handler.c	Thu Jan 30 07:58:27 2003
+@@ -29,6 +29,24 @@
+ #define digitp(a) ((a) >= '0' && (a) <= '9')
+ 
+ 
++#if !HAVE_FOPENCOOKIE
++/* Provide structure for our dummy replacement function.  Usually this
++   is defined in ../common/util.h but assuan should be self
++   contained. */
++/* Fixme: Remove fopencoookie :-(( */
++typedef struct
++{
++  ssize_t (*read)(void*,char*,size_t);
++  ssize_t (*write)(void*,const char*,size_t);
++  int (*seek)(void*,off_t*,int);
++  int (*close)(void*);
++} _IO_cookie_io_functions_t;
++typedef _IO_cookie_io_functions_t cookie_io_functions_t;
++FILE *fopencookie (void *cookie, const char *opentype,
++                   cookie_io_functions_t funclist);
++#endif /*!HAVE_FOPENCOOKIE*/
++
++
+ static int
+ dummy_handler (ASSUAN_CONTEXT ctx, char *line)
+ {
diff --git a/security/gpgme03/files/patch-assuan::assuan-socket-connect.c b/security/gpgme03/files/patch-assuan::assuan-socket-connect.c
new file mode 100644
index 000000000000..74acc38ea626
--- /dev/null
+++ b/security/gpgme03/files/patch-assuan::assuan-socket-connect.c
@@ -0,0 +1,10 @@
+--- assuan/assuan-socket-connect.c.orig	Wed Jan 29 15:30:12 2003
++++ assuan/assuan-socket-connect.c	Wed Jan 29 15:30:28 2003
+@@ -23,6 +23,7 @@
+ #include <stddef.h>
+ #include <stdio.h>
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>
diff --git a/security/gpgme03/files/patch-assuan::assuan-socket-server.c b/security/gpgme03/files/patch-assuan::assuan-socket-server.c
new file mode 100644
index 000000000000..af8a39751c34
--- /dev/null
+++ b/security/gpgme03/files/patch-assuan::assuan-socket-server.c
@@ -0,0 +1,10 @@
+--- assuan/assuan-socket-server.c.orig	Wed Jan 29 15:27:13 2003
++++ assuan/assuan-socket-server.c	Wed Jan 29 15:27:38 2003
+@@ -22,6 +22,7 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <errno.h>
++#include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <unistd.h>