From 46c9aa22eb6eae39aa98cf44d0604ebe9b509ae8 Mon Sep 17 00:00:00 2001
From: Chris Roberts <cpr420@gmail.com>
Date: Sun, 22 Dec 2013 19:57:58 -0700
Subject: [PATCH] Fix rezerware build ...

since nobody bothered to check the work of the student

Also, enable sound effects so I can test sdl-mixer
---
 .../rezerwar/patches/rezerwar-0.4.2.patch     | 33 ---------
 .../rezerwar/patches/rezerwar-0.4.2.patchset  | 68 +++++++++++++++++++
 games-puzzle/rezerwar/rezerwar-0.4.2.recipe   |  8 +--
 3 files changed, 71 insertions(+), 38 deletions(-)
 delete mode 100644 games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch
 create mode 100644 games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset

diff --git a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch
deleted file mode 100644
index 18254aacf..000000000
--- a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- ../configure	2010-05-09 16:25:03.000524288 +0000
-+++ configure-new	2013-12-14 00:36:47.137887744 +0000
-@@ -232,7 +232,7 @@
- Haiku|BeOS)
- 	check_sdl
- 	check_sdl_mixer
--	[ -z "$PREFIX" ]	&& PREFIX="/boot/apps/rezerwar"
-+	[ -z "$PREFIX" ]	&& PREFIX="data"
- 	[ -z "$TARGET" ]	&& TARGET="$PREFIX"
- 	TARGET_BIN="$TARGET"
- 	TARGET_DOC="$TARGET"
---- ../src/main.c	2010-05-09 16:25:03.002097152 +0000
-+++ main-new.c	2013-12-13 23:59:59.994312192 +0000
-@@ -32,7 +32,8 @@
- #endif
- 
- #include "SDL.h"
--
-+#include <unistd.h>
-+#include <libgen.h>
- #include "rezerwar.h"
- #include "config.h"
- 
-@@ -231,7 +232,8 @@
- 	bool loop = true;
- 	char *path;
- 	SDL_Joystick *js;
--
-+	// For tracker
-+	chdir(dirname(av[0]));
- 	/* Version number only */
- 	if (has_flag(ac, av, "-v")) {
- 		printf("%s\n", VERSION);
diff --git a/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset
new file mode 100644
index 000000000..1ac7b966e
--- /dev/null
+++ b/games-puzzle/rezerwar/patches/rezerwar-0.4.2.patchset
@@ -0,0 +1,68 @@
+From 4daa17a279a72f67e7ca9414e3be6ef6d95c21ad Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 22 Dec 2013 19:53:37 -0700
+Subject: applying patch rezerwar-0.4.2.patch
+
+
+diff --git a/configure b/configure
+index 7933d69..623bd32 100755
+--- a/configure
++++ b/configure
+@@ -232,7 +232,7 @@ Debug)
+ Haiku|BeOS)
+ 	check_sdl
+ 	check_sdl_mixer
+-	[ -z "$PREFIX" ]	&& PREFIX="/boot/apps/rezerwar"
++	[ -z "$PREFIX" ]	&& PREFIX="data"
+ 	[ -z "$TARGET" ]	&& TARGET="$PREFIX"
+ 	TARGET_BIN="$TARGET"
+ 	TARGET_DOC="$TARGET"
+diff --git a/src/main.c b/src/main.c
+index ffc8a06..3132672 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -32,7 +32,8 @@
+ #endif
+ 
+ #include "SDL.h"
+-
++#include <unistd.h>
++#include <libgen.h>
+ #include "rezerwar.h"
+ #include "config.h"
+ 
+@@ -231,7 +232,8 @@ main(int ac, char **av)
+ 	bool loop = true;
+ 	char *path;
+ 	SDL_Joystick *js;
+-
++	// For tracker
++	chdir(dirname(av[0]));
+ 	/* Version number only */
+ 	if (has_flag(ac, av, "-v")) {
+ 		printf("%s\n", VERSION);
+-- 
+1.8.3.4
+
+
+From 8fcb551ba8ea30777bf83db46a163c24f3308a06 Mon Sep 17 00:00:00 2001
+From: Chris Roberts <cpr420@gmail.com>
+Date: Sun, 22 Dec 2013 19:54:31 -0700
+Subject: Enable sound fx
+
+
+diff --git a/configure b/configure
+index 623bd32..10584ec 100755
+--- a/configure
++++ b/configure
+@@ -239,7 +239,6 @@ Haiku|BeOS)
+ 	TARGET_DATA="$TARGET"
+ 	CFG_DATAPATH="$TARGET"
+ 	CFG_CFGPATH=".rezerwar"
+-	CFG_NOSOUND=1
+ 	MK_EXTRAOBJS="strsep.o"
+ 	;;
+ Win32|MINGW32*)
+-- 
+1.8.3.4
+
diff --git a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
index 8443aefe7..8f9e51990 100644
--- a/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
+++ b/games-puzzle/rezerwar/rezerwar-0.4.2.recipe
@@ -35,13 +35,11 @@ BUILD_PREREQUIRES="
 	cmd:sdl_config$secondaryArchSuffix
 	"
 
-PATCHES="
-	rezerwar-0.4.2.patch
-	"
+PATCHES="rezerwar-0.4.2.patchset"
 
 BUILD()
 {
-	configure
+	./configure
 	make
 }
 
@@ -53,4 +51,4 @@ INSTALL()
 	cp src/rezerwar $appsDir/rezerwar/rezerwar
 	
 	addAppDeskbarSymlink $appsDir/rezerwar/rezerwar "Rezerwar"
-}
\ No newline at end of file
+}