desktop/fbpanel: Updated for version 4.12

2 files changed, 24 insertions, 19 deletions

diff --git a/desktop/fbpanel/fbpanel.SlackBuild b/desktop/fbpanel/fbpanel.SlackBuild
index 5e016f702e990..52fac73e87ca0 100644
--- a/desktop/fbpanel/fbpanel.SlackBuild
+++ b/desktop/fbpanel/fbpanel.SlackBuild
@@ -12,49 +12,54 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=fbpanel
-VERSION=4.5
+VERSION=4.12
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
-	SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-elif [ "$ARCH" = "i586" ]; then
-	SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-	SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tgz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
+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 {} \;
 
-# This one doesn't support DESTDIR, and there doesn't seem to be any
-# other good way to package it (aside from copying everything manually,
-# which would be a good option if file locations were hard-coded in the 
-# resulting binary)
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
-  --prefix=$PKG/usr \
-  || exit 1
+  --prefix=/usr \
+  --cpu=on
 
-make || exit 1
-make install || exit 1
+make
+make install PREFIX=$PKG/usr
 
 # Strip the fbpanel binary
 strip --strip-unneeded $PKG/usr/bin/fbpanel
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README CHANGELOG COPYING CREDITS INSTALL $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  README CHANGELOG COPYING CREDITS INSTALL \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Fix manpage location and compress pages
diff --git a/desktop/fbpanel/fbpanel.info b/desktop/fbpanel/fbpanel.info
index fd2d084f43114..249f734ac33d9 100644
--- a/desktop/fbpanel/fbpanel.info
+++ b/desktop/fbpanel/fbpanel.info
@@ -1,8 +1,8 @@
 PRGNAM="fbpanel"
-VERSION="4.5"
+VERSION="4.12"
 HOMEPAGE="http://fbpanel.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/fbpanel/fbpanel-4.5.tgz"
-MD5SUM="3041be5d6fe80a9a52a4ab0d03922d29"
+DOWNLOAD="http://downloads.sourceforge.net/fbpanel/fbpanel-4.12.tgz"
+MD5SUM="12528e7b2936a3548840fe01acaf39f5"
 MAINTAINER="Lehman Black"
 EMAIL="bzqwerty[at]gmail[dot]com"
 APPROVED="rworkman"