diff options
| -rw-r--r-- | games/hnefatafl/hnefatafl.SlackBuild | 24 | ||||
| -rw-r--r-- | games/hnefatafl/hnefatafl.info | 8 | ||||
| -rw-r--r-- | games/hnefatafl/no-link-xlib.diff | 28 |
3 files changed, 21 insertions, 39 deletions
diff --git a/games/hnefatafl/hnefatafl.SlackBuild b/games/hnefatafl/hnefatafl.SlackBuild index f480eff456d10..3e0af446a39fc 100644 --- a/games/hnefatafl/hnefatafl.SlackBuild +++ b/games/hnefatafl/hnefatafl.SlackBuild @@ -2,14 +2,14 @@ # Slackware 14.0 build script for HNEFATAFL -# Copyright 2013 Alexander Söderlund, Sweden. Revised 2013-07-09. +# Copyright 2013 Alexander Söderlund, Sweden. Revised 2013-09-20. # # Script license: CC0, see: # http://creativecommons.org/publicdomain/zero/1.0/ # http://creativecommons.org/publicdomain/zero/1.0/legalcode PRGNAM=hnefatafl -VERSION=${VERSION:-130527} +VERSION=${VERSION:-130920} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -28,16 +28,16 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="-O3 -march=i486 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O3 -march=i686 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O3 -fPIC" LIBDIRSUFFIX="64" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O3" LIBDIRSUFFIX="" fi @@ -57,18 +57,12 @@ find . \ -exec chmod 644 {} \; if [ ! "${LINK_XLIB:-YES}" = "YES" ]; then - patch -p1 < $CWD/no-link-xlib.diff + patch -p1 config.mk $CWD/no-link-xlib.diff fi # See config.mk for available LANGUAGE ISO 639-2 codes. -# CFLAGS_WARN, which are optional anyway, cause warnings to be treated as -# errors, which make the no-x11 build error out -# CFLAGS_OPT_LVL defaults to -Ofast, but we want the -O2 from SLKCFLAGS -# to be used make \ - CFLAGS_WARN="" \ - CFLAGS_OPT_LVL="" \ - CFLAGS_OPT_ARC="$SLKCFLAGS" \ + CFLAGS_OPT="$SLKCFLAGS" \ LANGUAGE="${LANGUAGE:-eng}" \ PREFIX="/usr" \ PREFIX_X11_LIB="/usr/lib${LIBDIRSUFFIX}" @@ -76,7 +70,7 @@ make \ make install \ LANGUAGE="${LANGUAGE:-eng}" \ PREFIX="${PKG}/usr" \ - PREFIX_DATA_RULES_CONF="/usr/share/games/${PRGNAM}/rules" + PREFIX_DATA_RULES_CONF="/usr/share/games/${PRGNAM}/rules" find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/games/hnefatafl/hnefatafl.info b/games/hnefatafl/hnefatafl.info index 9f8aafd9bae9f..9dcb8c487a8fe 100644 --- a/games/hnefatafl/hnefatafl.info +++ b/games/hnefatafl/hnefatafl.info @@ -1,10 +1,10 @@ PRGNAM="hnefatafl" -VERSION="130527" +VERSION="130920" HOMEPAGE="http://www.oktv.se/hemsida/alexander.soderlund/prog/c/hnefatafl/hnefatafl.html" -DOWNLOAD="http://www.oktv.se/hemsida/alexander.soderlund/prog/c/hnefatafl/src/hnefatafl130527.tar.bz2" -MD5SUM="c3abe314eac2fcfcf0627ffbafe88f9b" +DOWNLOAD="http://www.oktv.se/hemsida/alexander.soderlund/prog/c/hnefatafl/src/hnefatafl130920.tar.bz2" +MD5SUM="c4ab56ca75ee66a913d25ad4b71128a2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="Alexander Söderlund" -EMAIL="alexandersoderlund@lavabit.com" +EMAIL="alexander.soderlund@oktv.se" diff --git a/games/hnefatafl/no-link-xlib.diff b/games/hnefatafl/no-link-xlib.diff index 555dad61f17d1..74adc927327ab 100644 --- a/games/hnefatafl/no-link-xlib.diff +++ b/games/hnefatafl/no-link-xlib.diff @@ -1,20 +1,8 @@ ---- hnefatafl130527.orig/config.mk 2013-05-31 16:39:25.000000000 -0500 -+++ hnefatafl130527/config.mk 2013-07-12 01:45:58.685050150 -0500 -@@ -93,7 +93,7 @@ - MACRO_AIM_HASH_MEM_TAB= -DHT_AI_MINIMAX_HASH_MEM_TAB=32000000 - MACRO_AIM_HASH_MEM_COL= -DHT_AI_MINIMAX_HASH_MEM_COL=48000000 - MACRO_UI_CLI= -DHT_UI_CLI --MACRO_UI_XLIB= -DHT_UI_XLIB -+#MACRO_UI_XLIB= -DHT_UI_XLIB - MACROS= -DHT_VERSION=$(VERSION)\ - -DHT_FILE_RC_DEF=\"$(FILE_RC)\"\ - -DHT_FILE_RULE_DEF=\"$(PREFIX_DATA_RULES_CONF)/$(FILE_RULE_DEF)\"\ -@@ -119,7 +119,7 @@ - # interface). - ######################################################################## - LIB_C= -lm --LIB_XLIB= -L$(PREFIX_X11_LIB) -lX11 -lXpm -+#LIB_XLIB= -L$(PREFIX_X11_LIB) -lX11 -lXpm - LIBS= $(LIB_C) $(LIB_XLIB) - - ######################################################################## +96c96 +< MACRO_UI_XLIB= -DHT_UI_XLIB +--- +> #MACRO_UI_XLIB= -DHT_UI_XLIB +122c122 +< LIB_XLIB= -L$(PREFIX_X11_LIB) -lX11 -lXpm +--- +> #LIB_XLIB= -L$(PREFIX_X11_LIB) -lX11 -lXpm |