diff --git a/games/freeciv/doinst.sh b/games/freeciv/doinst.sh index 82a2a30436..392c12adb9 100644 --- a/games/freeciv/doinst.sh +++ b/games/freeciv/doinst.sh @@ -1,5 +1,4 @@ - -if [ -x usr/bin/update-desktop-database ]; then - usr/bin/update-desktop-database -q usr/share/applications +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications fi diff --git a/games/freeciv/freeciv.SlackBuild b/games/freeciv/freeciv.SlackBuild index ed51a3f797..f7830355df 100644 --- a/games/freeciv/freeciv.SlackBuild +++ b/games/freeciv/freeciv.SlackBuild @@ -3,20 +3,27 @@ # Slackware build script for freeciv # Written by Iskar Enev +# Modified by SlackBuilds.org + PRGNAM=freeciv -VERSION=2.1.0 +VERSION=2.1.6 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +DOCUMENTATION="ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README doc/" + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" fi set -e @@ -37,13 +44,14 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ + --without-ggz-client \ --enable-client=yes - + make make install DESTDIR=$PKG ( cd $PKG - find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null + find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null ) @@ -53,8 +61,7 @@ make install DESTDIR=$PKG ) mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS doc/* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCUMENTATION $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild ( cd $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/games/freeciv/freeciv.info b/games/freeciv/freeciv.info index c658ee8da2..2e5e2552df 100644 --- a/games/freeciv/freeciv.info +++ b/games/freeciv/freeciv.info @@ -1,8 +1,8 @@ PRGNAM="freeciv" -VERSION="2.1.0" +VERSION="2.1.6" HOMEPAGE="http://www.freeciv.org" -DOWNLOAD="http://downloads.sourceforge.net/freeciv/freeciv-2.1.0.tar.bz2" -MD5SUM="f640aa48abca0a235220d6df22b9bc82" +DOWNLOAD="http://downloads.sourceforge.net/freeciv/freeciv-2.1.6.tar.bz2" +MD5SUM="377a44273cdd0c2cab4e1c0a457fc7c7" MAINTAINER="Iskar Enev" -EMAIL="iskar.enev@gmail.com" -APPROVED="rworkman" +EMAIL="" +APPROVED="David Somero" \ No newline at end of file