games/foobillardplus: Updated for version 3.43beta.

(also some cleanups and fixes --ponce)

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

4 files changed, 24 insertions, 27 deletions

diff --git a/games/foobillardplus/foobillardplus.SlackBuild b/games/foobillardplus/foobillardplus.SlackBuild
index 6f078a722f..2fb56a002e 100644
--- a/games/foobillardplus/foobillardplus.SlackBuild
+++ b/games/foobillardplus/foobillardplus.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for foobillardplus
 
-# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
+# Copyright 2013-2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,8 @@
 # by Zbigniew Baniewski, zbigniew.baniewski@gmail.com
 
 PRGNAM=foobillardplus
-VERSION=${VERSION:-3.42beta}
+VERSION=${VERSION:-3.43beta}
+SRCVERSION=${SRCVERSION:-170}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -63,12 +64,12 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+unzip -o $CWD/$PRGNAM-code-$SRCVERSION.zip
+cd $PRGNAM-code-$SRCVERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
@@ -77,35 +78,31 @@ autoconf -f
 autoheader -f
 automake -a -c -f
 
+mkdir -p $PKG/usr/bin $PKG/usr/games/$PRGNAM/data
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=/usr/share \
   --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG \
-  prefix=$PKG/usr/share datadir=$PKG/usr/share/$PRGNAM/data
+  datadir=$PKG/usr/games/$PRGNAM/data \
+  datarootdir=$PKG/usr/games/$PRGNAM/data
 
 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
 
-mkdir -p $PKG/usr/share/pixmaps $PKG/usr/share/applications \
-  $PKG/usr/bin $PKG/usr/doc/$PRGNAM-$VERSION
-ln -s /usr/share/$PRGNAM/bin/$PRGNAM $PKG/usr/bin/$PRGNAM
+ln -sf /usr/games/$PRGNAM/bin/$PRGNAM $PKG/usr/bin/$PRGNAM
 
-( cd $PKG/usr/share
-  rm -f INSTALL
-  mv $PRGNAM.png $PRGNAM.xbm $PKG/usr/share/pixmaps
-  mv $PRGNAM.desktop $PKG/usr/share/applications
-  mv AUTHORS ChangeLog COPYING README TODO $PKG/usr/doc/$PRGNAM-$VERSION )
+# Use our desktop file
+install -m 0644 -D $CWD/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
-# Fix hardcoded paths in the desktop file
-sed -i \
-  -e "s|/opt/foobillardplus/bin/|/usr/bin/|" \
-  -e "s|/opt/foobillardplus/|/usr/share/pixmaps/|" \
-  $PKG/usr/share/applications/$PRGNAM.desktop
+# Install an icon
+install -m 0644 -D data/$PRGNAM.png $PKG/usr/share/pixmaps/$PRGNAM.png
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp AUTHORS COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/games/foobillardplus/foobillardplus.desktop b/games/foobillardplus/foobillardplus.desktop
index ff52ee0609..d0f9f043fd 100644
--- a/games/foobillardplus/foobillardplus.desktop
+++ b/games/foobillardplus/foobillardplus.desktop
@@ -4,7 +4,7 @@ Name=FooBillard++
 GenericName=OpenGL billard game
 Comment=Free OpenGL billard game for Linux
 Exec=foobillard
-Icon=foobillard
+Icon=foobillardplus
 Terminal=false
 Type=Application
 Categories=Game;
diff --git a/games/foobillardplus/foobillardplus.info b/games/foobillardplus/foobillardplus.info
index 9793c120dc..0a64dfc605 100644
--- a/games/foobillardplus/foobillardplus.info
+++ b/games/foobillardplus/foobillardplus.info
@@ -1,8 +1,8 @@
 PRGNAM="foobillardplus"
-VERSION="3.42beta"
-HOMEPAGE="http://foobillard.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/foobillardplus/foobillardplus-3.42beta.tar.gz"
-MD5SUM="a28beae7247fbd925335f1aea9b20b73"
+VERSION="3.43beta"
+HOMEPAGE="http://foobillard.sourceforge.net"
+DOWNLOAD="http://downloads.sf.net/slackbuildsdirectlinks/foobillardplus-code-170.zip"
+MD5SUM="097ae22366266dcb8196daaba8801794"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/games/foobillardplus/slack-desc b/games/foobillardplus/slack-desc
index a7bb475f23..5de81c8c4f 100644
--- a/games/foobillardplus/slack-desc
+++ b/games/foobillardplus/slack-desc
@@ -8,9 +8,9 @@
               |-----handy-ruler------------------------------------------------------|
 foobillardplus: FooBillard++
 foobillardplus:
-foobillardplus: OpenGL billard game
+foobillardplus: OpenGL billard game.
 foobillardplus:
-foobillardplus: http://foobillardplus.sourceforge.net/
+foobillardplus: homepage: http://foobillardplus.sourceforge.net/
 foobillardplus:
 foobillardplus:
 foobillardplus: