diff --git a/dev-games/physfs/patches/physfs-2.0.1.patch b/dev-games/physfs/patches/physfs-2.0.1.patch deleted file mode 100644 index 102cdd882..000000000 --- a/dev-games/physfs/patches/physfs-2.0.1.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff -up physfs-2.0.1/CMakeLists.txt.orig physfs-2.0.1/CMakeLists.txt ---- physfs-2.0.1/CMakeLists.txt.orig 2010-04-28 19:12:08.240386048 -0600 -+++ physfs-2.0.1/CMakeLists.txt 2010-04-28 19:12:15.603717632 -0600 -@@ -108,7 +108,9 @@ IF(BEOS) - # We add this explicitly, since we don't want CMake to think this - # is a C++ project unless we're on BeOS. - SET(PHYSFS_BEOS_SRCS platform/beos.cpp) -- SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} be root) -+ FIND_LIBRARY(BE_LIBRARY be) -+ FIND_LIBRARY(ROOT_LIBRARY root) -+ SET(OPTIONAL_LIBRARY_LIBS ${OPTIONAL_LIBRARY_LIBS} ${BE_LIBRARY} ${ROOT_LIBRARY}) - ENDIF(BEOS) - - # Almost everything is "compiled" here, but things that don't apply to the -@@ -298,7 +300,8 @@ IF(PHYSFS_BUILD_TEST) - FIND_PATH(READLINE_H readline/readline.h) - FIND_PATH(HISTORY_H readline/history.h) - IF(READLINE_H AND HISTORY_H) -- SET(CMAKE_REQUIRED_LIBRARIES curses) -+ FIND_LIBRARY(CURSES_LIBRARY NAMES curses ncurses) -+ SET(CMAKE_REQUIRED_LIBRARIES ${CURSES_LIBRARY}) - FIND_LIBRARY(READLINE_LIBRARY readline) - FIND_LIBRARY(HISTORY_LIBRARY history) - IF(READLINE_LIBRARY AND HISTORY_LIBRARY) -diff -up physfs-2.0.1/platform/beos.cpp.orig physfs-2.0.1/platform/beos.cpp ---- physfs-2.0.1/platform/beos.cpp.orig 2010-05-01 18:11:13.848822272 -0600 -+++ physfs-2.0.1/platform/beos.cpp 2010-05-01 18:11:01.658767872 -0600 -@@ -174,14 +174,17 @@ static team_id getTeamID(void) - - char *__PHYSFS_platformCalcBaseDir(const char *argv0) - { -- /* in case there isn't a BApplication yet, we'll construct a roster. */ -- BRoster roster; -- app_info info; -- status_t rc = roster.GetRunningAppInfo(getTeamID(), &info); -- BAIL_IF_MACRO(rc < B_OK, strerror(rc), NULL); -- BEntry entry(&(info.ref), true); -+ image_info info; -+ int32 cookie = 0; -+ -+ while (get_next_image_info(0, &cookie, &info) == B_OK) { -+ if (info.type == B_APP_IMAGE) -+ break; -+ } -+ -+ BEntry entry(info.name, true); - BPath path; -- rc = entry.GetPath(&path); /* (path) now has binary's path. */ -+ status_t rc = entry.GetPath(&path); /* (path) now has binary's path. */ - assert(rc == B_OK); - rc = path.GetParent(&path); /* chop filename, keep directory. */ - assert(rc == B_OK); diff --git a/dev-games/physfs/patches/physfs-2.0.3.patchset b/dev-games/physfs/patches/physfs-2.0.3.patchset deleted file mode 100644 index 820fe3295..000000000 --- a/dev-games/physfs/patches/physfs-2.0.3.patchset +++ /dev/null @@ -1,22 +0,0 @@ -From e5b9e4951eb0c1e7b8b203e625ecfb350cc0a47f Mon Sep 17 00:00:00 2001 -From: Jerome Duval -Date: Mon, 28 Nov 2016 20:00:57 +0000 -Subject: x86_64 haiku patch - - -diff --git a/platform/beos.cpp b/platform/beos.cpp -index ee7b190..91f9a23 100644 ---- a/platform/beos.cpp -+++ b/platform/beos.cpp -@@ -199,7 +199,7 @@ char *__PHYSFS_platformCalcBaseDir(const char *argv0) - - void *__PHYSFS_platformGetThreadID(void) - { -- return((void *) find_thread(NULL)); -+ return((void *) ((size_t) find_thread(NULL))); - } /* __PHYSFS_platformGetThreadID */ - - --- -2.10.2 - diff --git a/dev-games/physfs/physfs-2.0.3.recipe b/dev-games/physfs/physfs-3.0.1.recipe similarity index 71% rename from dev-games/physfs/physfs-2.0.3.recipe rename to dev-games/physfs/physfs-3.0.1.recipe index de87900ad..6acdbd1e2 100644 --- a/dev-games/physfs/physfs-2.0.3.recipe +++ b/dev-games/physfs/physfs-3.0.1.recipe @@ -8,29 +8,28 @@ which all writing through the PhysicsFS is restricted for security reasons. PhysicsFS gives you platform-abstracted means to determine if CD-ROMs are \ available, the user's home directory (where in the real filesystem your \ game is running), etc." -HOMEPAGE="http://icculus.org/physfs" -COPYRIGHT="2001-2012 Ryan C. Gordon" +HOMEPAGE="https://icculus.org/physfs" +COPYRIGHT="2001-2017 Ryan C. Gordon" LICENSE="PHYSFS" -REVISION="4" +REVISION="1" SOURCE_URI="http://icculus.org/physfs/downloads/physfs-$portVersion.tar.bz2" -CHECKSUM_SHA256="ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69" -PATCHES="physfs-$portVersion.patchset" +CHECKSUM_SHA256="b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1" ARCHITECTURES="x86_gcc2 x86 x86_64" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +SECONDARY_ARCHITECTURES="x86" PROVIDES=" - physfs$secondaryArchSuffix = $portVersion compat >= 2.0 - cmd:test_physfs$secondaryArchSuffix = $portVersion compat >= 2.0 - lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 + physfs$secondaryArchSuffix = $portVersion compat >= 3.0 + cmd:test_physfs$secondaryArchSuffix = $portVersion compat >= 3.0 + lib:libphysfs$secondaryArchSuffix = $portVersion compat >= 3.0 " REQUIRES=" haiku$secondaryArchSuffix " PROVIDES_devel=" - physfs${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 - devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 2.0 + physfs${secondaryArchSuffix}_devel = $portVersion compat >= 3.0 + devel:libphysfs$secondaryArchSuffix = $portVersion compat >= 3.0 " REQUIRES_devel=" physfs$secondaryArchSuffix == $portVersion base