8 files changed, 27 insertions, 24 deletions
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.14 b/dev-lang/tcl/files/digest-tcl-8.4.14
deleted file mode 100644
index dbdb813bb271..000000000000
--- a/dev-lang/tcl/files/digest-tcl-8.4.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51c6bf74d3ffdb0bd866ecdac6ff6460 tcl8.4.14-src.tar.gz 3544609
-RMD160 392a4f4617ee77cfdae10b24e9ccbe84afed0a40 tcl8.4.14-src.tar.gz 3544609
-SHA256 2746e3c568a5837cfb7a83359ab34401886ad621965ab4571333859807ab6143 tcl8.4.14-src.tar.gz 3544609
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.14-r1 b/dev-lang/tcl/files/digest-tcl-8.4.14-r1
deleted file mode 100644
index dbdb813bb271..000000000000
--- a/dev-lang/tcl/files/digest-tcl-8.4.14-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 51c6bf74d3ffdb0bd866ecdac6ff6460 tcl8.4.14-src.tar.gz 3544609
-RMD160 392a4f4617ee77cfdae10b24e9ccbe84afed0a40 tcl8.4.14-src.tar.gz 3544609
-SHA256 2746e3c568a5837cfb7a83359ab34401886ad621965ab4571333859807ab6143 tcl8.4.14-src.tar.gz 3544609
diff --git a/dev-lang/tcl/files/digest-tcl-8.4.16 b/dev-lang/tcl/files/digest-tcl-8.4.16
new file mode 100644
index 000000000000..9b3ef1304908
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.4.16
@@ -0,0 +1,3 @@
+MD5 f1c783a49547778d160e10be2fb5d76f tcl8.4.16-src.tar.gz 3641017
+RMD160 8432aff66525a3c3f9dadb2bd8e32c28c539d14d tcl8.4.16-src.tar.gz 3641017
+SHA256 23e925a59744e9f2bce7770971ad5d7b22ea74770f71fdfa24d5ed364781356d tcl8.4.16-src.tar.gz 3641017
diff --git a/dev-lang/tcl/files/digest-tcl-8.5.0 b/dev-lang/tcl/files/digest-tcl-8.5.0
new file mode 100644
index 000000000000..ee99bf70e1dd
--- /dev/null
+++ b/dev-lang/tcl/files/digest-tcl-8.5.0
@@ -0,0 +1,3 @@
+MD5 d890c505465411b25050b6cd95971d2c tcl8.5.0-src.tar.gz 4352897
+RMD160 f398a26ea7c8937507049a927f918d18c906f6e5 tcl8.5.0-src.tar.gz 4352897
+SHA256 f364c89117ac833950bfedd84818c309fafdf6d600aa9e6df91096869672797c tcl8.5.0-src.tar.gz 4352897
diff --git a/dev-lang/tcl/files/digest-tcl-8.5_alpha6 b/dev-lang/tcl/files/digest-tcl-8.5_alpha6
deleted file mode 100644
index 6942ad4863d7..000000000000
--- a/dev-lang/tcl/files/digest-tcl-8.5_alpha6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 2759f9517898e2928d3a4bf6831a7eaa tcl8.5a6-src.tar.gz 4231357
-RMD160 d9db96aa34919c5c699a73e9ead7e871dd4865d2 tcl8.5a6-src.tar.gz 4231357
-SHA256 16f6d0c48f766560789e91ac79b07aa3c3adc2ef7159dd2fe7e4ceff370636ac tcl8.5a6-src.tar.gz 4231357
diff --git a/dev-lang/tcl/files/digest-tcl-8.5_beta3 b/dev-lang/tcl/files/digest-tcl-8.5_beta3
deleted file mode 100644
index 194fa1fb0134..000000000000
--- a/dev-lang/tcl/files/digest-tcl-8.5_beta3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08b9a17eab59a634c47b0a38898f7c5a tcl8.5b3-src.tar.gz 4336995
-RMD160 4b16b48eaf0ebbfac26681542763c82384b8bcc0 tcl8.5b3-src.tar.gz 4336995
-SHA256 00c9ff3519102b9330ba8f2ecb9537679b8e0a775e1669af7df17520acfa36e4 tcl8.5b3-src.tar.gz 4336995
diff --git a/dev-lang/tcl/files/tcl-8.3.5-tclm4-soname.patch b/dev-lang/tcl/files/tcl-8.3.5-tclm4-soname.patch
deleted file mode 100644
index 1005f6715879..000000000000
--- a/dev-lang/tcl/files/tcl-8.3.5-tclm4-soname.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u tcl8.3.5/unix/tcl.m4~ tcl8.3.5/unix/tcl.m4
---- tcl8.3.5/unix/tcl.m4~	2003-01-14 20:42:53.000000000 +0900
-+++ tcl8.3.5/unix/tcl.m4	2003-01-14 20:42:53.000000000 +0900
-@@ -954,7 +954,7 @@
- 	    CFLAGS_OPTIMIZE="${CFLAGS_OPTIMIZE} -D__NO_STRING_INLINES -D__NO_MATH_INLINES"
- 
- 	    if test "$have_dl" = yes; then
--		SHLIB_LD="${CC} -shared"
-+		SHLIB_LD='${CC} -shared -Wl,-soname,${@}'
- 		DL_OBJS="tclLoadDl.o"
- 		DL_LIBS="-ldl"
- 		LDFLAGS="-rdynamic"
diff --git a/dev-lang/tcl/files/tcl-8.4.16-multilib.patch b/dev-lang/tcl/files/tcl-8.4.16-multilib.patch
new file mode 100644
index 000000000000..59d1b8af2f1e
--- /dev/null
+++ b/dev-lang/tcl/files/tcl-8.4.16-multilib.patch
@@ -0,0 +1,21 @@
+diff -Naur tcl8.4.16.orig/unix/configure.in tcl8.4.16/unix/configure.in
+--- tcl8.4.16.orig/unix/configure.in	2007-09-22 02:07:02.000000000 +0900
++++ tcl8.4.16/unix/configure.in	2007-12-15 10:43:16.000000000 +0900
+@@ -570,7 +570,7 @@
+ DBGX='${TCL_DBGX}'
+ eval "TCL_LIB_FILE=${TCL_LIB_FILE}"
+ 
+-TCL_LIBRARY='$(prefix)/lib/tcl$(VERSION)'
++TCL_LIBRARY='$(libdir)/tcl$(VERSION)'
+ PRIVATE_INCLUDE_DIR='$(includedir)'
+ HTML_DIR='$(DISTDIR)/html'
+ 
+@@ -669,7 +669,7 @@
+ if test "$FRAMEWORK_BUILD" = "1" ; then
+     test -z "$TCL_PACKAGE_PATH" && \
+         TCL_PACKAGE_PATH="~/Library/Tcl /Library/Tcl /Network/Library/Tcl /System/Library/Tcl ~/Library/Frameworks /Library/Frameworks /Network/Library/Frameworks /System/Library/Frameworks"
+-elif test "$prefix" != "$exec_prefix"; then
++elif test "$prefix" != "$exec_prefix" -o "${libdir}" != "${prefix}/lib"; then
+     TCL_PACKAGE_PATH="${libdir} ${prefix}/lib ${TCL_PACKAGE_PATH}"
+ else
+     TCL_PACKAGE_PATH="${prefix}/lib ${TCL_PACKAGE_PATH}"