Index: branches/2016Q1/security/mbedtls/Makefile
===================================================================
--- branches/2016Q1/security/mbedtls/Makefile	(revision 405430)
+++ branches/2016Q1/security/mbedtls/Makefile	(revision 405431)
@@ -1,35 +1,35 @@
 # $FreeBSD$
 
 PORTNAME=	mbedtls
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 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
 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: branches/2016Q1/security/mbedtls/distinfo
===================================================================
--- branches/2016Q1/security/mbedtls/distinfo	(revision 405430)
+++ branches/2016Q1/security/mbedtls/distinfo	(revision 405431)
@@ -1,2 +1,2 @@
-SHA256 (mbedtls-2.2.0-apache.tgz) = 3c6d3487ab056da94450cf907afc84f026aff7880182baffe137c98e3d00fb55
-SIZE (mbedtls-2.2.0-apache.tgz) = 1860353
+SHA256 (mbedtls-2.2.1-apache.tgz) = 6ddd5ca2e7dfb43d2fd750400856246fc1c98344dabf01b1594eb2f9880ef7ce
+SIZE (mbedtls-2.2.1-apache.tgz) = 1863674
Index: branches/2016Q1/security/polarssl13/Makefile
===================================================================
--- branches/2016Q1/security/polarssl13/Makefile	(revision 405430)
+++ branches/2016Q1/security/polarssl13/Makefile	(revision 405431)
@@ -1,37 +1,37 @@
 # $FreeBSD$
 
 PORTNAME=	polarssl
-PORTVERSION=	1.3.15
+PORTVERSION=	1.3.16
 DISTVERSIONSUFFIX=	-gpl
 CATEGORIES=	security devel
 MASTER_SITES=	https://polarssl.org/download/
 PKGNAMESUFFIX=	13
 DISTNAME=	mbedtls-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	tijl@FreeBSD.org
 COMMENT=	SSL/TLS and cryptography library
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ALL_TARGET=	no_test
 MAKE_ENV=	SHARED=1
 USES=		cpe gmake tar:tgz
 USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/mbedtls-${PORTVERSION}
 
 CONFLICTS=	polarssl-[0-9]*
 
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's/PREFIX/NAMEPREFIX/' \
 		-e 's/$$(DESTDIR)/&$$(PREFIX)/' \
 		${WRKSRC}/Makefile
 	@${REINPLACE_CMD} 's/-fpic//' ${WRKSRC}/library/Makefile
 
 post-install:
 	${FIND} ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/lib -type f | \
 		${XARGS} ${STRIP_CMD}
 
 .include <bsd.port.mk>
Index: branches/2016Q1/security/polarssl13/distinfo
===================================================================
--- branches/2016Q1/security/polarssl13/distinfo	(revision 405430)
+++ branches/2016Q1/security/polarssl13/distinfo	(revision 405431)
@@ -1,2 +1,2 @@
-SHA256 (mbedtls-1.3.15-gpl.tgz) = ed0be9905ba08f614772ac2b6dcce0c65cf3fb235cab7e6894838efc19518da3
-SIZE (mbedtls-1.3.15-gpl.tgz) = 1758935
+SHA256 (mbedtls-1.3.16-gpl.tgz) = f413146c177c52d4ad8f48015e2fb21dd3a029ca30a2ea000cbc4f9bd092c933
+SIZE (mbedtls-1.3.16-gpl.tgz) = 1760112
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 405430)
+++ branches/2016Q1	(revision 405431)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r405429