games/lbreakout2: Updated for version 2.6beta7

5 files changed, 39 insertions, 35 deletions

diff --git a/games/lbreakout2/doinst.sh b/games/lbreakout2/doinst.sh
index 22d4849bce4a9..392c12adb9bd3 100644
--- a/games/lbreakout2/doinst.sh
+++ b/games/lbreakout2/doinst.sh
@@ -1,5 +1,4 @@
-
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications
 fi
 
diff --git a/games/lbreakout2/lbreakout2.SlackBuild b/games/lbreakout2/lbreakout2.SlackBuild
index 36429b278774d..307f4fa28bb20 100644
--- a/games/lbreakout2/lbreakout2.SlackBuild
+++ b/games/lbreakout2/lbreakout2.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for LBreakout2
 
-# Copyright 2007  Frank Caraballo <fecaraballo[AT]gmail.com>
+# Copyright 2007, 2008  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,61 +22,66 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
-set -e
-
 PRGNAM=lbreakout2
-VERSION=2.6beta-7
-PKG_VERSION=2.6beta7
+VERSION=${VERSION:-2.6beta7}
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README README-SDL.txt TODO"
-
 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
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM-2.6beta-7
+tar xvf $CWD/$PRGNAM-2.6beta-7.tar.gz
+cd $PRGNAM-2.6beta-7
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
-  --localstatedir=/var/lib/lgames
+  --localstatedir=/var/lib/lgames \
+  --enable-sdl-net \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$PKG_VERSION
-cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$PKG_VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$PKG_VERSION/$PRGNAM.SlackBuild
-# Move auto-installed doc files to correct location:
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$PKG_VERSION/HTML
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ABOUT-NLS AUTHORS ChangeLog COPYING INSTALL NEWS README* TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION/HTML
 
-# Install desktop file and link icon to /usr/share/pixmaps
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
-( cd $PKG/usr/share/pixmaps ; ln -s ../$PRGNAM/gfx/win_icon.png lbreakout2.png )
+( cd $PKG/usr/share/pixmaps
+  ln -s ../lbreakout2/gfx/win_icon.png lbreakout2.png
+)
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 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-$PKG_VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/games/lbreakout2/lbreakout2.desktop b/games/lbreakout2/lbreakout2.desktop
index 8eba85d4d7cc4..39ac59c7f1020 100644
--- a/games/lbreakout2/lbreakout2.desktop
+++ b/games/lbreakout2/lbreakout2.desktop
@@ -6,5 +6,5 @@ Exec=lbreakout2
 Terminal=false
 Type=Application
 Categories=Application;Game;ArcadeGame
-Icon=/usr/share/pixmaps/lbreakout2.png
+Icon=lbreakout2.png
 StartupNotify=false
diff --git a/games/lbreakout2/lbreakout2.info b/games/lbreakout2/lbreakout2.info
index 8e74f529f21ff..05ba83604b949 100644
--- a/games/lbreakout2/lbreakout2.info
+++ b/games/lbreakout2/lbreakout2.info
@@ -1,8 +1,8 @@
 PRGNAM="lbreakout2"
 VERSION="2.6beta7"
 HOMEPAGE="http://lgames.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/lgames/lbreakout2-2.6beta-7.tar.gz"
+DOWNLOAD="http://downloads.sourceforge.net/lgames/lbreakout2-2.6beta-7.tar.gz"
 MD5SUM="bccede972d2f73612c47ca6a5aa9770e"
 MAINTAINER="Frank Caraballo"
-EMAIL="fecaraballo[AT]gmail.com"
+EMAIL="fecaraballo{at}gmail{dot}com"
 APPROVED="rworkman"
diff --git a/games/lbreakout2/slack-desc b/games/lbreakout2/slack-desc
index 82707563574cb..80ddfb3abc9b2 100644
--- a/games/lbreakout2/slack-desc
+++ b/games/lbreakout2/slack-desc
@@ -1,11 +1,11 @@
 # HOW TO EDIT THIS FILE:
 # The "handy ruler" below makes it easier to edit a package description.  Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
-# customary to leave one space after the ':'.
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 lbreakout2: LBreakout2 (Breakout-style Arcade Game)
 lbreakout2:
 lbreakout2: LBreakout2 is a breakout-style arcade game in the manner of