tuxpaint and tuxpaint_stamps, bump versions (#5537)

media-gfx/tuxpaint-stamps/tuxpaint_stamps-2020.12.27.recipe

@@ -5,11 +5,11 @@ in schools and around the world as a computer literacy drawing activity. \
 It combines an easy-to-use interface, fun sound effects, and an \
 encouraging cartoon mascot who guides children as they use the program."
 HOMEPAGE="http://www.tuxpaint.org/"
-COPYRIGHT="2002-2018 Bill Kendrick and others"
+COPYRIGHT="2002-2020 Bill Kendrick and others"
 LICENSE="GNU GPL v2"
 REVISION="1"
 SOURCE_URI="https://downloads.sourceforge.net/tuxpaint/tuxpaint-stamps-$portVersion.tar.gz"
-CHECKSUM_SHA256="d78f55e7fde6abc3fb1a79e6fed0114a2c0ad2edff7ee5f8db43fa23e61079ea"
+CHECKSUM_SHA256="df53bbd866d4b045e8148f7271efd7d4c3e689f4511796ab31d4b95a98733235"
 SOURCE_DIR="tuxpaint-stamps-$portVersion"
 
 ARCHITECTURES="any"
@@ -18,23 +18,13 @@ DISABLE_SOURCE_PACKAGE="yes"
 PROVIDES="
 	tuxpaint_stamps = $portVersion
 	"
-REQUIRES="
-	haiku
-	"
 
-BUILD_REQUIRES="
-	haiku_devel
-	"
 BUILD_PREREQUIRES="
 	cmd:find
 	cmd:make
+	cmd:which
 	"
 
-BUILD()
-{
-	true
-}
-
 INSTALL()
 {
 	mkdir -p $appsDir/TuxPaint/share/tuxpaint/

media-gfx/tuxpaint/patches/tuxpaint-0.9.24.patchset

@@ -1,72 +0,0 @@
-From b13bf235eca59415b516a788a93fd5458e191a03 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Tue, 16 Jun 2020 23:43:49 +1000
-Subject: Use min/max
-
-
-diff --git a/src/compiler.h b/src/compiler.h
-index 82efd7a..61e6f39 100644
---- a/src/compiler.h
-+++ b/src/compiler.h
-@@ -28,7 +28,6 @@
-   $Id$
- */
- 
--#ifndef __HAIKU__
- #ifdef __GNUC__
- // This version has strict type checking for safety.
- // See the "unnecessary" pointer comparison. (from Linux)
-@@ -46,7 +45,6 @@
- #define min(a,b) (((a) < (b)) ? (a) : (b))
- #define max(a,b) (((a) > (b)) ? (a) : (b))
- #endif
--#endif /* Not Haiku */
- 
- #define clamp(lo,value,hi)    (min(max(value,lo),hi))
- 
-diff --git a/src/tp_magic_api.h.in b/src/tp_magic_api.h.in
-index 442f13a..0366b8b 100644
---- a/src/tp_magic_api.h.in
-+++ b/src/tp_magic_api.h.in
-@@ -10,7 +10,6 @@
- 
- /* min() and max() variable comparisons: */
- 
--#ifndef __HAIKU__
- #ifdef __GNUC__
- // This version has strict type checking for safety.
- // See the "unnecessary" pointer comparison. (from Linux)
-@@ -28,7 +27,6 @@
- #define min(a,b) (((a) < (b)) ? (a) : (b))
- #define max(a,b) (((a) > (b)) ? (a) : (b))
- #endif
--#endif /* Not Haiku */
- 
- /* clamp() returns 'value', unless it's less than 'lo' or greater than 'hi',
-    in which cases it returns 'lo' or 'hi', respectively: */
--- 
-2.26.0
-
-
-From ad677235a7e423b8a080386a79fb880bbdced3c3 Mon Sep 17 00:00:00 2001
-From: Gerasim Troeglazov <3dEyes@gmail.com>
-Date: Wed, 17 Jun 2020 10:40:53 +1000
-Subject: Use safer_dirent for Haiku
-
-
-diff --git a/src/tuxpaint.c b/src/tuxpaint.c
-index 60b1495..0632bcc 100644
---- a/src/tuxpaint.c
-+++ b/src/tuxpaint.c
-@@ -278,7 +278,7 @@ char *strcasestr(const char *haystack, const char *needle)
- #include <dirent.h>
- #include <signal.h>
- 
--#if defined __BEOS__
-+#if defined __BEOS__ || defined __HAIKU__
- 
- /* BeOS */
- 
--- 
-2.26.0
-

media-gfx/tuxpaint/tuxpaint-0.9.24.recipe

@@ -1,73 +0,0 @@
-SUMMARY="Drawing program designed for young children"
-DESCRIPTION="Tux Paint is a free, award-winning drawing program for children \
-ages 3 to 12 (for example, preschool and K-6). Tux Paint is used \
-in schools and around the world as a computer literacy drawing activity. \
-It combines an easy-to-use interface, fun sound effects, and an \
-encouraging cartoon mascot who guides children as they use the program."
-HOMEPAGE="http://www.tuxpaint.org/"
-COPYRIGHT="2002-2020 Bill Kendrick and others"
-LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="https://downloads.sourceforge.net/tuxpaint/tuxpaint-$portVersion.tar.gz"
-CHECKSUM_SHA256="8762572f55f335aaa6329106282bebf171e7305f796fa7b5aad3cd78c5a3a11a"
-PATCHES="tuxpaint-0.9.24.patchset"
-
-ARCHITECTURES="x86_gcc2 ?x86 x86_64"
-
-USER_SETTINGS_FILES="
-	settings/TuxPaint directory
-	"
-
-PROVIDES="
-	tuxpaint = $portVersion
-	"
-REQUIRES="
-	haiku
-	lib:libfribidi
-	lib:libiconv
-	lib:libintl
-	lib:libpaper
-	lib:libpng16
-	lib:libSDL_1.2
-	lib:libSDL_image_1.2
-	lib:libSDL_mixer_1.2
-	lib:libSDL_ttf_2.0
-	lib:libz
-	"
-
-BUILD_REQUIRES="
-	haiku_devel
-	devel:libfribidi
-	devel:libiconv
-	devel:libintl
-	devel:libpaper
-	devel:libpng16
-	devel:libSDL_1.2
-	devel:libSDL_image_1.2
-	devel:libSDL_mixer_1.2
-	devel:libSDL_ttf_2.0
-	devel:libz
-	"
-BUILD_PREREQUIRES="
-	cmd:convert
-	cmd:gcc
-	cmd:gperf
-	cmd:ld
-	cmd:make
-	cmd:pkg_config
-	"
-
-BUILD()
-{
-	make $jobArgs PREFIX=$appsDir/TuxPaint
-}
-
-INSTALL()
-{
-	mkdir -p $appsDir/TuxPaint
-
-	make install PREFIX=$appsDir/TuxPaint
-	ln -s $appsDir/TuxPaint/bin/tuxpaint $appsDir/TuxPaint/TuxPaint
-
-	addAppDeskbarSymlink $appsDir/TuxPaint/bin/tuxpaint TuxPaint
-}

media-gfx/tuxpaint/tuxpaint-0.9.25.recipe

@@ -0,0 +1,76 @@
+SUMMARY="Drawing program designed for young children"
+DESCRIPTION="Tux Paint is a free, award-winning drawing program for children \
+ages 3 to 12 (for example, preschool and K-6). Tux Paint is used \
+in schools and around the world as a computer literacy drawing activity. \
+It combines an easy-to-use interface, fun sound effects, and an \
+encouraging cartoon mascot who guides children as they use the program."
+HOMEPAGE="http://www.tuxpaint.org/"
+COPYRIGHT="2002-2020 Bill Kendrick and others"
+LICENSE="GNU GPL v2"
+REVISION="1"
+SOURCE_URI="https://downloads.sourceforge.net/tuxpaint/tuxpaint-$portVersion.tar.gz"
+CHECKSUM_SHA256="c1185b7ba97701ae48639ade3e55488bd695a919a7b5b38f5b2ab0df93b6e19d"
+
+ARCHITECTURES="x86_gcc2 x86_64"
+SECONDARY_ARCHITECTURES="x86"
+
+USER_SETTINGS_FILES="
+	settings/TuxPaint directory
+	"
+
+PROVIDES="
+	tuxpaint$secondaryArchSuffix = $portVersion
+	app:TuxPaint
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libfribidi$secondaryArchSuffix
+	lib:libiconv$secondaryArchSuffix
+	lib:libimagequant$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	lib:libpaper$secondaryArchSuffix
+	lib:libpng16$secondaryArchSuffix
+	lib:libSDL_1.2$secondaryArchSuffix
+	lib:libSDL_image_1.2$secondaryArchSuffix
+	lib:libSDL_mixer_1.2$secondaryArchSuffix
+	lib:libSDL_ttf_2.0$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+BUILD_REQUIRES="
+	haiku_devel
+	devel:libfribidi$secondaryArchSuffix
+	devel:libiconv$secondaryArchSuffix
+	devel:libimagequant$secondaryArchSuffix
+	devel:libintl$secondaryArchSuffix
+	devel:libpaper$secondaryArchSuffix
+	devel:libpng16$secondaryArchSuffix
+	devel:libSDL_1.2$secondaryArchSuffix
+	devel:libSDL_image_1.2$secondaryArchSuffix
+	devel:libSDL_mixer_1.2$secondaryArchSuffix
+	devel:libSDL_ttf_2.0$secondaryArchSuffix
+	devel:libz$secondaryArchSuffix
+	"
+BUILD_PREREQUIRES="
+	cmd:convert$secondaryArchSuffix
+	cmd:gcc$secondaryArchSuffix
+	cmd:gperf
+	cmd:ld
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	make PREFIX=$appsDir/TuxPaint
+}
+
+INSTALL()
+{
+	mkdir -p $appsDir/TuxPaint
+
+	make install PREFIX=$appsDir/TuxPaint
+	ln -s $appsDir/TuxPaint/bin/tuxpaint $appsDir/TuxPaint/TuxPaint
+
+	addAppDeskbarSymlink $appsDir/TuxPaint/bin/tuxpaint TuxPaint
+}