Update to 1.2.

PR:		51541
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org>

3 files changed, 75 insertions, 46 deletions

diff --git a/security/botan/Makefile b/security/botan/Makefile
index aba0b00ffe62..d504eddf6440 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	botan
-PORTVERSION=	1.0.2
+PORTVERSION=	1.2.0
 PORTREVISION=	0
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -24,13 +24,14 @@ HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.pl
 CONFIGURE_ARGS=	gcc-freebsd-generic
 USE_GMAKE=	yes
-MAKE_ARGS=	LANG_FLAGS="-fpermissive -ansi"
+MAKE_ARGS=	CXX="${CXX}" LIB_OPT="${CXXFLAGS}" \
+		LANG_FLAGS="-fpermissive -ansi"
 INSTALLS_SHLIB=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g ; \
+	@${REINPLACE_CMD} -e "s,/usr/local,${PREFIX},g ; \
 		s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/${CONFIGURE_SCRIPT}
 	@${RM} -f ${WRKSRC}/src/pipe_io.cpp.orig
 
diff --git a/security/botan/distinfo b/security/botan/distinfo
index d56c1a6c88c7..88c945937ce4 100644
--- a/security/botan/distinfo
+++ b/security/botan/distinfo
@@ -1 +1 @@
-MD5 (Botan-1.0.2.tgz) = fdc099e3af1061e5823d7d56d4e2e3a1
+MD5 (Botan-1.2.0.tgz) = 0792fbd2d1927e7c167b65d9c30a9c9c
diff --git a/security/botan/pkg-plist b/security/botan/pkg-plist
index d8a6b9d730b0..7d0f99ef6756 100644
--- a/security/botan/pkg-plist
+++ b/security/botan/pkg-plist
@@ -1,87 +1,107 @@
+@comment $FreeBSD$
+bin/botan-config
 include/botan/adler32.h
+include/botan/aes.h
 include/botan/allocate.h
 include/botan/arc4.h
+include/botan/asn1.h
+include/botan/asn1_obj.h
+include/botan/asn1_oid.h
 include/botan/barrett.h
 include/botan/base.h
 include/botan/base64.h
+include/botan/basefilt.h
+include/botan/ber_dec.h
 include/botan/bigint.h
+include/botan/blinding.h
 include/botan/blowfish.h
 include/botan/botan.h
+include/botan/buf_es.h
 include/botan/buf_filt.h
 include/botan/cast128.h
 include/botan/cast256.h
 include/botan/cbc.h
+include/botan/certstor.h
 include/botan/cfb.h
-include/botan/chain.h
+include/botan/conf.h
 include/botan/config.h
 include/botan/crc24.h
 include/botan/crc32.h
+include/botan/crl_ent.h
 include/botan/cscipher.h
 include/botan/ctr.h
 include/botan/cts.h
+include/botan/data_snk.h
+include/botan/data_src.h
 include/botan/defalloc.h
+include/botan/der_enc.h
 include/botan/des.h
 include/botan/desx.h
 include/botan/dh.h
-include/botan/dl_parm.h
+include/botan/dl_algo.h
+include/botan/dl_param.h
+include/botan/dlies.h
 include/botan/dsa.h
+include/botan/eax.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/eme.h
+include/botan/emsa.h
+include/botan/enums.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/has160.h
 include/botan/haval.h
 include/botan/hex.h
 include/botan/hmac.h
 include/botan/idea.h
+include/botan/if_algo.h
 include/botan/init.h
 include/botan/isaac.h
-include/botan/kdf1.h
-include/botan/kdf2.h
-include/botan/key_filt.h
+include/botan/kdf.h
+include/botan/keypair.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/mem_ops.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_mul.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/oids.h
+include/botan/omac.h
 include/botan/par_hash.h
+include/botan/pbe.h
+include/botan/pbe_pkcs.h
+include/botan/pem.h
 include/botan/pgp_s2k.h
 include/botan/pipe.h
+include/botan/pk_algs.h
 include/botan/pk_filts.h
 include/botan/pk_keys.h
-include/botan/pk_misc.h
+include/botan/pk_util.h
+include/botan/pkcs10.h
+include/botan/pkcs5.h
+include/botan/pkcs8.h
 include/botan/primes.h
 include/botan/pubkey.h
 include/botan/randpool.h
@@ -89,7 +109,6 @@ 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
@@ -98,18 +117,17 @@ 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/sha160.h
 include/botan/sha256.h
-include/botan/sha384.h  
-include/botan/sha512.h
+include/botan/sha_64.h
 include/botan/shark.h
 include/botan/skipjack.h
 include/botan/square.h
+include/botan/ssl3_mac.h
 include/botan/symkey.h
 include/botan/tea.h
 include/botan/threeway.h
@@ -120,27 +138,37 @@ include/botan/types.h
 include/botan/util.h
 include/botan/version.h
 include/botan/whrlpool.h
+include/botan/wid_wake.h
+include/botan/x509_ca.h
+include/botan/x509_crl.h
+include/botan/x509_key.h
+include/botan/x509_obj.h
+include/botan/x509cert.h
+include/botan/x509opt.h
+include/botan/x509self.h
+include/botan/x509stor.h
 include/botan/x917_rng.h
 include/botan/x919_mac.h
 include/botan/xtea.h
-include/opencl
-@dirrm include/botan
 lib/libbotan.a
-lib/libbotan-%%PORTVERSION%%.so
-lib/libbotan-1.0.so
+lib/libbotan-1.2.0.so
+lib/libbotan-1.2.so
 lib/libbotan-1.so
 lib/libbotan.so
-lib/libopencl.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%%
+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%%/rngs.txt
+share/doc/Botan-%%PORTVERSION%%/thanks.txt
+share/doc/Botan-%%PORTVERSION%%/todo.txt
+share/doc/Botan-%%PORTVERSION%%/tutorial.ps
+share/doc/Botan-%%PORTVERSION%%/tutorial.tex
+@dirrm include/botan
+@dirrm share/doc/Botan-%%PORTVERSION%%