23 files changed, 145 insertions, 180 deletions

diff --git a/Mk/Uses/tcl.mk b/Mk/Uses/tcl.mk
index 27e14e9d48fd..d279b4715618 100644
--- a/Mk/Uses/tcl.mk
+++ b/Mk/Uses/tcl.mk
@@ -27,7 +27,7 @@
 #
 # Usage:
 #
-# USES+=	PORT[:(VERSION|wrapper),build,run]
+# USES+=	PORT[:(VERSION|wrapper),build,run,tea]
 #
 # where PORT is one of:
 #
@@ -53,6 +53,9 @@
 #
 # Build-time / Run-time only dependencies can be specified with build or run.
 #
+# Tea can be used for Tcl/Tk extensions that use the Tcl Extension Architecture
+# [http://www.tcl.tk/doc/tea] and allows to set common autoconf parameters.
+#
 # MAINTAINER: tcltk@FreeBSD.org
 
 .if ${USES:Mtk} || ${USES:Mtk\:*}
@@ -200,6 +203,19 @@ RUN_DEPENDS+=	${_TCLTK_WRAPPER_PORT}
 LIB_DEPENDS+=	${_TCLTK_LIB_LINE}
 .endif
 
+# Setup TEA stuff
+.if ${tcl_ARGS:Mtea}
+GNU_CONFIGURE=	yes
+TCL_PKG?=	${PORTNAME:C/^tcl(-?)//:C/(-?)tcl\$//}${PORTVERSION}
+PLIST_SUB+=	TCL_PKG=${TCL_PKG}
+CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
+		--with-tcl=${TCL_LIBDIR} \
+		--with-tcl-includes=${TCL_INCLUDEDIR}
+.  if ${_TCLTK_PORT} == "tk"
+CONFIGURE_ARGS+=--with-tk=${TK_LIBDIR}
+.  endif
+.endif
+
 .endif # defined(_INCLUDE_USES_TCL_MK)
 
 .undef _TCLTK_IGNORE
diff --git a/devel/dbus-tcl/Makefile b/devel/dbus-tcl/Makefile
index 5c5505fdcc25..df51d4108b77 100644
--- a/devel/dbus-tcl/Makefile
+++ b/devel/dbus-tcl/Makefile
@@ -21,10 +21,7 @@ PORTDOCS=	*
 
 TEST_TARGET=	do-test
 
-USES=		pkgconfig tcl:85+
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--exec-prefix=${PREFIX}
+USES=		pkgconfig tcl:85+,tea
 
 PLIST_FILES=	lib/dbus/libdbus21.so.1 \
 		lib/dbus/pkgIndex.tcl \
@@ -36,8 +33,8 @@ post-patch:
 
 do-test:
 	DBUS=$$(${LOCALBASE}/bin/dbus-daemon --session --print-address --fork --print-pid); \
-	DBUS_ADDR=$$(echo $$DBUS | awk '{print $$1}'); \
-	DBUS_PID=$$(echo $$DBUS | awk '{print $$2}'); \
+	DBUS_ADDR=$$(echo $$DBUS | ${AWK} '{print $$1}'); \
+	DBUS_PID=$$(echo $$DBUS | ${AWK} '{print $$2}'); \
 	DBUS_ENV=DBUS_SESSION_BUS_ADDRESS=$$DBUS_ADDR; \
 	${SETENV} ${MAKE_ENV} $$DBUS_ENV ${MAKE} -C ${WRKSRC} test; \
 	kill $$DBUS_PID
diff --git a/devel/tcl-memchan/Makefile b/devel/tcl-memchan/Makefile
index 6c8080f55dbc..603aa2f2b308 100644
--- a/devel/tcl-memchan/Makefile
+++ b/devel/tcl-memchan/Makefile
@@ -16,16 +16,9 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/tcllib/doctools/pkgIndex.tcl:devel/tcllib
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 ALL_TARGET=	binaries libraries doc-old
+TEST_TARGET=	test
 
-USES+=		tcl
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
-		--exec-prefix=${PREFIX}
-
-# Too bad, n is no longer an acceptable section for bsd.man.mk
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
-
-regression-test test:
-	${MAKE} -C ${WRKSRC} test
+USES+=		tcl:tea
+TCL_PKG=	Memchan${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/devel/tcl-memchan/files/patch-Makefile.in b/devel/tcl-memchan/files/patch-Makefile.in
index 0415fc9e5ff5..bd80a4e60692 100644
--- a/devel/tcl-memchan/files/patch-Makefile.in
+++ b/devel/tcl-memchan/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	2010-12-10 22:24:41.000000000 +0100
-+++ Makefile.in	2014-02-17 15:55:10.000000000 +0100
-@@ -237,7 +237,7 @@
+--- Makefile.in.orig	2010-12-10 21:24:41 UTC
++++ Makefile.in
+@@ -237,7 +237,7 @@ install-doc: doc
  	@for i in $(DOC_NROFF); do \
  	    echo "Installing $$i"; \
  	    rm -f $(DESTDIR)$(mandir)/mann/`basename $$i`; \
@@ -9,7 +9,7 @@
  	done
  
  test: binaries libraries
-@@ -419,6 +419,7 @@
+@@ -419,6 +419,7 @@ install-lib-binaries:
  	  if test -f $$p; then \
  	    echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p"; \
  	    $(INSTALL_PROGRAM) $$p $(DESTDIR)$(pkglibdir)/$$p; \
diff --git a/devel/tcl-memchan/pkg-plist b/devel/tcl-memchan/pkg-plist
index 9a435ec5eab5..58792b92a993 100644
--- a/devel/tcl-memchan/pkg-plist
+++ b/devel/tcl-memchan/pkg-plist
@@ -1,6 +1,6 @@
-lib/Memchan%%PORTVERSION%%/libMemchan.so.1
-lib/Memchan%%PORTVERSION%%/libMemchanstub.a
-lib/Memchan%%PORTVERSION%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/libMemchan.so.1
+lib/%%TCL_PKG%%/libMemchanstub.a
+lib/%%TCL_PKG%%/pkgIndex.tcl
 include/memchan.h
 include/memchanDecls.h
 include/buf.h
diff --git a/devel/tcl-mmap/Makefile b/devel/tcl-mmap/Makefile
index 3e59f63bd0ca..353f0208f7ae 100644
--- a/devel/tcl-mmap/Makefile
+++ b/devel/tcl-mmap/Makefile
@@ -11,17 +11,14 @@ COMMENT=	New TCL channel type using mmap-ed files
 
 LICENSE=	GPLv3
 
-USES+=		tcl
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--prefix=${PREFIX} \
-		--exec-prefix=${PREFIX}
+USES+=		tcl:tea
 
-PLIST_FILES=	lib/mmap${PORTVERSION}/pkgIndex.tcl \
-		lib/mmap${PORTVERSION}/libmmap${PORTVERSION}.so \
-		man/mann/tcl-mmap.n.gz
+PLIST_FILES=	lib/${TCL_PKG}/pkgIndex.tcl \
+		lib/${TCL_PKG}/lib${TCL_PKG}.so \
+		man/mann/${PORTNAME}.n.gz
+TEST_TARGET=	do-test
 
-regression-test: build
+do-test:
 	cd ${WRKSRC}/tests; \
 	for t in *.tcl; \
 	do \
diff --git a/devel/tcl-signal/Makefile b/devel/tcl-signal/Makefile
index 2df1b7ec6c84..d9622032c8a6 100644
--- a/devel/tcl-signal/Makefile
+++ b/devel/tcl-signal/Makefile
@@ -10,10 +10,9 @@ DISTNAME=	signal_ext${PORTVERSION:R:R}
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Dynamically loadable signal handling for Tcl/Tk scripts
 
-USES+=		tcl
-GNU_CONFIGURE=	yes
+USES+=		tcl:tea
 ALL_TARGET=	signal.so
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR}
+
 CONFIGURE_ENV+=	TCL_INC_DIR=${TCL_INCLUDEDIR}
 
 PLIST_FILES=	lib/signal/signal.so \
diff --git a/devel/tcl-trf/Makefile b/devel/tcl-trf/Makefile
index c1474d90eb41..5b7cf40d4ba4 100644
--- a/devel/tcl-trf/Makefile
+++ b/devel/tcl-trf/Makefile
@@ -14,19 +14,17 @@ COMMENT=	Data conversion, digests, compression, error-correction for Tcl
 
 ALL_TARGET=	all
 
-USES+=		tcl tar:bzip2
+USES+=		tcl:tea tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib/Trf
 DDIR=		${PREFIX}/lib/tcl${TCL_VER}/Trf
 CFLAGS+=	-Wall -Werror
 
-MAKE_ENV+=	TCL_VER=${TCL_VER} MKDIR="${MKDIR}" \
-		INSTALL_DATA="${INSTALL_DATA}"
+MAKE_ENV+=	INSTALL_DATA="${INSTALL_DATA}"
+
+TEST_TARGET=	do-test
 
 REINPLACE_ARGS=	-i ""
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TCL_VER} \
-		--with-tclinclude=${LOCALBASE}/include/tcl${TCL_VER} \
-		--enable-static-zlib --enable-static-bzlib \
+CONFIGURE_ARGS+=--enable-static-zlib --enable-static-bzlib \
 		--enable-static-md5
 
 .include <bsd.port.options.mk>
@@ -58,7 +56,7 @@ do-install:
 		${INSTALL_MAN} $$m ${STAGEDIR}${MANNPREFIX}/man/mann/ ;\
 	done
 
-check regression-test test:
+do-test:
 	@if ! ${PKG_BIN} info --quiet tcl-memchan; then	\
 		${PRINTF} "*****************\n%s\n*****************\n"	\
 		    "devel/tcl-memchan must be installed for the tests to work";	\
diff --git a/devel/tclbsd/Makefile b/devel/tclbsd/Makefile
index 2d9463a9fe88..015885c8eaec 100644
--- a/devel/tclbsd/Makefile
+++ b/devel/tclbsd/Makefile
@@ -14,18 +14,15 @@ LICENSE=	MIT
 OPTIONS_DEFINE=	DOCS
 PORTDOCS=	bsd.pdf
 
-USES=		tcl
-USE_AUTOTOOLS=	autoconf
+USES=		autoreconf tcl:tea
+TCL_PKG=	BSD${PORTVERSION}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
 
-CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR}
-
-PLIST_FILES=	lib/BSD${PORTVERSION}/bsd_procs.tcl \
-		lib/BSD${PORTVERSION}/libBSD${PORTVERSION}.so \
-		lib/BSD${PORTVERSION}/pkgIndex.tcl \
+PLIST_FILES=	lib/${TCL_PKG}/bsd_procs.tcl \
+		lib/${TCL_PKG}/lib${TCL_PKG}.so \
+		lib/${TCL_PKG}/pkgIndex.tcl \
 		man/mann/bsd.n.gz
 
 post-install:
diff --git a/devel/tcllauncher/Makefile b/devel/tcllauncher/Makefile
index 7d7ead7db342..7d1ecdce3df2 100644
--- a/devel/tcllauncher/Makefile
+++ b/devel/tcllauncher/Makefile
@@ -16,18 +16,13 @@ LIB_DEPENDS=	libtclx8.4.so:lang/tclX
 USE_GITHUB=	yes
 GH_ACCOUNT=	flightaware
 
-USES+=		tcl autoreconf
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--prefix=${PREFIX} \
-		--exec-prefix=${PREFIX}
-
-LIBDIR=		lib/Tcllauncher${PORTVERSION}
+USES+=		tcl:tea autoreconf
+TCL_PKG=	Tcllauncher${PORTVERSION}
 
 PLIST_FILES=	bin/${PORTNAME} \
-		${LIBDIR}/tcllauncher.tcl \
-		${LIBDIR}/tcllauncher-support.tcl \
-		${LIBDIR}/pkgIndex.tcl \
+		lib/${TCL_PKG}/tcllauncher.tcl \
+		lib/${TCL_PKG}/tcllauncher-support.tcl \
+		lib/${TCL_PKG}/pkgIndex.tcl \
 		man/mann/${PORTNAME}.n.gz
 
 .include <bsd.port.mk>
diff --git a/devel/tclmore/Makefile b/devel/tclmore/Makefile
index 143d4de49865..31ae0a2e1bd0 100644
--- a/devel/tclmore/Makefile
+++ b/devel/tclmore/Makefile
@@ -11,15 +11,12 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}_src
 MAINTAINER=	dsh@vlink.ru
 COMMENT=	More TCL commands
 
-USES=		gmake makeinfo tcl
-GNU_CONFIGURE=	yes
+USES=		gmake makeinfo tcl:tea
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_src$//}
 
 INFO=		${PORTNAME}
 
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--enable-threads
 MAKE_ENV+=	STAGEDIR=${STAGEDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/tcloo/Makefile b/devel/tcloo/Makefile
index ca303b329d52..6d82004f983a 100644
--- a/devel/tcloo/Makefile
+++ b/devel/tcloo/Makefile
@@ -10,15 +10,16 @@ DISTNAME=	TclOO+Package-${FOSSIL_CHECKIN}
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Implementation of TclOO for Tcl 8.5
 
+LICENSE=	TclTk
+LICENSE_NAME=	Tcl/Tk License
+LICENSE_FILE=	${WRKSRC}/license.terms
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+
 FOSSIL_CHECKIN=	0a6e9f1ea3
 WRKSRC=		${WRKDIR}/${DISTNAME:S/+/_/}
-USES+=		tcl:85
 USE_LDCONFIG=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--exec-prefix=${PREFIX}
-
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+USES+=		tcl:85,tea
+TCL_PKG=	TclOO${PORTVERSION}
 
 TEST_TARGET=	test
 
diff --git a/devel/tcloo/pkg-plist b/devel/tcloo/pkg-plist
index 1a8ea85ec3c7..d99ddeabbba0 100644
--- a/devel/tcloo/pkg-plist
+++ b/devel/tcloo/pkg-plist
@@ -1,7 +1,7 @@
-lib/TclOO%%PORTVERSION%%/libTclOO.so.1
-lib/TclOO%%PORTVERSION%%/pkgIndex.tcl
-lib/TclOO%%PORTVERSION%%/tclooConfig.sh
-lib/TclOO%%PORTVERSION%%/libTclOOstub.a
+lib/%%TCL_PKG%%/libTclOO.so.1
+lib/%%TCL_PKG%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/tclooConfig.sh
+lib/%%TCL_PKG%%/libTclOOstub.a
 include/tclOO.h
 include/tclOODecls.h
 man/mann/class.n.gz
diff --git a/devel/tclreadline/Makefile b/devel/tclreadline/Makefile
index 8bd0589bb4b8..8ada52d226d9 100644
--- a/devel/tclreadline/Makefile
+++ b/devel/tclreadline/Makefile
@@ -10,14 +10,10 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	GNU readline for TCL
 
-USES=		libtool tcl readline
-GNU_CONFIGURE=	yes
+USES=		libtool tcl:tea readline
 USE_LDCONFIG=	yes
-
-PLIST_SUB+=	VERSION="${PORTVERSION}"
-
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--with-tcl-includes=${TCL_INCLUDEDIR}
+TCL_PKG=	${PORTNAME}${PORTVERSION}
+PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
 post-patch:
 	${REINPLACE_CMD} \
diff --git a/devel/tclreadline/pkg-plist b/devel/tclreadline/pkg-plist
index 2b8f7d9bda92..68d58025d596 100644
--- a/devel/tclreadline/pkg-plist
+++ b/devel/tclreadline/pkg-plist
@@ -1,9 +1,9 @@
 include/tclreadline.h
-lib/libtclreadline-%%VERSION%%.so
+lib/libtclreadline-%%PORTVERSION%%.so
 lib/libtclreadline.a
 lib/libtclreadline.so
-lib/tclreadline%%VERSION%%/pkgIndex.tcl
-lib/tclreadline%%VERSION%%/tclreadlineCompleter.tcl
-lib/tclreadline%%VERSION%%/tclreadlineInit.tcl
-lib/tclreadline%%VERSION%%/tclreadlineSetup.tcl
+lib/%%TCL_PKG%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/tclreadlineCompleter.tcl
+lib/%%TCL_PKG%%/tclreadlineInit.tcl
+lib/%%TCL_PKG%%/tclreadlineSetup.tcl
 man/mann/tclreadline.n.gz
diff --git a/devel/tclthread/Makefile b/devel/tclthread/Makefile
index 80de68c317ed..750dd285f5c3 100644
--- a/devel/tclthread/Makefile
+++ b/devel/tclthread/Makefile
@@ -14,14 +14,10 @@ COMMENT=	Scripting level thread extension for Tcl
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/license.terms
 
-USES=		autoreconf tcl
-
-DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--prefix=${PREFIX} \
-		--exec-prefix=${PREFIX}
-USE_LDCONFIG=	${PREFIX}/lib/thread${PORTVERSION}
+USES=		autoreconf tcl:tea
+
+DOCSDIR=	${PREFIX}/share/doc/${TCL_PKG}
+USE_LDCONFIG=	${PREFIX}/lib/${TCL_PKG}
 
 PLIST_SUB+=	VERSION="${PORTVERSION}"
 
diff --git a/devel/tclthread/pkg-plist b/devel/tclthread/pkg-plist
index d52acbe40d9a..2e4e04deae8c 100644
--- a/devel/tclthread/pkg-plist
+++ b/devel/tclthread/pkg-plist
@@ -1,6 +1,6 @@
-lib/thread%%VERSION%%/libthread%%VERSION%%.so
-lib/thread%%VERSION%%/ttrace.tcl
-lib/thread%%VERSION%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so
+lib/%%TCL_PKG%%/ttrace.tcl
+lib/%%TCL_PKG%%/pkgIndex.tcl
 man/mann/thread.n.gz
 man/mann/tpool.n.gz
 man/mann/tsv.n.gz
diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index feda34bd28fa..8eb40cce80a2 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -18,19 +18,14 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 OPTIONS_DEFINE=	DOCS
 
-USES+=		tcl
+USES+=		tcl:tea
 USE_OPENSSL=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--exec-prefix=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR} \
-		--with-ssl-dir=${OPENSSLBASE}
-
-TCLPKG=		tls${PORTVERSION}
-WRKSRC=		${WRKDIR}/${TCLPKG}
-PLIST_FILES=	\
-		lib/${TCLPKG}/libtls.so.1 \
-		lib/${TCLPKG}/pkgIndex.tcl \
-		lib/${TCLPKG}/tls.tcl
+CONFIGURE_ARGS+=--with-ssl-dir=${OPENSSLBASE}
+
+WRKSRC=		${WRKDIR}/${TCL_PKG}
+PLIST_FILES=	lib/${TCL_PKG}/libtls.so.1 \
+		lib/${TCL_PKG}/pkgIndex.tcl \
+		lib/${TCL_PKG}/tls.tcl
 PORTDOCS=	*
 INSTALL_TARGET=	install-binaries install-doc
 
diff --git a/devel/tclvfs/Makefile b/devel/tclvfs/Makefile
index 35a25c37fdcb..1eaafc954171 100644
--- a/devel/tclvfs/Makefile
+++ b/devel/tclvfs/Makefile
@@ -11,10 +11,7 @@ COMMENT=	Tcl VirtualFileSystem layer
 
 LIB_DEPENDS=	libTrf2.1.4.so:devel/tcl-trf
 
-USES+=		gmake tcl
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--with-tcl=${TCL_LIBDIR} \
-		--prefix=${PREFIX} \
-		-exec-prefix=${PREFIX}
+USES+=		gmake tcl:tea
+TCL_PKG=	vfs1.3
 
 .include <bsd.port.mk>
diff --git a/devel/tclvfs/pkg-plist b/devel/tclvfs/pkg-plist
index b65da4cfee3d..ff6598fa0c51 100644
--- a/devel/tclvfs/pkg-plist
+++ b/devel/tclvfs/pkg-plist
@@ -1,28 +1,28 @@
-lib/vfs1.3/ftpvfs.tcl
-lib/vfs1.3/httpvfs.tcl
-lib/vfs1.3/libvfs1.3.so
-lib/vfs1.3/mk4vfs.tcl
-lib/vfs1.3/mk4vfscompat.tcl
-lib/vfs1.3/pkgIndex.tcl
-lib/vfs1.3/starkit.tcl
-lib/vfs1.3/tarvfs.tcl
-lib/vfs1.3/tclIndex
-lib/vfs1.3/tclprocvfs.tcl
-lib/vfs1.3/template/collatevfs.tcl
-lib/vfs1.3/template/deltavfs.tcl
-lib/vfs1.3/template/fishvfs.tcl
-lib/vfs1.3/template/globfind.tcl
-lib/vfs1.3/template/quotavfs.tcl
-lib/vfs1.3/template/tdelta.tcl
-lib/vfs1.3/template/templatevfs.tcl
-lib/vfs1.3/template/versionvfs.tcl
-lib/vfs1.3/testvfs.tcl
-lib/vfs1.3/tkvfs.tcl
-lib/vfs1.3/vfsUrl.tcl
-lib/vfs1.3/vfsUtils.tcl
-lib/vfs1.3/vfslib.tcl
-lib/vfs1.3/webdavvfs.tcl
-lib/vfs1.3/zipvfs.tcl
-lib/vfs1.3/zipvfscompat.tcl
+lib/%%TCL_PKG%%/ftpvfs.tcl
+lib/%%TCL_PKG%%/httpvfs.tcl
+lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so
+lib/%%TCL_PKG%%/mk4vfs.tcl
+lib/%%TCL_PKG%%/mk4vfscompat.tcl
+lib/%%TCL_PKG%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/starkit.tcl
+lib/%%TCL_PKG%%/tarvfs.tcl
+lib/%%TCL_PKG%%/tclIndex
+lib/%%TCL_PKG%%/tclprocvfs.tcl
+lib/%%TCL_PKG%%/template/collatevfs.tcl
+lib/%%TCL_PKG%%/template/deltavfs.tcl
+lib/%%TCL_PKG%%/template/fishvfs.tcl
+lib/%%TCL_PKG%%/template/globfind.tcl
+lib/%%TCL_PKG%%/template/quotavfs.tcl
+lib/%%TCL_PKG%%/template/tdelta.tcl
+lib/%%TCL_PKG%%/template/templatevfs.tcl
+lib/%%TCL_PKG%%/template/versionvfs.tcl
+lib/%%TCL_PKG%%/testvfs.tcl
+lib/%%TCL_PKG%%/tkvfs.tcl
+lib/%%TCL_PKG%%/vfsUrl.tcl
+lib/%%TCL_PKG%%/vfsUtils.tcl
+lib/%%TCL_PKG%%/vfslib.tcl
+lib/%%TCL_PKG%%/webdavvfs.tcl
+lib/%%TCL_PKG%%/zipvfs.tcl
+lib/%%TCL_PKG%%/zipvfscompat.tcl
 man/mann/vfs.n.gz
 man/mann/vfslib.n.gz
diff --git a/devel/tclxml/Makefile b/devel/tclxml/Makefile
index 6d0bf14910fb..a129d538b306 100644
--- a/devel/tclxml/Makefile
+++ b/devel/tclxml/Makefile
@@ -19,14 +19,12 @@ PORTDOCS=	README.xml html.xsl man.macros nroff.xsl tcldoc-1.0.dtd \
 		tcldom.html tcldom.xml tclxml.css tclxml.html tclxml.xml \
 		tclxslt.html tclxslt.xml transform.tcl txt.xsl
 
-USES=		tcl tar:xz
+USES=		tcl:tea tar:xz
+TCL_PKG=	Tclxml${PORTVERSION}
+PLIST_SUB=	PORTVERSION=${PORTVERSION}
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
-GNU_CONFIGURE=	yes
-USE_LDCONFIG?=	${PREFIX}/lib/Tclxml${PORTVERSION}
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
-		--with-tcl=${TCL_LIBDIR} \
-		XML_CONFIG="${XML_CONFIG}"
-PLIST_SUB=	VER=${PORTVERSION}
+USE_LDCONFIG=	${PREFIX}/lib/${TCL_PKG}
+CONFIGURE_ARGS+=XML_CONFIG="${XML_CONFIG}"
 
 OPTIONS_DEFINE=	DOCS
 MAKE_ENV+=	TCLLIBPATH=${STAGEDIR}/${PREFIX}/lib
@@ -39,13 +37,9 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/FreeBSD-\*/FreeBSD-*|DragonFly-*/g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} doc)
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-.endif
 
 .include <bsd.port.mk>
diff --git a/devel/tclxml/pkg-plist b/devel/tclxml/pkg-plist
index aeb8108c3659..e1659e4d0693 100644
--- a/devel/tclxml/pkg-plist
+++ b/devel/tclxml/pkg-plist
@@ -3,24 +3,24 @@ include/tclxml/tcldom-libxml2.h
 include/tclxml/tcldom.h
 include/tclxml/tclxml-libxml2.h
 include/tclxml/tclxslt.h
-lib/Tclxml%%VER%%/libTclxml%%VER%%.so
-lib/Tclxml%%VER%%/libTclxmlstub%%VER%%.a
-lib/Tclxml%%VER%%/pkgIndex.tcl
-lib/Tclxml%%VER%%/process.tcl
-lib/Tclxml%%VER%%/resources.tcl
-lib/Tclxml%%VER%%/sgml-8.0.tcl
-lib/Tclxml%%VER%%/sgml-8.1.tcl
-lib/Tclxml%%VER%%/sgmlparser.tcl
-lib/Tclxml%%VER%%/tcldom-libxml2.tcl
-lib/Tclxml%%VER%%/tclparser-8.0.tcl
-lib/Tclxml%%VER%%/tclparser-8.1.tcl
-lib/Tclxml%%VER%%/tclxslt-libxslt.tcl
-lib/Tclxml%%VER%%/utilities.tcl
-lib/Tclxml%%VER%%/xml-8.0.tcl
-lib/Tclxml%%VER%%/xml-8.1.tcl
-lib/Tclxml%%VER%%/xml__tcl.tcl
-lib/Tclxml%%VER%%/xmldep.tcl
-lib/Tclxml%%VER%%/xmlswitch.tcl
-lib/Tclxml%%VER%%/xpath.tcl
-lib/Tclxml%%VER%%/xsltcache.tcl
+lib/%%TCL_PKG%%/lib%%TCL_PKG%%.so
+lib/%%TCL_PKG%%/libTclxmlstub%%PORTVERSION%%.a
+lib/%%TCL_PKG%%/pkgIndex.tcl
+lib/%%TCL_PKG%%/process.tcl
+lib/%%TCL_PKG%%/resources.tcl
+lib/%%TCL_PKG%%/sgml-8.0.tcl
+lib/%%TCL_PKG%%/sgml-8.1.tcl
+lib/%%TCL_PKG%%/sgmlparser.tcl
+lib/%%TCL_PKG%%/tcldom-libxml2.tcl
+lib/%%TCL_PKG%%/tclparser-8.0.tcl
+lib/%%TCL_PKG%%/tclparser-8.1.tcl
+lib/%%TCL_PKG%%/tclxslt-libxslt.tcl
+lib/%%TCL_PKG%%/utilities.tcl
+lib/%%TCL_PKG%%/xml-8.0.tcl
+lib/%%TCL_PKG%%/xml-8.1.tcl
+lib/%%TCL_PKG%%/xml__tcl.tcl
+lib/%%TCL_PKG%%/xmldep.tcl
+lib/%%TCL_PKG%%/xmlswitch.tcl
+lib/%%TCL_PKG%%/xpath.tcl
+lib/%%TCL_PKG%%/xsltcache.tcl
 lib/TclxmlConfig.sh
diff --git a/lang/tclX/Makefile b/lang/tclX/Makefile
index 6570a5ee7f06..518efcc4fd41 100644
--- a/lang/tclX/Makefile
+++ b/lang/tclX/Makefile
@@ -17,13 +17,10 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 WRKSRC=		${WRKDIR}/${PORTNAME:tl}${PORTVERSION:R}
 
-USES=		alias tcl tar:bzip2
+USES=		autoreconf alias tcl:tea tar:bzip2
 USE_LDCONFIG=	${PREFIX}/lib/tclx${PORTVERSION:R}
-USE_AUTOTOOLS=	autoconf
-CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
-		--enable-shared \
-		--with-help=Help \
-		--with-tcl="${TCL_LIBDIR}"
+CONFIGURE_ARGS+=--enable-shared \
+		--with-help=Help
 PLIST_SUB=	TCLX_VER=${PORTVERSION:R}
 ALL_TARGET=	binaries libraries
 INSTALL_TARGET=	install-binaries install-libraries