office/keepassx: Updated for version 0.4.1

4 files changed, 26 insertions, 19 deletions

diff --git a/office/keepassx/README b/office/keepassx/README
index 286f6aab24d7e..0b1dd29870c31 100644
--- a/office/keepassx/README
+++ b/office/keepassx/README
@@ -8,5 +8,3 @@ specified for each single entry.  Furthermore the entries are sorted in
 groups, which are customizable as well.  The integrated search function
 allows to search in a single group or the complete database. KeePassX
 offers a little utility for secure password generation.
-
-requires: qt4 (which is also provided by slackbuilds.org)
diff --git a/office/keepassx/doinst.sh b/office/keepassx/doinst.sh
index f39d8d4dfa88a..e4e6459838cbf 100644
--- a/office/keepassx/doinst.sh
+++ b/office/keepassx/doinst.sh
@@ -1,3 +1,8 @@
 if [ -x /usr/bin/update-desktop-database ]; then
-    /usr/bin/update-desktop-database -q usr/share/applications
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
+if [ -x /usr/bin/update-mime-database ]; then
+  /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
+fi
+
diff --git a/office/keepassx/keepassx.SlackBuild b/office/keepassx/keepassx.SlackBuild
index 9c10ca238f41d..c8ef485035244 100644
--- a/office/keepassx/keepassx.SlackBuild
+++ b/office/keepassx/keepassx.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for KeePassX
 
-# Copyright 2008 Ferenc Deak <ferenc.deak@gmail.com>
+# Copyright 2008-2009 Ferenc Deak <ferenc.deak@gmail.com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=keepassx
-VERSION=0.3.3
+VERSION=0.4.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -35,10 +35,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
@@ -47,7 +50,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvzf $CWD/KeePassX-$VERSION.tar.gz
+tar xvf $CWD/keepassx-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -56,7 +59,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-qmake-qt4 \
+qmake \
   QMAKE_CFLAGS="$SLKCFLAGS" \
   QMAKE_CXXFLAGS="$SLKCFLAGS"
 
@@ -64,17 +67,16 @@ make
 make install INSTALL_ROOT=$PKG
 
 ( 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
+  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
 )
 
-( 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
-)
+# there is no manpage
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COPYING INSTALL changelog todo \
+cp -a COPYING INSTALL changelog \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -83,4 +85,4 @@ 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
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/office/keepassx/keepassx.info b/office/keepassx/keepassx.info
index 8757ef76d3c81..f483ef9fae9a3 100644
--- a/office/keepassx/keepassx.info
+++ b/office/keepassx/keepassx.info
@@ -1,8 +1,10 @@
 PRGNAM="keepassx"
-VERSION="0.3.3"
+VERSION="0.4.1"
 HOMEPAGE="http:///www.keepassx.org/"
-DOWNLOAD="http://downloads.sourceforge.net/keepassx/KeePassX-0.3.3.tar.gz"
-MD5SUM="9796b905c92e1de6f3d600a28433aeb0"
+DOWNLOAD="http://downloads.sourceforge.net/keepassx/keepassx-0.4.1.tar.gz"
+MD5SUM="96efdf5855703e3d2817973d5e2b0fcf"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="fdeak"
 EMAIL="ferenc.deak@gmail.com"
-APPROVED="David Somero"
\ No newline at end of file
+APPROVED="rworkman"