@@ -1,34 +1,27 @@
 #! /bin/bash
 
-if [ ! -x "../platform" ]; then
-	echo "No platform script found, aborting." >&2
-
-	exit 1
-fi
-
-if [ "${PLATFORM}" = "tcl" ]; then
-	rm -rf out
-
-	exit 0
-fi
-
+# Define parameters
 VERS=1.0
 SRC="src/dbus-tcl-${VERS}.tar.gz"
 SRCURL="http://sourceforge.net/projects/dbus-tcl/files/dbus-tcl/${VERS}/dbus-tcl${VERS}.tar.gz/download"
 BUILDDIR="dbus-tcl${VERS}"
-WORKDIR="${TMPDIR:-/tmp}/dbus-tcl-$$${RANDOM}${RANDOM}${RANDOM}"
-PLATDIR="$(pwd)/out/${PLATFORM}"
-
-export VERS SRC SRCURL BUILDDIR WORKDIR PLATDIR
-
-if [ ! -f "${SRC}" ]; then
-	mkdir src >/dev/null 2>/dev/null
-
-	wget -O "${SRC}" "${SRCURL}" || exit 1
-fi
-
+export VERS SRC SRCURL BUILDDIR
+
+# Load common functions
+source ../common.sh
+
+# Do not build if the "tcl" platform has been requested
+not_platforms 'tcl'
+
+# Require Tcl 8.5 to build
+setup_tcl85
+
+# Download source
+download_src
+
+# Build package
 (
 	rm -rf build
 	mkdir -p "${PLATDIR}" >/dev/null 2>/dev/null
 	mkdir build
 
@@ -44,8 +37,9 @@
 	${MAKE:-make} install-binaries PKG_DIR='' || exit 1
 
 	rm -f "${PLATDIR}"/*.a
 ) || exit 1
 
+# Create metadata
 ../create_teapot "${PLATDIR}/teapot.txt" "dbus-tcl" "${VERS}" "${SRCURL}" "${PLATFORM}" "Tcl 8.5" "The DBus-Tcl project provides a Tcl interface to the dbus message bus system. It contains packages that allow Tcl programs to send and receive dbus signals, as well as invoke and respond to dbus method calls.  http://dbus-tcl.sourceforge.net/"
 
 exit 0