network/smb4k: Updated for version 0.10.4

4 files changed, 48 insertions, 26 deletions

diff --git a/network/smb4k/doinst.sh b/network/smb4k/doinst.sh
new file mode 100644
index 0000000000..1f8ff67ded
--- /dev/null
+++ b/network/smb4k/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/network/smb4k/slack-desc b/network/smb4k/slack-desc
index 982551e66e..22760ea562 100644
--- a/network/smb4k/slack-desc
+++ b/network/smb4k/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 smb4k: smb4k (A SMB Share Browser)
 smb4k: 
-smb4k: Smb4K is a SMB (Windows) share browser for KDE.
-smb4k: 
-smb4k: Homepage: http://smb4k.berlios.de/
-smb4k: 
-smb4k: 
+smb4k: SSmb4K is an advanced network neighborhood browser for KDE and a 
+smb4k: frontend to the programs of the Samba software suite. Its purpose is
+smb4k: to provide a program that's easy to use and has as many features as 
+smb4k: possible.
 smb4k: 
 smb4k: 
+smb4k: Homepage: http://smb4k.berlios.de/
 smb4k: 
 smb4k: 
diff --git a/network/smb4k/smb4k.SlackBuild b/network/smb4k/smb4k.SlackBuild
index 3fd8e0f29e..7a240e117d 100644
--- a/network/smb4k/smb4k.SlackBuild
+++ b/network/smb4k/smb4k.SlackBuild
@@ -4,10 +4,9 @@
 # Project Homepage: http://smb4k.berlios.de/
 
 # Written by Roberto Neri <rneri@libero.it>
-# Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=smb4k
-VERSION=${VERSION:-0.9.9}
+VERSION=${VERSION:-0.10.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,10 +18,13 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -40,29 +42,37 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
-
+mkdir build
+cd build
+cmake \
+  -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+  -DCMAKE_BUILD_TYPE=Release \
+  -DCMAKE_INSTALL_PREFIX=/usr \
+  -DMAN_INSTALL_DIR=/usr/man \
+  -DSYSCONF_INSTALL_DIR=/etc/kde \
+  -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+  ..
 make
 make install DESTDIR=$PKG
+cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS ChangeLog COPYING FAQ INSTALL README TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS ChangeLog COPYING FAQ README TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/network/smb4k/smb4k.info b/network/smb4k/smb4k.info
index c28163873a..75ab0e75c4 100644
--- a/network/smb4k/smb4k.info
+++ b/network/smb4k/smb4k.info
@@ -1,8 +1,10 @@
 PRGNAM="smb4k"
-VERSION="0.9.9"
+VERSION="0.10.4"
 HOMEPAGE="http://smb4k.berlios.de/"
-DOWNLOAD="http://download.berlios.de/smb4k/smb4k-0.9.9.tar.bz2"
-MD5SUM="a38da207beae0ced66be0219a0028843"
+DOWNLOAD="http://download.berlios.de/smb4k/smb4k-0.10.4.tar.bz2"
+MD5SUM="e8676d8baaecdbcee60354c687a88a55"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Roberto Neri"
 EMAIL="rneri@libero.it"
-APPROVED="rworkman"
+APPROVED="dsomero"