Long due update to OpenCDK 0.6.6, based on a submission of Giovanni Bechis.

- reformat PLIST
- remove unneeded patches
- remove modgnu_ goo
ok kili@ okan@, tested by many

security/opencdk/Makefile

@@ -1,14 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2007/09/15 23:29:59 merdely Exp $
+# $OpenBSD: Makefile,v 1.10 2007/12/03 20:48:39 landry Exp $
 
 COMMENT=		Open Crypto Development Kit
 
-VERSION=		0.5.5
+VERSION=		0.6.6
 DISTNAME=		opencdk-${VERSION}
-PKGNAME=		${DISTNAME}p1
 CATEGORIES=		security
-SHARED_LIBS=		opencdk	8.1
+SHARED_LIBS=		opencdk	9.0	# .10.5
-MODGNU_SHARED_LIBS=	opencdk	''
-LIBopencdk_ALIAS=	realopencdk
 
 HOMEPAGE=		http://www.gnutls.org/
 
@@ -25,7 +22,7 @@ MASTER_SITES=	ftp://ftp.gnupg.org/gcrypt/alpha/gnutls/opencdk/ \
 		http://ftp.linux.it/pub/mirrors/gnupg/alpha/gnutls/opencdk/
 EXTRACT_SUFX=	.tar.bz2
 
-LIB_DEPENDS=	gcrypt.>=12::security/libgcrypt
+LIB_DEPENDS=	gcrypt.>=13::security/libgcrypt
 
 USE_LIBTOOL=	Yes
 

security/opencdk/distinfo

@@ -1,5 +1,5 @@
-MD5 (opencdk-0.5.5.tar.bz2) = qv9gEH8BU4cxkv/aAGmalg==
+MD5 (opencdk-0.6.6.tar.bz2) = gT1i16/nssLY898KbJ2TMQ==
-RMD160 (opencdk-0.5.5.tar.bz2) = mP5/8eLMIscwmFlOA5prGTzvobY=
+RMD160 (opencdk-0.6.6.tar.bz2) = IhkkFc2+gNX1M4p9JNkiXvMmVjk=
-SHA1 (opencdk-0.5.5.tar.bz2) = N2uT4D5oCpLmzppUwztdMnOh2Gs=
+SHA1 (opencdk-0.6.6.tar.bz2) = rTM6VWMuypt9A108xcfwsDQssU4=
-SHA256 (opencdk-0.5.5.tar.bz2) = UnIt+0ECUvrva2yMC4l87UR70oxYcnRtnPnEYEqF0I8=
+SHA256 (opencdk-0.6.6.tar.bz2) = 1/wKa/c2B5P2QwGghdcsYEyaolWrM6uOxY4+1i5RcEg=
-SIZE (opencdk-0.5.5.tar.bz2) = 330280
+SIZE (opencdk-0.6.6.tar.bz2) = 481904

security/opencdk/patches/patch-configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.2 2004/05/08 06:42:59 sturm Exp $
+$OpenBSD: patch-configure,v 1.3 2007/12/03 20:48:39 landry Exp $
---- configure.orig	2004-04-25 08:52:01.000000000 +0200
+--- configure.orig	Mon Jun 11 12:25:42 2007
-+++ configure	2004-04-25 08:54:16.000000000 +0200
++++ configure	Sat Sep 22 11:32:33 2007
-@@ -7329,12 +7329,12 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -8668,12 +8668,12 @@ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:
        else
         case $host_os in
  	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
@@ -16,7 +16,7 @@ $OpenBSD: patch-configure,v 1.2 2004/05/08 06:42:59 sturm Exp $
  	   ;;
         esac
        fi
-@@ -8003,6 +8003,8 @@ openbsd*)
+@@ -9371,6 +9371,8 @@ openbsd*)
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
    shlibpath_var=LD_LIBRARY_PATH

security/opencdk/patches/patch-src_Makefile_in

@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_Makefile_in,v 1.1 2005/12/25 11:15:34 sturm Exp $
---- src/Makefile.in.orig	Sun Dec 25 10:02:44 2005
-+++ src/Makefile.in	Sun Dec 25 10:03:05 2005
-@@ -225,8 +225,7 @@ EXTRA_DIST = opencdk-config.in opencdk.m
- AM_CPPFLAGS = $(LIBGCRYPT_CFLAGS)
- @HAVE_LD_VERSION_SCRIPT_FALSE@libopencdk_version_script_cmd = 
- @HAVE_LD_VERSION_SCRIPT_TRUE@libopencdk_version_script_cmd = -Wl,--version-script=$(srcdir)/libopencdk.vers
--libopencdk_la_LDFLAGS = -version-info \
--	@OPENCDK_LT_CURRENT@:@OPENCDK_LT_REVISION@:@OPENCDK_LT_AGE@ \
-+libopencdk_la_LDFLAGS = ${librealopencdk_la_LDFLAGS} \
- 	$(libopencdk_version_script_cmd)
- 
- libopencdk_la_SOURCES = \

security/opencdk/patches/patch-src_encrypt_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_encrypt_c,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
---- src/encrypt.c.orig	Wed Apr 30 20:40:06 2003
-+++ src/encrypt.c	Wed Apr 30 20:40:16 2003
-@@ -24,7 +24,7 @@
- #endif
- #include <stdio.h>
- #include <stdarg.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <assert.h>
- 
- #include "opencdk.h"

security/opencdk/patches/patch-src_keyserver_c

@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_keyserver_c,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
---- src/keyserver.c.orig	Wed Apr 30 18:12:13 2003
-+++ src/keyserver.c	Wed Apr 30 18:12:25 2003
-@@ -24,6 +24,7 @@
- #endif
- #include <stdio.h>
- #ifdef HAVE_NETDB_H
-+# include <sys/types.h>
- # include <sys/socket.h>
- # include <netinet/in.h>
- # include <arpa/inet.h>

security/opencdk/patches/patch-src_main_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_main_c,v 1.1.1.1 2003/05/02 04:01:25 margarida Exp $
---- src/main.c.orig	Wed Apr 30 20:40:20 2003
-+++ src/main.c	Wed Apr 30 20:40:29 2003
-@@ -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

security/opencdk/patches/patch-src_misc_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_misc_c,v 1.2 2004/05/08 06:42:59 sturm Exp $
---- src/misc.c.orig	2003-11-13 13:53:02.000000000 +0100
-+++ src/misc.c	2004-04-25 08:57:39.000000000 +0200
-@@ -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"

security/opencdk/patches/patch-tests_t-stream_c

@@ -1,20 +0,0 @@
-$OpenBSD: patch-tests_t-stream_c,v 1.2 2004/05/08 06:42:59 sturm Exp $
---- tests/t-stream.c.orig	2003-10-31 08:11:49.000000000 +0100
-+++ tests/t-stream.c	2004-04-25 08:57:39.000000000 +0200
-@@ -20,6 +20,7 @@
- 
- #include <stdio.h>
- #include <sys/stat.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <errno.h>
- #include <time.h>
-@@ -289,7 +290,7 @@ get_sig_time (unsigned long timestamp)
-   static char buf[128];
-   struct tm * tmbuf;
-   
--  tmbuf = localtime (&timestamp);
-+  tmbuf = localtime ((const time_t *)&timestamp);
-   sprintf (buf, "%04d-%02d-%02d",
-            tmbuf->tm_year+1900, tmbuf->tm_mon+1, tmbuf->tm_mday);
-   return buf;

security/opencdk/pkg/DESCR

@@ -1,7 +1,6 @@
-OpenCDK (Open Crypto Development Kit) provides basic parts 
+OpenCDK (Open Crypto Development Kit) provides basic parts of the
-of the OpenPGP message format. The aim of the library is 
+OpenPGP message format. The aim of the library is *not* to replace any
-*not* to replace any available OpenPGP version. There will be 
+available OpenPGP version. There will be no real support for key
-no real support for key management (sign, revoke, alter 
+management (sign, revoke, alter preferences, etc) and some other parts
-preferences, etc) and some other parts are only rudimentary
+are only rudimentary available. The main purpose is to handle and
-available. The main purpose is to handle and understand 
+understand OpenPGP packets and to use basic operations.
-OpenPGP packets and to use basic operations.

security/opencdk/pkg/PLIST

@@ -1,17 +1,32 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:36:01 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2007/12/03 20:48:39 landry Exp $
 bin/opencdk-config
 include/opencdk.h
 lib/libopencdk.a
 lib/libopencdk.la
+lib/pkgconfig/
+lib/pkgconfig/opencdk.pc
 share/doc/opencdk/
 share/doc/opencdk/README
 share/doc/opencdk/opencdk-api.html
 share/examples/opencdk/
-share/examples/opencdk/minpg.c
+share/examples/opencdk/basic.c
+share/examples/opencdk/exp-key.gpg
+share/examples/opencdk/newkey.gpg
+share/examples/opencdk/photo-key.gpg
+share/examples/opencdk/plain-test-pubenc-part.gpg
+share/examples/opencdk/plain-test-sym.gpg
+share/examples/opencdk/plain-test.gpg
+share/examples/opencdk/pub-asc.gpg
 share/examples/opencdk/pub.gpg
 share/examples/opencdk/sec-with-pwd.gpg
 share/examples/opencdk/sec.gpg
+share/examples/opencdk/t-encr.c
+share/examples/opencdk/t-key.c
+share/examples/opencdk/t-keydb.c
+share/examples/opencdk/t-misc.c
+share/examples/opencdk/t-sign.c
 share/examples/opencdk/t-stream.c
+share/examples/opencdk/testpa.c
 share/examples/opencdk/ts.gpg
 share/examples/opencdk/wkold.gpg
 %%SHARED%%