opencl -> botan

upgrade botan to 0.9.2

12 files changed, 154 insertions, 387 deletions

diff --git a/security/Makefile b/security/Makefile
index ef9bb66..b9fcbf1 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -18,6 +18,7 @@
     SUBDIR += bfbtester
     SUBDIR += bjorb
     SUBDIR += borzoi
+    SUBDIR += botan
     SUBDIR += bro
     SUBDIR += bugs
     SUBDIR += ca-roots
@@ -123,7 +124,6 @@
     SUBDIR += nss
     SUBDIR += oidentd
     SUBDIR += op
-    SUBDIR += opencl
     SUBDIR += openssh
     SUBDIR += openssh-askpass
     SUBDIR += openssh-portable
diff --git a/security/botan/Makefile b/security/botan/Makefile
index 4cc606f..38951d9 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -1,23 +1,22 @@
 # ex:ts=8
-# New ports collection makefile for:	opencl
+# New ports collection makefile for:	botan
 # Date created:			Mar 3, 2001
 # Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	opencl
-PORTVERSION=	0.8.7
+PORTNAME=	botan
+PORTVERSION=	0.9.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	OpenCL-${PORTVERSION}
+MASTER_SITE_SUBDIR=	opencl
+DISTNAME=	Botan-${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_REINPLACE=	yes
-USE_NEWGCC=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.pl
 CONFIGURE_ARGS=	gcc-freebsd-generic
diff --git a/security/botan/distinfo b/security/botan/distinfo
index b7f6048..32b1d37 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1 +1 @@
-MD5 (OpenCL-0.8.7.tgz) = ad99b9e5f38ce8d19965adcf29316554
+MD5 (Botan-0.9.2.tgz) = 9e0fbb11de20a22c998c46568c2ddb6a
diff --git a/security/botan/pkg-descr b/security/botan/pkg-descr
index 4049472..2962b53 100644
--- a/security/botan/pkg-descr
+++ b/security/botan/pkg-descr
@@ -1,5 +1,5 @@
-OpenCL aims to be a portable, easy to use, and efficient C++ crypto
-library. It currently supports the following algorithms: 
+Botan (formerly OpenCL) aims to be a portable, easy to use, and efficient
+C++ crypto library. It currently supports the following algorithms:
 
     Public Key Algorithms: RSA
     Block Ciphers: Blowfish, CAST256, CAST5, CS-Cipher, DES, GOST, IDEA,
diff --git a/security/botan/pkg-plist b/security/botan/pkg-plist
index f07f7b4..19c66588 100644
--- a/security/botan/pkg-plist
+++ b/security/botan/pkg-plist
@@ -1,140 +1,145 @@
-include/opencl/adler32.h
-include/opencl/allocate.h
-include/opencl/arc4.h
-include/opencl/barrett.h
-include/opencl/base.h
-include/opencl/base64.h
-include/opencl/bigint.h
-include/opencl/blowfish.h
-include/opencl/buf_filt.h
-include/opencl/cast128.h
-include/opencl/cast256.h
-include/opencl/cbc.h
-include/opencl/cfb.h
-include/opencl/chain.h
-include/opencl/config.h
-include/opencl/crc24.h
-include/opencl/crc32.h
-include/opencl/cscipher.h
-include/opencl/cts.h
-include/opencl/defalloc.h
-include/opencl/des.h
-include/opencl/desx.h
-include/opencl/dh.h
-include/opencl/dl_parm.h
-include/opencl/dsa.h
-include/opencl/ecb.h
-include/opencl/emac.h
-include/opencl/eme1.h
-include/opencl/emsa1.h
-include/opencl/emsa2.h
-include/opencl/emsa3.h
-include/opencl/emsa4.h
-include/opencl/emsa_raw.h
-include/opencl/es_file.h
-include/opencl/exceptn.h
-include/opencl/filter.h
-include/opencl/filters.h
-include/opencl/fork.h
-include/opencl/fused.h
-include/opencl/gost.h
-include/opencl/hash_id.h
-include/opencl/haval.h
-include/opencl/hex.h
-include/opencl/hmac.h
-include/opencl/idea.h
-include/opencl/init.h
-include/opencl/isaac.h
-include/opencl/kdf1.h
-include/opencl/kdf2.h
-include/opencl/key_filt.h
-include/opencl/lion.h
-include/opencl/look_add.h
-include/opencl/look_pk.h
-include/opencl/lookup.h
-include/opencl/lubyrack.h
-include/opencl/manalloc.h
-include/opencl/md2.h
-include/opencl/md4.h
-include/opencl/md5.h
-include/opencl/md5mac.h
-include/opencl/mdx_hash.h
-include/opencl/mgf1.h
-include/opencl/mil_rab.h
-include/opencl/misty1.h
-include/opencl/mod_exp.h
-include/opencl/mode_pad.h
-include/opencl/modebase.h
-include/opencl/mp_core.h
-include/opencl/mp_types.h
-include/opencl/mutex.h
-include/opencl/mux_def.h
-include/opencl/nr.h
-include/opencl/numthry.h
-include/opencl/ofb.h
-include/opencl/opencl.h
-include/opencl/par_hash.h
-include/opencl/pgp_s2k.h
-include/opencl/pipe.h
-include/opencl/pk_filts.h
-include/opencl/pk_keys.h
-include/opencl/pk_misc.h
-include/opencl/pkcs1.h
-include/opencl/primes.h
-include/opencl/pubkey.h
-include/opencl/randpool.h
-include/opencl/rc2.h
-include/opencl/rc5.h
-include/opencl/rc6.h
-include/opencl/reducer.h
-include/opencl/rijndael.h
-include/opencl/rmd128.h
-include/opencl/rmd160.h
-include/opencl/rng.h
-include/opencl/rsa.h
-include/opencl/rw.h
-include/opencl/s2k.h
-include/opencl/safer_sk.h
-include/opencl/seal.h
-include/opencl/secalloc.h
-include/opencl/secmem.h
-include/opencl/serpent.h
-include/opencl/sha1.h
-include/opencl/sha256.h
-include/opencl/sha384.h  
-include/opencl/sha512.h
-include/opencl/shark.h
-include/opencl/skipjack.h
-include/opencl/square.h
-include/opencl/symkey.h
-include/opencl/tea.h
-include/opencl/threeway.h
-include/opencl/tiger.h
-include/opencl/timers.h
-include/opencl/tm_def.h
-include/opencl/twofish.h
-include/opencl/types.h
-include/opencl/util.h
-include/opencl/version.h
-include/opencl/x917_rng.h
-include/opencl/x919_mac.h
-include/opencl/xtea.h
-@dirrm include/opencl
-lib/libopencl.a
-lib/libopencl-%%PORTVERSION%%.so
-lib/libopencl-0.8.so
-lib/libopencl-0.so
-lib/libopencl.so
-share/doc/OpenCL-%%PORTVERSION%%/authors.txt
-share/doc/OpenCL-%%PORTVERSION%%/bugs.txt
-share/doc/OpenCL-%%PORTVERSION%%/deprecated.txt
-share/doc/OpenCL-%%PORTVERSION%%/indent.el
-share/doc/OpenCL-%%PORTVERSION%%/license.txt
-share/doc/OpenCL-%%PORTVERSION%%/log.txt
-share/doc/OpenCL-%%PORTVERSION%%/opencl.ps
-share/doc/OpenCL-%%PORTVERSION%%/opencl.tex
-share/doc/OpenCL-%%PORTVERSION%%/pgpkeys.asc
-share/doc/OpenCL-%%PORTVERSION%%/readme.txt
-share/doc/OpenCL-%%PORTVERSION%%/thanks.txt
-share/doc/OpenCL-%%PORTVERSION%%/todo.txt
-@dirrm share/doc/OpenCL-%%PORTVERSION%%
+include/botan/adler32.h
+include/botan/allocate.h
+include/botan/arc4.h
+include/botan/barrett.h
+include/botan/base.h
+include/botan/base64.h
+include/botan/bigint.h
+include/botan/blowfish.h
+include/botan/botan
+include/botan/botan.h
+include/botan/buf_filt.h
+include/botan/cast128.h
+include/botan/cast256.h
+include/botan/cbc.h
+include/botan/cfb.h
+include/botan/chain.h
+include/botan/config.h
+include/botan/crc24.h
+include/botan/crc32.h
+include/botan/cscipher.h
+include/botan/ctr.h
+include/botan/cts.h
+include/botan/defalloc.h
+include/botan/des.h
+include/botan/desx.h
+include/botan/dh.h
+include/botan/dl_parm.h
+include/botan/dsa.h
+include/botan/ecb.h
+include/botan/elgamal.h
+include/botan/emac.h
+include/botan/eme1.h
+include/botan/eme_pkcs.h
+include/botan/emsa1.h
+include/botan/emsa2.h
+include/botan/emsa3.h
+include/botan/emsa4.h
+include/botan/emsa_raw.h
+include/botan/es_file.h
+include/botan/exceptn.h
+include/botan/filter.h
+include/botan/filters.h
+include/botan/fork.h
+include/botan/gost.h
+include/botan/hash_id.h
+include/botan/haval.h
+include/botan/hex.h
+include/botan/hmac.h
+include/botan/idea.h
+include/botan/init.h
+include/botan/isaac.h
+include/botan/kdf1.h
+include/botan/kdf2.h
+include/botan/key_filt.h
+include/botan/lion.h
+include/botan/look_add.h
+include/botan/look_pk.h
+include/botan/lookup.h
+include/botan/lubyrack.h
+include/botan/manalloc.h
+include/botan/md2.h
+include/botan/md4.h
+include/botan/md5.h
+include/botan/md5mac.h
+include/botan/mdx_hash.h
+include/botan/mgf1.h
+include/botan/mil_rab.h
+include/botan/misty1.h
+include/botan/mod_exp.h
+include/botan/mode_pad.h
+include/botan/modebase.h
+include/botan/mp_core.h
+include/botan/mp_types.h
+include/botan/mutex.h
+include/botan/mux_def.h
+include/botan/nr.h
+include/botan/numthry.h
+include/botan/ofb.h
+include/botan/opencl.h
+include/botan/par_hash.h
+include/botan/pgp_s2k.h
+include/botan/pipe.h
+include/botan/pk_filts.h
+include/botan/pk_keys.h
+include/botan/pk_misc.h
+include/botan/primes.h
+include/botan/pubkey.h
+include/botan/randpool.h
+include/botan/rc2.h
+include/botan/rc5.h
+include/botan/rc6.h
+include/botan/reducer.h
+include/botan/rijndael.h
+include/botan/rmd128.h
+include/botan/rmd160.h
+include/botan/rng.h
+include/botan/rsa.h
+include/botan/rw.h
+include/botan/s2k.h
+include/botan/safer_sk.h
+include/botan/seal.h
+include/botan/seal_gam.h
+include/botan/secalloc.h
+include/botan/secmem.h
+include/botan/secqueue.h
+include/botan/serpent.h
+include/botan/sha1.h
+include/botan/sha256.h
+include/botan/sha384.h  
+include/botan/sha512.h
+include/botan/shark.h
+include/botan/skipjack.h
+include/botan/square.h
+include/botan/symkey.h
+include/botan/tea.h
+include/botan/threeway.h
+include/botan/tiger.h
+include/botan/timers.h
+include/botan/twofish.h
+include/botan/types.h
+include/botan/util.h
+include/botan/version.h
+include/botan/whrlpool.h
+include/botan/x917_rng.h
+include/botan/x919_mac.h
+include/botan/xtea.h
+@dirrm include/botan
+lib/libbotan.a
+lib/libbotan-%%PORTVERSION%%.so
+lib/libbotan-0.9.so
+lib/libbotan-0.so
+lib/libbotan.so
+share/doc/botan-%%PORTVERSION%%/api.ps
+share/doc/botan-%%PORTVERSION%%/api.tex
+share/doc/botan-%%PORTVERSION%%/authors.txt
+share/doc/botan-%%PORTVERSION%%/bugs.txt
+share/doc/botan-%%PORTVERSION%%/deprecated.txt
+share/doc/botan-%%PORTVERSION%%/indent.el
+share/doc/botan-%%PORTVERSION%%/license.txt
+share/doc/botan-%%PORTVERSION%%/log.txt
+share/doc/botan-%%PORTVERSION%%/pgpkeys.asc
+share/doc/botan-%%PORTVERSION%%/readme.txt
+share/doc/botan-%%PORTVERSION%%/thanks.txt
+share/doc/botan-%%PORTVERSION%%/todo.txt
+@dirrm share/doc/botan-%%PORTVERSION%%
diff --git a/security/opencl/Makefile b/security/opencl/Makefile
deleted file mode 100644
index 4cc606f..0000000
--- a/security/opencl/Makefile
+++ /dev/null
@@ -1,35 +0,0 @@
-# ex:ts=8
-# New ports collection makefile for:	opencl
-# Date created:			Mar 3, 2001
-# Whom:				Ying-Chieh Liao <ijliao@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	opencl
-PORTVERSION=	0.8.7
-CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	OpenCL-${PORTVERSION}
-EXTRACT_SUFX=	.tgz
-
-MAINTAINER=	ports@FreeBSD.org
-
-USE_REINPLACE=	yes
-USE_NEWGCC=	yes
-HAS_CONFIGURE=	yes
-CONFIGURE_SCRIPT=	configure.pl
-CONFIGURE_ARGS=	gcc-freebsd-generic
-USE_GMAKE=	yes
-MAKE_ARGS=	LANG_FLAGS="-fpermissive -ansi"
-INSTALLS_SHLIB=	yes
-
-PLIST_SUB=	PORTVERSION=${PORTVERSION}
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g ; \
-		s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${RM} -f ${WRKSRC}/src/pipe_io.cpp.orig
-
-.include <bsd.port.mk>
diff --git a/security/opencl/distinfo b/security/opencl/distinfo
deleted file mode 100644
index b7f6048..0000000
--- a/security/opencl/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (OpenCL-0.8.7.tgz) = ad99b9e5f38ce8d19965adcf29316554
diff --git a/security/opencl/files/patch-configure.pl b/security/opencl/files/patch-configure.pl
deleted file mode 100644
index 56db6f1..0000000
--- a/security/opencl/files/patch-configure.pl
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.pl.orig	Fri May 10 10:03:25 2002
-+++ configure.pl	Fri May 10 10:03:35 2002
-@@ -1705,7 +1705,7 @@
- DOCDIR        = \$(INSTALLROOT)/$doc_dir/OpenCL-\$(VERSION)
- 
- OWNER         = root
--GROUP         = root
-+GROUP         = wheel
- DATA_MODE     = 644
- EXEC_MODE     = 755
- 
diff --git a/security/opencl/files/patch-pipe_io.cpp b/security/opencl/files/patch-pipe_io.cpp
deleted file mode 100644
index 25c4bd7..0000000
--- a/security/opencl/files/patch-pipe_io.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/pipe_io.cpp.orig	Fri May 10 10:10:27 2002
-+++ src/pipe_io.cpp	Fri May 10 10:10:57 2002
-@@ -33,12 +33,12 @@
-    {
-    static const u32bit BUFFERSIZE = DEFAULT_BUFFERSIZE;
-    SecureBuffer<byte, BUFFERSIZE> buffer;
--   while(!std::ferror(stream) && pipe.remaining())
-+   while(!ferror(stream) && pipe.remaining())
-       {
-       u32bit got = pipe.read(buffer, BUFFERSIZE);
--      std::fwrite(buffer, 1, got, stream);
-+      fwrite(buffer, 1, got, stream);
-       }
--   if(std::ferror(stream))
-+   if(ferror(stream))
-       throw Stream_IO_Error("Pipe output operator (stdio) has failed");
-    return stream;
-    }
-@@ -67,12 +67,12 @@
-    {
-    static const u32bit BUFFERSIZE = DEFAULT_BUFFERSIZE;
-    SecureBuffer<byte, BUFFERSIZE> buffer;
--   while(!std::ferror(stream) && !std::feof(stream))
-+   while(!ferror(stream) && !feof(stream))
-       {
--      u32bit got = std::fread(buffer, 1, BUFFERSIZE, stream);
-+      u32bit got = fread(buffer, 1, BUFFERSIZE, stream);
-       pipe.write(buffer, got);
-       }
--   if(std::ferror(stream))
-+   if(ferror(stream))
-       throw Stream_IO_Error("Pipe input operator (stdio) has failed");
-    return stream;
-    }
diff --git a/security/opencl/pkg-comment b/security/opencl/pkg-comment
deleted file mode 100644
index d735abd..0000000
--- a/security/opencl/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A portable, easy to use, and efficient C++ crypto library
diff --git a/security/opencl/pkg-descr b/security/opencl/pkg-descr
deleted file mode 100644
index 4049472..0000000
--- a/security/opencl/pkg-descr
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenCL aims to be a portable, easy to use, and efficient C++ crypto
-library. It currently supports the following algorithms: 
-
-    Public Key Algorithms: RSA
-    Block Ciphers: Blowfish, CAST256, CAST5, CS-Cipher, DES, GOST, IDEA,
-        Lion, Luby-Rackoff, MISTY1, RC2, RC5, RC6, Rijndael, SAFER-SK128,
-        Serpent, SHARK, Skipjack, Square, TEA, Threeway, Twofish, XTEA
-    Stream Ciphers: ARC4, ISAAC, SEAL
-    Hash Functions: HAVAL, MD2, MD4, MD5, RIPEMD-128, RIPEMD-160, SHA-1,
-        SHA2-256, SHA2-512, Tiger
-    MACs: EMAC, HMAC, MD5-MAC, ANSI X9.19 MAC
-    Misc: Adler32, CRC24, CRC32, Randpool, X9.17 RNG
-    Cipher Modes: CBC w/ Padding, CTS, CFB, OFB, Counter
-
-WWW: http://opencl.sourceforge.net/
diff --git a/security/opencl/pkg-plist b/security/opencl/pkg-plist
deleted file mode 100644
index f07f7b4..0000000
--- a/security/opencl/pkg-plist
+++ /dev/null
@@ -1,140 +0,0 @@
-include/opencl/adler32.h
-include/opencl/allocate.h
-include/opencl/arc4.h
-include/opencl/barrett.h
-include/opencl/base.h
-include/opencl/base64.h
-include/opencl/bigint.h
-include/opencl/blowfish.h
-include/opencl/buf_filt.h
-include/opencl/cast128.h
-include/opencl/cast256.h
-include/opencl/cbc.h
-include/opencl/cfb.h
-include/opencl/chain.h
-include/opencl/config.h
-include/opencl/crc24.h
-include/opencl/crc32.h
-include/opencl/cscipher.h
-include/opencl/cts.h
-include/opencl/defalloc.h
-include/opencl/des.h
-include/opencl/desx.h
-include/opencl/dh.h
-include/opencl/dl_parm.h
-include/opencl/dsa.h
-include/opencl/ecb.h
-include/opencl/emac.h
-include/opencl/eme1.h
-include/opencl/emsa1.h
-include/opencl/emsa2.h
-include/opencl/emsa3.h
-include/opencl/emsa4.h
-include/opencl/emsa_raw.h
-include/opencl/es_file.h
-include/opencl/exceptn.h
-include/opencl/filter.h
-include/opencl/filters.h
-include/opencl/fork.h
-include/opencl/fused.h
-include/opencl/gost.h
-include/opencl/hash_id.h
-include/opencl/haval.h
-include/opencl/hex.h
-include/opencl/hmac.h
-include/opencl/idea.h
-include/opencl/init.h
-include/opencl/isaac.h
-include/opencl/kdf1.h
-include/opencl/kdf2.h
-include/opencl/key_filt.h
-include/opencl/lion.h
-include/opencl/look_add.h
-include/opencl/look_pk.h
-include/opencl/lookup.h
-include/opencl/lubyrack.h
-include/opencl/manalloc.h
-include/opencl/md2.h
-include/opencl/md4.h
-include/opencl/md5.h
-include/opencl/md5mac.h
-include/opencl/mdx_hash.h
-include/opencl/mgf1.h
-include/opencl/mil_rab.h
-include/opencl/misty1.h
-include/opencl/mod_exp.h
-include/opencl/mode_pad.h
-include/opencl/modebase.h
-include/opencl/mp_core.h
-include/opencl/mp_types.h
-include/opencl/mutex.h
-include/opencl/mux_def.h
-include/opencl/nr.h
-include/opencl/numthry.h
-include/opencl/ofb.h
-include/opencl/opencl.h
-include/opencl/par_hash.h
-include/opencl/pgp_s2k.h
-include/opencl/pipe.h
-include/opencl/pk_filts.h
-include/opencl/pk_keys.h
-include/opencl/pk_misc.h
-include/opencl/pkcs1.h
-include/opencl/primes.h
-include/opencl/pubkey.h
-include/opencl/randpool.h
-include/opencl/rc2.h
-include/opencl/rc5.h
-include/opencl/rc6.h
-include/opencl/reducer.h
-include/opencl/rijndael.h
-include/opencl/rmd128.h
-include/opencl/rmd160.h
-include/opencl/rng.h
-include/opencl/rsa.h
-include/opencl/rw.h
-include/opencl/s2k.h
-include/opencl/safer_sk.h
-include/opencl/seal.h
-include/opencl/secalloc.h
-include/opencl/secmem.h
-include/opencl/serpent.h
-include/opencl/sha1.h
-include/opencl/sha256.h
-include/opencl/sha384.h  
-include/opencl/sha512.h
-include/opencl/shark.h
-include/opencl/skipjack.h
-include/opencl/square.h
-include/opencl/symkey.h
-include/opencl/tea.h
-include/opencl/threeway.h
-include/opencl/tiger.h
-include/opencl/timers.h
-include/opencl/tm_def.h
-include/opencl/twofish.h
-include/opencl/types.h
-include/opencl/util.h
-include/opencl/version.h
-include/opencl/x917_rng.h
-include/opencl/x919_mac.h
-include/opencl/xtea.h
-@dirrm include/opencl
-lib/libopencl.a
-lib/libopencl-%%PORTVERSION%%.so
-lib/libopencl-0.8.so
-lib/libopencl-0.so
-lib/libopencl.so
-share/doc/OpenCL-%%PORTVERSION%%/authors.txt
-share/doc/OpenCL-%%PORTVERSION%%/bugs.txt
-share/doc/OpenCL-%%PORTVERSION%%/deprecated.txt
-share/doc/OpenCL-%%PORTVERSION%%/indent.el
-share/doc/OpenCL-%%PORTVERSION%%/license.txt
-share/doc/OpenCL-%%PORTVERSION%%/log.txt
-share/doc/OpenCL-%%PORTVERSION%%/opencl.ps
-share/doc/OpenCL-%%PORTVERSION%%/opencl.tex
-share/doc/OpenCL-%%PORTVERSION%%/pgpkeys.asc
-share/doc/OpenCL-%%PORTVERSION%%/readme.txt
-share/doc/OpenCL-%%PORTVERSION%%/thanks.txt
-share/doc/OpenCL-%%PORTVERSION%%/todo.txt
-@dirrm share/doc/OpenCL-%%PORTVERSION%%