From 1bf0965dac2e2710e31fd2942f9835402671dfc9 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 29 Jun 2019 14:12:58 +0200
Subject: [PATCH] circuslinux, fix references to libSDL* (#3958)

---
 .../circuslinux/circuslinux-1.0.3.recipe      | 24 +++++-----
 .../patches/circuslinux-1.0.3.patch           | 11 -----
 .../patches/circuslinux-1.0.3.patchset        | 45 +++++++++++++++++++
 3 files changed, 57 insertions(+), 23 deletions(-)
 delete mode 100644 games-arcade/circuslinux/patches/circuslinux-1.0.3.patch
 create mode 100644 games-arcade/circuslinux/patches/circuslinux-1.0.3.patchset

diff --git a/games-arcade/circuslinux/circuslinux-1.0.3.recipe b/games-arcade/circuslinux/circuslinux-1.0.3.recipe
index 41d0ab168..19fbdb738 100644
--- a/games-arcade/circuslinux/circuslinux-1.0.3.recipe
+++ b/games-arcade/circuslinux/circuslinux-1.0.3.recipe
@@ -5,27 +5,27 @@ pop rows of balloons and then fall back down."
 HOMEPAGE="http://www.newbreedsoftware.com/circus-linux/"
 COPYRIGHT="2000 Bill Kendrik, Jarkko Rotsten"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="ftp://ftp.tuxpaint.org/unix/x/circus-linux/src/circuslinux-$portVersion.tar.gz"
 CHECKSUM_SHA256="bf9550ebd598a9e7d93a20d80ff466475122f8b023314bb1e07c31e8c608ce8a"
-PATCHES="circuslinux-$portVersion.patch"
+PATCHES="circuslinux-$portVersion.patchset"
 
-ARCHITECTURES="x86 ?x86_gcc2 ?x86_64"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
 PROVIDES="
 	circuslinux = $portVersion
-	app:circuslinux = $portVersion
+	app:CircusLinux = $portVersion
 	"
 REQUIRES="
 	haiku
-	lib:libsdl
-	lib:libSDL_image
-	lib:libSDL_mixer
+	lib:libSDL_1.2
+	lib:libSDL_image_1.2
+	lib:libSDL_mixer_1.2
 	"
 
 BUILD_REQUIRES="
 	haiku_devel
-	devel:libsdl
+	devel:libSDL
 	devel:libSDL_image
 	devel:libSDL_mixer
 	"
@@ -38,14 +38,14 @@ BUILD_PREREQUIRES="
 BUILD()
 {
 	libtoolize -fci
-	./configure --prefix=$appsDir/CircusLinux
+	runConfigure --omit-dirs "binDir docDir dataRootDir" \
+		./configure --bindir=$appsDir
 	make $jobArgs
 }
 
 INSTALL()
 {
-	mkdir -p $appsDir/CircusLinux
 	make install
-	ln -s $appsDir/CircusLinux/bin/circuslinux $appsDir/CircusLinux/CircusLinux
-	addAppDeskbarSymlink $appsDir/CircusLinux/bin/circuslinux CircusLinux
+	mv $appsDir/circuslinux $appsDir/CircusLinux
+	addAppDeskbarSymlink $appsDir/CircusLinux
 }
diff --git a/games-arcade/circuslinux/patches/circuslinux-1.0.3.patch b/games-arcade/circuslinux/patches/circuslinux-1.0.3.patch
deleted file mode 100644
index 1705c0cb8..000000000
--- a/games-arcade/circuslinux/patches/circuslinux-1.0.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- circuslinux-1.0.3/Makefile.in_org	2014-10-13 21:55:14.330563584 +0200
-+++ circuslinux-1.0.3/Makefile.in	2014-10-13 21:47:12.418906112 +0200
-@@ -85,7 +85,7 @@
- JOY = @JOY@
- TARGET_DEF = @TARGET_DEF@
- 
--CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\" 	  -D$(TARGET_DEF) -DJOY_$(JOY)
-+CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\"
- 
- LIBS = @LIBS@ 
- 
diff --git a/games-arcade/circuslinux/patches/circuslinux-1.0.3.patchset b/games-arcade/circuslinux/patches/circuslinux-1.0.3.patchset
new file mode 100644
index 000000000..4f21e9a7e
--- /dev/null
+++ b/games-arcade/circuslinux/patches/circuslinux-1.0.3.patchset
@@ -0,0 +1,45 @@
+From 5f6f302a20cbc19fb51f47d33e92e12fb012ac02 Mon Sep 17 00:00:00 2001
+From: Begasus <begasus@gmail.com>
+Date: Sat, 29 Jun 2019 10:40:54 +0200
+Subject: applying patch circuslinux-1.0.3.patch
+
+
+diff --git a/Makefile.in b/Makefile.in
+index 0611db5..389657b 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -85,7 +85,7 @@ DATA_PREFIX = $(pkgdatadir)/data/
+ JOY = @JOY@
+ TARGET_DEF = @TARGET_DEF@
+ 
+-CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\" 	  -D$(TARGET_DEF) -DJOY_$(JOY)
++CFLAGS = @CFLAGS@ -Wall -O2 -DDATA_PREFIX=\"$(DATA_PREFIX)\"
+ 
+ LIBS = @LIBS@ 
+ 
+-- 
+2.21.0
+
+
+From a777a6dfb88a37ed997d23bc3692bf3c4efd27fe Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 29 Jun 2019 10:41:35 +0200
+Subject: Fix documentation path
+
+
+diff --git a/Makefile.in b/Makefile.in
+index 389657b..2d91eec 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -95,7 +95,7 @@ circuslinux_SOURCES = circuslinux.c
+ circuslinux_CFLAGS = CFLAGS
+ circuslinux_LIBS = LIBS
+ 
+-docdir = $(prefix)/share/doc/$(PACKAGE)-$(VERSION)
++docdir = $(prefix)/documentation/packages/$(PACKAGE)-$(VERSION)
+ 
+ doc_DATA = AUTHORS.txt 	   COPYING.txt 	   INSTALL.txt            CHANGES.txt 	   FAQ.txt 	   README.txt 	   README-SDL.txt 	   TODO.txt
+ 
+-- 
+2.21.0
+