diff options
| -rw-r--r-- | games/rott/doinst.sh | 6 | ||||
| -rw-r--r-- | games/rott/manpage.diff (renamed from games/rott/patches/manpage.diff) | 28 | ||||
| -rw-r--r-- | games/rott/patches/cdrom_version.diff | 14 | ||||
| -rw-r--r-- | games/rott/patches/registered_version.diff | 12 | ||||
| -rw-r--r-- | games/rott/rott.SlackBuild | 32 | ||||
| -rw-r--r-- | games/rott/rott.info | 6 | ||||
| -rw-r--r-- | games/rott/rott.sh | 3 |
7 files changed, 34 insertions, 67 deletions
diff --git a/games/rott/doinst.sh b/games/rott/doinst.sh index 392c12adb9..86cad8c1a4 100644 --- a/games/rott/doinst.sh +++ b/games/rott/doinst.sh @@ -2,3 +2,9 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications fi +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + diff --git a/games/rott/patches/manpage.diff b/games/rott/manpage.diff index 70864338ec..a2c83dae22 100644 --- a/games/rott/patches/manpage.diff +++ b/games/rott/manpage.diff @@ -1,6 +1,6 @@ -diff -Naur rott-1.1.1.orig/doc/rott.6 rott-1.1.1/doc/rott.6 ---- rott-1.1.1.orig/doc/rott.6 2009-06-08 07:04:26.000000000 -0400 -+++ rott-1.1.1/doc/rott.6 2010-03-17 16:26:41.000000000 -0400 +diff -Naur rott-1.1.2/doc/rott.6 rott-1.1.2.patched/doc/rott.6 +--- rott-1.1.2/doc/rott.6 2011-01-04 02:44:17.000000000 -0500 ++++ rott-1.1.2.patched/doc/rott.6 2012-12-20 21:49:58.000000000 -0500 @@ -6,6 +6,15 @@ .SH SYNOPSIS .B rott @@ -36,21 +36,7 @@ diff -Naur rott-1.1.1.orig/doc/rott.6 rott-1.1.1/doc/rott.6 .BR spaceball Enable check for Spaceball. .TP -@@ -73,21 +94,40 @@ - Exit program when demo is terminated. - .TP - .BR warp\ \fIlevel\fP --Warp to specific ROTT level (next paramater is level to start on). -+Warp to specific ROTT level (next parameter is level to start on). - .TP - .BR timelimit\ \fItime\fP --Play ROTT in time limit mode (next paramater is time in seconds). -+Play ROTT in time limit mode (next parameter is time in seconds). - .TP - .BR maxtimelimit\ \fItime\fP --Maximimum time to count down from (next paramater is time in seconds). -+Maximimum time to count down from (next parameter is time in seconds). - .TP +@@ -84,10 +105,29 @@ .BR dopefish ? @@ -58,11 +44,11 @@ diff -Naur rott-1.1.1.orig/doc/rott.6 rott-1.1.1/doc/rott.6 +Game data files are searched for in \fB/usr/share/games/rott\fR. Each +game binary requires its own particular data files: +.PP -+\fBrott\-demo\fR \- HUNTBGIN.WAD HUNTBGIN.RTC HUNTBGIN.RTL REMOTE1.RTS ++\fBrott\-demo\fR (shareware/demo) \- HUNTBGIN.WAD HUNTBGIN.RTC HUNTBGIN.RTL REMOTE1.RTS +.PP -+\fBrott\-reg\fR \- DARKWAR.WAD DARKWAR.RTC DARKWAR.RTL REMOTE1.RTS ++\fBrott\-reg\fR (registered floppy/download) \- DARKWAR.WAD DARKWAR.RTC DARKWAR.RTL REMOTE1.RTS +.PP -+\fBrott\-cdrom\fR \- DARKWAR.WAD ROTTCD.RTC DARKWAR.RTL REMOTE1.RTS ++\fBrott\-cdrom\fR (retail CD) \- DARKWAR.WAD ROTTCD.RTC DARKWAR.RTL REMOTE1.RTS +.PP +All filenames must be UPPERCASE. +.PP diff --git a/games/rott/patches/cdrom_version.diff b/games/rott/patches/cdrom_version.diff deleted file mode 100644 index e4adf80dd3..0000000000 --- a/games/rott/patches/cdrom_version.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur rott-1.1.1.orig/rott/develop.h rott-1.1.1/rott/develop.h ---- rott-1.1.1.orig/rott/develop.h 2008-05-24 02:29:04.000000000 -0400 -+++ rott-1.1.1/rott/develop.h 2010-03-16 23:52:12.000000000 -0400 -@@ -41,8 +41,8 @@ - - #define BNACRASHPREVENT 1 //bna added - // Make sure only one of the following are on at one time --#define SHAREWARE 1 --#define SUPERROTT 0 -+#define SHAREWARE 0 -+#define SUPERROTT 1 - #define SITELICENSE 0 - - // cute little dopefish thing, only works with special patch? diff --git a/games/rott/patches/registered_version.diff b/games/rott/patches/registered_version.diff deleted file mode 100644 index 6fe8aaf49c..0000000000 --- a/games/rott/patches/registered_version.diff +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur rott-1.1.1.orig/rott/develop.h rott-1.1.1/rott/develop.h ---- rott-1.1.1.orig/rott/develop.h 2008-05-24 02:29:04.000000000 -0400 -+++ rott-1.1.1/rott/develop.h 2010-03-17 14:31:22.000000000 -0400 -@@ -41,7 +41,7 @@ - - #define BNACRASHPREVENT 1 //bna added - // Make sure only one of the following are on at one time --#define SHAREWARE 1 -+#define SHAREWARE 0 - #define SUPERROTT 0 - #define SITELICENSE 0 - diff --git a/games/rott/rott.SlackBuild b/games/rott/rott.SlackBuild index 48522decd8..fadbf19600 100644 --- a/games/rott/rott.SlackBuild +++ b/games/rott/rott.SlackBuild @@ -4,17 +4,17 @@ # Written by B. Watson (yalhcru@gmail.com) +# Licensed under the WTFPL. See http://sam.zoy.org/wtfpl/ for details. + PRGNAM=rott -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -# Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; arm*) ARCH=arm ;; - # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$( uname -m ) ;; esac fi @@ -24,18 +24,15 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +# LIBDIRSUFFIX not needed if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" fi set -e @@ -53,32 +50,33 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -patch -p1 < $CWD/patches/manpage.diff +patch -p1 < $CWD/manpage.diff + +# 1.1.2 now lets us define SHAREWARE and SUPERROTT as make options, +# no more patching rott/develop.h # The shareware/demo binary -make -C $PRGNAM \ +make -j1 -C $PRGNAM clean all \ + SHAREWARE=1 SUPERROTT=0 \ EXTRACFLAGS="$SLKCFLAGS -DDATADIR=\\\"/usr/share/games/$PRGNAM/\\\"" mkdir -p $PKG/usr/games install -s -m0755 $PRGNAM/$PRGNAM $PKG/usr/games/$PRGNAM-demo # The registered binary -make -C $PRGNAM clean -patch -p1 < $CWD/patches/registered_version.diff -make -C $PRGNAM \ +make -j1 -C $PRGNAM clean all \ + SHAREWARE=0 SUPERROTT=0 \ EXTRACFLAGS="$SLKCFLAGS -DDATADIR=\\\"/usr/share/games/$PRGNAM/\\\"" install -s -m0755 $PRGNAM/$PRGNAM $PKG/usr/games/$PRGNAM-reg # The retail/cdrom binary -make -C $PRGNAM clean -patch -p1 -R < $CWD/patches/registered_version.diff -patch -p1 < $CWD/patches/cdrom_version.diff -make -C $PRGNAM \ +make -j1 -C $PRGNAM clean all \ + SHAREWARE=0 SUPERROTT=1 \ EXTRACFLAGS="$SLKCFLAGS -DDATADIR=\\\"/usr/share/games/$PRGNAM/\\\"" install -s -m0755 $PRGNAM/$PRGNAM $PKG/usr/games/$PRGNAM-cdrom # Not going to bother with the "Site License" binary: doubt anyone # will have any use for it, since multiplayer isn't supported. If you need -# it, see rott/develop.h +# it, build with SHAREWARE=0 SUPERROTT=0 SITELICENSE=1 # Man page is modified from the original version. MANDIR=$PKG/usr/man/man6 diff --git a/games/rott/rott.info b/games/rott/rott.info index 5e9242ca67..cc02fa203f 100644 --- a/games/rott/rott.info +++ b/games/rott/rott.info @@ -1,10 +1,10 @@ PRGNAM="rott" -VERSION="1.1.1" +VERSION="1.1.2" HOMEPAGE="http://icculus.org/rott/" DOWNLOAD="http://icculus.org/rott/share/1rott13.zip \ - http://icculus.org/rott/releases/rott-1.1.1.tar.gz" + http://icculus.org/rott/releases/rott-1.1.2.tar.gz" MD5SUM="0fafd6b629eab80278fc726e31f9cf41 \ - c0c0e1719375f58428627af9f8dbc7c3" + d523c7c6c97f95ba84b8cf4deae7db38" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/rott/rott.sh b/games/rott/rott.sh index 2248dfd758..dea7ee767f 100644 --- a/games/rott/rott.sh +++ b/games/rott/rott.sh @@ -2,6 +2,9 @@ # Wrapper script for Rise of the Triad, by B. Watson +# Figures out which rott binary to execute, based on which +# game data files are installed. + DATADIR=/usr/share/games/rott CDROMFILE=$DATADIR/ROTTCD.RTC REGFILE=$DATADIR/DARKWAR.WAD |