Long overdue update to gpgme-1.3.1.

ok rpointel@ jasper@

security/gpgme/Makefile

@@ -1,32 +1,48 @@
-# $OpenBSD: Makefile,v 1.24 2010/11/26 07:51:00 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2011/08/30 06:43:07 ajacoutot Exp $
 
 COMMENT=		GnuPG Made Easy
 
-DISTNAME=		gpgme-1.1.5
-REVISION=		1
+DISTNAME=		gpgme-1.3.1
 CATEGORIES=     	security devel
-SHARED_LIBS=		gpgme-pthread	17.0 \
-			gpgme		17.0
+
+SHARED_LIBS +=  gpgme                18.0     # 19.0
+SHARED_LIBS +=  gpgme-pthread        18.0     # 19.0
 
 HOMEPAGE=		http://www.gnupg.org/gpgme.html
 
-# GPL
+# GPLv2 - LGPLv2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		pthread gpg-error
+
+WANTLIB += assuan gpg-error
 
 MASTER_SITES=		ftp://ftp.gnupg.org/gcrypt/gpgme/
+EXTRACT_SUFX=		.tar.bz2
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS=		--without-gpgsm
+CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
+			--with-gpg=${LOCALBASE}/bin/gpg \
+			--with-gpgsm=no \
+			--with-gpgconf=no \
+			--with-g13=no \
+			--without-pth \
+			--without-pth-test
 
 MODULES=		devel/gettext
 RUN_DEPENDS=		security/gnupg
 BUILD_DEPENDS=		${RUN_DEPENDS}
-LIB_DEPENDS=		security/libgpg-error>=1.4
+LIB_DEPENDS=		security/libgpg-error>=1.4 \
+			security/libassuan
+
+# needed for the regression tests
+USE_GMAKE=		Yes
 
 USE_LIBTOOL=		Yes
 
+pre-configure:
+	perl -pi -e 's,-lpthread,-pthread,g' \
+		${WRKSRC}/{configure,src/Makefile.in,src/gpgme-config.in}
+
 .include <bsd.port.mk>

security/gpgme/distinfo

@@ -1,5 +1,5 @@
-MD5 (gpgme-1.1.5.tar.gz) = TObWwOQXCg37pMBRRl8rMQ==
-RMD160 (gpgme-1.1.5.tar.gz) = VFIOC8rOzDN+M7kubaxtHO2KMK8=
-SHA1 (gpgme-1.1.5.tar.gz) = Qo0PruR1Ceac6VYg1QdVeSlsuIQ=
-SHA256 (gpgme-1.1.5.tar.gz) = T/sZ1pt8+ReSUvp/Cl8NuQZEFwJNomB3DZWdz3vDSSo=
-SIZE (gpgme-1.1.5.tar.gz) = 929270
+MD5 (gpgme-1.3.1.tar.bz2) = kK+oQ2zismg8AByCS9ImAQ==
+RMD160 (gpgme-1.3.1.tar.bz2) = lTVAabUV75qoDpciZF6QixDqbco=
+SHA1 (gpgme-1.3.1.tar.bz2) = fRmpWiI52hN2Ta1/l1Qb6ITsWjc=
+SHA256 (gpgme-1.3.1.tar.bz2) = Fe8nqHWuDXnXRG/ZMd7aEUOOck/76sdESe0Zy6I99NQ=
+SIZE (gpgme-1.3.1.tar.bz2) = 841093

security/gpgme/patches/patch-gpgme_posix-io_c

@@ -1,11 +0,0 @@
-$OpenBSD: patch-gpgme_posix-io_c,v 1.1 2007/12/16 22:20:52 simon Exp $
---- gpgme/posix-io.c.orig	Wed Aug 15 09:22:21 2007
-+++ gpgme/posix-io.c	Wed Aug 15 09:25:05 2007
-@@ -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"