aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/dosbox/dosbox.SlackBuild31
-rw-r--r--system/dosbox/dosbox.info10
2 files changed, 26 insertions, 15 deletions
diff --git a/system/dosbox/dosbox.SlackBuild b/system/dosbox/dosbox.SlackBuild
index 15de881592754..17eae99642cc3 100644
--- a/system/dosbox/dosbox.SlackBuild
+++ b/system/dosbox/dosbox.SlackBuild
@@ -3,7 +3,7 @@
# Slackware build script for dosbox
# Copyright 2006 Martin Lefebvre <dadexter@gmail.com>
-# Copyright 2008, Michiel van Wessem, Manchester, United Kingdom.
+# Copyright 2008-2009, Michiel van Wessem, Manchester, United Kingdom.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=dosbox
-VERSION=0.72
+VERSION=${VERSION:-0.73}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -35,17 +35,24 @@ PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
+set -e
+
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -57,13 +64,15 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--localstatedir=/var \
--mandir=/usr/man \
- || exit 1
+ --docdir=/usr/doc/$PRGNAM-$VERSION \
+ --build=$ARCH-slackware-linux
-make DESTDIR=$PKG || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
@@ -87,4 +96,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/dosbox/dosbox.info b/system/dosbox/dosbox.info
index e2ce93ca8f8d0..23f3c537d5396 100644
--- a/system/dosbox/dosbox.info
+++ b/system/dosbox/dosbox.info
@@ -1,8 +1,10 @@
PRGNAM="dosbox"
-VERSION="0.72"
+VERSION="0.73"
HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="http://downloads.sourceforge.net/dosbox/dosbox-0.72.tar.gz"
-MD5SUM="262939cc28966c1f9b07c2bc472b699f"
+DOWNLOAD="http://downloads.sourceforge.net/dosbox/dosbox-0.73.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MD5SUM="0823a11242db711ac3d6ebfff6aff572"
MAINTAINER="Michiel"
EMAIL="michiel@slackbuilds.org"
-APPROVED="David Somero"
+APPROVED="dsomero"