Update to new release; specify version of freedos binary in the build

1 files changed, 27 insertions, 7 deletions

diff --git a/dosemu/build/dosemu.SlackBuild b/dosemu/build/dosemu.SlackBuild
index 41914053..f9a687a2 100755
--- a/dosemu/build/dosemu.SlackBuild
+++ b/dosemu/build/dosemu.SlackBuild
@@ -1,6 +1,24 @@
 #!/bin/sh
 # $Id$
 # Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+#
+#  Permission to use, copy, modify, and distribute this software for
+#  any purpose with or without fee is hereby granted, provided that
+#  the above copyright notice and this permission notice appear in all
+#  copies.
+#
+#  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+#  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+#  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+#  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+#  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+#  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+#  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+#  SUCH DAMAGE.
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
@@ -13,6 +31,8 @@
 # Changelog:
 # 1.3.4-1:   06/Feb/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+# 1.3.5-1:   29/apr/2007 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
 # Run 'sh dosemu.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -24,9 +44,9 @@
 # Set initial variables:
 
 PRGNAM=dosemu
-VERSION=${VERSION:-1.3.4}
-FDVERSION=${FDVERSION:-b9r5a}
-ARCH=${ARCH:-i486}
+VERSION=${VERSION:-"1.3.5"}
+FDVERSION=${FDVERSION:-"1.0"}
+ARCH=${ARCH:-"i486"}
 BUILD=${BUILD:-1}
 
 DOCS="BUGS COPYING* ChangeLog* INSTALL NEWS QuickStart README* THANKS VERSION"
@@ -37,16 +57,16 @@ SRCDIR=`dirname $0`
 [ "${SRCDIR:0:1}" == "." ] && SRCDIR=${CWD}/${SRCDIR}
 
 # Place to build (TMP) package (PKG) and output (OUTPUT) the program:
-TMP=${TMP:-/tmp/build}
+TMP=${TMP:-"/tmp/build"}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
+OUTPUT=${OUTPUT:-"/tmp"}
 
 # Input URL: http://dl.sourceforge.net/dosemu/dosemu-1.3.4.tgz
 SOURCE[0]="$SRCDIR/${PRGNAM}-${VERSION}.tgz"
 SRCURL[0]="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-${VERSION}.tgz"
 
 # This is the binary freedos package needed by dosemu:
-SOURCE[1]="$SRCDIR/${PRGNAM}-freedos-bin.tgz"
+SOURCE[1]="$SRCDIR/${PRGNAM}-freedos-${FDVERSION}-bin.tgz"
 SRCURL[1]="http://dl.sourceforge.net/${PRGNAM}/${PRGNAM}-freedos-${FDVERSION}-bin.tgz"
 
 ##
@@ -117,7 +137,7 @@ for (( i = 0; i < ${#SOURCE[*]}; i++ )) ; do
       [ -w "$SRCDIR" ] || SOURCE[$i]="$OUTPUT/`basename ${SOURCE[$i]}`"
       echo "Source '`basename ${SOURCE[$i]}`' not available yet..."
       echo "Will download file to `dirname $SOURCE[$i]`"
-      wget -nv -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
+      wget -nv --connect-timeout=20 -O "${SOURCE[$i]}" "${SRCURL[$i]}" || true
       if [ $? -ne 0 ]; then
         echo "Downloading '`basename ${SOURCE[$i]}`' failed.. aborting the build."
         mv -f "${SOURCE[$i]}" "${SOURCE[$i]}".FAIL