@@ -63,11 +63,11 @@
 
 			mkdir "${workdir}" || exit 1
 			cd "${workdir}" || exit 1
 
 			# Handle Tcl first, since it will be used to base other packages on
-			wget -O "tmp-tcl.tar.gz" "http://core.tcl.tk/tcl/tarball/tcl-fossil.tar.gz?uuid=${FOSSILTAG}" || rm -f 'tmp-tcl.tar.gz'
+			download "http://core.tcl.tk/tcl/tarball/tcl-fossil.tar.gz?uuid=${FOSSILTAG}" "tmp-tcl.tar.gz" - || rm -f 'tmp-tcl.tar.gz'
 			gzip -dc 'tmp-tcl.tar.gz' | tar -xf -
 			mv "tcl-fossil" "tcl${TCLVERS}"
 
 			# Determine date of this Tcl release and use that date for all other dependent packages
 			## Unless the release we are talking about is "trunk", in which case we use that everywhere
@@ -81,25 +81,25 @@
 			if [ -z "${FOSSILDATE}" ]; then
 				FOSSILDATE="${FOSSILTAG}"
 			fi
 
 			# Handle other packages
-			wget -O "tmp-itcl.tar.gz" "http://core.tcl.tk/itcl/tarball/itcl-fossil.tar.gz?uuid=${FOSSILDATE}" || rm -f 'tmp-itcl.tar.gz'
-			wget -O "tmp-thread.tar.gz" "http://core.tcl.tk/thread/tarball/thread-fossil.tar.gz?uuid=${FOSSILDATE}" || rm -f "tmp-thread.tar.gz"
-			wget -O "tmp-tclconfig.tar.gz" "http://core.tcl.tk/tclconfig/tarball/tclconfig-fossil.tar.gz?uuid=${FOSSILDATE}" || rm -f "tmp-tclconfig.tar.gz"
+			download "http://core.tcl.tk/itcl/tarball/itcl-fossil.tar.gz?uuid=${FOSSILDATE}" "tmp-itcl.tar.gz" - || rm -f 'tmp-itcl.tar.gz'
+			download "http://core.tcl.tk/thread/tarball/thread-fossil.tar.gz?uuid=${FOSSILDATE}" "tmp-thread.tar.gz" - || rm -f "tmp-thread.tar.gz"
+			download "http://core.tcl.tk/tclconfig/tarball/tclconfig-fossil.tar.gz?uuid=${FOSSILDATE}" "tmp-tclconfig.tar.gz" - || rm -f "tmp-tclconfig.tar.gz"
 			if [ "${FOSSILDATE}" = "trunk" ] || [ "$(echo "${FOSSILDATE}" | cut -f 1 -d '-')" -ge '2012' ]; then
 				_USE_TDBC='1'
 				_USE_SQLITE='1'
 				SQLITEVERS='3071401'
 			fi
 
 			if [ "${_USE_TDBC}" = '1' ]; then
-				wget -O "tmp-tdbc.tar.gz" "http://core.tcl.tk/tdbc/tarball/tdbc-fossil.tar.gz?uuid=${FOSSILDATE}" || rm -f "tmp-tdbc.tar.gz"
+				download "http://core.tcl.tk/tdbc/tarball/tdbc-fossil.tar.gz?uuid=${FOSSILDATE}" "tmp-tdbc.tar.gz" - || rm -f "tmp-tdbc.tar.gz"
 			fi
 
 			if [ "${_USE_SQLITE}" = '1' ]; then
-				wget -O "tmp-sqlite3.tar.gz" "http://www.sqlite.org/sqlite-autoconf-${SQLITEVERS}.tar.gz" || rm -f "tmp-sqlite3.tar.gz"
+				download "http://www.sqlite.org/sqlite-autoconf-${SQLITEVERS}.tar.gz" "tmp-sqlite3.tar.gz" - || rm -f "tmp-sqlite3.tar.gz"
 			fi
 
 			gzip -dc "tmp-itcl.tar.gz" | tar -xf -
 			gzip -dc "tmp-thread.tar.gz" | tar -xf -
 			gzip -dc "tmp-tclconfig.tar.gz" | tar -xf -
@@ -149,22 +149,16 @@
 
 			rm -rf "${workdir}"
 		) || exit 1
 	else
 		if [ ! -d 'buildsrc' ]; then
-			rm -f "${SRC}.tmp"
-			wget -O "${SRC}.tmp" "${SRCURL}" || (
+			download "${SRCURL}" "${SRC}" - || (
 				echo '  Unable to download source code for Tcl.' >&4
-				echo "  Attempted to run:  wget -O \"${SRC}.tmp\" \"${SRCURL}\"" >&4
-				echo "  Got:"
-				wget -O "${SRC}.tmp" "${SRCURL}" 2>&1 | sed 's@^@    @' >&4
-
 				echo '  Aborting Tcl -- further packages will likely also fail.' >&4
 
 				exit 1
 			) || exit 1
-			mv "${SRC}.tmp" "${SRC}"
 		fi
 	fi
 fi
 
 (