Index: Makefile
===================================================================
--- Makefile	(revision 493364)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		openvpn
-DISTVERSION=		201821
-PORTREVISION=		3
+DISTVERSION=		201907
 CATEGORIES=		security net
 MASTER_SITES=		https://secure-computing.net/files/openvpn/ \
 			ftp://ftp2.secure-computing.net/pub/FreeBSD/openvpn-devel/
@@ -13,8 +12,9 @@
 COMMENT?=		Secure IP/Ethernet tunnel daemon
 
 LICENSE=		GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYRIGHT.GPL
 
-CONFLICTS_INSTALL=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]*
+CONFLICTS_INSTALL?=	openvpn-2.[!4].* openvpn-[!2].* openvpn-beta-[0-9]* openvpn-devel-[0-9]* openvpn-mbedtls-[0-9]*
 
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}
@@ -89,12 +89,6 @@
 TEST_ALL_TARGET=	check
 TEST_TEST_TARGET_OFF=	check
 
-# XXX Please remove this compatibility wrapper after 2017Q2 is branched.
-.ifdef(WITHOUT_CHECK)
-WARNING+=	"${.CURDIR}: WITHOUT_CHECK is deprecated, please use WITHOUT=TEST or OPTIONS_UNSET=TEST."
-WITHOUT+=	TEST
-.endif
-
 pre-configure:
 .ifdef (LOG_OPENVPN)
 	@${ECHO} "Building with LOG_OPENVPN=${LOG_OPENVPN}"
@@ -121,11 +115,23 @@
 _tlslibs=libssl libcrypto
 .endif
 
+.if ${SSL_DEFAULT:Mlibressl*} && empty(PORT_OPTIONS:MMBEDTLS)
+pre-everything::
+	@${ECHO_CMD} "WARNING: OpenVPN does not officially support LibreSSL."
+	@${ECHO_CMD} "If things break, rebuild with OpenSSL or mbedTLS."
+	@${ECHO_CMD} "You may wish to change your default SSL library"
+	@${ECHO_CMD} "and press Ctrl+C within the next 10 seconds to abort."
+.  if !(defined(PACKAGE_BUILDING) || defined(BATCH))
+       @sleep 10
+.  endif
+.endif
+
+
 # sanity check that we don't inherit incompatible SSL libs through,
 # for instance, pkcs11-helper:
 post-build:
 	   @a=$$(LC_ALL=C ldd -f '%o\n' ${WRKSRC}/src/openvpn/openvpn \
-       |	${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\
+       | ${SORT} -u) ; set -- $$(for i in ${_tlslibs} ; do ${PRINTF} '%s\n' "$$a" | ${GREP} $${i}.so | wc -l ; done | ${SORT} -u) ;\
        if test "$$*" != "1" ; then ${ECHO_CMD} >&2 "${.CURDIR} FAILED: either of ${_tlslibs} libraries linked multiple times" ; ${PRINTF} '%s\n' "$$a"; ${RM} ${BUILD_COOKIE} ; exit 1 ; fi
 
 post-install:
Index: distinfo
===================================================================
--- distinfo	(revision 493364)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1527696598
-SHA256 (openvpn-201821.tar.xz) = 3283fbe2b7fcd8a6273e469de28ced3e4ebd6af4cd5f2438930c82831dcbb800
-SIZE (openvpn-201821.tar.xz) = 940716
+TIMESTAMP = 1550580278
+SHA256 (openvpn-201907.tar.xz) = 1e2394ca6582877c90fc3d9948cfb1b1c1aaa2383c02af62410d5a51f812ff68
+SIZE (openvpn-201907.tar.xz) = 995288