Update to 0.6.1.

Package change: Fix opencdk-config and opencdk.pc.

Noteworthy changes in version 0.6.1 (2007-05-12)
------------------------------------------------

* The opencdk.def file is included in the distribution archive,
  fixes build failures on mingw32.

* Some bug fixes for the mingw32 build in combination with WINE.

* Now the decryption code uses the name in the literal packet
  for the output file whenever this is possible.

* Take care of absolute file names in literal packets.

4 files changed, 36 insertions, 7 deletions

diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 6aa57575313..e308400be1b 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.25 2007/06/05 05:35:19 wiz Exp $
+# $NetBSD: Makefile,v 1.26 2007/06/06 06:11:16 wiz Exp $
 
-DISTNAME=	opencdk-0.6.0
+DISTNAME=	opencdk-0.6.1
 CATEGORIES=	security devel
 MASTER_SITES=	http://josefsson.org/gnutls/releases/opencdk/ \
-		ftp://ftp.gnutls.org/pub/gnutls/opencdk/
+		ftp://ftp.gnutls.org/pub/gnutls/opencdk/ \
+		http://www.gnu.org/software/gnutls/releases/opencdk/
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnutls.org/
@@ -33,5 +35,6 @@ pre-install:
 	cd ${WRKSRC}/tests && ${INSTALL_DATA} *.gpg *.c ${DESTDIR}${EGDIR}
 
 .include "../../devel/zlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libgcrypt+=	libgcrypt>=1.2.2
 .include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/opencdk/distinfo b/security/opencdk/distinfo
index cc1d8fe0bbf..b3586d8d30a 100644
--- a/security/opencdk/distinfo
+++ b/security/opencdk/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.15 2007/06/05 05:35:20 wiz Exp $
+$NetBSD: distinfo,v 1.16 2007/06/06 06:11:16 wiz Exp $
 
-SHA1 (opencdk-0.6.0.tar.gz) = 40cffb5482d64a749e627ae7dd047a0c8f63366d
-RMD160 (opencdk-0.6.0.tar.gz) = 9b07ae5c022bf854ed8b9ef80bd65958779fee0b
-Size (opencdk-0.6.0.tar.gz) = 610395 bytes
+SHA1 (opencdk-0.6.1.tar.bz2) = 4f2ab4cf8104004a4c46bc27aeef9b5a438e5171
+RMD160 (opencdk-0.6.1.tar.bz2) = 6297b797e2df2d7f96bbf22813b8a5d1a71fac05
+Size (opencdk-0.6.1.tar.bz2) = 468452 bytes
+SHA1 (patch-aa) = d199fca6021f078e3d9a5075d3916b5c5b262a4e
+SHA1 (patch-ab) = 19829ded621e38db1500dd479d8747f297d2da13
diff --git a/security/opencdk/patches/patch-aa b/security/opencdk/patches/patch-aa
new file mode 100644
index 00000000000..7228f26e8a3
--- /dev/null
+++ b/security/opencdk/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.3 2007/06/06 06:11:16 wiz Exp $
+
+--- src/opencdk-config.in.orig	2007-04-15 11:05:34.000000000 +0000
++++ src/opencdk-config.in
+@@ -14,7 +14,7 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ exec_prefix_set=no
+ 
+-opencdk_libs="@LIBOPENCDK_LIBS@ @LTLIBZ@"
++opencdk_libs="@LIBOPENCDK_LIBS@"
+ opencdk_cflags="@LIBOPENCDK_CFLAGS@"
+ 
+ usage()
diff --git a/security/opencdk/patches/patch-ab b/security/opencdk/patches/patch-ab
new file mode 100644
index 00000000000..9f575d2a137
--- /dev/null
+++ b/security/opencdk/patches/patch-ab
@@ -0,0 +1,11 @@
+$NetBSD: patch-ab,v 1.3 2007/06/06 06:11:17 wiz Exp $
+
+--- src/opencdk.pc.in.orig	2006-08-07 06:27:48.000000000 +0000
++++ src/opencdk.pc.in
+@@ -19,5 +19,5 @@ Name: OpenCDK
+ Description: OpenCDK - Open Crypto Development Kit
+ Version: @VERSION@
+ Libs: -L${libdir} -lopencdk
+-Libs.private: @LIBOPENCDK_LIBS@  @LTLIBZ@
++Libs.private: @LIBOPENCDK_LIBS@
+ Cflags: -I${includedir}