1 files changed, 15 insertions, 22 deletions
diff --git a/games/freeciv/freeciv.SlackBuild b/games/freeciv/freeciv.SlackBuild
index 2c9add462d..ed51a3f797 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