From 218fb2d2830812fa44eecaf2a94df80acf3931c8 Mon Sep 17 00:00:00 2001 From: "B. Watson" Date: Tue, 28 Dec 2010 23:30:50 -0600 Subject: games/eduke32: Updated for version 20101220_1743. Signed-off-by: Robby Workman --- games/eduke32/doinst.sh | 2 +- games/eduke32/eduke32.SlackBuild | 53 +++++++++++++++-------------- games/eduke32/eduke32.info | 8 ++--- games/eduke32/eduke32.wrapper | 2 +- games/eduke32/eduke32_src_20090313.diff.gz | Bin 24885 -> 0 bytes games/eduke32/mapster32.desktop | 2 +- 6 files changed, 35 insertions(+), 32 deletions(-) delete mode 100644 games/eduke32/eduke32_src_20090313.diff.gz (limited to 'games/eduke32') diff --git a/games/eduke32/doinst.sh b/games/eduke32/doinst.sh index 854e20633d66..59eb079d1557 100644 --- a/games/eduke32/doinst.sh +++ b/games/eduke32/doinst.sh @@ -1,3 +1,3 @@ if [ -x /usr/bin/update-desktop-database ]; then - ./usr/bin/update-desktop-database -q usr/share/applications + /usr/bin/update-desktop-database -q usr/share/applications 2>/dev/null fi diff --git a/games/eduke32/eduke32.SlackBuild b/games/eduke32/eduke32.SlackBuild index 8d1f8f0d4309..69f566345423 100644 --- a/games/eduke32/eduke32.SlackBuild +++ b/games/eduke32/eduke32.SlackBuild @@ -3,11 +3,9 @@ # Slackware build script for eduke32 # Written by B. Watson (yalhcru@gmail.com) -# Modified by the SlackBuilds.org project. PRGNAM=eduke32 -VERSION=${VERSION:-20090313} -ARCH=${ARCH:-i486} +VERSION=${VERSION:-20101220_1743} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -16,44 +14,50 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -SRCVER=${SRCVER:-20090131} +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" - EXTRAMAKEFLAGS="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" - EXTRAMAKEFLAGS="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - EXTRAMAKEFLAGS="NOASM=1" fi set -e +SRCVER=${VERSION/_/-} + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf ${PRGNAM}_src_${SRCVER} -unzip $CWD/${PRGNAM}_src_${SRCVER}.zip -cd ${PRGNAM}_src_${SRCVER} +rm -rf ${PRGNAM}_${SRCVER} +tar xvf $CWD/${PRGNAM}_src_${SRCVER}.tar.bz2 +cd ${PRGNAM}_${SRCVER} chown -R root:root . chmod -R a-s,u+w,go+r-w . # Latest src is only available as a diff against the previous # release, it came from here: # http://wiki.eduke32.com/stuff/source_code/eduke32_src_20090313.diff -zcat $CWD/${PRGNAM}_src_${VERSION}.diff.gz | patch -p1 +#zcat $CWD/${PRGNAM}_src_${VERSION}.diff.gz | patch -p1 -make CFLAGS="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" $EXTRAMAKEFLAGS +# Mildly confusing: the Makefile uses ARCH for arch-specific cflags +make ARCH="$SLKCFLAGS" # Build the utilities, if requested. if [ "${BUILD_UTILS:-yes}" = "yes" ]; then cd build - make utils + make utils ARCH="$SLKCFLAGS" for i in kextract kgroup transpal wad2art wad2map; do install -s -D -m0755 $i $PKG/usr/games/$i @@ -64,8 +68,8 @@ if [ "${BUILD_UTILS:-yes}" = "yes" ]; then cd - fi -install -D -m0755 $PRGNAM $PKG/usr/libexec/$PRGNAM/$PRGNAM -install -D -m0755 mapster32 $PKG/usr/libexec/$PRGNAM/mapster32 +install -D -m0755 $PRGNAM $PKG/usr/libexec/$PRGNAM/$PRGNAM +install -D -m0755 mapster32 $PKG/usr/libexec/$PRGNAM/mapster32 mkdir -p $PKG/usr/man/man6 gzip -9c $CWD/$PRGNAM.6 > $PKG/usr/man/man6/$PRGNAM.6.gz @@ -76,24 +80,23 @@ install -D -m0755 $CWD/$PRGNAM.wrapper $PKG/usr/games/$PRGNAM # Mapster help files mkdir -p $PKG/usr/share/games/$PRGNAM -cp *.hlp *.HLP names.h tiles.cfg $PKG/usr/share/games/$PRGNAM +cp *.hlp *.HLP names.h samples/tiles.cfg $PKG/usr/share/games/$PRGNAM +cp -r samples $PKG/usr/share/games/$PRGNAM/samples + +mkdir -p $PKG/usr/share/applications +cp $CWD/mapster32.desktop $CWD/$PRGNAM.desktop $PKG/usr/share/applications + +mkdir -p $PKG/usr/share/pixmaps +cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp ChangeLog* *.txt *.TXT *.sample *.cfg $CWD/README_game_data.txt \ +cp ChangeLog* *.txt *.TXT $CWD/README_game_data.txt \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild ( cd $PKG/usr/share/games/$PRGNAM ln -s ../../../doc/$PRGNAM-$VERSION/README_game_data.txt . ) -# Icon and desktop link -mkdir -p $PKG/usr/share/applications -cp $CWD/mapster32.desktop $CWD/$PRGNAM.desktop $PKG/usr/share/applications - -mkdir -p $PKG/usr/share/pixmaps -cp $CWD/$PRGNAM.png $PKG/usr/share/pixmaps - -# slack-desc mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh diff --git a/games/eduke32/eduke32.info b/games/eduke32/eduke32.info index aa318129c349..1a970be4c149 100644 --- a/games/eduke32/eduke32.info +++ b/games/eduke32/eduke32.info @@ -1,10 +1,10 @@ PRGNAM="eduke32" -VERSION="20090313" +VERSION="20101220_1743" HOMEPAGE="http://www.eduke32.com/" -DOWNLOAD="http://wiki.eduke32.com/stuff/source_code/eduke32_src_20090131.zip" -MD5SUM="cf5eb51de024f28e8b24aae2702d459e" +DOWNLOAD="http://dukeworld.duke4.net/eduke32/synthesis/20101220-1743/eduke32_src_20101220-1743.tar.bz2" +MD5SUM="9aeaa152fd1cb8f3457e7007d2dc8e0b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="B. Watson" EMAIL="yalhcru@gmail.com" -APPROVED="dsomero" +APPROVED="rworkman" diff --git a/games/eduke32/eduke32.wrapper b/games/eduke32/eduke32.wrapper index 969cf757ea96..64696863bdd3 100644 --- a/games/eduke32/eduke32.wrapper +++ b/games/eduke32/eduke32.wrapper @@ -15,7 +15,7 @@ if ! cd ~/.eduke32; then exit 1 fi -for i in autoload m32help.hlp SEHELP.HLP STHELP.HLP names.h tiles.cfg; do +for i in samples autoload m32help.hlp SEHELP.HLP STHELP.HLP names.h tiles.cfg; do if [ -e $SHAREDIR/$i -a ! -e $i ]; then ln -s $SHAREDIR/$i $i fi diff --git a/games/eduke32/eduke32_src_20090313.diff.gz b/games/eduke32/eduke32_src_20090313.diff.gz deleted file mode 100644 index bfd7c5188fbe..000000000000 Binary files a/games/eduke32/eduke32_src_20090313.diff.gz and /dev/null differ diff --git a/games/eduke32/mapster32.desktop b/games/eduke32/mapster32.desktop index 66908945b3d9..432e44e25f7c 100644 --- a/games/eduke32/mapster32.desktop +++ b/games/eduke32/mapster32.desktop @@ -6,4 +6,4 @@ Icon=eduke32 Exec=mapster32 Terminal=false Type=Application -Categories=Game;Editor +Categories=Game;ActionGame; -- cgit v1.2.3