Update to new stable branch: 1.5.0 (compatible with 1.4).

security/libgcrypt/Makefile

@@ -1,11 +1,10 @@
-# $OpenBSD: Makefile,v 1.23 2011/07/07 17:18:11 jasper Exp $
+# $OpenBSD: Makefile,v 1.24 2012/04/04 06:59:23 ajacoutot Exp $
 
 COMMENT=		crypto library based on code used in GnuPG
 
-DISTNAME=		libgcrypt-1.4.6
+DISTNAME=		libgcrypt-1.5.0
 CATEGORIES=		security
-SHARED_LIBS=		gcrypt	15.0 # .17.0
-REVISION=		1
+SHARED_LIBS +=  gcrypt               18.0     # 18.0
 
 HOMEPAGE=		http://www.gnupg.org/
 
@@ -22,7 +21,7 @@ MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/libgcrypt/ \
 		http://ftp.linux.it/pub/mirrors/gnupg/libgcrypt/
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		security/libgpg-error>=1.9
+LIB_DEPENDS=		security/libgpg-error
 
 WANTLIB=		c gpg-error
 

security/libgcrypt/distinfo

@@ -1,5 +1,5 @@
-MD5 (libgcrypt-1.4.6.tar.gz) = v9RZIu77iiTVmK93NmIg1A==
-RMD160 (libgcrypt-1.4.6.tar.gz) = ynj1tIa7iRSNdf1NGuZXpT9fWfg=
-SHA1 (libgcrypt-1.4.6.tar.gz) = 2+P+4KnuqBKKHkfJc+D0MqYr+qI=
-SHA256 (libgcrypt-1.4.6.tar.gz) = mW0odGQzGMnfg1d3A0qLepI9PNC+5ZO6sXgDBfnehy0=
-SIZE (libgcrypt-1.4.6.tar.gz) = 1424076
+MD5 (libgcrypt-1.5.0.tar.gz) = ePj4vsRYD3WyWBb3iW0DiQ==
+RMD160 (libgcrypt-1.5.0.tar.gz) = KlbBzkpT25S8BgUTsGrMEWdBA8M=
+SHA1 (libgcrypt-1.5.0.tar.gz) = 5lCDFbdurz0N9FP2c3GxBmVL1P4=
+SHA256 (libgcrypt-1.5.0.tar.gz) = zJix9kya47AYUJnO9KxsQ2qEkJXt+H80FX8LsQ4YeZA=
+SIZE (libgcrypt-1.5.0.tar.gz) = 1738282

security/libgcrypt/patches/patch-src_gcrypt_h_in

@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_gcrypt_h_in,v 1.2 2010/07/27 21:45:47 ajacoutot Exp $
-
-gcc-3.3.5 workaround: g++ doesn't understand attributes on enums.
-
---- src/gcrypt.h.in.orig	Tue Jul 13 16:01:50 2010
-+++ src/gcrypt.h.in	Tue Jul 27 23:29:17 2010
-@@ -180,7 +180,7 @@ gcry_err_code_t gcry_error_from_errno (int err);
- enum gcry_thread_option
-   {
-     _GCRY_THREAD_OPTION_DUMMY
--  } _GCRY_GCC_ATTR_DEPRECATED;
-+  };
- 
- 
- /* Constants defining the thread model to use.  Used with the OPTION