2 files changed, 21 insertions, 254 deletions

diff --git a/security/botan/Makefile b/security/botan/Makefile
index 05000001a4cf..4d8db3e5f9cb 100644
--- a/security/botan/Makefile
+++ b/security/botan/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	botan
 PORTVERSION=	1.8.7
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://files.randombit.net/botan/v1.8/
 DISTNAME=	Botan-${PORTVERSION}
@@ -16,31 +17,41 @@ EXTRACT_SUFX=	.tbz
 MAINTAINER=	lapo@lapo.it
 COMMENT=	A portable, easy to use, and efficient C++ crypto library
 
-OPTIONS=	ECC "Enable ECC support" on
+OPTIONS=	SSL "Enable OpenSSL engine" on \
+		GMP "Enable GMP engine" on \
+		ECC "Enable ECC support" on
 
 USE_BZIP2=	yes
 USE_PYTHON_BUILD=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.py
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-tr1-implementation=boost
+CONFIGURE_ARGS=	--prefix=${PREFIX} --with-tr1-implementation=boost \
+		--with-bzip2 --with-zlib
 USE_GMAKE=	yes
 MAKE_ARGS=	CXX="${CXX}" LIB_OPT="${CXXFLAGS}"
 USE_LDCONFIG=	yes
 
-PLIST_SUB=	SOVERSION=1.8.2
-
 PORTDOCS=	*
 
 .include <bsd.port.options.mk>
 
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
+.endif
+
+.if !defined(WITHOUT_GMP)
+LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
+CONFIGURE_ARGS+=--with-gnump
+MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
+.endif
+
 .if !defined(WITHOUT_ECC)
 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/tr1/memory.hpp:${PORTSDIR}/devel/boost-libs
 CONFIGURE_ARGS+=--with-tr1-implementation=boost
 CXXFLAGS+=	-I${LOCALBASE}/include
-PLIST_SUB+=	ECC=""
 .else
 CONFIGURE_ARGS+=--with-tr1-implementation=none
-PLIST_SUB+=	ECC="@comment "
 .endif
 
 .if defined(NOPORTDOCS)
@@ -50,4 +61,8 @@ post-patch:
 			${WRKSRC}/src/build-data/makefile/unix_shr.in
 .endif
 
+post-install:
+	@(cd ${PREFIX}; ${FIND} -s include/botan -not -type d) >> ${TMPPLIST}
+	@${ECHO_CMD} @dirrm include/botan >> ${TMPPLIST}
+
 .include <bsd.port.mk>
diff --git a/security/botan/pkg-plist b/security/botan/pkg-plist
index b939483edb07..e17e63e39039 100644
--- a/security/botan/pkg-plist
+++ b/security/botan/pkg-plist
@@ -1,253 +1,5 @@
 bin/botan-config
-include/botan/adler32.h
-include/botan/aes.h
-include/botan/alg_id.h
-include/botan/algo_cache.h
-include/botan/algo_factory.h
-include/botan/allocate.h
-include/botan/arc4.h
-include/botan/asm_macr.h
-include/botan/asn1_int.h
-include/botan/asn1_obj.h
-include/botan/asn1_oid.h
-include/botan/auto_rng.h
-include/botan/base64.h
-include/botan/basefilt.h
-include/botan/benchmark.h
-include/botan/ber_dec.h
-include/botan/bigint.h
-include/botan/bit_ops.h
-include/botan/blinding.h
-include/botan/block_cipher.h
-include/botan/blowfish.h
-include/botan/botan.h
-include/botan/bswap.h
-include/botan/buf_comp.h
-include/botan/buf_filt.h
-include/botan/build.h
-include/botan/cast128.h
-include/botan/cast256.h
-include/botan/cbc.h
-include/botan/cbc_mac.h
-include/botan/certstor.h
-include/botan/cfb.h
-include/botan/charset.h
-include/botan/cmac.h
-include/botan/cms_dec.h
-include/botan/cms_enc.h
-include/botan/crc24.h
-include/botan/crc32.h
-include/botan/crl_ent.h
-include/botan/cryptobox.h
-include/botan/ctr.h
-include/botan/cts.h
-%%ECC%%include/botan/curve_gfp.h
-%%ECC%%include/botan/cvc_ado.h
-%%ECC%%include/botan/cvc_ca.h
-%%ECC%%include/botan/cvc_cert.h
-%%ECC%%include/botan/cvc_gen_cert.h
-%%ECC%%include/botan/cvc_key.h
-%%ECC%%include/botan/cvc_req.h
-%%ECC%%include/botan/cvc_self.h
-include/botan/data_snk.h
-include/botan/data_src.h
-include/botan/datastor.h
-include/botan/def_eng.h
-include/botan/def_powm.h
-include/botan/defalloc.h
-include/botan/der_enc.h
-include/botan/des.h
-include/botan/desx.h
-include/botan/dh.h
-include/botan/dh_core.h
-include/botan/dh_op.h
-include/botan/divide.h
-include/botan/dl_algo.h
-include/botan/dl_group.h
-include/botan/dlies.h
-include/botan/dsa.h
-include/botan/dsa_core.h
-include/botan/dsa_op.h
-%%ECC%%include/botan/eac_asn_obj.h
-%%ECC%%include/botan/eac_obj.h
-include/botan/eax.h
-%%ECC%%include/botan/ec_dompar.h
-include/botan/ecb.h
-%%ECC%%include/botan/ecc_key.h
-%%ECC%%include/botan/ecdsa.h
-%%ECC%%include/botan/ecdsa_core.h
-%%ECC%%include/botan/ecdsa_op.h
-%%ECC%%include/botan/ecdsa_sig.h
-%%ECC%%include/botan/eckaeg.h
-%%ECC%%include/botan/eckaeg_core.h
-%%ECC%%include/botan/eckaeg_op.h
-include/botan/elg_core.h
-include/botan/elg_op.h
-include/botan/elgamal.h
-include/botan/eme.h
-include/botan/eme1.h
-include/botan/eme_pkcs.h
-include/botan/emsa.h
-include/botan/emsa1.h
-include/botan/emsa1_bsi.h
-include/botan/emsa2.h
-include/botan/emsa3.h
-include/botan/emsa4.h
-include/botan/emsa_raw.h
-include/botan/engine.h
-include/botan/entropy_src.h
-include/botan/es_dev.h
-include/botan/es_egd.h
-include/botan/es_ftw.h
-include/botan/exceptn.h
-include/botan/fd_unix.h
-include/botan/filter.h
-include/botan/filters.h
-include/botan/fork256.h
-%%ECC%%include/botan/freestore.h
-include/botan/get_pbe.h
-%%ECC%%include/botan/gfp_element.h
-%%ECC%%include/botan/gfp_modulus.h
-include/botan/gost_28147.h
-include/botan/gost_3411.h
-include/botan/has160.h
-include/botan/hash.h
-include/botan/hash_id.h
-include/botan/hex.h
-include/botan/hmac.h
-include/botan/hmac_rng.h
-include/botan/idea.h
-include/botan/if_algo.h
-include/botan/if_core.h
-include/botan/if_op.h
-include/botan/init.h
-include/botan/kasumi.h
-include/botan/kdf.h
-include/botan/kdf1.h
-include/botan/kdf2.h
-include/botan/keypair.h
-include/botan/libstate.h
-include/botan/lion.h
-include/botan/loadstor.h
-include/botan/look_pk.h
-include/botan/lookup.h
-include/botan/lubyrack.h
-include/botan/mac.h
-include/botan/mars.h
-include/botan/md2.h
-include/botan/md4.h
-include/botan/md4_ia32.h
-include/botan/md5.h
-include/botan/md5_ia32.h
-include/botan/mdx_hash.h
-include/botan/mem_ops.h
-include/botan/mem_pool.h
-include/botan/mgf1.h
-include/botan/misty1.h
-include/botan/mmap_mem.h
-include/botan/mode_pad.h
-include/botan/modebase.h
-include/botan/mp_asm.h
-include/botan/mp_asmi.h
-include/botan/mp_core.h
-include/botan/mp_types.h
-include/botan/mutex.h
-include/botan/mux_noop.h
-include/botan/mux_pthr.h
-include/botan/noekeon.h
-include/botan/nr.h
-include/botan/nr_core.h
-include/botan/nr_op.h
-include/botan/numthry.h
-include/botan/ofb.h
-include/botan/oids.h
-include/botan/openpgp.h
-include/botan/out_buf.h
-include/botan/par_hash.h
-include/botan/parsing.h
-include/botan/pbe.h
-include/botan/pbes1.h
-include/botan/pbes2.h
-include/botan/pbkdf1.h
-include/botan/pbkdf2.h
-include/botan/pem.h
-include/botan/pgp_s2k.h
-include/botan/pipe.h
-include/botan/pk_algs.h
-include/botan/pk_engine.h
-include/botan/pk_filts.h
-include/botan/pk_keys.h
-include/botan/pkcs10.h
-include/botan/pkcs8.h
-%%ECC%%include/botan/point_gfp.h
-include/botan/pow_mod.h
-include/botan/prf_ssl3.h
-include/botan/prf_tls.h
-include/botan/prf_x942.h
-include/botan/pubkey.h
-include/botan/pubkey_enums.h
-include/botan/randpool.h
-include/botan/rc2.h
-include/botan/rc5.h
-include/botan/rc6.h
-include/botan/reducer.h
-include/botan/rmd128.h
-include/botan/rmd160.h
-include/botan/rng.h
-include/botan/rotate.h
-include/botan/rsa.h
-include/botan/rw.h
-include/botan/s2k.h
-include/botan/safer_sk.h
-include/botan/salsa20.h
-include/botan/scan_name.h
-include/botan/secmem.h
-include/botan/secqueue.h
-include/botan/seed.h
-include/botan/selftest.h
-include/botan/serp_ia32.h
-include/botan/serpent.h
-include/botan/sha160.h
-include/botan/sha1_ia32.h
-include/botan/sha2_32.h
-include/botan/sha2_64.h
-%%ECC%%include/botan/signed_obj.h
-include/botan/skein_512.h
-include/botan/skipjack.h
-include/botan/square.h
-include/botan/ssl3_mac.h
-include/botan/stl_util.h
-include/botan/stream_cipher.h
-include/botan/sym_algo.h
-include/botan/symkey.h
-include/botan/tea.h
-include/botan/tiger.h
-include/botan/timer.h
-include/botan/tm_unix.h
-include/botan/turing.h
-include/botan/twofish.h
-include/botan/types.h
-include/botan/ui.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_ext.h
-include/botan/x509_key.h
-include/botan/x509_obj.h
-include/botan/x509cert.h
-include/botan/x509find.h
-include/botan/x509self.h
-include/botan/x509stor.h
-include/botan/x919_mac.h
-include/botan/x931_rng.h
-include/botan/xor_buf.h
-include/botan/xtea.h
-include/botan/xts.h
 lib/libbotan.a
 lib/libbotan.so
 lib/libbotan.so.0
 libdata/pkgconfig/botan-1.8.pc
-@dirrm include/botan