3 files changed, 27 insertions, 16 deletions

diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index d48d1b2dbe4e..174700f7e4eb 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tcltls
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6
 CATEGORIES=	devel tcl
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=tls
@@ -17,11 +17,10 @@ COMMENT=	SSL extensions for TCL; dynamicly loadable
 
 LIB_DEPENDS+=	tcl${TCLVND}:${PORTSDIR}/lang/tcl${TCLVND}
 
-MANUAL_PACKAGE_BUILD=Self-tests fail/hang
+USE_TCL=	83+
+USE_OPENSSL=	yes
 
-USE_OPENSSL=	Yes
-
-WRKSRC=	${WRKDIR}/tls${PORTVERSION:R}
+WRKSRC=	${WRKDIR}/tls${PORTVERSION}
 
 PLIST_SUB+=	TCL_VER=${TCL_VER} DISTNAME="${DISTNAME}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
@@ -32,7 +31,8 @@ MAKE_ENV=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
 		SHLIB_NAME=libtls.so.1 \
 		PORTVERSION="${PORTVERSION}" SED="${SED}"
 REINPLACE_ARGS=	-i ""
-ALL_TARGET=	all
+ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu` all
+PLIST_SUB=	TLS_VERSION=${PORTVERSION}
 
 post-patch:
 	${REINPLACE_CMD} -e \
@@ -48,11 +48,20 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/tls.htm ${PREFIX}/share/doc/tls/
 .endif
 
-post-build test:
+post-build:
+	#
+	#
+	# Please, try performing `make test' now and report any failures
+	# to the ${PORTNAME} developers:
+	#	http://sourceforge.net/tracker/?group_id=13248&atid=113248
+	# and/or ${MAINTAINER}.
+	#
+	#
+
+test:
 	cd ${WRKSRC}/tests && env TCL_LIBRARY="${WRKSRC}" \
 		tclsh${TCL_VER} all.tcl
 
-TCL_VER?=	8.4
 TCLVND=		${TCL_VER:S/.//}
 
 .include <bsd.port.mk>
diff --git a/devel/tcltls/distinfo b/devel/tcltls/distinfo
index f14da540b4b0..9f36fe19e94d 100644
--- a/devel/tcltls/distinfo
+++ b/devel/tcltls/distinfo
@@ -1,3 +1,3 @@
-MD5 (tls1.5.0-src.tar.gz) = 9eeab472475773b3810acc808ebec759
-SHA256 (tls1.5.0-src.tar.gz) = 422ac2e4a812763a8f859b868c659d69769945ab754bd418b2eb07ce9bbcd253
-SIZE (tls1.5.0-src.tar.gz) = 113600
+MD5 (tls1.6-src.tar.gz) = eb326ff9e6fc3b9885aa5c72fb8df3bf
+SHA256 (tls1.6-src.tar.gz) = adec50143a9ad634a671d24f7c7bbf2455487eb5f12d290f41797c32a98b93f3
+SIZE (tls1.6-src.tar.gz) = 168043
diff --git a/devel/tcltls/files/Makefile.bsd b/devel/tcltls/files/Makefile.bsd
index f1fe1fad661b..f051c08135af 100644
--- a/devel/tcltls/files/Makefile.bsd
+++ b/devel/tcltls/files/Makefile.bsd
@@ -1,5 +1,5 @@
 PACKAGE		= tls
-VERSION		?= ${PORTVERSION:R}
+VERSION		?= ${PORTVERSION}
 .ifndef(SHLIB_NAME)
 LIB		= ${PACKAGE}
 SHLIB_MAJOR	= ${VERSION:R}
@@ -25,13 +25,15 @@ LDADD		+= ${TCL_STUB_LIB_SPEC} -L${OPENSSLLIB} -lcrypto -lssl
 
 CFLAGS		+=-I${PREFIX}/include/tcl${TCL_VER} -I${OPENSSLINC}
 CFLAGS		+=-DNDEBUG -I. -DUSE_TCL_STUBS -I${PREFIX}/include
-CFLAGS		+=-DVERSION=\"${VERSION}\" -DPACKAGE=\"${PACKAGE}\"
+CFLAGS		+=-DPACKAGE_VERSION=\"${VERSION}\" -DPACKAGE_NAME=\"${PACKAGE}\"
 
 all: ${SHLIB_NAME} pkgIndex.tcl
 
-pkgIndex.tcl: ${.CURDIR}/pkgIndex.tcl.in
-	${SED} -e "s#@RELPATH@#..#" -e "s#@tls_LIB_FILE@#${SHLIB_NAME}#" \
-		< ${.CURDIR}/pkgIndex.tcl.in > pkgIndex.tcl
+pkgIndex.tcl:
+	(echo 'package ifneeded $(PACKAGE) $(VERSION) \
+	    "[list source [file join $$dir tls.tcl]] ; \
+	     [list tls::initlib ${LIBDIR} ${SHLIB_NAME}]"'\
+	) > pkgIndex.tcl
 
 SCRIPTDIR	= lib/tls
 SCRIPTPATH	= ${PREFIX}/${SCRIPTDIR}