Diff

Differences From Artifact [d31f7c598a]:

To Artifact [3095948699]:


     6      6   	exit 1
     7      7   fi
     8      8   if [ -z "${TCLVERS}" ]; then
     9      9   	echo 'ERROR: The TCLVERS environment variable is not set' >&2
    10     10   
    11     11   	exit 1
    12     12   fi
           13  +
           14  +case "${TCLVERS}" in
           15  +	*:*)
           16  +		TCLVERS_CLEAN="$(echo "${TCLVERS}" | sed 's@:@_@g')"
           17  +		;;
           18  +	*)
           19  +		TCLVERS_CLEAN="${TCLVERS}"
           20  +		;;
           21  +esac
    13     22   
    14     23   SRC="src/tk${TCLVERS}.tar.gz"
    15     24   SRCURL="http://prdownloads.sourceforge.net/tcl/tk${TCLVERS}-src.tar.gz"
    16     25   SRCHASH='-'
    17         -BUILDDIR="$(pwd)/build/tk${TCLVERS}"
           26  +BUILDDIR="$(pwd)/build/tk${TCLVERS_CLEAN}"
    18     27   PATCHDIR="$(pwd)/patches"
    19     28   OUTDIR="$(pwd)/out"
    20     29   INSTDIR="$(pwd)/inst"
    21     30   PATCHSCRIPTDIR="$(pwd)/patchscripts"
    22     31   export SRC SRCURL BUILDDIR PATCHDIR OUTDIR INSTDIR PATCHSCRIPTDIR
    23     32   
    24     33   case "${TCLVERS}" in
................................................................................
    98    107   			gzip -dc "tmp-tk.tar.gz" | tar -xf - || rm -f 'tmp-tk.tar.gz'
    99    108   
   100    109   			if [ ! -s 'tmp-tk.tar.gz' ]; then
   101    110   				download "http://core.tcl.tk/tk/tarball/tk-fossil.tar.gz?uuid=${FOSSILDATE}" "tmp-tk.tar.gz" - || rm -f 'tmp-tk.tar.gz'
   102    111   				gzip -dc "tmp-tk.tar.gz" | tar -xf -
   103    112   			fi
   104    113   
   105         -			mv "tk-fossil" "tk${TCLVERS}"
          114  +			mv "tk-fossil" "tk${TCLVERS_CLEAN}"
   106    115                           
   107         -			tar -cf - "tk${TCLVERS}" | gzip -c > "../../${SRC}"
          116  +			tar -cf - "tk${TCLVERS_CLEAN}" | gzip -c > "../../${SRC}"
   108    117   
   109    118   			cd ..
   110    119   			rm -rf "${workdir}"
   111    120   		)
   112    121   	else
   113    122   		if [ ! -d 'buildsrc' ]; then
   114    123   			download "${SRCURL}" "${SRC}" "${SRCHASH}" || exit 1