Changes 0.5.7:

* Various build fixes, to make version info not say 0.5.5 any more.

Changes 0.5.6:
* Use libtool -export-symbols-regex instead of GNU ld script.
* Fix license with new FSF address.
* Test for socklen_t, needed for libgcrypt on some platforms.
* A few configure/build fixes.
* Don't use malloc.h.

6 files changed, 15 insertions, 60 deletions

diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 8dd336e3d5d..bb4c3370657 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:14 tv Exp $
-#
+# $NetBSD: Makefile,v 1.16 2005/08/30 14:28:46 adam Exp $
 
-DISTNAME=	opencdk-0.5.5
-PKGREVISION=	1
+DISTNAME=	opencdk-0.5.7
 CATEGORIES=	security devel
-MASTER_SITES=	ftp://ftp.gnutls.org/pub/gnutls/opencdk/
-EXTRACT_SUFX=	.tar.bz2
+MASTER_SITES=	http://josefsson.org/gnutls/releases/opencdk/ \
+		ftp://ftp.gnutls.org/pub/gnutls/opencdk/
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
@@ -13,8 +11,8 @@ COMMENT=	Open Crypto Development Kit
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_LIBTOOL=	YES
-GNU_CONFIGURE=	YES
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
 
 NOT_FOR_COMPILER=	xlc
 
@@ -34,5 +32,4 @@ pre-install:
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/libgcrypt/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/opencdk/distinfo b/security/opencdk/distinfo
index 671b3e94a3c..91b2c8d2b28 100644
--- a/security/opencdk/distinfo
+++ b/security/opencdk/distinfo
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/05/31 21:02:10 salo Exp $
+$NetBSD: distinfo,v 1.8 2005/08/30 14:28:46 adam Exp $
 
-SHA1 (opencdk-0.5.5.tar.bz2) = 376b93e03e680a92e6ce9a54c33b5d3273a1d86b
-RMD160 (opencdk-0.5.5.tar.bz2) = 98fe7ff1e2cc22c73098594e039a6b193cefa1b6
-Size (opencdk-0.5.5.tar.bz2) = 330280 bytes
-SHA1 (patch-aa) = 87e8bb1bc1ea6e840ab48707e30737e0fdbfee8d
-SHA1 (patch-ab) = ae0c6fdb0b86532b3187a042e60067665a327869
-SHA1 (patch-ac) = 3aac5e767b7160757c789fb7abe5126b45834a25
-SHA1 (patch-ad) = 2457132b22909aec179b869fd4280fbebc8dc7aa
+SHA1 (opencdk-0.5.7.tar.gz) = 0f90d87a7514baa3c8822c927f26023f2cb548bc
+RMD160 (opencdk-0.5.7.tar.gz) = d7f0e467c50cc97d5518963226fd656b21ef02b9
+Size (opencdk-0.5.7.tar.gz) = 479925 bytes
+SHA1 (patch-ad) = d1496f18b3b8eb3916bc592437afad9b3437ca86
diff --git a/security/opencdk/patches/patch-aa b/security/opencdk/patches/patch-aa
deleted file mode 100644
index cafb741f0e0..00000000000
--- a/security/opencdk/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2004/05/09 20:02:59 danw Exp $
-
---- src/encrypt.c.orig	Sat Mar 13 11:34:03 2004
-+++ src/encrypt.c
-@@ -24,7 +24,7 @@
- #endif
- #include <stdio.h>
- #include <stdarg.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <assert.h>
- 
- #include "opencdk.h"
diff --git a/security/opencdk/patches/patch-ab b/security/opencdk/patches/patch-ab
deleted file mode 100644
index 5a7cb19bcff..00000000000
--- a/security/opencdk/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2004/05/09 20:02:59 danw Exp $
-
---- src/main.c.orig	Sat Mar 13 11:34:08 2004
-+++ src/main.c
-@@ -24,7 +24,7 @@
- #endif
- #include <stdio.h>
- #include <errno.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #ifdef HAVE_PWD_H
- # include <pwd.h>
- #endif
diff --git a/security/opencdk/patches/patch-ac b/security/opencdk/patches/patch-ac
deleted file mode 100644
index 9681a478a76..00000000000
--- a/security/opencdk/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2004/05/09 20:02:59 danw Exp $
-
---- src/misc.c.orig	Sat Mar 13 11:34:11 2004
-+++ src/misc.c
-@@ -27,7 +27,7 @@
- #include <string.h>
- #include <ctype.h>
- #include <time.h>
--#include <malloc.h>
-+#include <stdlib.h>
- 
- #include "opencdk.h"
- #include "main.h"
diff --git a/security/opencdk/patches/patch-ad b/security/opencdk/patches/patch-ad
index 0647dbf82e7..45042a92ed9 100644
--- a/security/opencdk/patches/patch-ad
+++ b/security/opencdk/patches/patch-ad
@@ -1,10 +1,10 @@
-$NetBSD: patch-ad,v 1.1 2005/05/31 21:02:10 salo Exp $
+$NetBSD: patch-ad,v 1.2 2005/08/30 14:28:46 adam Exp $
 
---- src/keyserver.c.orig	2005-05-31 07:20:08.000000000 +0200
+--- src/keyserver.c.orig	2005-06-13 12:24:50.000000000 +0000
 +++ src/keyserver.c
-@@ -24,6 +24,7 @@
+@@ -27,6 +27,7 @@
+ # include <sys/types.h>
  #endif
- #include <stdio.h>
  #ifdef HAVE_NETDB_H
 +# include <sys/types.h>
  # include <sys/socket.h>