aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichiel <michiel@slackbuilds.org>2010-05-11 22:26:37 +0200
committerDavid Somero <xgizzmo@slackbuilds.org>2010-05-11 22:26:37 +0200
commite41bcbd88bb99125dcae91b6160fd5575a708c3d (patch)
treea60e8717737aa14240157957aecfbf3c1c5a9077
parent092d5de961b26898564981745fee0bae1f8d22a3 (diff)
system/dosbox: Updated for version 0.72
-rw-r--r--system/dosbox/doinst.sh5
-rw-r--r--system/dosbox/dosbox.SlackBuild20
-rw-r--r--system/dosbox/dosbox.info12
3 files changed, 20 insertions, 17 deletions
diff --git a/system/dosbox/doinst.sh b/system/dosbox/doinst.sh
index 22d4849bce4a9..174d6f9e8977d 100644
--- a/system/dosbox/doinst.sh
+++ b/system/dosbox/doinst.sh
@@ -1,5 +1,4 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
- usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+ ./usr/bin/update-desktop-database -q usr/share/applications
fi
diff --git a/system/dosbox/dosbox.SlackBuild b/system/dosbox/dosbox.SlackBuild
index 608059a5ad715..258d8e056c365 100644
--- a/system/dosbox/dosbox.SlackBuild
+++ b/system/dosbox/dosbox.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for dosbox
# Copyright 2006 Martin Lefebvre <dadexter@gmail.com>
+# Copyright 2008, Michiel van Wessem, Manchester, United Kingdom.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -22,14 +23,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified by the SlackBuilds.org project
-# Modified by Mattias Linde <mattias.linde@gmail.com>
-
PRGNAM=dosbox
-VERSION=0.70
+VERSION=${VERSION:-0.72}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
+
CWD=$(pwd)
TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
@@ -39,6 +38,8 @@ if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
fi
rm -rf $PKG
@@ -48,7 +49,11 @@ rm -rf $PRGNAM-$VERSION
tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
cd $PRGNAM-$VERSION || exit 1
chown -R root:root .
-chmod -R a-s,u+w,go-w+r .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -56,13 +61,12 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--sysconfdir=/etc \
--localstatedir=/var \
+ --mandir=/usr/man \
|| exit 1
make DESTDIR=$PKG || exit 1
make install-strip DESTDIR=$PKG || exit 1
-mv $PKG/usr/share/man $PKG/usr/man
-
( cd $PKG/usr/man
find . -type f -exec gzip -9 {} \;
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
@@ -77,7 +81,7 @@ install -D -m 0644 src/dosbox.ico $PKG/usr/share/pixmaps/dosbox.ico
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS \
- docs/README.video $PKG/usr/doc/$PRGNAM-$VERSION
+ docs/PORTING docs/README.video $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/dosbox/dosbox.info b/system/dosbox/dosbox.info
index 0eb38269288c1..88101b3a3a24f 100644
--- a/system/dosbox/dosbox.info
+++ b/system/dosbox/dosbox.info
@@ -1,8 +1,8 @@
PRGNAM="dosbox"
-VERSION="0.70"
+VERSION="0.72"
HOMEPAGE="http://dosbox.sourceforge.net"
-DOWNLOAD="http://dl.sourceforge.net/dosbox/dosbox-0.70.tar.gz"
-MD5SUM="ea0a936e88eb294038e67eeb0d7129c4"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@gmail.com"
-APPROVED="BP{k}"
+DOWNLOAD="http://dl.sourceforge.net/dosbox/dosbox-0.72.tar.gz"
+MD5SUM="262939cc28966c1f9b07c2bc472b699f"
+MAINTAINER="Michiel"
+EMAIL="michiel@slackbuilds.org"
+APPROVED="David Somero"