Index: head/java/bouncycastle15/Makefile
===================================================================
--- head/java/bouncycastle15/Makefile	(revision 429628)
+++ head/java/bouncycastle15/Makefile	(revision 429629)
@@ -1,68 +1,74 @@
 # Created by: Eugene Grosbein <ports@grosbein.net>
 # $FreeBSD$
 
 PORTNAME=	bouncycastle
-PORTVERSION=	1.55
+PORTVERSION=	1.56
 CATEGORIES=	java security
-MASTER_SITES=	http://downloads.bouncycastle.org/java/ \
-		http://polydistortion.net/bc/download/ \
-		http://bouncycastle.gva.es/download/
+MASTER_SITES=	http://www.bouncycastle.org/download/ \
+		http://polydistortion.net/bc/download/
 PKGNAMESUFFIX=	15
 DISTNAME=	crypto-${DVERSION}
 
 MAINTAINER=	ports@grosbein.net
 COMMENT=	Cleanroom build of Java Cryptography Extensions
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	${JAVALIBDIR}/activation.jar:java/jaf \
 		${JAVALIBDIR}/mail.jar:java/javamail \
 		${JAVALIBDIR}/junit.jar:java/junit
 RUN_DEPENDS=	${JAVALIBDIR}/activation.jar:java/jaf \
 		${JAVALIBDIR}/mail.jar:java/javamail
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS ZIPSRC
+OPTIONS_DEFAULT=	ZIPSRC
+OPTIONS_SUB=	yes
+ZIPSRC_DESC=	Install bundled ZIP source files
 CONFLICTS_INSTALL=	bouncycastle-1.4*
 DVERSION=	${PORTVERSION:S/.//}
 NO_ARCH=	yes
 CPE_PRODUCT=	legion-of-the-bouncy-castle-java-crytography-api
 CPE_VENDOR=	${PORTNAME}
 USE_JAVA=	yes
 USES=		cpe
 JAVA_VERSION=	1.6+
 JDKMVERSION=	1.5
 JDKNVERSION=	15
 USE_ANT=	yes
 MAKE_ENV=	ANT_INCLUDE_SHARED_JARS=YES
 MAKE_ARGS=	-f ant/jdk${JDKNVERSION}+.xml
 ALL_TARGET=	build-provider build zip-src
 
 JARS_SRC=	bcmail bcpkix bcprov bcpg
-JARS_DOCS=	${JARS_SRC} bctest
+JARS_DOCS=	${JARS_SRC} bctest bctls
 JARS=		${JARS_DOCS} bcprov-ext
 
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 do-install:
-	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for jar in ${JARS}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/jars/${jar}-jdk${JDKNVERSION}on-${DVERSION}.jar \
 	      ${STAGEDIR}${JAVAJARDIR}/${jar}.jar
 .endfor
+	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}on-${DVERSION}.jar \
+		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
+.if ${PORT_OPTIONS:MZIPSRC}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 .for jar in ${JARS_SRC}
 	${INSTALL_DATA} ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/src.zip \
 	      ${STAGEDIR}${DATADIR}/${jar}-src.zip
 .endfor
-	${INSTALL_DATA} ${WRKSRC}/jars/bcprov-jdk${JDKNVERSION}on-${DVERSION}.jar \
-		${STAGEDIR}${JAVAJARDIR}/bcprov.jar
+.endif
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.html ${STAGEDIR}${DOCSDIR}
 .for jar in ${JARS_DOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}/${jar}
 	@cd ${WRKSRC}/build/artifacts/jdk${JDKMVERSION}/${jar}-jdk${JDKNVERSION}on-${DVERSION}/docs/ && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/${jar}
 .endfor
 
 .include <bsd.port.mk>
Index: head/java/bouncycastle15/distinfo
===================================================================
--- head/java/bouncycastle15/distinfo	(revision 429628)
+++ head/java/bouncycastle15/distinfo	(revision 429629)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472104749
-SHA256 (crypto-155.tar.gz) = a14fad87697463deda91f84c1eb51d6a4abf26cfc122ee6af832feca3adf85a6
-SIZE (crypto-155.tar.gz) = 117160658
+TIMESTAMP = 1482474725
+SHA256 (crypto-156.tar.gz) = 2c80ae39b8c76d35b959d6d7b4e54176f899e8d3f4a21ce5b3eb69ab47450d37
+SIZE (crypto-156.tar.gz) = 114207297
Index: head/java/bouncycastle15/pkg-descr
===================================================================
--- head/java/bouncycastle15/pkg-descr	(revision 429628)
+++ head/java/bouncycastle15/pkg-descr	(revision 429629)
@@ -1,18 +1,24 @@
 The Bouncy Castle Crypto APIs consist of the following:
 
 . A lightweight cryptography API in Java.
 . A provider for the JCE and JCA.
 . A clean room implementation of the JCE 1.2.1.
 . A library for reading and writing encoded ASN.1 objects.
+. Lightweight APIs for TLS (RFC 2246, RFC 4346) and DTLS (RFC 4347).
 . Generators for Version 1 and Version 3 X.509 certificates, Version 2 CRLs,
   and PKCS12 files.
 . Generators for Version 2 X.509 attribute certificates.
-. Generators/Processors for S/MIME and CMS (PKCS7).
+. Generators/Processors for S/MIME and CMS (PKCS7/RFC 3852).
 . Generators/Processors for OCSP (RFC 2560).
-. Generators/Processors for TSP (RFC 3161).
+. Generators/Processors for TSP (RFC 3161 & RFC 5544).
+. Generators/Processors for CMP and CRMF (RFC 4210 & RFC 4211).
 . Generators/Processors for OpenPGP (RFC 2440).
-. A signed jar version suitable for JDK 1.4/1.5 and the Sun JCE.
+. Generators/Processors for Extended Access Control (EAC).
+. Generators/Processors for Data Validation and Certification Server (DVCS) -
+  RFC 3029.
+. Generators/Processors for DNS-based Authentication of Named Entities (DANE).
+. A signed jar version suitable for JDK 1.4-1.8 and the Sun JCE.
 
 It's distributed under a modified X license.
 
 WWW: http://www.bouncycastle.org/
Index: head/java/bouncycastle15/pkg-plist
===================================================================
--- head/java/bouncycastle15/pkg-plist	(revision 429628)
+++ head/java/bouncycastle15/pkg-plist	(revision 429629)
@@ -1,10 +1,11 @@
 %%JAVAJARDIR%%/bcmail.jar
 %%JAVAJARDIR%%/bcpg.jar
 %%JAVAJARDIR%%/bcpkix.jar
 %%JAVAJARDIR%%/bcprov.jar
 %%JAVAJARDIR%%/bcprov-ext.jar
 %%JAVAJARDIR%%/bctest.jar
-%%DATADIR%%/bcmail-src.zip
-%%DATADIR%%/bcpg-src.zip
-%%DATADIR%%/bcpkix-src.zip
-%%DATADIR%%/bcprov-src.zip
+%%JAVAJARDIR%%/bctls.jar
+%%ZIPSRC%%%%DATADIR%%/bcmail-src.zip
+%%ZIPSRC%%%%DATADIR%%/bcpg-src.zip
+%%ZIPSRC%%%%DATADIR%%/bcpkix-src.zip
+%%ZIPSRC%%%%DATADIR%%/bcprov-src.zip