graphics/tuxpaint: Updated for version 0.9.24.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 20 insertions, 31 deletions

diff --git a/graphics/tuxpaint/README b/graphics/tuxpaint/README
index 3be2b90773..3641e2360a 100644
--- a/graphics/tuxpaint/README
+++ b/graphics/tuxpaint/README
@@ -9,4 +9,5 @@ and has entertaining, child-oriented additions such as sound effects.
 tuxpaint-config is now also included as a gui tool to configure
 tuxpaint.
 
+tuxpaint-config is now included, a gui for setting up tuxpaint.
 SDL_Pango is an optional dependency.
diff --git a/graphics/tuxpaint/tuxpaint.SlackBuild b/graphics/tuxpaint/tuxpaint.SlackBuild
index 598a128576..b486609124 100644
--- a/graphics/tuxpaint/tuxpaint.SlackBuild
+++ b/graphics/tuxpaint/tuxpaint.SlackBuild
@@ -6,12 +6,11 @@
 # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org>
 # Taken over maintenance (and some updates) by Tim Dickson (dickson.tim@googlemail.com)
 # added tuxpaint-config 2019-02-11
-#added missing dep.
 
 PRGNAM=tuxpaint
-VERSION=${VERSION:-0.9.23}
-CONFVER=${CONFVER:-0.0.14}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.9.24}
+CONFVER=${CONFVER:-0.0.15}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -77,28 +76,17 @@ cp src/$PRGNAM.desktop $PKG/usr/share/applications/
 cd ..
 tar xvf $CWD/$PRGNAM-config-$CONFVER.tar.gz
 cd $PRGNAM-config-$CONFVER
-make
-#unfortunately tuxpaint-config does not have DESTDIR configured, so we
-#have to do things by hand. copy executable, icons and desktop file and man
-mkdir -p $PKG/usr/bin
-cp $PRGNAM-config $PKG/usr/bin/
-mkdir -p $PKG/usr/share/pixmaps
-cp data/images/icon.png $PKG/usr/share/pixmaps/$PRGNAM-config.png
-cp data/images/icon32x32.xpm $PKG/usr/share/pixmaps/$PRGNAM-config.xpm
-for i in "16x16" "32x32" "48x48"; do
-  mkdir -p $PKG/usr/share/icons/hicolor/$i
-  cp data/images/icon$i.png $PKG/usr/share/icons/hicolor/$i/$PRGNAM-config.png
-done
-mkdir -p $PKG/usr/share/applications
-cp src/$PRGNAM-config.desktop $PKG/usr/share/applications/$PRGNAM-config.desktop
-mkdir -p $PKG/usr/man/man1
-cp src/$PRGNAM-config.1 $PKG/usr/man/man1/$PRGNAM-config.1
-gzip -9f $PKG/usr/man/man1/$PRGNAM-config.1
-#finally for translation files
-for i in `ls trans`; do
-  mkdir -p $PKG/usr/share/locale/$i/LC_MESSAGES
-  cp trans/$i $PKG/usr/share/locale/$i/LC_MESSAGES/$PRGNAM-config.mo
-done
+make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX OPTFLAGS="$SLKCFLAGS"
+make \
+  MAN_PREFIX=/usr/man \
+  DEVMAN_PREFIX=/usr/man \
+  DOC_PREFIX=/usr/doc/$PRGNAM-$VERSION \
+  DEVDOC_PREFIX=/usr/doc/$PRGNAM-$VERSION \
+  PREFIX=/usr \
+  LIBDIRSUFFIX=$LIBDIRSUFFIX \
+  DESTDIR=$PKG \
+  install
+
 #now sanitize stuff.
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/graphics/tuxpaint/tuxpaint.info b/graphics/tuxpaint/tuxpaint.info
index a1b8887912..d3076044d3 100644
--- a/graphics/tuxpaint/tuxpaint.info
+++ b/graphics/tuxpaint/tuxpaint.info
@@ -1,10 +1,10 @@
 PRGNAM="tuxpaint"
-VERSION="0.9.23"
+VERSION="0.9.24"
 HOMEPAGE="http://www.tuxpaint.org"
-DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.23.tar.gz \
-          http://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.14.tar.gz"
-MD5SUM="5dfc5a710b5550c54bbc8cb7cf06d594 \
-        1d7e81f01c52943ee9849aac5415cd86"
+DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.24.tar.gz \
+          http://downloads.sourceforge.net/tuxpaint/tuxpaint-config-0.0.15.tar.gz"
+MD5SUM="966c6348714369aa573764703d6d961f \
+        aab5ea7f2f5d41a2bc66ebf78b15356b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libpaper SDL_Pango fltk"