diff --git a/lang/tcl82/Makefile b/lang/tcl82/Makefile
index b95e9cd45fd1..af1da5d25ae0 100644
--- a/lang/tcl82/Makefile
+++ b/lang/tcl82/Makefile
@@ -15,13 +15,11 @@ MAINTAINER=	jseger@FreeBSD.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
-FILE_DEPENDS=	${PORTSDIR}/lang/tcl80
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
-PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
+PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
diff --git a/lang/tcl83/Makefile b/lang/tcl83/Makefile
index b95e9cd45fd1..af1da5d25ae0 100644
--- a/lang/tcl83/Makefile
+++ b/lang/tcl83/Makefile
@@ -15,13 +15,11 @@ MAINTAINER=	jseger@FreeBSD.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
-FILE_DEPENDS=	${PORTSDIR}/lang/tcl80
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
-PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
+PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
diff --git a/lang/tcl84/Makefile b/lang/tcl84/Makefile
index b95e9cd45fd1..af1da5d25ae0 100644
--- a/lang/tcl84/Makefile
+++ b/lang/tcl84/Makefile
@@ -15,13 +15,11 @@ MAINTAINER=	jseger@FreeBSD.org
 
 Y2K=            http://www.scriptics.com/Y2K.html
 
-FILE_DEPENDS=	${PORTSDIR}/lang/tcl80
-
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR}
-PKGINSTALL=     ${PORTSDIR}/lang/tcl80/pkg/INSTALL.tclsh
+PKGINSTALL=     ${PKGDIR}/INSTALL.tclsh
 
 PLIST_SUB=	TCL_VER=8.2 SHORT_TCL_VER=82
 
diff --git a/x11-toolkits/tk82/Makefile b/x11-toolkits/tk82/Makefile
index 96095c1e88f7..4cfbafd99bcc 100644
--- a/x11-toolkits/tk82/Makefile
+++ b/x11-toolkits/tk82/Makefile
@@ -14,14 +14,13 @@ MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 MAINTAINER=	jseger@FreeBSD.org
 
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
-FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1
-PKGINSTALL=     ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
+PKGINSTALL=     ${PKGDIR}/INSTALL.wish
 
 PLIST_SUB=	TK_VER=8.2 SHORT_TK_VER=82
 
diff --git a/x11-toolkits/tk83/Makefile b/x11-toolkits/tk83/Makefile
index 96095c1e88f7..4cfbafd99bcc 100644
--- a/x11-toolkits/tk83/Makefile
+++ b/x11-toolkits/tk83/Makefile
@@ -14,14 +14,13 @@ MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 MAINTAINER=	jseger@FreeBSD.org
 
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
-FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1
-PKGINSTALL=     ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
+PKGINSTALL=     ${PKGDIR}/INSTALL.wish
 
 PLIST_SUB=	TK_VER=8.2 SHORT_TK_VER=82
 
diff --git a/x11-toolkits/tk84/Makefile b/x11-toolkits/tk84/Makefile
index 96095c1e88f7..4cfbafd99bcc 100644
--- a/x11-toolkits/tk84/Makefile
+++ b/x11-toolkits/tk84/Makefile
@@ -14,14 +14,13 @@ MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_2/
 MAINTAINER=	jseger@FreeBSD.org
 
 LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
-FILE_DEPENDS=	${PORTSDIR}/x11-toolkits/tk80
 
 USE_XLIB=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl8.2
 CONFIGURE_ENV=  PORTSDIR=${PORTSDIR} TK_LIB_FILE=libtk82.so.1
-PKGINSTALL=     ${PORTSDIR}/x11-toolkits/tk80/pkg/INSTALL.wish
+PKGINSTALL=     ${PKGDIR}/INSTALL.wish
 
 PLIST_SUB=	TK_VER=8.2 SHORT_TK_VER=82