Index: branches/2015Q4/security/mbedtls/Makefile
===================================================================
--- branches/2015Q4/security/mbedtls/Makefile	(revision 399352)
+++ branches/2015Q4/security/mbedtls/Makefile	(revision 399353)
@@ -1,34 +1,34 @@
 # $FreeBSD$
 
 PORTNAME=	mbedtls
-PORTVERSION=	2.1.1
+PORTVERSION=	2.1.2
 DISTVERSIONSUFFIX=	-apache
 CATEGORIES=	security devel
 MASTER_SITES=	https://tls.mbed.org/download/
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SSL/TLS and cryptography library
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/apache-2.0.txt
 
 ALL_TARGET=	no_test
 MAKE_ENV=	SHARED=1
 USES=		gmake tar:tgz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION}
 
 CONFLICTS_INSTALL=	polarssl13-[0-9]*
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/PREFIX/NAMEPREFIX/' \
 		-e 's/$$(DESTDIR)/&$$(PREFIX)/' \
 		${WRKSRC}/Makefile
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: branches/2015Q4/security/mbedtls/distinfo
===================================================================
--- branches/2015Q4/security/mbedtls/distinfo	(revision 399352)
+++ branches/2015Q4/security/mbedtls/distinfo	(revision 399353)
@@ -1,2 +1,2 @@
-SHA256 (mbedtls-2.1.1-apache.tgz) = 8f25b6f156ae5081e91bcc58b02455926d9324035fe5f7028a6bb5bc0139a757
-SIZE (mbedtls-2.1.1-apache.tgz) = 1829955
+SHA256 (mbedtls-2.1.2-apache.tgz) = ce57cb9085f976ffde945af7e8cec058a66ad181a96fd228fbcbc485213a7c58
+SIZE (mbedtls-2.1.2-apache.tgz) = 1830208
Index: branches/2015Q4
===================================================================
--- branches/2015Q4	(revision 399352)
+++ branches/2015Q4	(revision 399353)

Property changes on: branches/2015Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r399351