Index: .fossil-settings/ignore-glob
==================================================================
--- .fossil-settings/ignore-glob
+++ .fossil-settings/ignore-glob
@@ -1,12 +1,16 @@
 client/teapot-client.kit
 client/teapot-client.kit/*
+server/buildpkgs/Tclx/build
+server/buildpkgs/Tclx/build/*
+server/buildpkgs/Tclx/out
+server/buildpkgs/Tclx/out/*
+server/buildpkgs/Tclx/src
+server/buildpkgs/Tclx/src/*
 server/buildpkgs/tclpkgs-*.tar.*
 server/buildpkgs/tclpkgs-*.tar.*/*
 server/buildpkgs/tls/build
-server/buildpkgs/tls/build.log
-server/buildpkgs/tls/build.log/*
 server/buildpkgs/tls/build/*
 server/buildpkgs/tls/out
 server/buildpkgs/tls/out/*
 server/buildpkgs/tls/src
 server/buildpkgs/tls/src/*

ADDED   server/buildpkgs/Tclx/build.sh
Index: server/buildpkgs/Tclx/build.sh
==================================================================
--- /dev/null
+++ server/buildpkgs/Tclx/build.sh
@@ -0,0 +1,94 @@
+#! /bin/bash
+
+if [ ! -x "../platform" ]; then
+	echo "No platform script found, aborting." >&2
+
+	exit 1
+fi
+
+VERS=8.4
+SRC="src/tclx${VERS}.tar.bz2"
+SRCURL="http://sourceforge.net/projects/tclx/files/TclX/${VERS}.0/tclx${VERS}.tar.bz2/download"
+BUILDDIR="tclx${VERS}"
+WORKDIR="${TMPDIR:-/tmp}/tclx-$$${RANDOM}${RANDOM}${RANDOM}"
+PLATFORM="$(../platform)"
+PLATDIR="out/${PLATFORM}"
+
+export VERS SRC SRCURL BUILDDIR WORKDIR PLATFORM PLATDIR
+
+if [ ! -f "${SRC}" ]; then
+	mkdir src >/dev/null 2>/dev/null
+
+	wget -O "${SRC}" "${SRCURL}" || exit 1
+fi
+
+(
+	rm -rf build
+	mkdir build
+	cd build/ || exit 1
+
+	bzip2 -dc "../${SRC}" | tar -xf -
+	cd "${BUILDDIR}" || exit 1
+
+	cat << \__EOF__ | patch -p1
+--- tclx8.4/configure.relid	2006-02-03 16:13:25.000000000 -0500
++++ tclx8.4/configure	2006-02-03 16:13:33.000000000 -0500
+@@ -6999,7 +6999,7 @@
+ 	    # results, and the version is kept in special file).
+ 
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- tclx8.4/tclconfig/tcl.m4.relid	2006-02-03 16:13:43.000000000 -0500
++++ tclx8.4/tclconfig/tcl.m4	2006-02-03 16:13:57.000000000 -0500
+@@ -859,7 +859,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+@@ -2302,7 +2302,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+__EOF__
+	cat << \__EOF__ | patch -p1
+--- tclx8.4/generic/tclXdup.c.varinit	2006-02-03 15:54:38.000000000 -0500
++++ tclx8.4/generic/tclXdup.c	2006-02-03 15:54:53.000000000 -0500
+@@ -202,7 +202,7 @@
+ {
+     Tcl_Channel newChannel;
+     int bindFnum, fnum;
+-    char *srcChannelId, *targetChannelId;
++    char *srcChannelId = NULL, *targetChannelId;
+ 
+     if ((objc < 2) || (objc > 3)) {
+         return TclX_WrongArgs (interp, objv [0],
+__EOF__
+
+	bash ./configure --enable-shared --with-tcl="${TCLCONFIGDIR}"
+	${MAKE:-make} || exit 1
+) || exit 1
+
+(
+	mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null
+
+	cp "build/${BUILDDIR}/libtls1.6.so" "${PLATDIR}/"
+	cp "build/${BUILDDIR}/pkgIndex.tcl" "${PLATDIR}/"
+	cp "build/${BUILDDIR}/tls.tcl" "${PLATDIR}/"
+
+	../create_teapot "${PLATDIR}/teapot.txt" "Tclx" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.4" "Extended Tcl"
+) || exit 1
+
+exit 0

ADDED   server/buildpkgs/Tclx/tclx-8.4.configure.diff
Index: server/buildpkgs/Tclx/tclx-8.4.configure.diff
==================================================================
--- /dev/null
+++ server/buildpkgs/Tclx/tclx-8.4.configure.diff
@@ -0,0 +1,31 @@
+--- tclx8.4/configure.relid	2006-02-03 16:13:25.000000000 -0500
++++ tclx8.4/configure	2006-02-03 16:13:33.000000000 -0500
+@@ -6999,7 +6999,7 @@
+ 	    # results, and the version is kept in special file).
+ 
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print }' /etc/.relid'`
++		system=MP-RAS-`awk '{print }' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+--- tclx8.4/tclconfig/tcl.m4.relid	2006-02-03 16:13:43.000000000 -0500
++++ tclx8.4/tclconfig/tcl.m4	2006-02-03 16:13:57.000000000 -0500
+@@ -859,7 +859,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`
+@@ -2302,7 +2302,7 @@
+ 	    # results, and the version is kept in special file).
+ 	
+ 	    if test -r /etc/.relid -a "X`uname -n`" = "X`uname -s`" ; then
+-		system=MP-RAS-`awk '{print $3}' /etc/.relid'`
++		system=MP-RAS-`awk '{print $3}' /etc/.relid`
+ 	    fi
+ 	    if test "`uname -s`" = "AIX" ; then
+ 		system=AIX-`uname -v`.`uname -r`

ADDED   server/buildpkgs/Tclx/tclx-8.4.gcc4.diff
Index: server/buildpkgs/Tclx/tclx-8.4.gcc4.diff
==================================================================
--- /dev/null
+++ server/buildpkgs/Tclx/tclx-8.4.gcc4.diff
@@ -0,0 +1,11 @@
+--- tclx8.4/generic/tclXdup.c.varinit	2006-02-03 15:54:38.000000000 -0500
++++ tclx8.4/generic/tclXdup.c	2006-02-03 15:54:53.000000000 -0500
+@@ -202,7 +202,7 @@
+ {
+     Tcl_Channel newChannel;
+     int bindFnum, fnum;
+-    char *srcChannelId, *targetChannelId;
++    char *srcChannelId = NULL, *targetChannelId;
+ 
+     if ((objc < 2) || (objc > 3)) {
+         return TclX_WrongArgs (interp, objv [0],

Index: server/buildpkgs/build_all.sh
==================================================================
--- server/buildpkgs/build_all.sh
+++ server/buildpkgs/build_all.sh
@@ -51,25 +51,33 @@
 	failed=0
 	(
 		cd "${dir}" || exit 1
 
 		rm -rf "build" "out"
+		rm -f failed-*.log
 		if [ "${DISTCLEAN}" = "1" ]; then
 			rm -rf "src"
 		fi
 		if [ "${CLEANONLY}" = "1" ]; then
 			exit 0
 		fi
 
 		mkdir -p "out/${PLATFORM}" >/dev/null 2>/dev/null
 
-		./build.sh 2>&1 | tee "out/${PLATFORM}/build.log" || exit 1
+		./build.sh > "out/${PLATFORM}/build.log" 2>&1 || exit 1
 	) || failed=1
+
+	if [ "${CLEANONLY}" = "0" ]; then
+		echo "Building ${dir}"
+	fi
 
 	if [ "${failed}" = "1" ]; then
+		cp "${dir}/out/${PLATFORM}/build.log" "${dir}/failed-${PLATFORM}-`hostname`.log"
+
 		rm -rf "${dir}/out"
 		faileddirs="${faileddirs} ${dir}"
+		echo "Failed to build ${dir}"
 	fi
 done
 
 # Cleanup is done at this point
 if [ "${CLEANONLY}" = "1" ]; then
@@ -76,15 +84,15 @@
 	exit 0
 fi
 
 # Let the user know what failed to build
 if [ -n "${faileddirs}" ]; then
-	echo "The following failed to build:${failddirs}"
+	echo "The following failed to build:${faileddirs}"
 fi
 
 # Create tarfile of built packages
 PLATFORM="$(./platform)"
 DATECODE="$(date +%Y%m%d%H%M)"
 OUTFILEBASE="tclpkgs-${PLATFORM}-${DATECODE}"
 tar -cf - */out | bzip2 -9c > "${OUTFILEBASE}.tar.bz2"
 
 exit 0

Index: server/buildpkgs/tls/build.sh
==================================================================
--- server/buildpkgs/tls/build.sh
+++ server/buildpkgs/tls/build.sh
@@ -38,11 +38,11 @@
 	if [ -z "${SSLDIR}" ]; then
 		SSLDIR="/usr"
 	fi
 
 	./configure --enable-shared --with-tcl="${TCLCONFIGDIR}" --with-ssl-dir="${SSLDIR}"
-	gmake || exit 1
+	${MAKE:-make} || exit 1
 ) || exit 1
 
 (
 	mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null