upgrade to 0.8.1

5 files changed, 107 insertions, 26 deletions

diff --git a/security/botan/Makefile b/security/botan/Makefile
index abd01e089850..074ce2f07e21 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	opencl
-PORTVERSION=	0.7.3
+PORTVERSION=	0.8.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,15 +17,18 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 
 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=0.7.2
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
+
+post-patch:
+	@${PERL} -pi -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/botan/distinfo b/security/botan/distinfo
index 8c40a78f9f65..957ebb2270ba 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1 +1 @@
-MD5 (OpenCL-0.7.3.tgz) = 19b67c399a21e61989d06e9d27645fc8
+MD5 (OpenCL-0.8.1.tgz) = 1462f48c84ec7d0222141dd32071c70d
diff --git a/security/botan/files/patch-configure.pl b/security/botan/files/patch-configure.pl
index 7ce69a825bc2..56db6f11ba49 100644
--- a/security/botan/files/patch-configure.pl
+++ b/security/botan/files/patch-configure.pl
@@ -1,7 +1,7 @@
---- configure.pl.orig	Sat Jun  9 09:40:22 2001
-+++ configure.pl	Sun Jun 10 19:23:51 2001
-@@ -1312,7 +1312,7 @@
- DOCDIR        = \$(INSTALLROOT)/share/doc/\$(NAME)-\$(VERSION)
+--- 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
@@ -9,12 +9,3 @@
  DATA_MODE     = 644
  EXEC_MODE     = 755
  
-@@ -1341,7 +1341,7 @@
- # FIXME: Hardcoded
- USER_DOCS     = readme.txt doc/license.txt doc/log.txt doc/thanks.txt \\
-                 doc/pgpkeys.asc
--DEVEL_DOCS    = doc/doc.ps doc/relnotes.txt
-+DEVEL_DOCS    = doc/opencl.ps doc/relnotes.txt
- 
- HEADERS       = $headers
- 
diff --git a/security/botan/files/patch-pipe_io.cpp b/security/botan/files/patch-pipe_io.cpp
new file mode 100644
index 000000000000..25c4bd7ce15e
--- /dev/null
+++ b/security/botan/files/patch-pipe_io.cpp
@@ -0,0 +1,34 @@
+--- 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/botan/pkg-plist b/security/botan/pkg-plist
index 5a9a246fb7d0..7c171f317f5d 100644
--- a/security/botan/pkg-plist
+++ b/security/botan/pkg-plist
@@ -1,44 +1,88 @@
+include/opencl/adler32.h
+include/opencl/allocate.h
 include/opencl/arc4.h
+include/opencl/barrett.h
+include/opencl/base.h
+include/opencl/bigint.h
 include/opencl/blowfish.h
+include/opencl/buf_filt.h
 include/opencl/cast256.h
 include/opencl/cast5.h
-include/opencl/checksum.h
+include/opencl/cbc.h
+include/opencl/cbc.icc
+include/opencl/cfb.h
+include/opencl/cfb.icc
+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/cts.icc
+include/opencl/defalloc.h
 include/opencl/des.h
 include/opencl/desx.h
+include/opencl/ecb.h
 include/opencl/emac.h
+include/opencl/eme1.h
+include/opencl/eme1.icc
+include/opencl/emsa2.h
+include/opencl/emsa2.icc
 include/opencl/encoder.h
+include/opencl/es_file.h
 include/opencl/exceptn.h
-include/opencl/filtbase.h
+include/opencl/filter.h
 include/opencl/filters.h
 include/opencl/filters.icc
+include/opencl/fork.h
 include/opencl/gost.h
 include/opencl/haval.h
 include/opencl/hmac.h
 include/opencl/idea.h
+include/opencl/ieee1363.h
+include/opencl/init.h
 include/opencl/isaac.h
+include/opencl/kdf1.h
+include/opencl/lion.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/mgf1.h
 include/opencl/misty1.h
-include/opencl/modes.h
-include/opencl/modes.icc
+include/opencl/mode_pad.h
+include/opencl/modebase.h
+include/opencl/mutex.h
+include/opencl/numthry.h
+include/opencl/ofb.h
+include/opencl/ofb.icc
 include/opencl/opencl.h
+include/opencl/pgp_s2k.h
+include/opencl/pipe.h
+include/opencl/pk_base.h
+include/opencl/pk_misc.h
+include/opencl/pk_raw.h
+include/opencl/pk_types.h
+include/opencl/primes.h
+include/opencl/pubkey.h
+include/opencl/pubkey.icc
 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/s2k.h
 include/opencl/safer_sk.h
 include/opencl/seal.h
 include/opencl/secalloc.h
 include/opencl/secmem.h
-include/opencl/secqueue.h
 include/opencl/serpent.h
 include/opencl/sha1.h
 include/opencl/sha256.h
@@ -48,26 +92,35 @@ include/opencl/skipjack.h
 include/opencl/square.h
 include/opencl/symkey.h
 include/opencl/tea.h
+include/opencl/thr_filt.h
 include/opencl/threeway.h
 include/opencl/tiger.h
+include/opencl/timers.h
+include/opencl/tm_def.h
 include/opencl/triple.h
 include/opencl/twofish.h
 include/opencl/types.h
 include/opencl/util.h
 include/opencl/version.h
 include/opencl/x917.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.7.so
+lib/libopencl-0.8.so
 lib/libopencl-0.so
 lib/libopencl.so
+share/doc/OpenCL-%%PORTVERSION%%/authors.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%%/relnotes.txt
 share/doc/OpenCL-%%PORTVERSION%%/thanks.txt
+share/doc/OpenCL-%%PORTVERSION%%/todo.txt
 @dirrm share/doc/OpenCL-%%PORTVERSION%%