Index: head/security/testssl.sh/Makefile
===================================================================
--- head/security/testssl.sh/Makefile	(revision 479247)
+++ head/security/testssl.sh/Makefile	(revision 479248)
@@ -1,40 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	testssl.sh
-DISTVERSIONPREFIX=	v
-DISTVERSION=	2.9.5-5
+DISTVERSION=	3.0rc1
 CATEGORIES=	security
 
 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Test TLS/SSL encryption anywhere on any port
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/openssl-unsafe/bin/openssl:security/openssl-unsafe
 
 USES=		shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	drwetter
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 SHEBANG_FILES=	testssl.sh utils/*
 
 post-patch:
 	@${REINPLACE_CMD} -e '/elif test_openssl_suffix/d' \
 		-e 's@OPENSSL=PREFIX@OPENSSL=${PREFIX}@' \
 		-e 's@$${TESTSSL_INSTALL_DIR:-""}@$${TESTSSL_INSTALL_DIR:-"${DATADIR}"}@' \
 		-e '/check_bsd_mount$$/d' \
 		${WRKSRC}/testssl.sh
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/testssl.sh ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/testssl.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DATADIR}/etc ${STAGEDIR}${DATADIR}/utils
 	@cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/etc
 	@cd ${WRKSRC}/utils && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/utils
 
 .include <bsd.port.mk>
Index: head/security/testssl.sh/distinfo
===================================================================
--- head/security/testssl.sh/distinfo	(revision 479247)
+++ head/security/testssl.sh/distinfo	(revision 479248)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1523782340
-SHA256 (drwetter-testssl.sh-v2.9.5-5_GH0.tar.gz) = 836a7b45455c95f17c4d7eec9468028a7fc6b613fd4b3c8e8e125b7b8206b89d
-SIZE (drwetter-testssl.sh-v2.9.5-5_GH0.tar.gz) = 8955523
+TIMESTAMP = 1536404389
+SHA256 (drwetter-testssl.sh-3.0rc1_GH0.tar.gz) = 3991f8e3a94dbc75a2e4beaf98ed8dbccade33bfb0b5b75aa0c8a1ec06edef82
+SIZE (drwetter-testssl.sh-3.0rc1_GH0.tar.gz) = 9011839
Index: head/security/testssl.sh/files/patch-testssl.sh
===================================================================
--- head/security/testssl.sh/files/patch-testssl.sh	(revision 479247)
+++ head/security/testssl.sh/files/patch-testssl.sh	(revision 479248)
@@ -1,12 +1,12 @@
---- testssl.sh.orig	2018-03-17 15:02:25 UTC
+--- testssl.sh.orig	2018-09-08 11:00:02 UTC
 +++ testssl.sh
-@@ -175,6 +175,9 @@ TERM_CURRPOS=0                          
- ## CONFIGURATION PART ##
- # following variables make use of $ENV, e.g. OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <host>
- # 0 means (normally) true here. Some of the variables are also accessible with a command line switch, see --help
+@@ -188,6 +188,9 @@ TERM_CURRPOS=0                                        
+ ########### Defining (and presetting) variables which can be changed
+ #
+ # Following variables make use of $ENV and can be used like "OPENSSL=<myprivate_path_to_openssl> ./testssl.sh <URI>"
 +if [[ -z "$OPENSSL" ]] ; then
 +     OPENSSL=PREFIX/openssl-unsafe/bin/openssl
 +fi
  declare -x OPENSSL OPENSSL_TIMEOUT
+ PHONE_OUT=${PHONE_OUT:-false}           # Whether testssl can retrieve CRLs and OCSP
  FAST_SOCKET=${FAST_SOCKET:-false}       # EXPERIMENTAL feature to accelerate sockets -- DO NOT USE it for production
- COLOR=${COLOR:-2}                       # 2: Full color, 1: b/w+positioning, 0: no ESC at all
Index: head/security/testssl.sh/pkg-plist
===================================================================
--- head/security/testssl.sh/pkg-plist	(revision 479247)
+++ head/security/testssl.sh/pkg-plist	(revision 479248)
@@ -1,30 +1,30 @@
 bin/testssl.sh
 man/man1/testssl.1.gz
 %%DATADIR%%/etc/Apple.pem
+%%DATADIR%%/etc/Linux.pem
+%%DATADIR%%/etc/Microsoft.pem
+%%DATADIR%%/etc/Mozilla.pem
+%%DATADIR%%/etc/README.md
 %%DATADIR%%/etc/ca_hashes.txt
 %%DATADIR%%/etc/cipher-mapping.txt
-%%DATADIR%%/etc/client_simulation.txt
 %%DATADIR%%/etc/client-simulation.txt
 %%DATADIR%%/etc/common-primes.txt
 %%DATADIR%%/etc/curves.txt
-%%DATADIR%%/etc/Linux.pem
-%%DATADIR%%/etc/Microsoft.pem
-%%DATADIR%%/etc/Mozilla.pem
-%%DATADIR%%/etc/README.md
 %%DATADIR%%/etc/tls_data.txt
 %%DATADIR%%/utils/00_unittest_baseline.sh
 %%DATADIR%%/utils/ccs-injection.bash
 %%DATADIR%%/utils/checkcert.sh
 %%DATADIR%%/utils/create_ca_hashes.sh
 %%DATADIR%%/utils/curves.bash
 %%DATADIR%%/utils/generate_static_cipher_lists.sh
 %%DATADIR%%/utils/gmap2testssl.sh
 %%DATADIR%%/utils/heartbleed.bash
 %%DATADIR%%/utils/make-openssl.sh
+%%DATADIR%%/utils/make-openssl111.sh
 %%DATADIR%%/utils/parse_client_ciphers.pl
 %%DATADIR%%/utils/prototype.ssl2proto-check.bash
 %%DATADIR%%/utils/prototype.tls-protocol-checker.bash
 %%DATADIR%%/utils/resume.sh
 %%DATADIR%%/utils/ticketbleed.bash
 %%DATADIR%%/utils/update_client_sim_data.pl
 %%DATADIR%%/utils/wireshark2ciphers.pl