Index: head/security/botan110/Makefile
===================================================================
--- head/security/botan110/Makefile	(revision 450701)
+++ head/security/botan110/Makefile	(revision 450702)
@@ -1,73 +1,62 @@
 # Created by: Ying-Chieh Liao <ijliao@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	botan
 PORTVERSION=	1.10.13
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security
 MASTER_SITES=	http://botan.randombit.net/releases/
 PKGNAMESUFFIX=	110
 DISTNAME=	Botan-${PORTVERSION}
 
 MAINTAINER=	lapo@lapo.it
 COMMENT=	Portable, easy to use, and efficient C++ crypto library
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/doc/license.txt
 
-OPTIONS_DEFINE=		SSL GMP ECC DOCS
-OPTIONS_DEFAULT=	SSL GMP ECC
-ECC_DESC=	ECC support
+OPTIONS_DEFINE=		SSL GMP DOCS
+OPTIONS_DEFAULT=	SSL GMP
 
 USES=		compiler gmake python:build tar:tgz
 HAS_CONFIGURE=	yes
 CONFIGURE_SCRIPT=	configure.py
-CONFIGURE_ARGS=	--prefix=${PREFIX} --with-bzip2 --with-zlib
+CONFIGURE_ARGS=	--prefix=${PREFIX} --cc ${CHOSEN_COMPILER_TYPE} \
+		--with-tr1-implementation=system --with-bzip2 --with-zlib
 MAKE_ARGS=	CXX="${CXX}" LIB_OPT="${CXXFLAGS}"
 USE_LDCONFIG=	yes
 PLIST_FILES=	bin/botan-config-1.10 lib/libbotan-1.10.a lib/libbotan-1.10.so lib/libbotan-1.10.so.1 \
 		lib/libbotan-1.10.so.1.13 libdata/pkgconfig/botan-1.10.pc
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	*
 
 BROKEN_aarch64=		Fails to configure: unknown or unidentifiable processor arm64
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSSL}
 USES+=		ssl
 CONFIGURE_ARGS+=--with-openssl
 .endif
 
 .if ${PORT_OPTIONS:MGMP}
+USES+=		localbase:ldflags
 LIB_DEPENDS+=	libgmp.so:math/gmp
 CONFIGURE_ARGS+=--with-gnump
-MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib"
 .endif
 
-.if ${PORT_OPTIONS:MECC}
-BROKEN=		fails to build with boost 1.65, see bug 220760
-BUILD_DEPENDS+=	${LOCALBASE}/include/boost/tr1/memory.hpp:devel/boost-libs
-CONFIGURE_ARGS+=--with-tr1-implementation=boost
-CXXFLAGS+=	-I${LOCALBASE}/include
-.else
-CONFIGURE_ARGS+=--with-tr1-implementation=none
-.endif
-
 .include <bsd.port.pre.mk>
-
-CONFIGURE_ARGS+=--cc ${COMPILER_TYPE}
 
 post-patch:
 	${REINPLACE_CMD} -e "s|#!/usr/bin/env python|#!${PYTHON_CMD}|" \
 			${WRKSRC}/configure.py
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e '/DOCDIR/d' \
 			${WRKSRC}/src/build-data/makefile/unix_shr.in
 .endif
 
 post-install:
 	@(cd "${STAGEDIR}${PREFIX}"; ${FIND} -s include/botan-1.10 -not -type d) >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
Index: head/security/botan110/files/patch-src_ssl_tls__record.h
===================================================================
--- head/security/botan110/files/patch-src_ssl_tls__record.h	(nonexistent)
+++ head/security/botan110/files/patch-src_ssl_tls__record.h	(revision 450702)
@@ -0,0 +1,31 @@
+--- src/ssl/tls_record.h.orig	2016-04-28 13:27:08 UTC
++++ src/ssl/tls_record.h
+@@ -17,8 +17,15 @@
+ 
+ #if defined(BOTAN_USE_STD_TR1)
+ 
+-#if defined(BOTAN_BUILD_COMPILER_IS_MSVC)
++#if defined(_LIBCPP_VERSION) || defined(BOTAN_BUILD_COMPILER_IS_MSVC)
+     #include <functional>
++    #if defined(_LIBCPP_VERSION)
++    namespace std {
++      namespace tr1 {
++        using std::function;
++      }
++    }
++    #endif
+ #else
+     #include <tr1/functional>
+ #endif
+@@ -31,7 +38,11 @@
+ 
+ namespace Botan {
+ 
++#if defined(_LIBCPP_VERSION)
++using namespace std::placeholders;
++#else
+ using namespace std::tr1::placeholders;
++#endif
+ 
+ /**
+ * TLS Record Writer

Property changes on: head/security/botan110/files/patch-src_ssl_tls__record.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property