Changes 1.2.0

 * First stable release.

Changes 1.1.94
 * The support for multi-threaded users goes into its third
   incarnation.  We removed compile time support for thread libraries.
   To support the thread library of your choice, you have to set up
   callback handlers at initialization time.  New data structures, a
   new control command, and default initializers are provided for this
   purpose.

 * Interface changes relative to the 1.1.93 release:
libgcrypt-config --thread       OBSOLETE
libgcrypt-pth.la                REMOVED
libgcrypt-pthread.la            REMOVED
GCRYCTL_SET_THREAD_CBS          NEW
struct gcrypt_thread_cbs        NEW
enum gcry_thread_option         NEW
GCRY_THREAD_OPTION_PTH_IMPL     NEW
GCRY_THREAD_OPTION_PTHREAD_IMPL NEW

Changes 1.1.93
 * The automatic thread library detection has finally been removed.
   From now on, only linking explicitely to libgcrypt, libgcrypt-pth
   or libgcrypt-pthread is supported.

4 files changed, 21 insertions, 37 deletions

diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index b6db1f1baf2..dbbd238edfd 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.16 2004/04/29 15:03:47 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.17 2004/05/22 10:07:48 adam Exp $
 
-DISTNAME=	libgcrypt-1.1.92
+DISTNAME=	libgcrypt-1.2.0
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/alpha/libgcrypt/ \
 		http://gd.tuwien.ac.at/privacy/gnupg/alpha/libgcrypt/
@@ -12,11 +11,9 @@ COMMENT=	GNU cryptographic library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_BUILDLINK3=	YES
-USE_LIBTOOL=	YES
-GNU_CONFIGURE=	YES
-
-CONFIGURE_ARGS+=	--without-pth-test
+USE_BUILDLINK3=		YES
+USE_LIBTOOL=		YES
+GNU_CONFIGURE=		YES
 
 TEST_TARGET=	check
 
@@ -32,9 +29,4 @@ CONFIGURE_ARGS+=	--disable-asm
 
 .include "../../security/libgpg-error/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-
-.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "native")
-CONFIGURE_ARGS+=	--without-pth
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libgcrypt/PLIST b/security/libgcrypt/PLIST
index 5dc75ce97c1..0251cf99260 100644
--- a/security/libgcrypt/PLIST
+++ b/security/libgcrypt/PLIST
@@ -1,15 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2004/02/25 15:51:51 minskim Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/05/22 10:07:48 adam Exp $
 bin/libgcrypt-config
 include/gcrypt-module.h
 include/gcrypt.h
-lib/libgcrypt-pthread.a
-lib/libgcrypt-pthread.la
-lib/libgcrypt-pthread.so
-lib/libgcrypt-pthread.so.11
-lib/libgcrypt-pthread.so.11.0
 lib/libgcrypt.a
 lib/libgcrypt.la
 lib/libgcrypt.so
-lib/libgcrypt.so.11
-lib/libgcrypt.so.11.0
+lib/libgcrypt.so.12
+lib/libgcrypt.so.12.1
 share/aclocal/libgcrypt.m4
diff --git a/security/libgcrypt/distinfo b/security/libgcrypt/distinfo
index 681a82129e9..577e07a19f9 100644
--- a/security/libgcrypt/distinfo
+++ b/security/libgcrypt/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/02/25 21:53:17 minskim Exp $
+$NetBSD: distinfo,v 1.7 2004/05/22 10:07:48 adam Exp $
 
-SHA1 (libgcrypt-1.1.92.tar.gz) = 30bbc674bf965ca29142074c5cf4cdd80a0a7ea1
-Size (libgcrypt-1.1.92.tar.gz) = 847112 bytes
-SHA1 (patch-aa) = 2fbc83cf914b4167566b0dbaa4504cc4019d416d
+SHA1 (libgcrypt-1.2.0.tar.gz) = 3785a47abcb1c15079b18c5df47a474dfe647ec2
+Size (libgcrypt-1.2.0.tar.gz) = 949159 bytes
+SHA1 (patch-aa) = d8f659e4aac872abb152252731fd29bdaac635e3
diff --git a/security/libgcrypt/patches/patch-aa b/security/libgcrypt/patches/patch-aa
index 68c3c3bdc0a..86a38bcee47 100644
--- a/security/libgcrypt/patches/patch-aa
+++ b/security/libgcrypt/patches/patch-aa
@@ -1,16 +1,13 @@
-$NetBSD: patch-aa,v 1.4 2004/02/25 15:51:51 minskim Exp $
+$NetBSD: patch-aa,v 1.5 2004/05/22 10:07:48 adam Exp $
 
---- src/libgcrypt-config.in.orig	2004-02-18 12:33:53.000000000 -0600
+--- src/libgcrypt-config.in.orig	Mon Mar 29 10:49:19 2004
 +++ src/libgcrypt-config.in
-@@ -158,9 +158,9 @@ if test "$echo_libs" = "yes"; then
+@@ -139,7 +139,7 @@ if test "$echo_libs" = "yes"; then
  
      # Set up `libdirs'.
-     if test "@libdir@" != "/usr/lib" ; then
--	libdirs="-L@libdir@"
-+	libdirs="-L@libdir@ -Wl,-R@libdir@"
- 	for i in $libs ; do
--	    if test "$i" = "-L@libdir@" ; then
-+	    if test "$i" = "-L@libdir@ -Wl,-R@libdir@" ; then
- 		libdirs=""
- 	    fi
- 	done
+     if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/lib"; then
+-	libdirs="-L$libdir"
++	libdirs="-L$libdir -Wl,-R@libdir@"
+     fi
+ 
+     # Set up `libs_final'.