summaryrefslogtreecommitdiff
path: root/games
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2017-03-13 19:27:13 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2017-03-18 06:58:58 +0700
commit522a3dab163d314d66748a875483f28b1aee406c (patch)
treeb4e2cd86525b5b51db3e98a8dde6f07360068810 /games
parent07de987cfc91cfd8271b83170b0650bcd3efe0c2 (diff)
downloadslackbuilds-522a3dab163d314d66748a875483f28b1aee406c.tar.gz
games/chocolate_duke3D: Minor hygiene fixes.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'games')
-rw-r--r--games/chocolate_duke3D/README4
-rw-r--r--games/chocolate_duke3D/chocolate_duke3D.SlackBuild37
-rw-r--r--games/chocolate_duke3D/chocolate_duke3D.info4
-rw-r--r--games/chocolate_duke3D/slack-desc4
4 files changed, 32 insertions, 17 deletions
diff --git a/games/chocolate_duke3D/README b/games/chocolate_duke3D/README
index a9f4caebe0..408645bb02 100644
--- a/games/chocolate_duke3D/README
+++ b/games/chocolate_duke3D/README
@@ -3,11 +3,11 @@ Chocolate Duke Nukem 3D is the equivalent of Chocolate Doom.
A port that:
1. Remains as faithful as possible to the original source code.
- 2. Is portable and compiling in one click on Windows, OS X and Linux.
+ 2. Is portable and compiles in one click on Windows, OS X and Linux.
3. Is aimed at education, with lots of comments and documentation added
in order to help programmers to understand and learn.
-Note: Place "duke3d.grp" from any legit Duke 3D copy to
+Note: Place "duke3d.grp" from any legit Duke 3D copy in
/usr/share/games/duke3d to play.
Currently, only 32-bit x86 is supported. The code is not 64-bit clean,
diff --git a/games/chocolate_duke3D/chocolate_duke3D.SlackBuild b/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
index d7735997b8..09b18e3ef7 100644
--- a/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
+++ b/games/chocolate_duke3D/chocolate_duke3D.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Chocolate Duke 3D
#
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2015 Gethyn ThomasQuail (email removed)
# All rights reserved.
#
# Based on:
@@ -25,15 +25,27 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Now maintained by B. Watson (yalhcru@gmail.com)
+
+# 20170313 bkw:
+# - i486 => i586
+# - actually use SLKCFLAGS
+# - minor grammar fixes in README and slack-desc
+# - use long-format github URL
+# - use commit date + short hash as VERSION, instead of full hash only.
+# - look at upstream, the only 2 new commits are minor edits to README.md,
+# don't bother updating.
+
PRGNAM=chocolate_duke3D
-VERSION=${VERSION:-dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc}
+VERSION=${VERSION:-20150902_dd8db65}
+COMMIT=${COMMIT:-dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
GAMDIR=usr/share/games/duke3d
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +56,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -63,9 +75,9 @@ set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip || unzip $CWD/$VERSION.zip
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-$COMMIT
+unzip $CWD/$PRGNAM-$COMMIT.zip
+cd $PRGNAM-$COMMIT
chown -R root:root .
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -75,8 +87,10 @@ find -L . \
# Let's compile!
./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
./configure
-make
+make #V=1
# Copies over compiled binary
install -D -m 0755 chocolate-duke3d $PKG/$GAMDIR/chocolate-duke3d
@@ -86,9 +100,10 @@ install -D -m 0644 $CWD/chocolate-duke3d.png $PKG/usr/share/pixmaps/chocolate-du
install -D -m 0644 $CWD/chocolate-duke3d.desktop $PKG/usr/share/applications/chocolate-duke3d.desktop
install -D -m 0755 $CWD/chocolate-duke3d $PKG/usr/games/chocolate-duke3d
-# Make it so the games group can access the folder
+# Make it so the games group can access the dir
+# 20170313 bkw: does this actually accomplish anything?
chgrp games $PKG/$GAMDIR
-chmod 774 $PKG/$GAMDIR
+chmod 775 $PKG/$GAMDIR
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a README.md $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/games/chocolate_duke3D/chocolate_duke3D.info b/games/chocolate_duke3D/chocolate_duke3D.info
index eef3d518d8..2b7b2802de 100644
--- a/games/chocolate_duke3D/chocolate_duke3D.info
+++ b/games/chocolate_duke3D/chocolate_duke3D.info
@@ -1,7 +1,7 @@
PRGNAM="chocolate_duke3D"
-VERSION="dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc"
+VERSION="20150902_dd8db65"
HOMEPAGE="https://github.com/fabiensanglard/chocolate_duke3D/"
-DOWNLOAD="https://github.com/fabiensanglard/chocolate_duke3D/archive/dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc.zip"
+DOWNLOAD="https://github.com/fabiensanglard/chocolate_duke3D/archive/dd8db653/chocolate_duke3D-dd8db653e08cc3029a84dbfd36b2c927a8d3e8fc.zip"
MD5SUM="ce87a33d07de869584261191404e6f16"
DOWNLOAD_x86_64="UNSUPPORTED"
MD5SUM_x86_64=""
diff --git a/games/chocolate_duke3D/slack-desc b/games/chocolate_duke3D/slack-desc
index 34a80e6584..4db4cdb25e 100644
--- a/games/chocolate_duke3D/slack-desc
+++ b/games/chocolate_duke3D/slack-desc
@@ -11,8 +11,8 @@ chocolate_duke3D:
chocolate_duke3D: Chocolate Duke Nukem 3D is the equivalent of Chocolate Doom.
chocolate_duke3D: A port that:
chocolate_duke3D: Remains as faithful as possible to the original source code.
-chocolate_duke3D: Portable and compiling in one click on Windows, OS X and Linux.
-chocolate_duke3D: Aimed at education, with lots of comments and documentation added
+chocolate_duke3D: Is portable and compiles in one click on Windows, OS X and Linux.
+chocolate_duke3D: Is aimed at education, with lots of comments and documentation added
chocolate_duke3D: in order to help programmers to understand and learn.
chocolate_duke3D:
chocolate_duke3D: Homepage: https://github.com/fabiensanglard/chocolate_duke3D