From cd49f5b46ffc14864c33cb81e3746f4470756cff Mon Sep 17 00:00:00 2001 From: Niels Horn Date: Sun, 11 Jul 2010 02:21:24 -0500 Subject: [PATCH] system/sdltrs: Miscellaneous cleanups Signed-off-by: Robby Workman --- system/sdltrs/README | 2 -- system/sdltrs/sdltrs.SlackBuild | 19 +++++++++++++++---- system/sdltrs/sdltrs.info | 2 +- system/sdltrs/slack-desc | 10 +++++----- 4 files changed, 21 insertions(+), 12 deletions(-) diff --git a/system/sdltrs/README b/system/sdltrs/README index 0680a3fbb3..bab7f5bafa 100644 --- a/system/sdltrs/README +++ b/system/sdltrs/README @@ -1,5 +1,3 @@ -sdltrs: Radio Shack TRS-80 Model I/III/4/4P Emulator - sdltrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for Macintosh OSX, Windows and Linux. It has been ported from the excellent X Window Unix emulator xtrs. Instead of using the X-Window system for graphics, it uses diff --git a/system/sdltrs/sdltrs.SlackBuild b/system/sdltrs/sdltrs.SlackBuild index 410c88f622..3b43f48d6f 100644 --- a/system/sdltrs/sdltrs.SlackBuild +++ b/system/sdltrs/sdltrs.SlackBuild @@ -4,14 +4,21 @@ # the Radio Shack TRS-80 Model I/III/4/4p emulator # Written by Niels Horn - niels.horn@gmail.com -# revision date 2010/03/12 +# revision date 2010/07/10 PRGNAM=sdltrs VERSION=${VERSION:-1.1.0} -ARCH=${ARCH:-i486} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + SRCVERSION=$(echo $VERSION | tr . _) CWD=$(pwd) @@ -35,6 +42,10 @@ elif [ "$ARCH" = "arm" ]; then SLKCFLAGS="-O2 -march=armv4t" LIBDIRSUFFIX="" ARCHQUADLET="-gnueabi" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + ARCHQUADLET="" fi set -e @@ -64,7 +75,7 @@ cat $CWD/sdltrs.png > $PKG/usr/share/pixmaps/sdltrs.png mkdir -p $PKG/usr/share/sdltrs cp -a diskimages/* $PKG/usr/share/sdltrs -mkdir -p $PKG/usr/doc/${PRGNAM}-$VERSION/html +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html cp -a BUILDING README $PKG/usr/doc/$PRGNAM-$VERSION cp -a docs/* $PKG/usr/doc/$PRGNAM-$VERSION/html/ find $PKG/usr/doc/$PRGNAM-$VERSION/ -type f -exec chmod 644 {} \; diff --git a/system/sdltrs/sdltrs.info b/system/sdltrs/sdltrs.info index aed0b841fb..de266275be 100644 --- a/system/sdltrs/sdltrs.info +++ b/system/sdltrs/sdltrs.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Niels Horn" EMAIL="niels.horn@gmail.com" -APPROVED="Erik Hanson" +APPROVED="rworkman" diff --git a/system/sdltrs/slack-desc b/system/sdltrs/slack-desc index 99af87b884..29608185ec 100644 --- a/system/sdltrs/slack-desc +++ b/system/sdltrs/slack-desc @@ -6,11 +6,11 @@ # leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -sdltrs: sdltrs: Radio Shack TRS-80 Model I/III/4/4P Emulator. -sdltrs: -sdltrs: sdltrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for -sdltrs: Macintosh OSX, Windows and Linux. It has been ported from the -sdltrs: excellent X-Windows Unix emulator xtrs. Instead of using the +sdltrs: sdltrs (Radio Shack TRS-80 Model I/III/4/4P Emulator) +sdltrs: +sdltrs: sdltrs is a Radio Shack TRS-80 Model I/III/4/4P emulator for +sdltrs: Macintosh OSX, Windows and Linux. It has been ported from the +sdltrs: excellent X-Windows Unix emulator xtrs. Instead of using the sdltrs: X-Window system for graphics, it uses the portable SDL library. sdltrs: sdltrs: http://sdltrs.sourceforge.net/