root/trunk/base/src/thread2.6.diff

src/thread2.6

@@ -67 +67 @@
 
 srcdir          = @srcdir@
 prefix          = @prefix@
-exec_prefix     = @exec_prefix@
+exec_prefix     = @prefix@
 
 bindir          = @bindir@
-libdir          = @libdir@
+libdir          = @prefix@/share/macports/Tcl
 datadir         = @datadir@
-mandir          = @mandir@
+mandir          = @prefix@/share/macports/man
 includedir      = @includedir@
 
 DESTDIR         =

src/thread2.6

@@ -6374 +6374 @@
    { (exit 1); exit 1; }; }
             fi
         else
-            # Check order: pkg --prefix location, Tcl's --prefix location,
+            # Check order:
             # directory of tclConfig.sh, and Tcl source directory.
             # Looking in the source dir is not ideal, but OK.
 
-            eval "temp_includedir=${includedir}"
-            list="`ls -d ${temp_includedir}      2>/dev/null` \
-                `ls -d ${TCL_PREFIX}/include     2>/dev/null` \
+            list="`ls -d ${TCL_PREFIX}/include     2>/dev/null` \
                 `ls -d ${TCL_BIN_DIR}/../include 2>/dev/null` \
                 `ls -d ${TCL_SRC_DIR}/generic    2>/dev/null`"
             if test "${TEA_PLATFORM}" != "windows" -o "$GCC" = "yes"; then

lib/ttrace.tcl

@@ -50 +50 @@
         variable mutex ns_mutex
         variable elock [$mutex create traceepochmutex]
         variable store nsv_
-    } elseif {![catch {package require Thread} version]} {
-        variable tvers $version
+    } elseif {![catch {package require Thread} thread_pkg_version]} {
+        variable tvers $thread_pkg_version
         variable mutex thread::mutex
         variable elock [$mutex create]
         variable store tsv::

src/thread2.6/generic/threadPoolCmd.c

@@ -1710 +1710 @@
  *
  *----------------------------------------------------------------------
  */
+#ifdef __WIN32__
+#include <sys/timeb.h>
+#else
+#include <sys/time.h>
+#endif
 static void
 GetTime(timePtr)
     Tcl_Time *timePtr;
 {
 #ifdef __WIN32__
-#include <sys/timeb.h>
     struct timeb tb;
     (void)ftime(&tb);
     timePtr->sec  = tb.time;
     timePtr->usec = tb.millitm * 1000;
 #else
-#include <sys/time.h>
     struct timeval tv;
     (void)gettimeofday(&tv, NULL);
     timePtr->sec  = tv.tv_sec;