--- /opt/local/var/macports/sources/rsync.macports.org/release/ports/x11/tk/Portfile	2009-10-03 00:57:22.000000000 -0400
+++ x11/tk/Portfile	2009-10-06 00:39:49.000000000 -0400
@@ -1,4 +1,5 @@
-# $Id: Portfile 58709 2009-10-03 04:57:22Z jmr@macports.org $
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
 
 PortSystem      1.0
 
@@ -14,17 +15,21 @@
   Ousterhout, Addison-Wesley, ISBN 0-201-63337-X.
 
 platforms       darwin
-master_sites    sourceforge:tcl
+master_sites    sourceforge:tcl:sf \
+		http://download.github.com/:git
 dist_subdir     tcltk
-distname        ${name}${version}-src
-worksrcdir      ${name}${version}/unix
+distname        das-tcltk-50e4270
+distfiles	${distname}${extract.suffix}:git
+#worksrcdir      ${name}${version}/unix
+worksrcdir	${distname}/tk/unix
 checksums \
   ${distname}${extract.suffix} \
-    md5     0764f63ae2106b4774c4ecb0ef391610 \
-    sha1    b5def6871e53c78354ac01b27abd523bb4295158 \
-    rmd160  8ff412f84ffb76b9b0da5a32f7404c37a5337003 \
+    md5     fa78b2161381c6740212a6e04927f01d \
+    sha1    66f7964fcf7c8e319b66ecbd6bd9b32d241e123c \
+    rmd160  5b4fe9a10d51300ee21bb9c5920e3298e497b416
+
 # suck in Tcl as well so we can use it internally.
-distfiles-append    tcl${version}-src${extract.suffix}
+distfiles-append    tcl${version}-src${extract.suffix}:sf
 checksums-append \
   tcl${version}-src${extract.suffix} \
     md5     f70ad8f78b5e4a9f792fe101f22b125f \
@@ -40,7 +45,7 @@
 	port:xorg-libXScrnSaver
 
 post-patch {
-    reinplace s|@TCL_SRC_DIR@|${worksrcpath}/../../tcl${version}/|g ${worksrcpath}/Makefile.in
+    reinplace s|@TCL_SRC_DIR@|${worksrcpath}/../../../tcl${version}/|g ${worksrcpath}/Makefile.in
 }
 
 configure.args      --mandir=${prefix}/share/man --with-tcl=${prefix}/lib