4 files changed, 16 insertions, 19 deletions
diff --git a/graphics/whyteboard/README b/graphics/whyteboard/README
index e3a8f97b8b..d264f130f3 100644
--- a/graphics/whyteboard/README
+++ b/graphics/whyteboard/README
@@ -10,7 +10,4 @@ the editing of multiple documents or images inside a single instance of
 Whyteboard. Each sheet has its own undo and redo operations as well as
 its own history replay list.
 
-Requires python >=2.5 (included in slackware-13.0), wxPython >= 2.8
-available at Slackbuilds.org.
-
-An optional requirement is ImageMagick included in Slackware.
+This requires wxPython.
diff --git a/graphics/whyteboard/slack-desc b/graphics/whyteboard/slack-desc
index 450b6c085b..f497ced91c 100644
--- a/graphics/whyteboard/slack-desc
+++ b/graphics/whyteboard/slack-desc
@@ -5,14 +5,14 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-          |-----handy-ruler----------------------------------------------------|
+          |-----handy-ruler------------------------------------------------------|
 whyteboard: Whyteboard (A simple image, pdf and postcript annotator)
-whyteboard: 
+whyteboard:
 whyteboard: Whyteboard is a painting application that allows
 whyteboard: the annotation of pdf, postcript documents and various image
 whyteboard: formats with common drawing tools (pen, rectangles, ellipses,
 whyteboard: text)
-whyteboard: 
+whyteboard:
 whyteboard: Homepage: http://code.google.com/p/whyteboard
 whyteboard:
 whyteboard:
diff --git a/graphics/whyteboard/whyteboard.SlackBuild b/graphics/whyteboard/whyteboard.SlackBuild
index 94a88b4bc0..356e16a875 100644
--- a/graphics/whyteboard/whyteboard.SlackBuild
+++ b/graphics/whyteboard/whyteboard.SlackBuild
@@ -23,16 +23,14 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=whyteboard
-VERSION=${VERSION:-0.37.0}
+VERSION=${VERSION:-0.41.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -51,7 +49,6 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
   LIBDIRSUFFIX=""
 fi
 
@@ -62,19 +59,22 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM
+cd $PRGNAM-$VERSION
 chown -R root:root .
 
 mkdir -p $PKG/usr/bin \
-         $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM \
+         $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION/{images,locale,whyteboard} \
          $PKG/usr/doc/$PRGNAM-$VERSION \
          $PKG/usr/share/{applications,pixmaps}
 
-cp *.py $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM
+cp *.py $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION
+cp -r images/ $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION
+cp -r locale/ $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION
+cp -r whyteboard $PKG/usr/lib$LIBDIRSUFFIX/$PRGNAM-$VERSION
 cp *.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cp whyteboard-help/*.htm $PKG/usr/doc/$PRGNAM-$VERSION
 cd $PKG/usr/bin
-ln -s ../lib/$PRGNAM/whyteboard.py whyteboard
+ln -s ../lib$LIBDIRSUFFIX/$PRGNAM-$VERSION/whyteboard.py whyteboard
 
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/$PRGNAM.desktop > $PKG/usr/share/applications/$PRGNAM.desktop
diff --git a/graphics/whyteboard/whyteboard.info b/graphics/whyteboard/whyteboard.info
index 22219682a1..c55509125f 100644
--- a/graphics/whyteboard/whyteboard.info
+++ b/graphics/whyteboard/whyteboard.info
@@ -1,10 +1,10 @@
 PRGNAM="whyteboard"
-VERSION="0.37.0"
+VERSION="0.41.1"
 HOMEPAGE="http://code.google.com/p/whyteboard"
-DOWNLOAD="http://whyteboard.googlecode.com/files/whyteboard-0.37.0.tar.gz"
-MD5SUM="deea69ebc5dc68d849b293d3695984c9"
+DOWNLOAD="http://whyteboard.googlecode.com/files/whyteboard-0.41.1.tar.gz"
+MD5SUM="ca95a8c702c59fe2516de9a525b59658"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Jose Maria Marin Carceles"
 EMAIL="chemarister@gmail.com"
-APPROVED="dsomero"
+APPROVED="dsomero,Niels Horn"