office/basket: Updated for version 1.0.3.1

3 files changed, 54 insertions, 35 deletions

diff --git a/office/basket/README b/office/basket/README
index ac483846f4b48..8c0f1704f5878 100644
--- a/office/basket/README
+++ b/office/basket/README
@@ -1,26 +1,27 @@
-BasKet Note Pads is a note-taking application that makes it easy to write down 
-ideas as you think and quickly find them again later.  Organizing your notes 
-has never been so easy.
+BasKet Note Pads is a note-taking application that makes it easy to write
+down ideas as you think and quickly find them again later.  Organizing your
+notes has never been so easy.
 
-There are plenty of flat note-taking applications that only let you write 
-text.  BasKet Note Pads offers more freedom by collecting any type of data. 
-It is ideal to bring together all the information about a project in one 
-place: you can take images, group needed documents, link to email addresses of 
-the project members, link to various interesting websites, and more...
+There are plenty of flat note-taking applications that only let you write
+text.  BasKet Note Pads offers more freedom by collecting any type of data.
+It is ideal to bring together all the information about a project in one
+place: you can take images, group needed documents, link to email addresses
+of the project members, link to various interesting websites, and more...
 
 This multi-purpose note-taking application can helps you to:
   * Easily take all sort of notes
   * Collect research results and share them
-  * Centralize your project data and re-use them
+  * Centralize your project data and re-use them 
   * Quickly organize your toughts in idea boxes
   * Keep track of your information in a smart way
   * Make intelligent To Do lists
   * Intergrate with KDE Kontact as well as stand alone
   * And a lot more...
 
-basket can optionally use gpgme, which is also available from SlackBuilds.org.
+basket can optionally use gpgme, which is also available from
+SlackBuilds.org.
 
 There is a script to convert your notes to UTF-8 format - get it from:
-http://basket.kde.org/downloads/?file=convert-baskets-to-utf8.bash.tar.gz 
-Quit BasKet Note Pads, edit the script to replace "latin1" with your own 
-local encoding, run the script in a console, and restart BasKet Note Pads. 
+http://basket.kde.org/downloads/?file=convert-baskets-to-utf8.bash.tar.gz
+Quit BasKet Note Pads, edit the script to replace "latin1" with your own
+local encoding, run the script in a console, and restart BasKet Note Pads.
diff --git a/office/basket/basket.SlackBuild b/office/basket/basket.SlackBuild
index 8735a46902152..aee5023cae01b 100644
--- a/office/basket/basket.SlackBuild
+++ b/office/basket/basket.SlackBuild
@@ -1,28 +1,45 @@
 #!/bin/sh
 
 # Slackware build script for: basket 
-# Written by: Michiel van Wessem (BP{k}) <michiel@slackbuilds.org>
-
-# Modified by the SlackBuilds.org project
-
-set -e 
+# 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=basket
-VERSION=1.0.2
+VERSION=1.0.3.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO"
-
 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
 
 rm -rf $PKG
@@ -32,27 +49,28 @@ rm -rf $TMP/$PRGNAM-$VERSION
 tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz 
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-KDEPREF=$(kde-config --prefix)
+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" \
-./configure --prefix=$KDEPREF \
+./configure \
+  --prefix=/usr \
   --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
-  --program-prefix="" \
-  --program-suffix="" \
   --disable-debug 
 
 make 
 make install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
+  $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 
diff --git a/office/basket/basket.info b/office/basket/basket.info
index cb9149a5ba1b4..37bd331aa459f 100644
--- a/office/basket/basket.info
+++ b/office/basket/basket.info
@@ -1,8 +1,8 @@
 PRGNAM="basket"
-VERSION="1.0.2"
+VERSION="1.0.3.1"
 HOMEPAGE="http://basket.kde.org/"
-DOWNLOAD="http://basket.kde.org/downloads/basket-1.0.2.tar.gz"
-MD5SUM="d71c62a56de9cc32ba2633e63e99071f"
+DOWNLOAD="http://basket.kde.org/downloads/basket-1.0.3.1.tar.gz"
+MD5SUM="5a58bbe69c4a80a40747ed80ebb5b3b9"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="rworkman"
+APPROVED="David Somero"
\ No newline at end of file