6 files changed, 10 insertions, 14 deletions

diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index a15bc518ca86..283dba3263d4 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -2,14 +2,15 @@
 # $FreeBSD$
 
 PORTNAME=	tcl
-DISTVERSION=	8.4.20
+PORTVERSION=	8.4.20
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang tcl
 MASTER_SITES=	${MASTER_SITE_TCLTK} \
 		SF/tcl/Tcl/${PORTVERSION}
 MASTER_SITE_SUBDIR=	tcl8_4
-DISTNAME=	${PORTNAME}${DISTVERSION}-src
+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Tool Command Language
@@ -34,7 +35,6 @@ CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
 TCL_VER=	8.4
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
-LATEST_LINK=	${PORTNAME}${SHORT_TCL_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TCL_VER="${SHORT_TCL_VER}" \
diff --git a/lang/tcl85/Makefile b/lang/tcl85/Makefile
index d550467c2e36..8f648a145f62 100644
--- a/lang/tcl85/Makefile
+++ b/lang/tcl85/Makefile
@@ -35,7 +35,6 @@ CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
 TCL_VER=	8.5
 SHORT_TCL_VER=	${TCL_VER:S/8./8/}
-LATEST_LINK=	${PORTNAME}${SHORT_TCL_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
diff --git a/lang/tcl86/Makefile b/lang/tcl86/Makefile
index 2ff98fd7f16f..1c085f8b48c3 100644
--- a/lang/tcl86/Makefile
+++ b/lang/tcl86/Makefile
@@ -36,7 +36,6 @@ CONFIGURE_ENV=	PORTSDIR=${PORTSDIR}
 
 TCL_VER=	${PORTVERSION:R}
 SHORT_TCL_VER=	${TCL_VER:S/.//}
-LATEST_LINK=	${PORTNAME}${SHORT_TCL_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TCL_VER=${SHORT_TCL_VER} \
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 1d82a775dba7..f50bdf511d9f 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -6,6 +6,8 @@ PORTEPOCH=	2
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	${MASTER_SITE_TCLTK} \
 		SF/tcl/Tcl/${PORTVERSION}
+MASTER_SITE_SUBDIR=tcl8_4
+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
 DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
@@ -23,8 +25,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}/unix
 ALL_TARGET=	all
 INSTALL_TARGET=	install
 
+USES+=		tcl:${SHORT_TK_VER}
 USE_LDCONFIG=	yes
-USE_TCL=	${SHORT_TK_VER}
 USE_XORG=	x11
 CFLAGS+=	-I${TCL_INCLUDEDIR}/generic
 GNU_CONFIGURE=	yes
@@ -39,7 +41,6 @@ CFLAGS+=	-I${TCL_INCLUDEDIR}
 
 TK_VER=		${PORTVERSION:R}
 SHORT_TK_VER=	${TK_VER:S/.//}
-LATEST_LINK=	${PORTNAME}${SHORT_TK_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}
diff --git a/x11-toolkits/tk85/Makefile b/x11-toolkits/tk85/Makefile
index ef615a514248..fb414d144768 100644
--- a/x11-toolkits/tk85/Makefile
+++ b/x11-toolkits/tk85/Makefile
@@ -2,12 +2,13 @@
 # $FreeBSD$
 
 PORTNAME=	tk
-DISTVERSION=	8.5.15
+PORTVERSION=	8.5.15
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_TCLTK} \
 		SF/tcl/Tcl/${PORTVERSION}
 MASTER_SITE_SUBDIR=tcl8_5
-DISTNAME=	${PORTNAME}${DISTVERSION}-src
+PKGNAMESUFFIX=	${PORTVERSION:R:S/.//}
+DISTNAME=	${PORTNAME}${PORTVERSION}-src
 
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	Graphical toolkit for Tcl
@@ -16,7 +17,7 @@ LICENSE=	BSD
 
 LICENSE_TERMS=	${WRKSRC}/../license.terms
 
-LATEST_LINK=	tk85
+USES+=		tcl:${SHORT_TK_VER}
 USE_XORG=	x11 xft xscrnsaver
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}/unix
@@ -32,7 +33,6 @@ CONFIGURE_ARGS=	--enable-shared \
 
 CONFIGURE_ENV=	PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk${SHORT_TK_VER}.so.1 \
 		ac_cv_path_tclsh="${LOCALBASE}/bin/tclsh${TK_VER}"
-LATEST_LINK=	${PORTNAME}${SHORT_TK_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 INSTALL_TARGET=	install
@@ -44,8 +44,6 @@ MANCOMPRESSED=	no
 DATADIR=	${PREFIX}/share/${PORTNAME}${TK_VER}
 SUB_FILES=	pkgIndex.tcl
 
-USE_TCL=	${SHORT_TK_VER}
-
 OPTIONS_DEFINE=	TK85_MAN DEMOS THREADS
 OPTIONS_DEFAULT=THREADS
 TK85_MAN_DESC=	Install tk 8.5 function manpages
diff --git a/x11-toolkits/tk86/Makefile b/x11-toolkits/tk86/Makefile
index cf4d0d2a5698..af622c3ac4cc 100644
--- a/x11-toolkits/tk86/Makefile
+++ b/x11-toolkits/tk86/Makefile
@@ -45,7 +45,6 @@ CFLAGS+=	-I${TCL_INCLUDEDIR} \
 
 TK_VER=		${PORTVERSION:R}
 SHORT_TK_VER=	${TK_VER:S/.//}
-LATEST_LINK=	${PORTNAME}${SHORT_TK_VER}
 MAN_SUFFIX=	${LATEST_LINK}
 
 MAKE_ENV=	SHORT_TK_VER=${SHORT_TK_VER}