graphics/tuxpaint: Updated for version 0.9.23.

Signed-off-by: David Spencer <idlemoor@slackbuilds.org>

3 files changed, 19 insertions, 123 deletions

diff --git a/graphics/tuxpaint/patch.diff b/graphics/tuxpaint/patch.diff
deleted file mode 100644
index 829b669363137..0000000000000
--- a/graphics/tuxpaint/patch.diff
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -u -r tuxpaint-0.9.22/Makefile tuxpaint-0.9.22-patched/Makefile
---- tuxpaint-0.9.22/Makefile	2014-08-19 08:28:33.000000000 +0100
-+++ tuxpaint-0.9.22-patched/Makefile	2015-08-04 14:35:11.258065084 +0100
-@@ -138,14 +138,14 @@
- 
- # Magic Tool plug-ins
- INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
--MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib/tuxpaint/plugins
-+MAGIC_PREFIX:=$(DESTDIR)$(PREFIX)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
- 
- 
- # Docs and man page:
--DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint
--DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-dev
--MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
--DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
-+DOC_PREFIX:=$(DESTDIR)$(PREFIX)/doc/tuxpaint-$(VER_VERSION)
-+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
-+MAN_PREFIX:=$(DESTDIR)$(PREFIX)/man
-+DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/man
- 
- # BASH tab-completion file:
- COMPLETIONDIR:=$(DESTDIR)/etc/bash_completion.d
-@@ -163,10 +163,10 @@
- 
- # Icons and launchers:
- ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
--X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/X11R6/include/X11/pixmaps
-+X11_ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps
- GNOME_PREFIX:=$(shell gnome-config --prefix 2> /dev/null)
--KDE_PREFIX:=$(shell kde-config --install apps --expandvars 2> /dev/null)
--KDE_ICON_PREFIX:=$(shell kde-config --install icon --expandvars 2> /dev/null)
-+KDE_PREFIX:=/usr/share/applications
-+KDE_ICON_PREFIX:=$(shell kde4-config --install icon --expandvars 2> /dev/null)
- 
- # Maemo flag
- MAEMOFLAG:=
-@@ -435,7 +435,7 @@
- windows_ARCH_INSTALL:=
- osx_ARCH_INSTALL:=
- beos_ARCH_INSTALL:=install-haiku
--linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons
-+linux_ARCH_INSTALL:=install-kde install-kde-icons
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
- 
- # "make install" installs all of the various parts
-@@ -494,7 +494,8 @@
- 	@cp src/tp_magic_api.h $(INCLUDE_PREFIX)/tuxpaint
- 	@chmod a+r,g-w,o-w $(INCLUDE_PREFIX)/tuxpaint/tp_magic_api.h
- 	@install -d $(DEVDOC_PREFIX)
--	@cp -R magic/docs/* $(DEVDOC_PREFIX)
-+	@cp magic/docs/*.txt $(DEVDOC_PREFIX)
-+	@cp magic/magic-docs/*.txt $(DEVDOC_PREFIX)
- 	@chmod a=rX,g=rX,u=rwX $(DEVDOC_PREFIX)
- 
- # Installs the various parts for the MinGW/MSYS development/testing environment.
-@@ -573,7 +574,7 @@
- 	  rm /usr/share/pixmaps/tuxpaint.png; \
- 	fi
- 	-if [ "x$(KDE_PREFIX)" != "x" ]; then \
--	  rm $(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
-+	  rm $(KDE_PREFIX)/tuxpaint.desktop; \
- 	fi
- 	-rm $(ICON_PREFIX)/tuxpaint.png
- 	-rm $(X11_ICON_PREFIX)/tuxpaint.xpm
-@@ -761,9 +762,9 @@
- 	@echo
- 	@echo "...Installing launcher icon into KDE..."
- 	@if [ "x$(KDE_PREFIX)" != "x" ]; then \
--	  install -d $(DESTDIR)$(KDE_PREFIX)/Graphics; \
--	  cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/Graphics/; \
--	  chmod 644 $(DESTDIR)$(KDE_PREFIX)/Graphics/tuxpaint.desktop; \
-+	  install -d $(DESTDIR)$(KDE_PREFIX)/; \
-+	  cp src/tuxpaint.desktop $(DESTDIR)$(KDE_PREFIX)/; \
-+	  chmod 644 $(DESTDIR)$(KDE_PREFIX)/tuxpaint.desktop; \
- 	fi
- 
- .PHONY: install-kde-icons
-@@ -944,8 +945,7 @@
- 	@echo
- 	@echo "...Installing documentation..."
- 	@install -d $(DOC_PREFIX)
--	@cp -R docs/* $(DOC_PREFIX)
--	@cp -R magic/magic-docs $(DOC_PREFIX)
-+	@cp docs/*.txt $(DOC_PREFIX)
- 	@chmod -R a=rX,g=rX,u=rwX $(DOC_PREFIX)
- 
- 
-@@ -959,21 +959,21 @@
- 	@# tuxpaint.1
- 	@cp src/manpage/tuxpaint.1 $(MAN_PREFIX)/man1
- 	@gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+	@chmod 644 $(MAN_PREFIX)/man1/tuxpaint.1.gz
- 	@# pl/man1 directory...
- 	@install -d $(MAN_PREFIX)/pl/man1/
- 	@# tuxpaint-pl.1
- 	@cp src/manpage/tuxpaint-pl.1 $(MAN_PREFIX)/pl/man1/tuxpaint.1
- 	@gzip -f $(MAN_PREFIX)/pl/man1/tuxpaint.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/pl/man1/tuxpaint.1.gz
-+	@chmod 644 $(MAN_PREFIX)/pl/man1/tuxpaint.1.gz
- 	@# tuxpaint-import.1
- 	@cp src/manpage/tuxpaint-import.1 $(MAN_PREFIX)/man1/
- 	@gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+	@chmod 644 $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
- 	@# tp-magic-config.1
- 	@cp src/manpage/tp-magic-config.1 $(MAN_PREFIX)/man1/
- 	@gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
--	@chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+	@chmod 644 $(MAN_PREFIX)/man1/tp-magic-config.1.gz
- 
- 
- 
diff --git a/graphics/tuxpaint/tuxpaint.SlackBuild b/graphics/tuxpaint/tuxpaint.SlackBuild
index 5c8a0926192c8..41314b7256ebb 100644
--- a/graphics/tuxpaint/tuxpaint.SlackBuild
+++ b/graphics/tuxpaint/tuxpaint.SlackBuild
@@ -7,7 +7,7 @@
 # Taken over maintenance (and some updates) by Tim Dickson (dickson.tim@googlemail.com)
 
 PRGNAM=tuxpaint
-VERSION=${VERSION:-0.9.22}
+VERSION=${VERSION:-0.9.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,21 +53,31 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Create a more useful Makefile
-patch -p1 < $CWD/patch.diff
-
 make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX OPTFLAGS="$SLKCFLAGS"
-make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX DESTDIR=$PKG install
+make \
+  MAN_PREFIX=$PKG/usr/man \
+  DEVMAN_PREFIX=$PKG/usr/man \
+  DOC_PREFIX=$PKG/usr/doc/$PRGNAM-$VERSION \
+  DEVDOC_PREFIX=$PKG/usr/doc/$PRGNAM-$VERSION \
+  PREFIX=/usr \
+  LIBDIRSUFFIX=$LIBDIRSUFFIX \
+  DESTDIR=$PKG \
+  install
+
 mv $PKG/etc/tuxpaint/tuxpaint.conf $PKG/etc/tuxpaint/tuxpaint.conf.new
 
+mkdir -p $PKG/usr/share/applications
+cp src/$PRGNAM.desktop $PKG/usr/share/applications/
+
 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
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/doinst.sh  > $PKG/install/doinst.sh
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/graphics/tuxpaint/tuxpaint.info b/graphics/tuxpaint/tuxpaint.info
index 5095e596699cb..90c4e0c40cff3 100644
--- a/graphics/tuxpaint/tuxpaint.info
+++ b/graphics/tuxpaint/tuxpaint.info
@@ -1,8 +1,8 @@
 PRGNAM="tuxpaint"
-VERSION="0.9.22"
+VERSION="0.9.23"
 HOMEPAGE="http://www.tuxpaint.org"
-DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.22.tar.gz"
-MD5SUM="bb9d7e4460ed8084be23b5dfcbf49ef3"
+DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.23.tar.gz"
+MD5SUM="5dfc5a710b5550c54bbc8cb7cf06d594"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libpaper SDL_Pango"