diff --git a/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset b/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset deleted file mode 100644 index 9a741afa1..000000000 --- a/games-arcade/rocksndiamonds/patches/rocksndiamonds-3.3.1.2.patchset +++ /dev/null @@ -1,109 +0,0 @@ -From ba88fe1ad26fc936fcfece46929b4b1eebb091c1 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 28 Jan 2014 20:36:56 +0100 -Subject: remove hardcoded -lm and add -lnetwork. - - -diff --git a/src/Makefile b/src/Makefile -index a67cd14..8493bb9 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -53,6 +53,11 @@ EXTRA_LDFLAGS = -lnsl -lsocket -R$(XLIB_PATH) - PLATFORM = unix - endif - -+ifeq ($(PLATFORM),haiku) # native compiling to Haiku -+EXTRA_LDFLAGS = -lnetwork -+PLATFORM = unix -+endif -+ - ifeq ($(PLATFORM),macosx) # native compiling to Mac OS X - EXTRA_LDFLAGS = -lstdc++ - PLATFORM = unix -@@ -163,7 +168,7 @@ OPTIONS = -O3 -Wall - endif - - CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(EXTRA_CFLAGS) $(CONFIG) --LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm -+LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) - - - SRCS = main.c \ --- -1.8.3.4 - - -From 142ac2bc985591b85860f6fea82b5161fc4446e9 Mon Sep 17 00:00:00 2001 -From: Adrien Destugues -Date: Tue, 28 Jan 2014 21:10:09 +0100 -Subject: Store user files at the right place. - - -diff --git a/src/main.c b/src/main.c -index aaa3a5b..03723fb 100644 ---- a/src/main.c -+++ b/src/main.c -@@ -13,6 +13,9 @@ - - #include "libgame/libgame.h" - -+#include -+#include -+ - #include "main.h" - #include "init.h" - #include "game.h" -@@ -5588,11 +5591,27 @@ int main(int argc, char *argv[]) - { - char * window_title_string = getWindowTitleString(); - -+#ifdef __HAIKU__ -+ char datadir[256]; -+ find_directory(B_USER_SETTINGS_DIRECTORY, 0, true, datadir, sizeof(datadir)); -+ strcat(datadir,"/rocksndiamonds"); -+ find_directory(B_USER_DIRECTORY, 0, true, datadir, sizeof(datadir)); -+ char* ptr = datadir; -+ while(*ptr != 0) ptr++; -+ ptr++; -+ mkdir(ptr, 0770); -+ InitProgramInfo(argv[0], ptr, ptr, -+ PROGRAM_TITLE_STRING, window_title_string, ICON_TITLE_STRING, -+ X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME, -+ MSDOS_POINTER_FILENAME, -+ COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL); -+#else - InitProgramInfo(argv[0], USERDATA_DIRECTORY, USERDATA_DIRECTORY_UNIX, - PROGRAM_TITLE_STRING, window_title_string, ICON_TITLE_STRING, - X11_ICON_FILENAME, X11_ICONMASK_FILENAME, SDL_ICON_FILENAME, - MSDOS_POINTER_FILENAME, - COOKIE_PREFIX, FILENAME_PREFIX, GAME_VERSION_ACTUAL); -+#endif - - InitExitMessageFunction(DisplayExitMessage); - InitExitFunction(CloseAllAndExit); --- -1.8.3.4 - - -From 6953f4b742475f5d8befe8fcc9d9f5db5c7bc6c9 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Sun, 25 Dec 2016 10:12:22 +0100 -Subject: gcc5 patch - - -diff --git a/src/init.c b/src/init.c -index a7ad871..34e7ec2 100644 ---- a/src/init.c -+++ b/src/init.c -@@ -257,7 +257,7 @@ void InitGadgets() - gadgets_initialized = TRUE; - } - --inline void InitElementSmallImagesScaledUp(int graphic) -+inline static void InitElementSmallImagesScaledUp(int graphic) - { - #if 0 - struct FileInfo *fi = getImageListEntryFromImageID(graphic); --- -2.7.0 - diff --git a/games-arcade/rocksndiamonds/patches/rocksndiamonds-4.1.3.0.patchset b/games-arcade/rocksndiamonds/patches/rocksndiamonds-4.2.0.3.patchset similarity index 100% rename from games-arcade/rocksndiamonds/patches/rocksndiamonds-4.1.3.0.patchset rename to games-arcade/rocksndiamonds/patches/rocksndiamonds-4.2.0.3.patchset diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe deleted file mode 100644 index 97e5c0c80..000000000 --- a/games-arcade/rocksndiamonds/rocksndiamonds-3.3.1.2.recipe +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY="Arcade style game in the style of Boulder Dash" -DESCRIPTION=" -- network multiplayer games (upto 4 players) -- local multiplayer games (upto 4 players) -- soft scrolling with 50 frames per second -- freely customizable keyboard and joystick support -- stereo sound effects and music -- music modules and fullscreen in SDL version -- contains levels to play Boulder Dash, Emerald Mine and Sokoban -- lots of additional levels available (over 10.000)" -HOMEPAGE="https://www.artsoft.org/rocksndiamonds/" -COPYRIGHT="2001-2013 Artsoft Entertainment" -LICENSE="GNU GPL v2" -REVISION="2" -SOURCE_URI="http://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz" -CHECKSUM_SHA256="c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3" -PATCHES="rocksndiamonds-$portVersion.patchset" -ADDITIONAL_FILES="rocksndiamonds.rdef.in" - -ARCHITECTURES="!x86_gcc2 x86" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - rocksndiamonds$secondaryArchSuffix = $portVersion - app:rocksndiamonds = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libsdl$secondaryArchSuffix - lib:libsdl_image$secondaryArchSuffix - lib:libsdl_mixer$secondaryArchSuffix - lib:libsdl_net$secondaryArchSuffix - lib:libsmpeg$secondaryArchSuffix -# lib:libz$secondaryArchSuffix - " - -BUILD_REQUIRES=" - devel:libsdl$secondaryArchSuffix - devel:libsdl_image$secondaryArchSuffix - devel:libsdl_mixer$secondaryArchSuffix - devel:libsdl_net$secondaryArchSuffix - devel:libsmpeg$secondaryArchSuffix -# devel:libz$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - haiku${secondaryArchSuffix}_devel - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - # Parallel build doesn't work. - PLATFORM=haiku make sdl -} - -INSTALL() -{ - destdir=$appsDir/"Rocks'n'Diamonds" - mkdir -p $destdir - cp -r rocksndiamonds sounds graphics levels music $destdir - - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local INTERNAL="`echo "$portVersion" | cut -d. -f4`" - sed \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - -e "s|@INTERNAL@|$INTERNAL|" \ - $portDir/additional-files/rocksndiamonds.rdef.in > rocksndiamonds.rdef - - addResourcesToBinaries rocksndiamonds.rdef \ - $destdir/rocksndiamonds - - addAppDeskbarSymlink $destdir/rocksndiamonds "Rocks'n'Diamonds" -} diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.1.0.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-4.1.1.0.recipe deleted file mode 100644 index ce8404986..000000000 --- a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.1.0.recipe +++ /dev/null @@ -1,78 +0,0 @@ -SUMMARY="Arcade style game in the style of Boulder Dash" -DESCRIPTION=" -- network multiplayer games (upto 4 players) -- local multiplayer games (upto 4 players) -- soft scrolling with 50 frames per second -- freely customizable keyboard and joystick support -- stereo sound effects and music -- music modules and fullscreen in SDL version -- contains levels to play Boulder Dash, Emerald Mine and Sokoban -- lots of additional levels available (over 10.000)" -HOMEPAGE="https://www.artsoft.org/rocksndiamonds/" -COPYRIGHT="2001-2018 Artsoft Entertainment" -LICENSE="GNU GPL v2" -REVISION="1" -SOURCE_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$portVersion.tar.gz" -CHECKSUM_SHA256="e24c6d4db9571d02207d1944e46e2d68695c0e7f001bc8794dcd20f40a3515cc" -ADDITIONAL_FILES="rocksndiamonds.rdef.in" - -ARCHITECTURES="!x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86" - -PROVIDES=" - rocksndiamonds$secondaryArchSuffix = $portVersion - app:"Rocks'n'Diamonds" = $portVersion - " -REQUIRES=" - haiku$secondaryArchSuffix - lib:libsdl$secondaryArchSuffix - lib:libsdl_image$secondaryArchSuffix - lib:libsdl_mixer$secondaryArchSuffix - lib:libsdl_net_1.2$secondaryArchSuffix - lib:libsmpeg$secondaryArchSuffix - " - -BUILD_REQUIRES=" - haiku${secondaryArchSuffix}_devel - devel:libsdl$secondaryArchSuffix - devel:libsdl_image$secondaryArchSuffix - devel:libsdl_mixer$secondaryArchSuffix - devel:libsdl_net$secondaryArchSuffix - devel:libsmpeg$secondaryArchSuffix - " -BUILD_PREREQUIRES=" - cmd:gcc$secondaryArchSuffix - cmd:ld$secondaryArchSuffix - cmd:make - " - -BUILD() -{ - make #RW_GAME_DIR=$settingsDir/rocksndiamonds -} - -INSTALL() -{ - installDir=$appsDir/"Rocks'n'Diamonds" - mkdir -p $installDir - cp -r rocksndiamonds docs sounds graphics levels music $installDir - cp ChangeLog CREDITS $installDir - - local MAJOR="`echo "$portVersion" | cut -d. -f1`" - local MIDDLE="`echo "$portVersion" | cut -d. -f2`" - local MINOR="`echo "$portVersion" | cut -d. -f3`" - local INTERNAL="`echo "$portVersion" | cut -d. -f4`" - sed \ - -e "s|@MAJOR@|$MAJOR|" \ - -e "s|@MIDDLE@|$MIDDLE|" \ - -e "s|@MINOR@|$MINOR|" \ - -e "s|@INTERNAL@|$INTERNAL|" \ - $portDir/additional-files/rocksndiamonds.rdef.in > rocksndiamonds.rdef - - addResourcesToBinaries rocksndiamonds.rdef \ - $installDir/rocksndiamonds - - mv $installDir/rocksndiamonds $installDir/"Rocks'n'Diamonds" - - addAppDeskbarSymlink $installDir/"Rocks'n'Diamonds" -} diff --git a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.3.0.recipe b/games-arcade/rocksndiamonds/rocksndiamonds-4.2.0.3.recipe similarity index 92% rename from games-arcade/rocksndiamonds/rocksndiamonds-4.1.3.0.recipe rename to games-arcade/rocksndiamonds/rocksndiamonds-4.2.0.3.recipe index f8db89aaa..c439a9f0e 100644 --- a/games-arcade/rocksndiamonds/rocksndiamonds-4.1.3.0.recipe +++ b/games-arcade/rocksndiamonds/rocksndiamonds-4.2.0.3.recipe @@ -9,11 +9,11 @@ DESCRIPTION=" - contains levels to play Boulder Dash, Emerald Mine and Sokoban - lots of additional levels available (over 10.000)" HOMEPAGE="https://www.artsoft.org/rocksndiamonds/" -COPYRIGHT="2001-2019 Artsoft Entertainment" +COPYRIGHT="2001-2020 Artsoft Entertainment" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://www.artsoft.org/RELEASES/unix/rocksndiamonds/rocksndiamonds-$portVersion.tar.gz" -CHECKSUM_SHA256="93da17fdfb8e4b22b2e050724dc775cf86dc6ed278ffab8bc18922ed2b2594cb" +CHECKSUM_SHA256="e0be33b3ff6c9b28728d6eea7cd94d9bf20fe54a0438006c85d3a7102bc595ef" ADDITIONAL_FILES="rocksndiamonds.rdef.in" PATCHES="rocksndiamonds-$portVersion.patchset" @@ -51,7 +51,7 @@ BUILD_PREREQUIRES=" BUILD() { - make sdl2 #RW_GAME_DIR=$settingsDir + make #RW_GAME_DIR=$settingsDir } INSTALL()