office/kmymoney2: Updated for version 0.9.2

4 files changed, 47 insertions, 26 deletions

diff --git a/office/kmymoney2/README b/office/kmymoney2/README
index d9a14aefbe..227c622bc7 100644
--- a/office/kmymoney2/README
+++ b/office/kmymoney2/README
@@ -3,15 +3,12 @@ small-business use.  It is a full double-entry accounting software package
 compatible with KDE 3.2.x and later.
 
 The ultimate objectives of KMyMoney are...
-
   * Familiar Features. KMyMoney intends to provide all important features 
     found in the commercially-available, personal finance managers. The 
     current release is closer than ever to that goal and more improvements 
     are already planned or being tested.
-
   * Ease of use. KMyMoney strives to be the easiest open source personal 
     finance manager to use, especially for the non-technical user.
-
   * Accuracy. Using time tested double entry accounting principles KMyMoney 
     can help ensure that your finances are kept in correct order.
 
diff --git a/office/kmymoney2/doinst.sh b/office/kmymoney2/doinst.sh
index 22d4849bce..c3651bc867 100644
--- a/office/kmymoney2/doinst.sh
+++ b/office/kmymoney2/doinst.sh
@@ -1,5 +1,5 @@
 
-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 usr/share/applications >/dev/null 2>&1
 fi
 
diff --git a/office/kmymoney2/kmymoney2.SlackBuild b/office/kmymoney2/kmymoney2.SlackBuild
index d64253a237..5fdb6e1ac2 100644
--- a/office/kmymoney2/kmymoney2.SlackBuild
+++ b/office/kmymoney2/kmymoney2.SlackBuild
@@ -1,10 +1,31 @@
 #!/bin/sh
  
 # Slackware build script for: kmymoney2
-# Written by: Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
+
+# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kmymoney2
-VERSION=0.8.8
+VERSION=0.9.2
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -14,24 +35,28 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS COPYING ChangeLog* INSTALL README*"
-
 if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -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 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP 
+cd $TMP
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 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 {} \;
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -40,27 +65,26 @@ CXXFLAGS="$SLKCFLAGS" \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --program-prefix="" \
-  --program-suffix="" \
   --disable-debug \
   --enable-leak-check \
-  --disable-pdf-docs 
+  --disable-pdf-docs \
+  --build=$ARCH-slackware-linux
 
-make 
-make install-strip DESTDIR=$PKG 
+make
+make install-strip DESTDIR=$PKG
 
 ( 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
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog* INSTALL README* $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} \;
 
-mkdir $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc 
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
diff --git a/office/kmymoney2/kmymoney2.info b/office/kmymoney2/kmymoney2.info
index abb15039bf..c3b0a0fb8f 100644
--- a/office/kmymoney2/kmymoney2.info
+++ b/office/kmymoney2/kmymoney2.info
@@ -1,8 +1,8 @@
 PRGNAM="kmymoney2"
-VERSION="0.8.8"
+VERSION="0.9.2"
 HOMEPAGE="http://kmymoney2.sourceforge.net/index-home.html"
-DOWNLOAD="http://downloads.sourceforge.net/kmymoney2/kmymoney2-0.8.8.tar.bz2"
-MD5SUM="3b31f026b6065ce65a1948fb91e804d0"
+DOWNLOAD="http://downloads.sourceforge.net/kmymoney2/kmymoney2-0.9.2.tar.bz2"
+MD5SUM="5d4edb7c4dc8d894243a26c7bc91efb6"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
 APPROVED="rworkman"