- Convert existing ports to a new bsd.tcl.mk order

PR:		ports/109097
Submitted by:	Martin Matuska <martin@matuska.org>
Tested on:	pointyhat exp-run

46 files changed, 64 insertions, 98 deletions

diff --git a/astro/gpsman/Makefile b/astro/gpsman/Makefile
index 7ab1ce0dfea..f7a90ba0e4e 100644
--- a/astro/gpsman/Makefile
+++ b/astro/gpsman/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	david@catwhisker.org
 COMMENT=	A Tcl/Tk-based GPS management utility
 
 #RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84
-USE_TK=		84
+USE_TK_RUN=	84
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
diff --git a/astro/ptiger/Makefile b/astro/ptiger/Makefile
index ec3201cca6b..1124566c74c 100644
--- a/astro/ptiger/Makefile
+++ b/astro/ptiger/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Displays U.S. Census Burea populated places on a map
 LIB_DEPENDS=	tkgeomap.0:${PORTSDIR}/astro/tkgeomap
 
 USE_XLIB=	yes
-USE_TK=		yes
+USE_TK_RUN=	yes
 NO_BUILD=	yes
 
 post-patch:
diff --git a/astro/tclgeomap/Makefile b/astro/tclgeomap/Makefile
index d18c040d8ee..d0a1d4ea02d 100644
--- a/astro/tclgeomap/Makefile
+++ b/astro/tclgeomap/Makefile
@@ -13,8 +13,6 @@ MASTER_SITES=	SF/tkgeomap
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Read, manipulate and display geo data
 
-LIB_DEPENDS=	tcl${USE_TCL}.1:${PORTSDIR}/lang/tcl${USE_TCL}
-
 USE_TCL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
diff --git a/astro/tkgeomap/Makefile b/astro/tkgeomap/Makefile
index 183b0d0678b..b4afd577a38 100644
--- a/astro/tkgeomap/Makefile
+++ b/astro/tkgeomap/Makefile
@@ -13,8 +13,7 @@ MASTER_SITES=	SF
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Read, manipulate and display geo data
 
-LIB_DEPENDS=	tclgeomap.0:${PORTSDIR}/astro/tclgeomap \
-		tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
+LIB_DEPENDS=	tclgeomap.0:${PORTSDIR}/astro/tclgeomap
 
 CONFIGURE_ARGS=	--with-tclgeomap-include=${LOCALBASE}/include/tclgeomap --with-x \
 		--with-tcl=${TCL_LIBDIR} --with-tclinclude=${TCL_INCLUDEDIR} \
diff --git a/astro/xeartk/Makefile b/astro/xeartk/Makefile
index 0613d70b946..7e47935b12f 100644
--- a/astro/xeartk/Makefile
+++ b/astro/xeartk/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Small demo for tkgeomap
 LIB_DEPENDS=	tkgeomap.0:${PORTSDIR}/astro/tkgeomap
 
 USE_XLIB=	yes
-USE_TK=		yes
+USE_TK_RUN=	yes
 NO_BUILD=	yes
 DATA_FILES=	README cities land.xdr rivers.xdr water.xdr
 PLIST_FILES=	bin/${PORTNAME} ${DATA_FILES:S,^,%%DATADIR%%/,}
diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile
index bf065f8c4fa..33cde892cd5 100644
--- a/cad/pcb/Makefile
+++ b/cad/pcb/Makefile
@@ -27,7 +27,7 @@ USE_GNOME=	gtk20
 .endif
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_TK=		83
+USE_TK_RUN=	83
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
 
diff --git a/comms/tkhylafax/Makefile b/comms/tkhylafax/Makefile
index e595f9e816c..bf3e8659795 100644
--- a/comms/tkhylafax/Makefile
+++ b/comms/tkhylafax/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A tcl/tk interface to Sam Leffler's fax package
 
 USE_GHOSTSCRIPT_RUN=	yes
-USE_TK=		yes
+USE_TK_RUN=	yes
 
 RUN_DEPENDS=	sendfax:${PORTSDIR}/comms/hylafax \
 		gv:${PORTSDIR}/print/gv
diff --git a/deskutils/zorro/Makefile b/deskutils/zorro/Makefile
index 3db9a0128ae..6e2aa585e32 100644
--- a/deskutils/zorro/Makefile
+++ b/deskutils/zorro/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	${PORTNAME}-1.1p8
 MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	A simple to-do list manager
 
-USE_TK=		yes
+USE_TK_RUN=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/zorro
 PORTDOCS=	DOTzorrorc
diff --git a/devel/cbrowser/Makefile b/devel/cbrowser/Makefile
index 9b80bf44c29..9e8040dd8fe 100644
--- a/devel/cbrowser/Makefile
+++ b/devel/cbrowser/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	jkoshy@freebsd.org
 COMMENT=	Graphical front end for cscope and cscope clones
 
-USE_TK=		yes
+USE_TK_RUN=	yes
 NO_BUILD=	yes
 
 # Private variables
diff --git a/devel/tkcvs/Makefile b/devel/tkcvs/Makefile
index 754331a3e7e..323324fce70 100644
--- a/devel/tkcvs/Makefile
+++ b/devel/tkcvs/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/Tk frontends to CVS, Subversion and diff
 
 NO_BUILD=	yes
-USE_TK=		84
+USE_TK_RUN=	84
 
 MAN1=		tkcvs.1
 PORTDOCS=	CHANGELOG COPYING FAQ INSTALL vendor5readme.pdf
diff --git a/devel/tkp4/Makefile b/devel/tkp4/Makefile
index 36178348280..f6f36f4eb9a 100644
--- a/devel/tkp4/Makefile
+++ b/devel/tkp4/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	p4:${PORTSDIR}/devel/perforce
 
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
-USE_TK=		yes
+USE_TK_RUN=	yes
 
 do-install:
 	${MKDIR} ${DATADIR}
diff --git a/editors/impress/Makefile b/editors/impress/Makefile
index d7e3ee939f6..e03a81045c4 100644
--- a/editors/impress/Makefile
+++ b/editors/impress/Makefile
@@ -17,7 +17,7 @@ DISTNAME=	imp${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Publishing and presentation tool
 
-USE_TK=		84
+USE_TK_RUN=	84
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/emulators/bsvc/Makefile b/emulators/bsvc/Makefile
index fef4144960e..b31cbdb6d0c 100644
--- a/emulators/bsvc/Makefile
+++ b/emulators/bsvc/Makefile
@@ -18,7 +18,7 @@ COMMENT=	An extensible hardware simulation framework with MC68K support
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 MAKE_ENV=	PROJECT_BASE=${PREFIX} WRKSRC=${WRKSRC}
-USE_TK=		yes
+USE_TK_RUN=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/games/klondike/Makefile b/games/klondike/Makefile
index 4c3ce09df32..e048420fa40 100644
--- a/games/klondike/Makefile
+++ b/games/klondike/Makefile
@@ -17,8 +17,11 @@ COMMENT=	A solitaire game for X11
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--bindir=${PREFIX}/bin --datadir=${PREFIX}/share/games \
 		--mandir=${PREFIX}/man
-CONFIGURE_ENV=	WISHX=${PREFIX}/bin/wish8.4
-USE_TK=		yes
+USE_TK_RUN=	yes
 MAN6=		klondike.6
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+CONFIGURE_ENV=	WISHX=${WISH}
+
+.include <bsd.port.post.mk>
diff --git a/games/tkmoo/Makefile b/games/tkmoo/Makefile
index 044f157c1d8..3fc21d97a9a 100644
--- a/games/tkmoo/Makefile
+++ b/games/tkmoo/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	tkMOO-light-${PORTVERSION}
 MAINTAINER=	adam-ports@blacktabby.org
 COMMENT=	Tk-based M** client with scripting support
 
-USE_TK=		yes
+USE_TK_RUN=	yes
 MAKE_ENV+=	TKMOO_LIB_DIR="${DATADIR}" \
 		TKMOO_BIN_DIR="${PREFIX}/bin" WISH8.3="${WISH}"
 
diff --git a/graphics/aolserver-nsgd/Makefile b/graphics/aolserver-nsgd/Makefile
index 2334f5ceaf4..3d396bc0035 100644
--- a/graphics/aolserver-nsgd/Makefile
+++ b/graphics/aolserver-nsgd/Makefile
@@ -28,13 +28,8 @@ PLIST_SUB+=	AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}
 
 USE_GMAKE=	yes
 
-USE_TCL_VER?=	84
-
-.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
-IGNORE=		supported values for USE_TCL_VER are only 84 and 85
-.endif
-
-USE_TCL_BUILD=	${USE_TCL_VER}-thread
+USE_TCL=	84+
+USE_TCL_THREADS=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/tkpng/Makefile b/graphics/tkpng/Makefile
index 4f785953a89..b0cf2fe9105 100644
--- a/graphics/tkpng/Makefile
+++ b/graphics/tkpng/Makefile
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	PNG support for Tcl/Tk
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_TK=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
diff --git a/irc/tkirc/Makefile b/irc/tkirc/Makefile
index d5325f589e3..09552b995ab 100644
--- a/irc/tkirc/Makefile
+++ b/irc/tkirc/Makefile
@@ -17,7 +17,7 @@ COMMENT=	A GUI for the ircII Internet Relay Chat client
 
 RUN_DEPENDS=	irc:${PORTSDIR}/irc/ircII
 
-USE_TK=		yes
+USE_TK_RUN=	yes
 WRKSRC=		${WRKDIR}/tkirc2
 NO_BUILD=	yes
 
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index a94778ac80e..2c5c4290b9d 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -45,7 +45,7 @@ SCRIPT_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
 .endif
 
 .if !defined(WITHOUT_X11)
-USE_TK=		yes
+USE_TK_RUN=	yes
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/lang/erlang14/Makefile b/lang/erlang14/Makefile
index a94778ac80e..2c5c4290b9d 100644
--- a/lang/erlang14/Makefile
+++ b/lang/erlang14/Makefile
@@ -45,7 +45,7 @@ SCRIPT_ENV+=	PATH=${PATH}:${JAVA_HOME}/bin
 .endif
 
 .if !defined(WITHOUT_X11)
-USE_TK=		yes
+USE_TK_RUN=	yes
 .endif
 
 .include <bsd.port.pre.mk>
diff --git a/lang/tcl-wrapper/Makefile b/lang/tcl-wrapper/Makefile
index 5254e1e0648..8488115995c 100644
--- a/lang/tcl-wrapper/Makefile
+++ b/lang/tcl-wrapper/Makefile
@@ -33,9 +33,9 @@ TX_SHELL=	wish
 TX_PORT=	tk
 TX_PORT_U=	Tk
 TX_CAT=		x11-toolkits
-USE_TK=		yes
+USE_TK_RUN=	yes
 .else
-USE_TCL=	yes
+USE_TCL_RUN=	yes
 .endif
 
 TX_CONF=	${TX_SHELL}.conf
diff --git a/math/py-matplotlib/Makefile b/math/py-matplotlib/Makefile
index 2ce87dbafd7..ee317e996a9 100644
--- a/math/py-matplotlib/Makefile
+++ b/math/py-matplotlib/Makefile
@@ -32,8 +32,8 @@ BUILD_DEPENDS+=	Xvfb:${X_VFBSERVER_PORT}
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 USE_GNOME=	gtk20 pygtk2
-USE_TCL=	yes
-USE_TK=	yes
+USE_TCL_RUN=	yes
+USE_TK_RUN=	yes
 CFLAGS+=	-I${X11BASE}/include
 
 EXAMPLESDIR=	${TARGETDIR}/share/examples/py-${PORTNAME}
diff --git a/misc/ewipe/Makefile b/misc/ewipe/Makefile
index 5b8f0f09b1e..fb5aaffdb40 100644
--- a/misc/ewipe/Makefile
+++ b/misc/ewipe/Makefile
@@ -19,7 +19,7 @@ COMMENT?=	Tcl/tk-based presentation tool
 .if defined(KANJI)
 RUN_DEPENDS=	wish8.0jp:${PORTSDIR}/japanese/tk80
 .else
-USE_TK=		yes
+USE_TK_RUN=	yes
 .endif
 
 NO_BUILD=	yes
diff --git a/misc/fcalc/Makefile b/misc/fcalc/Makefile
index 69782e84b8c..1f1ff8c71b4 100644
--- a/misc/fcalc/Makefile
+++ b/misc/fcalc/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/tix8.1/Tix.tcl:${PORTSDIR}/x11-toolkits/tix
 
 NO_BUILD=	yes
 USE_X_PREFIX=	yes
-USE_TK=	84
+USE_TK_RUN=	84
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-1.00
 
diff --git a/misc/tkregexp/Makefile b/misc/tkregexp/Makefile
index f1f2243160b..40f4289dd66 100644
--- a/misc/tkregexp/Makefile
+++ b/misc/tkregexp/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	visual_regexp-${PORTVERSION}
 MAINTAINER=	carpetsmoker@xs4all.nl
 COMMENT=	An interactive regexp design tool
 
-USE_TK=		yes
+USE_TK_RUN=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/tkregexp
 
diff --git a/multimedia/tkxanim/Makefile b/multimedia/tkxanim/Makefile
index 402ffd930ed..e583ab4389c 100644
--- a/multimedia/tkxanim/Makefile
+++ b/multimedia/tkxanim/Makefile
@@ -16,7 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Tcl/Tk frontend to xanim
 
 RUN_DEPENDS=	xanim:${PORTSDIR}/multimedia/xanim
-USE_TK=		yes
+USE_TK_RUN=	yes
 
 WRKSRC=		${WRKDIR}/Tkxanim
 
diff --git a/net-im/tkabber-devel/Makefile b/net-im/tkabber-devel/Makefile
index 901ab1ceb6e..9e4e39c2ebf 100644
--- a/net-im/tkabber-devel/Makefile
+++ b/net-im/tkabber-devel/Makefile
@@ -25,8 +25,8 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_BZIP2=	yes
-USE_TCL=	yes
-USE_TK=		yes
+USE_TCL_RUN=	yes
+USE_TK_RUN=	yes
 
 SUBDIRS=	emoticons ifacetk jabberlib-tclxml mclistbox msgs pixmaps \
 		plugins sounds trans
diff --git a/net-mgmt/ipacco/Makefile b/net-mgmt/ipacco/Makefile
index 36ba6ccac1d..b612d01bcbc 100644
--- a/net-mgmt/ipacco/Makefile
+++ b/net-mgmt/ipacco/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/include/tclExtend.h:${PORTSDIR}/lang/tclX \
 
 NO_BUILD=	yes
 USE_PHP=	mysql gd
-USE_TCL=	yes
+USE_TCL_RUN=	yes
 
 IPACCO?=	www/${PORTNAME}
 IPACCO_WEB=	${PREFIX}/${IPACCO}
diff --git a/net/openverse/Makefile b/net/openverse/Makefile
index 33cb5f04d53..e4ca1727b3f 100644
--- a/net/openverse/Makefile
+++ b/net/openverse/Makefile
@@ -14,8 +14,8 @@ DISTNAME=	${PORTNAME}-0.8-7
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A visual chat program written in Tcl/Tk
 
-USE_TK=		yes
-USE_TCL=	yes
+USE_TK_RUN=	yes
+USE_TCL_RUN=	yes
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/OpenVerse
 
diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile
index ac52388b5eb..074faead15a 100644
--- a/net/tcpillust/Makefile
+++ b/net/tcpillust/Makefile
@@ -16,7 +16,6 @@ COMMENT=	A graphical TCP connection analysis tool
 
 USE_TCL=	yes
 USE_TK=		yes
-USE_TK_BUILD=	yes
 USE_XLIB=	yes
 USE_MOTIF=	yes
 
diff --git a/ports-mgmt/instant-tinderbox/Makefile b/ports-mgmt/instant-tinderbox/Makefile
index 03a317c02db..7b13fde2b24 100644
--- a/ports-mgmt/instant-tinderbox/Makefile
+++ b/ports-mgmt/instant-tinderbox/Makefile
@@ -36,8 +36,8 @@ USE_APACHE=	yes
 
 USE_PHP=	yes
 
-USE_TCL=	yes
-USE_TK=		yes
+USE_TCL_RUN=	yes
+USE_TK_RUN=	yes
 
 USE_XLIB=	yes
 USE_PERL5=	yes
diff --git a/security/aolserver-nsmcrypt/Makefile b/security/aolserver-nsmcrypt/Makefile
index e0387b8001f..0ccb7e5982f 100644
--- a/security/aolserver-nsmcrypt/Makefile
+++ b/security/aolserver-nsmcrypt/Makefile
@@ -27,13 +27,8 @@ PLIST_SUB+=	AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}
 
 USE_GMAKE=	yes
 
-USE_TCL_VER?=	84
-
-.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
-IGNORE=		supported values for USE_TCL_VER are only 84 and 85
-.endif
-
-USE_TCL_BUILD=	${USE_TCL_VER}-thread
+USE_TCL=	84+
+USE_TCL_THREADS=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/aolserver-nsmhash/Makefile b/security/aolserver-nsmhash/Makefile
index 6eec9f0f0c5..7c79eab3f74 100644
--- a/security/aolserver-nsmhash/Makefile
+++ b/security/aolserver-nsmhash/Makefile
@@ -27,13 +27,8 @@ PLIST_SUB+=	AOLSERVERBASE=${AOLSERVERBASE:S/${PREFIX}\///}
 
 USE_GMAKE=	yes
 
-USE_TCL_VER?=	84
-
-.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
-IGNORE=		supported values for USE_TCL_VER are only 84 and 85
-.endif
-
-USE_TCL_BUILD=	${USE_TCL_VER}-thread
+USE_TCL=	84+
+USE_TCL_THREADS=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/security/gorilla/Makefile b/security/gorilla/Makefile
index c9fed7e639f..8159b1db72e 100644
--- a/security/gorilla/Makefile
+++ b/security/gorilla/Makefile
@@ -17,9 +17,8 @@ COMMENT=	Password Gorilla is cross-platform Password Manager
 LIB_DEPENDS=	itcl.3:${PORTSDIR}/lang/itcl
 RUN_DEPENDS=	${LOCALBASE}/lib/bwidget/init.tcl:${PORTSDIR}/x11-toolkits/bwidget
 
-USE_TCL=	yes
+USE_TCL_RUN=	yes
 USE_TK=		yes
-USE_TK_BUILD=	yes
 GNU_CONFIGURE=	yes
 NO_BUILD=	yes
 
diff --git a/security/secpanel/Makefile b/security/secpanel/Makefile
index 2e81bbcaabf..a0248ff7fb9 100644
--- a/security/secpanel/Makefile
+++ b/security/secpanel/Makefile
@@ -18,7 +18,7 @@ COMMENT=	GUI for managing and running ssh and related utilities
 RUN_DEPENDS=	ssh-askpass:${PORTSDIR}/security/openssh-askpass
 
 USE_X_PREFIX=	yes
-USE_TK=		84
+USE_TK_RUN=	84
 
 NO_BUILD=	yes
 
diff --git a/textproc/msort/Makefile b/textproc/msort/Makefile
index d6a95e54f4a..136e9608b79 100644
--- a/textproc/msort/Makefile
+++ b/textproc/msort/Makefile
@@ -21,7 +21,7 @@ RUN_DEPENDS=	iwidgets>=0:${PORTSDIR}/x11-toolkits/iwidgets
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 MAKE_ENV+=	INCLUDES="-I${LOCALBASE}/include"
 GNU_CONFIGURE=	yes
-USE_TK=		yes
+USE_TK_RUN=	yes
 
 PLIST_FILES=	bin/msg bin/msort
 
diff --git a/textproc/redet/Makefile b/textproc/redet/Makefile
index 1eac91e945f..77df618d998 100644
--- a/textproc/redet/Makefile
+++ b/textproc/redet/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${LOCALBASE}/lib/iwidgets/iwidgets.tcl:${PORTSDIR}/x11-toolkits/iwi
 
 NO_BUILD=	yes
 USE_BZIP2=	yes
-USE_TK=		84
+USE_TK_RUN=	84
 
 PORTDOCS=	AUTHORS COPYING CREDITS LICENSE NEWS README-General ChangeLog
 MAN1=		redet.1
diff --git a/textproc/redland-bindings/Makefile b/textproc/redland-bindings/Makefile
index e473619e50c..828b5410ad9 100644
--- a/textproc/redland-bindings/Makefile
+++ b/textproc/redland-bindings/Makefile
@@ -77,10 +77,10 @@ PLIST_SUB+=	WITH_RUBY="@comment "
 .endif
 .if defined(WITH_TCL)
 .if defined(WITH_TCL83)
-USE_TCL=	83
+USE_TCL_RUN=	83
 TCL_LONG_V=	8.3
 .else
-USE_TCL=	84
+USE_TCL_RUN=	84
 TCL_LONG_V=	8.4
 .endif
 PLIST_SUB+=	WITH_TCL=""
diff --git a/textproc/xml2rfc/Makefile b/textproc/xml2rfc/Makefile
index 6a623b17ded..832b8534ad5 100644
--- a/textproc/xml2rfc/Makefile
+++ b/textproc/xml2rfc/Makefile
@@ -13,10 +13,10 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	lennox@cs.columbia.edu
 COMMENT=	A tool to create RFCs and related documents from XML, as per RFC2629
 
-USE_TCL=yes
+USE_TCL_RUN=	yes
 
 .if !defined(WITHOUT_X11)
-USE_TK=yes
+USE_TK_RUN=	yes
 .endif
 
 PATCH_TCL_SCRIPTS=xml2rfc.tcl
diff --git a/www/tdom/Makefile b/www/tdom/Makefile
index 130322d278d..bed6221b1c6 100644
--- a/www/tdom/Makefile
+++ b/www/tdom/Makefile
@@ -17,14 +17,8 @@ COMMENT=	High performance XML data processing with Tcl (ARGS for OpenACS)
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/unix
 TDOMBASE=	${PREFIX}/lib/tdom${PORTVERSION}
 
-USE_TCL_VER?=	84
-
-.if ${USE_TCL_VER} != 84 && ${USE_TCL_VER} != 85
-IGNORE=		supported values for USE_TCL_VER are only 84 and 85
-.endif
-
-# by default we want a threaded build
-LIB_DEPENDS=	tcl${USE_TCL_VER}-threads:${PORTSDIR}/lang/tcl${USE_TCL_VER}-thread
+USE_TCL=	84+
+USE_TCL_THREADS=	yes
 
 USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
@@ -45,8 +39,8 @@ HTMLDOCS=	category-index.html dom.html domDoc.html domNode.html \
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--enable-threads --disable-tdomalloc \
-		--with-tcl=${LOCALBASE}/lib/tcl${USE_TCL_VER:S/8/8./}-threads \
-		--with-tclinclude=${LOCALBASE}/include/tcl${USE_TCL_VER:S/8/8./} --prefix=${PREFIX}
+		--with-tcl=${TCL_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR} --prefix=${PREFIX}
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/www/websh/Makefile b/www/websh/Makefile
index f70d5400f97..8062010e27b 100644
--- a/www/websh/Makefile
+++ b/www/websh/Makefile
@@ -15,8 +15,6 @@ EXTRACT_SUFX=	-src.tar.gz
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Embeds a TCL8 interpreter in the Apache server
 
-LIB_DEPENDS=	tcl${TCL_DVER}:${PORTSDIR}/lang/tcl${TCL_DVER}
-
 OPTIONS=	WSMDEBUG "memory(n) and checkmem(n) commands in web-scripts" on
 OPTIONS+=	WSSTATIC "Link the objects into the module statically" off
 
diff --git a/x11-toolkits/py-tktreectrl/Makefile b/x11-toolkits/py-tktreectrl/Makefile
index 378fc68b2b0..64fc89bad6f 100644
--- a/x11-toolkits/py-tktreectrl/Makefile
+++ b/x11-toolkits/py-tktreectrl/Makefile
@@ -19,7 +19,7 @@ LIB_DEPENDS=	treectrl.0:${PORTSDIR}/x11-toolkits/tktreectrl
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/Pmw/__init__.py:${PORTSDIR}/x11-toolkits/pmw
 
-USE_TK=		yes
+USE_TK_RUN=	yes
 USE_ZIP=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=yes
diff --git a/x11-toolkits/tile/Makefile b/x11-toolkits/tile/Makefile
index 0104b3dfe3b..ee05999271d 100644
--- a/x11-toolkits/tile/Makefile
+++ b/x11-toolkits/tile/Makefile
@@ -13,12 +13,11 @@ MASTER_SITES=	SF/tktable
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Themed widget set for Tk
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_TK=		yes
+
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--exec-prefix=${PREFIX} --enable-shared
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
diff --git a/x11-toolkits/tkdnd/Makefile b/x11-toolkits/tkdnd/Makefile
index 2c5351a8b3b..0481170d684 100644
--- a/x11-toolkits/tkdnd/Makefile
+++ b/x11-toolkits/tkdnd/Makefile
@@ -15,8 +15,6 @@ MASTER_SITES=	CSME
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Native drag and drop capabilities
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_BZIP2=	yes
 USE_TK=		yes
 GNU_CONFIGURE=	yes
diff --git a/x11-toolkits/tktray/Makefile b/x11-toolkits/tktray/Makefile
index 974392b7beb..11104424915 100644
--- a/x11-toolkits/tktray/Makefile
+++ b/x11-toolkits/tktray/Makefile
@@ -14,8 +14,6 @@ DISTNAME=	${TKPKG}
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	System tray icon support
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_TK=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} \
diff --git a/x11-toolkits/tktreectrl/Makefile b/x11-toolkits/tktreectrl/Makefile
index ea7e965ea60..6da8b262a1a 100644
--- a/x11-toolkits/tktreectrl/Makefile
+++ b/x11-toolkits/tktreectrl/Makefile
@@ -13,19 +13,17 @@ MASTER_SITES=	SF
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Multi-column hierarchical listbox widget
 
-LIB_DEPENDS=	tk${USE_TK}.1:${PORTSDIR}/x11-toolkits/tk${USE_TK}
-
 USE_TK=		yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl${TK_VER} \
-		--with-tk=${LOCALBASE}/lib/tk${TK_VER} \
+CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
+		--with-tk=${TK_LIBDIR} \
 		--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
 		--mandir=${MANPREFIX}/man \
 		--exec-prefix=${PREFIX} --enable-shared
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDES} ${TK_INCLUDES}"
-TCL_INCLUDES=	-I${LOCALBASE}/include/tcl${TK_VER} -I${LOCALBASE}/include/tcl${TK_VER}/generic
-TK_INCLUDES=	-I${LOCALBASE}/include/tk${TK_VER} -I${LOCALBASE}/include/tk${TK_VER}/generic \
-		-I${LOCALBASE}/include/tk${TK_VER}/unix
+TCL_INCLUDES=	-I${TCL_INCLUDEDIR} -I${TCL_INCLUDEDIR}/generic
+TK_INCLUDES=	-I${TK_INCLUDEDIR} -I${TK_INCLUDEDIR}/generic \
+		-I${TK_INCLUDEDIR}/unix
 TKPKG=		treectrl${PORTVERSION}
 TKLIBVER=	2.2
 PLIST_SUB=	VER=${PORTVERSION} TKPKG=${TKPKG} TKLIBVER=${TKLIBVER}