4 files changed, 6 insertions, 17 deletions
diff --git a/security/aolserver-nsmcrypt/Makefile b/security/aolserver-nsmcrypt/Makefile
index e0387b8001fc..0ccb7e5982f5 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 6eec9f0f0c58..7c79eab3f749 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 c9fed7e639f7..8159b1db72e6 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 2e81bbcaabfa..a0248ff7fb99 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