Index: Makefile
===================================================================
--- Makefile	(revision 339336)
+++ Makefile	(working copy)
@@ -102,11 +102,8 @@
 PYTHON_USE=	PYTHON_BUILD=yes
 RUBY_USE=	RUBY=yes
 LUA_USE=	LUA=yes
-# broken: Do not set both tcl and tk in USES
-#TCL_USES=	tcl:84+,build
-#TK_USES= 	tk:84+,build
-TCL_USE=	TCL_BUILD=84+
-TK_USE=		TK_BUILD=84+
+TCL_USES=	tcl:build
+TK_USES= 	tk:build
 
 POPPLER_LIB_DEPENDS=	libpoppler-glib.so:${PORTSDIR}/graphics/poppler-glib
 ANN_LIB_DEPENDS=	libann.so:${PORTSDIR}/math/ann