10 files changed, 12 insertions, 10 deletions

diff --git a/chinese/tcl83/pkg-descr b/chinese/tcl83/pkg-descr
index 3ae6e1eab7a6..4995f2f4b8b5 100644
--- a/chinese/tcl83/pkg-descr
+++ b/chinese/tcl83/pkg-descr
@@ -5,4 +5,4 @@ Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
 
 A full set of manual pages is also provided with this package.
 
-WWW: http://www.scriptics.com/
+WWW: http://www.tcl.tk/
diff --git a/chinese/tk83/pkg-descr b/chinese/tk83/pkg-descr
index db7796ceca60..4993abd0959f 100644
--- a/chinese/tk83/pkg-descr
+++ b/chinese/tk83/pkg-descr
@@ -3,4 +3,4 @@ This is Tk version 8.3, a GUI toolkit for Tcl.
 The best way to get started with Tcl is to read ``Tcl and the Tk
 Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
 
-WWW: http://dev.scriptics.com/software/tcltk/8.3.html
+WWW: http://www.tcl.tk/software/tcltk/8.3.html
diff --git a/japanese/tcl80/Makefile b/japanese/tcl80/Makefile
index 44b1c099d8a5..5f3f11770304 100644
--- a/japanese/tcl80/Makefile
+++ b/japanese/tcl80/Makefile
@@ -9,7 +9,7 @@ PORTNAME=	tcl
 PORTVERSION=	8.0.5
 PORTREVISION=	1
 CATEGORIES=	japanese lang tcl80
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl${VERSION:S/./_/}/
+MASTER_SITES=	ftp://ftp.tcl.tk/pub/tcl/tcl${VERSION:S/./_/}/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
diff --git a/lang/tcl-manual/pkg-descr b/lang/tcl-manual/pkg-descr
index 384f5ba259b7..3af02b60f481 100644
--- a/lang/tcl-manual/pkg-descr
+++ b/lang/tcl-manual/pkg-descr
@@ -3,7 +3,7 @@ TK library. They're installed in PREFIX/share/doc/tcl83/contents.htm,
 PREFIX/share/doc/tcl84/contents.htm and
 PREFIX/share/doc/tcl85/contents.htm.
 
-WWW: http://www.scriptics.com/
+WWW: http://www.tcl.tk/
 
 - Edwin Groothuis
 edwin@mavetju.org
diff --git a/lang/tcl80/pkg-descr b/lang/tcl80/pkg-descr
index a03f651067a0..670d08e7a6b2 100644
--- a/lang/tcl80/pkg-descr
+++ b/lang/tcl80/pkg-descr
@@ -6,4 +6,4 @@ Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
 
 A full set of manual pages is also provided with this package.
 
-WWW: http://www.scriptics.com/
+WWW: http://www.tcl.tk/
diff --git a/lang/tcl81-thread/Makefile b/lang/tcl81-thread/Makefile
index 58a50adac404..fc0ac7717786 100644
--- a/lang/tcl81-thread/Makefile
+++ b/lang/tcl81-thread/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	tcl-thread
 PORTVERSION=	8.1.b1
 CATEGORIES=	lang tcl81
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_1/
+MASTER_SITES=	${MASTER_SITE_TCLTK}
+MASTER_SITE_SUBDIR=	tcl8_1
 DISTNAME=	tcl8.1b1
 
 MAINTAINER=	ports@FreeBSD.org
diff --git a/lang/tcl81-thread/pkg-descr b/lang/tcl81-thread/pkg-descr
index cc01a29383b8..ebe8b4b5214b 100644
--- a/lang/tcl81-thread/pkg-descr
+++ b/lang/tcl81-thread/pkg-descr
@@ -5,4 +5,4 @@ Toolkit'' by John K. Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
 
 A full set of manual pages is also provided with this package.
 
-WWW: http://www.scriptics.com/
+WWW: http://www.tcl.tk/
diff --git a/www/tclhttpd/pkg-descr b/www/tclhttpd/pkg-descr
index 9eeb02c5e8b8..b92b5ff461b1 100644
--- a/www/tclhttpd/pkg-descr
+++ b/www/tclhttpd/pkg-descr
@@ -21,4 +21,4 @@ it  is  possible to  manage  the  web  server, upload  Safe-Tcl  control
 scripts, download logging information, and  otherwise debug the Tcl part
 of the application without restarting the hosting application.
 
-WWW: http://dev.scriptics.com/software/tclhttpd/
+WWW: http://www.tcl.tk/software/tclhttpd/
diff --git a/x11-toolkits/tk80/pkg-descr b/x11-toolkits/tk80/pkg-descr
index 316d746e6d00..38cd1a4179a1 100644
--- a/x11-toolkits/tk80/pkg-descr
+++ b/x11-toolkits/tk80/pkg-descr
@@ -8,4 +8,4 @@ A full set of manual pages is also provided with this package.
 
 NOTE: This kit requires a Tcl8.0 binary kit.
 
-WWW: http://dev.scriptics.com/software/tcltk/8.0.html
+WWW: http://www.tcl.tk/
diff --git a/x11-toolkits/tkstep80/Makefile b/x11-toolkits/tkstep80/Makefile
index cb7d06d6ec92..035da8e6eb5d 100644
--- a/x11-toolkits/tkstep80/Makefile
+++ b/x11-toolkits/tkstep80/Makefile
@@ -8,7 +8,8 @@
 PORTNAME=	tkstep
 PORTVERSION=	8.0.4
 CATEGORIES=	x11-toolkits tk80
-MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
+MASTER_SITES=	${MASTER_SITE_TCLTK}
+MASTER_SITE_SUBDIR=	tcl8_0
 DISTNAME=	tk${PORTVERSION}
 
 PATCH_SITES=	ftp://touchwood.ee.uts.edu.au/pub/TkSTEP/