From 10f2a435dce3442017cb96d33dd3217c90edfb6f Mon Sep 17 00:00:00 2001
From: ehaupt <ehaupt@FreeBSD.org>
Date: Fri, 3 May 2013 16:35:24 +0000
Subject: Update to 1.5.2

Changelog:
http://lists.gnupg.org/pipermail/gnupg-announce/2013q1/000324.html (1.5.1)
http://lists.gnupg.org/pipermail/gnupg-announce/2013q2/000325.html (1.5.2)

PR:             177100
Submitted by:   Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
---
 security/libgcrypt/Makefile                     | 20 ++++++++++----------
 security/libgcrypt/distinfo                     |  4 ++--
 security/libgcrypt/files/patch-src__gcrypt.h.in | 19 -------------------
 security/libgcrypt/pkg-plist                    | 13 +------------
 4 files changed, 13 insertions(+), 43 deletions(-)
 delete mode 100644 security/libgcrypt/files/patch-src__gcrypt.h.in

(limited to 'security')

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index 987acfc52138..c936662b48bb 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,12 +1,8 @@
-# New ports collection Makefile for:	libgcrypt
-# Date created:				July 17 2002
-# Whom:					Tilman Linneweh <arved@FreeBSD.org>
-#
+# Created by: Tilman Linneweh <arved@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	libgcrypt
-PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTVERSION=	1.5.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_GNUPG}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -27,9 +23,10 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 USE_LDCONFIG=	yes
 
-DOCS=	AUTHORS ChangeLog INSTALL NEWS README README.SVN \
-	THANKS TODO doc/HACKING doc/README.apichanges
-INFO=	gcrypt
+DOCS=		AUTHORS ChangeLog ChangeLog-2011 INSTALL NEWS README \
+		README.GIT THANKS TODO doc/HACKING doc/README.apichanges
+INFO=		gcrypt
+PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
@@ -55,10 +52,13 @@ post-patch:
 pre-configure:
 	@${RM} -f ${WRKSRC}/doc/gcrypt.info*
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
+regression-test: build
+	cd ${WRKSRC} && ${MAKE} check
+
 .include <bsd.port.post.mk>
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 379c35a9e1a4..fa273055dfb5 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgcrypt-1.5.0.tar.bz2) = 4b62fc516004940a0571025401a0581d49199f1a76dfb5ce6fd63f50db8173fa
-SIZE (libgcrypt-1.5.0.tar.bz2) = 1433506
+SHA256 (libgcrypt-1.5.2.tar.bz2) = e41a4339f50294f3c925f2f71aaf2427eb162d2994da91666dfc32621afe963f
+SIZE (libgcrypt-1.5.2.tar.bz2) = 1507418
diff --git a/security/libgcrypt/files/patch-src__gcrypt.h.in b/security/libgcrypt/files/patch-src__gcrypt.h.in
deleted file mode 100644
index 703cf84171e9..000000000000
--- a/security/libgcrypt/files/patch-src__gcrypt.h.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/gcrypt.h.in.orig	2012-08-08 07:35:27.000000000 -0400
-+++ ./src/gcrypt.h.in	2012-08-08 07:37:47.000000000 -0400
-@@ -1248,7 +1248,7 @@
-    number.  */
- gcry_error_t gcry_md_list (int *list, int *list_length);
- 
--
-+#if !defined(GCRYPT_NO_DEPRECATED) || defined(_GCRYPT_IN_LIBGCRYPT)
- /* Alternative interface for asymmetric cryptography.  This interface
-    is deprecated.  */
- 
-@@ -1401,6 +1401,7 @@
-   gcry_md_algo_t md;
- } gcry_ac_ssa_pkcs_v1_5_t _GCRY_ATTR_INTERNAL;
- 
-+#endif
- 
- #ifndef GCRYPT_NO_DEPRECATED
- /* Returns a new, empty data set in DATA.  */
diff --git a/security/libgcrypt/pkg-plist b/security/libgcrypt/pkg-plist
index 34992f390282..aa67d293bd7a 100644
--- a/security/libgcrypt/pkg-plist
+++ b/security/libgcrypt/pkg-plist
@@ -6,16 +6,5 @@ include/gcrypt-module.h
 lib/libgcrypt.a
 lib/libgcrypt.la
 lib/libgcrypt.so
-lib/libgcrypt.so.18
+lib/libgcrypt.so.19
 share/aclocal/libgcrypt.m4
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/HACKING
-%%PORTDOCS%%%%DOCSDIR%%/INSTALL
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.SVN
-%%PORTDOCS%%%%DOCSDIR%%/README.apichanges
-%%PORTDOCS%%%%DOCSDIR%%/THANKS
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-- 
cgit