From f5c332f510d96dc7134b6c41c686ae79bbbba174 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Mon, 29 Jul 2019 06:54:56 +0200
Subject: [PATCH] sdlscavenger, bump, fix reference to libSDL, enable x86_64
 (#4067)

---
 ...1.patchset => sdlscavenger-145.4.patchset} | 16 ++++++------
 ...145.1.recipe => sdlscavenger-145.4.recipe} | 26 +++++++++----------
 2 files changed, 20 insertions(+), 22 deletions(-)
 rename games-arcade/sdlscavenger/patches/{sdlscavenger-145.1.patchset => sdlscavenger-145.4.patchset} (72%)
 rename games-arcade/sdlscavenger/{sdlscavenger-145.1.recipe => sdlscavenger-145.4.recipe} (52%)

diff --git a/games-arcade/sdlscavenger/patches/sdlscavenger-145.1.patchset b/games-arcade/sdlscavenger/patches/sdlscavenger-145.4.patchset
similarity index 72%
rename from games-arcade/sdlscavenger/patches/sdlscavenger-145.1.patchset
rename to games-arcade/sdlscavenger/patches/sdlscavenger-145.4.patchset
index f74b8d878..0f3ad2137 100644
--- a/games-arcade/sdlscavenger/patches/sdlscavenger-145.1.patchset
+++ b/games-arcade/sdlscavenger/patches/sdlscavenger-145.4.patchset
@@ -1,15 +1,15 @@
-From a39fa224fe4adcfc7a9189ad93b05a7e89b7a0fd Mon Sep 17 00:00:00 2001
+From d2b544b9d37c09475630d7a1001b8aec21503e85 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
-Date: Fri, 29 Nov 2013 16:15:13 +0100
+Date: Sun, 28 Jul 2019 08:18:28 +0200
 Subject: gcc2 and main directory fixes.
 
 
 diff --git a/scav.c b/scav.c
-index fa22286..38ad157 100644
+index f736d89..8c0a17b 100644
 --- a/scav.c
 +++ b/scav.c
 @@ -4,6 +4,8 @@
- #define VERSION "SDL Scavenger version 1.4.5.1 (11/05/2010)"
+ #define VERSION "SDL Scavenger version 1.4.5.4 (1/5/2015)"
  
  #include "scav.h"
 +#include <libgen.h>
@@ -17,7 +17,7 @@ index fa22286..38ad157 100644
  
  char demolevel0[]={
  0x04,0x44,0x44,0x07,0x00,0x06,0x60,0x00,0x70,0x44,0x44,0x40,
-@@ -1703,6 +1705,8 @@ int main (int argc, char **argv)
+@@ -1704,6 +1706,8 @@ int main (int argc, char **argv)
     strcpy(rcname,RCNAME);
     strcpy(LevelsName,LEVELSNAME); /* Normally use default name */
  
@@ -26,7 +26,7 @@ index fa22286..38ad157 100644
  #if defined(__WIN32__) || defined(WIN32)
     /* Crude command line options for windows (no getopt function) */
     if (argc != 1)  /* command line option used */
-@@ -1757,7 +1761,6 @@ int main (int argc, char **argv)
+@@ -1758,7 +1762,6 @@ int main (int argc, char **argv)
     while (1) 
     {
         int option_index = 0;
@@ -34,7 +34,7 @@ index fa22286..38ad157 100644
         static struct option long_options[] = {
             {"window", 0, 0, 'w'},
             {"help", 0, 0, 'h'},
-@@ -1769,6 +1772,7 @@ int main (int argc, char **argv)
+@@ -1770,6 +1773,7 @@ int main (int argc, char **argv)
  					 {"quiet", 0, 0, 'q'},
             {0, 0, 0, 0}
         };
@@ -43,5 +43,5 @@ index fa22286..38ad157 100644
         c = getopt_long (argc, argv, "hvwsqc:l:L:",
                  long_options, &option_index);
 -- 
-1.8.3.4
+2.21.0
 
diff --git a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe b/games-arcade/sdlscavenger/sdlscavenger-145.4.recipe
similarity index 52%
rename from games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
rename to games-arcade/sdlscavenger/sdlscavenger-145.4.recipe
index 1f08accaf..0194cc437 100644
--- a/games-arcade/sdlscavenger/sdlscavenger-145.1.recipe
+++ b/games-arcade/sdlscavenger/sdlscavenger-145.4.recipe
@@ -6,31 +6,29 @@ digging holes in the ground, climb ladders and ropes, and, or course, run fast!
 HOMEPAGE="https://sourceforge.net/projects/sdlscavenger/files/"
 COPYRIGHT="1999-2010 Dave Ashley"
 LICENSE="GNU GPL v2"
-REVISION="2"
-SOURCE_URI="http://www.mirrorservice.org/sites/downloads.sourceforge.net/s/sd/sdlscavenger/sdlscav-145.1_2010_11_5.tgz"
-CHECKSUM_SHA256="c63666c0783d05b24895065781608994c43e4b359605be6806845b46f093d016"
+REVISION="1"
+SOURCE_URI="https://sourceforge.net/projects/sdlscavenger/files/sdlscav-145.4_2015_01_05.tgz"
+CHECKSUM_SHA256="28337a4e43756048a6d53994fcdcba6af4c9a68568d734ea774189713c4d67fe"
 SOURCE_DIR="sdlscav-145"
-PATCHES="sdlscavenger-145.1.patchset"
+PATCHES="sdlscavenger-145.4.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 ?x86 x86_64"
 
 PROVIDES="
 	sdlscavenger = $portVersion
-	app:sdlscavenger = $portVersion
+	app:SDLScavenger = $portVersion
 	"
 REQUIRES="
-	haiku$secondaryArchSuffix
-	lib:libsdl$secondaryArchSuffix
+	haiku
+	lib:libSDL_1.2
 	"
 
 BUILD_REQUIRES="
-	devel:libsdl$secondaryArchSuffix
+	haiku_devel
+	devel:libSDL
 	"
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel
-	haiku_devel
-	cmd:gcc$secondaryArchSuffix
-	cmd:ld$secondaryArchSuffix
+	cmd:gcc
 	cmd:make
 	"
 
@@ -44,5 +42,5 @@ INSTALL()
 	mkdir -p $appsDir/sdlscavenger
 	cp sdlscav $appsDir/sdlscavenger
 	cp -r data $appsDir/sdlscavenger/data
-	addAppDeskbarSymlink $appsDir/sdlscavenger/sdlscav Scavenger
+	addAppDeskbarSymlink $appsDir/sdlscavenger/sdlscav SDLScavenger
 }