Merged revisions 64185-64196 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r64185 | martin.v.loewis | 2008-06-12 20:38:47 +0200 (Do, 12 Jun 2008) | 1 line

  Switch to Tcl/Tk 8.5.2.
........
  r64189 | martin.v.loewis | 2008-06-12 20:52:00 +0200 (Do, 12 Jun 2008) | 1 line

  Switch to Tcl/Tk 8.5.
........
  r64191 | martin.v.loewis | 2008-06-12 21:00:14 +0200 (Do, 12 Jun 2008) | 1 line

  Revert bogus disabling of Tcl and Tk.
........
  r64194 | martin.v.loewis | 2008-06-12 21:51:59 +0200 (Do, 12 Jun 2008) | 1 line

  Split Tcl make targets into separate ones.
........
  r64195 | martin.v.loewis | 2008-06-12 22:06:18 +0200 (Do, 12 Jun 2008) | 1 line

  Support file names which include '+' (for Tk 8.5).
........
  r64196 | martin.v.loewis | 2008-06-12 22:07:53 +0200 (Do, 12 Jun 2008) | 1 line

  Fix Tcl/Tk license file in tcl8*/tk8*, include Tix license.
........
diff --git a/Tools/buildbot/external-common.bat b/Tools/buildbot/external-common.bat
index ecf9901..d14ff52 100644
--- a/Tools/buildbot/external-common.bat
+++ b/Tools/buildbot/external-common.bat
@@ -27,8 +27,11 @@
 if not exist openssl-0.9.8g svn export http://svn.python.org/projects/external/openssl-0.9.8g

 

 @rem tcl/tk

-if not exist tcl-8.4.18.2 svn export http://svn.python.org/projects/external/tcl-8.4.18.2

-if not exist tk-8.4.18.1 svn export http://svn.python.org/projects/external/tk-8.4.18.1

+if not exist tcl-8.5.2.1 (

+   rd /s/q tcltk tcltk64

+   svn export http://svn.python.org/projects/external/tcl-8.5.2.1

+)

+if not exist tk-8.5.2.0 svn export http://svn.python.org/projects/external/tk-8.5.2.0

 

 @rem sqlite3

 if not exist sqlite-source-3.3.4 svn export http://svn.python.org/projects/external/sqlite-source-3.3.4