games/freeciv: Updated for version 2.1.0

4 files changed, 29 insertions, 31 deletions

diff --git a/games/freeciv/doinst.sh b/games/freeciv/doinst.sh
new file mode 100644
index 000000000000..82a2a3043642
--- /dev/null
+++ b/games/freeciv/doinst.sh
@@ -0,0 +1,5 @@
+
+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 2c9add462dca..ed51a3f79723 100644
--- a/games/freeciv/freeciv.SlackBuild
+++ b/games/freeciv/freeciv.SlackBuild
@@ -1,10 +1,10 @@
 #!/bin/sh
 
 # Slackware build script for freeciv
-# Written by Iskar Enev <iskar.enev@gmail.com>
+# Written by Iskar Enev <iskar.enev[@]gmail.com>
 
 PRGNAM=freeciv
-VERSION=2.0.9
+VERSION=2.1.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -13,20 +13,19 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-XPREF=`pkg-config --variable=prefix x11` || true
-[ "$XPREF" == "" ] && XPREF='/usr/X11R6'
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -38,40 +37,34 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --x-includes=$XPREF/include \
-  --x-libraries=$XPREF/lib \
-  --enable-client=yes \
-  || exit 1
-  
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+  --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 "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
-( cd $PKG/usr/man/man6
+( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
 
-# Fix icon path in desktop file 
-sed -i 's%Icon=gnome-globe.png%Icon=/usr/share/icons/gnome/96x96/apps/gnome-globe.png%' \
-  $PKG/usr/share/applications/$PRGNAM.desktop || exit 1
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS doc/* \
-	$PKG/usr/doc/$PRGNAM-$VERSION
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 ( cd $PKG/usr/doc/$PRGNAM-$VERSION
-	rm -rf man/
-	find . -name "Makefile*" -type f -exec rm {} \;
+  rm -rf man
+  find . -name "Makefile*" -type f -exec rm {} \;
 )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/games/freeciv/freeciv.info b/games/freeciv/freeciv.info
index 6539911f1c0b..c658ee8da250 100644
--- a/games/freeciv/freeciv.info
+++ b/games/freeciv/freeciv.info
@@ -1,8 +1,8 @@
 PRGNAM="freeciv"
-VERSION="2.0.9"
+VERSION="2.1.0"
 HOMEPAGE="http://www.freeciv.org"
-DOWNLOAD="http://dl.sourceforge.net/freeciv/freeciv-2.0.9.tar.bz2"
-MD5SUM="7bfa40220bd8e19a263ca247202682ce"
+DOWNLOAD="http://downloads.sourceforge.net/freeciv/freeciv-2.1.0.tar.bz2"
+MD5SUM="f640aa48abca0a235220d6df22b9bc82"
 MAINTAINER="Iskar Enev"
 EMAIL="iskar.enev@gmail.com"
-APPROVED="BP{k}"
+APPROVED="rworkman"
diff --git a/games/freeciv/slack-desc b/games/freeciv/slack-desc
index f3db770fab94..3f173c03e424 100644
--- a/games/freeciv/slack-desc
+++ b/games/freeciv/slack-desc
@@ -5,12 +5,12 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-       |-----handy-ruler---------------------------------------------------------|
-freeciv: freeciv
+       |-----handy-ruler----------------------------------------------------|
+freeciv: freeciv (turn-based multiplayer strategy game)
 freeciv:
-freeciv: Freeciv is a free turn-based multiplayer strategy game, in which each 
-freeciv: player becomes the leader of a civilization, fighting to obtain the 
-freeciv: ultimate goal: To become the greatest civilization.
+freeciv: Freeciv is a free turn-based multiplayer strategy game, in which
+freeciv: each player becomes the leader of a civilization, fighting to
+freeciv: obtain the ultimate goal: To become the greatest civilization.
 freeciv: 
 freeciv: 
 freeciv: