Update to 1.7.22.

Take maintainer with permission.

OK sebastia@, sthen@.

security/tcltls/Makefile

@@ -1,47 +1,57 @@
-BROKEN=	Needs update to less outdated version and checking of dependent ports
-
 COMMENT=	OpenSSL Tcl extension
 
-VERSION=	1.6
+VERSION=	1.7.22
 
-DISTNAME=	tls${VERSION}-src
-PKGNAME=	tcltls-${VERSION}
-REVISION=	4
+DISTNAME=	tcltls-${VERSION}
 
 CATEGORIES=	security
 
-HOMEPAGE=	http://tls.sourceforge.net/
+HOMEPAGE=	http://core.tcl-lang.org/tcltls/
 
-MAINTAINER=	Sebastian Reitenbach <[email protected]>
+MAINTAINER=	Stuart Cassoff <[email protected]>
 
 # BSD
 PERMIT_PACKAGE=	Yes
 
 WANTLIB=	ssl crypto
 
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=tls/}
+MASTER_SITES=	${HOMEPAGE:=uv/}
 
 MODULES=	lang/tcl
-
+MODTCL_VERSION=	8.6
 RUN_DEPENDS=	${MODTCL_RUN_DEPENDS}
 BUILD_DEPENDS=	${RUN_DEPENDS}
 
-WRKDIST=	${WRKDIR}/tls${VERSION}
+FAKE_FLAGS =	PACKAGE_INSTALL_DIR='$$(TCL_PACKAGE_PATH)/tcltls' \
+		INSTALL_PROGRAM='$$(INSTALL_DATA)'
+
+TEST_FLAGS =	TESTFLAGS='${TESTFLAGS}'
 SEPARATE_BUILD =Yes
 CONFIGURE_STYLE=gnu
+
 CONFIGURE_ARGS=	--libdir=${MODTCL_TCLDIR} \
 		--with-tcl=${MODTCL_LIBDIR} \
-		--with-tclinclude=${MODTCL_INCDIR} \
-		--with-ssl-dir=/usr \
-		--includedir=${PREFIX}/include/tcltls
+		--includedir=${PREFIX}/include/tcltls \
+		--disable-rpath \
+		--enable-deterministic \
+		--enable-ssl-fastpath
+
+# Tcltls configure will always choose tclsh8.6 (if installed) over tclsh8.5.
+# Ensure that the tclsh chosen matches MODTCL_VERSION.
+CONFIGURE_ENV += TCLSH_NATIVE=${MODTCL_BIN}
 
-FAKE_FLAGS =	PKG_DIR='$$(PACKAGE_NAME)' INSTALL_PROGRAM='$$(INSTALL_DATA)'
-INSTALL_TARGET=	install-binaries
 TEST_TARGET=	test
-CFLAGS +=	-DNO_SSL2 -DNO_SSL3
-SUBST_VARS=	VER
 
-VER=		${VERSION:S/.//g}
+# Use TESTFLAGS to control the Tcltls tests
+TESTFLAGS =
+
+# --enable-ssl-fastpath is the preferred option
+# but these tests will fail without it.
+# tlsIO-9.2 tlsIO-2.11 tlsIO-12.3
+# To be revisited.
+# 
+# Use premade DH primes instead of generating new; builds faster.
+# --enable-deterministic
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcltls/

security/tcltls/distinfo

@@ -1,2 +1,2 @@
-SHA256 (tls1.6-src.tar.gz) = rexQFDqa1jSmcdJPfHu/JFVIfrXxLSkPQXl8MqmLk/M=
-SIZE (tls1.6-src.tar.gz) = 168043
+SHA256 (tcltls-1.7.22.tar.gz) = 6E4reideyCxKqp0bH5eG2+Q1jIFekXU5/+f2Z/9Lw7Q=
+SIZE (tcltls-1.7.22.tar.gz) = 165206

security/tcltls/patches/patch-tlsBIO_c

@@ -0,0 +1,20 @@
+Found in the Debian port:
+http://deb.debian.org/debian/pool/main/t/tcltls/tcltls_1.7.22-2.debian.tar.xz
+
+Index: tlsBIO.c
+--- tlsBIO.c.orig
++++ tlsBIO.c
+@@ -231,9 +231,12 @@ static long BioCtrl(BIO *bio, int cmd, long num, void 
+ 	switch (cmd) {
+ 		case BIO_CTRL_RESET:
+ 			dprintf("Got BIO_CTRL_RESET");
+-			num = 0;
++			ret = 0;
++			break;
+ 		case BIO_C_FILE_SEEK:
+ 			dprintf("Got BIO_C_FILE_SEEK");
++			ret = 0;
++			break;
+ 		case BIO_C_FILE_TELL:
+ 			dprintf("Got BIO_C_FILE_TELL");
+ 			ret = 0;

security/tcltls/patches/patch-tlsInt_h

@@ -0,0 +1,12 @@
+Index: tlsInt.h
+--- tlsInt.h.orig
++++ tlsInt.h
+@@ -54,7 +54,7 @@
+  * Determine if we should use the pre-OpenSSL 1.1.0 API
+  */
+ #undef TCLTLS_OPENSSL_PRE_1_1
+-#if (defined(LIBRESSL_VERSION_NUMBER)) || OPENSSL_VERSION_NUMBER < 0x10100000L
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ #  define TCLTLS_OPENSSL_PRE_1_1_API 1
+ #endif
+

security/tcltls/pkg/PLIST

@@ -1,6 +1,5 @@
-lib/tcl/tls/
-lib/tcl/tls/libtls${VER}.so
-lib/tcl/tls/pkgIndex.tcl
-lib/tcl/tls/tls.tcl
+lib/tcl/tcltls/
+lib/tcl/tcltls/pkgIndex.tcl
+@so lib/tcl/tcltls/tcltls.so
 share/doc/tcltls/
 share/doc/tcltls/tls.htm