From ab83fa4bdf21663011af315732fd80ee63f7c29b Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 10 Mar 2014 14:20:20 +0100 Subject: [PATCH] cmake: remove antique patches. They have been upstreamed for the most part, and we don't have the matching recipes anymore. --- dev-util/cmake/patches/cmake-2.8-git.patch | 241 ------- dev-util/cmake/patches/cmake-2.8.4.patch | 116 ---- dev-util/cmake/patches/cmake-2.8.5.patch | 521 --------------- dev-util/cmake/patches/cmake-2.8.5.patchset | 664 -------------------- 4 files changed, 1542 deletions(-) delete mode 100644 dev-util/cmake/patches/cmake-2.8-git.patch delete mode 100644 dev-util/cmake/patches/cmake-2.8.4.patch delete mode 100644 dev-util/cmake/patches/cmake-2.8.5.patch delete mode 100644 dev-util/cmake/patches/cmake-2.8.5.patchset diff --git a/dev-util/cmake/patches/cmake-2.8-git.patch b/dev-util/cmake/patches/cmake-2.8-git.patch deleted file mode 100644 index 6fac71153..000000000 --- a/dev-util/cmake/patches/cmake-2.8-git.patch +++ /dev/null @@ -1,241 +0,0 @@ -diff -urN cmake-2.8.10.2-orig/Modules/FindLua51.cmake cmake-2.8.10.2/Modules/FindLua51.cmake ---- cmake-2.8-git-orig/Modules/FindLua51.cmake 2012-11-27 05:26:32.033030144 -0800 -+++ cmake-2.8-git/Modules/FindLua51.cmake 2012-12-03 12:02:17.644612096 -0800 -@@ -54,7 +54,7 @@ - - if(LUA_LIBRARY) - # include the math library for Unix -- if(UNIX AND NOT APPLE AND NOT BEOS) -+ if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - find_library(LUA_MATH_LIBRARY m) - set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library -diff -urN cmake-2.8-git-orig/Modules/Platform/Haiku.cmake cmake-2.8-git/Modules/Platform/Haiku.cmake ---- cmake-2.8-git-orig/Modules/Platform/Haiku.cmake 2012-12-03 12:11:47.804519936 -0800 -+++ cmake-2.8-git/Modules/Platform/Haiku.cmake 2012-12-03 12:02:17.652738560 -0800 -@@ -1,20 +1,25 @@ -+set(HAIKU 1) -+set(UNIX 1) -+ -+set(CMAKE_DL_LIBS "") --set(BEOS 1) -- --set(CMAKE_DL_LIBS root be) --set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") --set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE") - set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") -+set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") --set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") - set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") - set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -+ -+list(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/common/non-packaged -+ /boot/common -+ /boot/system -+ ) -+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/common/non-packaged/lib -+ /boot/common/lib -+ /boot/develop/lib/x86 -+ ) -- --include(Platform/UnixPaths) --list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) - list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) - list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) - -diff -urN cmake-2.8-git-orig/Source/cmExportCommand.cxx cmake-2.8-git/Source/cmExportCommand.cxx ---- cmake-2.8-git-orig/Source/cmExportCommand.cxx 2012-11-27 05:26:33.039059456 -0800 -+++ cmake-2.8-git/Source/cmExportCommand.cxx 2012-12-03 12:02:17.665059328 -0800 -@@ -20,7 +20,8 @@ - #include "cmExportBuildFileGenerator.h" - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmExportCommand::cmExportCommand() -@@ -305,14 +306,15 @@ - const char* hash) - { - #if defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != -+ B_OK) - { - return; - } -- dir.Append("cmake/packages"); -- dir.Append(package.c_str()); -- std::string fname = dir.Path(); -+ std::string fname = dir; -+ fname += "/cmake/packages/"; -+ fname += package; - #else - const char* home = cmSystemTools::GetEnv("HOME"); - if(!home) -diff -urN cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx cmake-2.8-git/Source/cmFindPackageCommand.cxx ---- cmake-2.8-git-orig/Source/cmFindPackageCommand.cxx 2012-11-27 05:26:33.059768832 -0800 -+++ cmake-2.8-git/Source/cmFindPackageCommand.cxx 2012-12-03 12:02:17.666107904 -0800 -@@ -19,7 +19,9 @@ - #endif - - #if defined(__HAIKU__) --#include -+#include -+#include -+#include - #endif - - void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1583,12 +1585,13 @@ - #if defined(_WIN32) && !defined(__CYGWIN__) - this->LoadPackageRegistryWinUser(); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == -+ B_OK) - { -- dir.Append("cmake/packages"); -- dir.Append(this->Name.c_str()); -- this->LoadPackageRegistryDir(dir.Path()); -+ strlcat(dir, "/cmake/packages/", sizeof(dir)); -+ strlcat(dir, this->Name.c_str(), sizeof(dir)); -+ this->LoadPackageRegistryDir(dir); - } - #else - if(const char* home = cmSystemTools::GetEnv("HOME")) -diff -urN cmake-2.8-git-orig/Source/cmLocalGenerator.cxx cmake-2.8-git/Source/cmLocalGenerator.cxx ---- cmake-2.8-git-orig/Source/cmLocalGenerator.cxx 2012-11-27 05:26:33.035389440 -0800 -+++ cmake-2.8-git/Source/cmLocalGenerator.cxx 2012-12-03 12:02:17.672399360 -0800 -@@ -37,7 +37,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ - prefix = prefix_win32.c_str(); - } - #elif defined(__HAIKU__) -+ char dir[B_PATH_NAME_LENGTH]; - if (!prefix) - { -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- prefix = dir.Path(); -+ prefix = dir; - } - else - { -diff -urN cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx ---- cmake-2.8-git-orig/Source/CPack/cmCPackGenerator.cxx 2012-11-27 05:26:32.015466496 -0800 -+++ cmake-2.8-git/Source/CPack/cmCPackGenerator.cxx 2012-12-03 12:02:17.677904384 -0800 -@@ -27,7 +27,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1265,10 +1266,10 @@ - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff -urN cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.8-git-orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-11-27 05:26:34.013369344 -0800 -+++ cmake-2.8-git/Tests/ComplexOneConfig/Library/CMakeLists.txt 2012-12-03 12:02:42.181665792 -0800 -@@ -51,7 +51,7 @@ - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) --if(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") - endif() - get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) -diff -urN cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.8-git-orig/Utilities/cmcurl/CMake/CurlTests.c 2012-11-27 05:26:34.045350912 -0800 -+++ cmake-2.8-git/Utilities/cmcurl/CMake/CurlTests.c 2012-12-03 12:02:42.189005824 -0800 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -urN cmake-2.8-git-orig/Utilities/cmcurl/select.c cmake-2.8-git/Utilities/cmcurl/select.c ---- cmake-2.8-git-orig/Utilities/cmcurl/select.c 2012-11-27 05:26:34.055312384 -0800 -+++ cmake-2.8-git/Utilities/cmcurl/select.c 2012-12-03 12:02:42.189792256 -0800 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zconf.h cmake-2.8-git/Utilities/cmzlib/zconf.h ---- cmake-2.8-git-orig/Utilities/cmzlib/zconf.h 2012-11-27 05:26:34.022020096 -0800 -+++ cmake-2.8-git/Utilities/cmzlib/zconf.h 2012-12-03 12:02:42.190578688 -0800 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) && !defined (__HAIKU__) -+#if defined (__BEOS__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -urN cmake-2.8-git-orig/Utilities/cmzlib/zutil.h cmake-2.8-git/Utilities/cmzlib/zutil.h ---- cmake-2.8-git-orig/Utilities/cmzlib/zutil.h 2012-11-27 05:26:34.022806528 -0800 -+++ cmake-2.8-git/Utilities/cmzlib/zutil.h 2012-12-03 12:02:42.195559424 -0800 -@@ -147,12 +147,6 @@ - # define OS_CODE 0x0f - #endif - --/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ --/* many BeOS workarounds are no longer needed in Haiku */ --#if defined(__HAIKU__) && defined(__BEOS__) --#undef __BEOS__ --#endif -- - #if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif diff --git a/dev-util/cmake/patches/cmake-2.8.4.patch b/dev-util/cmake/patches/cmake-2.8.4.patch deleted file mode 100644 index 910b48e92..000000000 --- a/dev-util/cmake/patches/cmake-2.8.4.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -urN cmake-2.8.4/Modules/FindGLUT.cmake cmake-2.8.4-haiku/Modules/FindGLUT.cmake ---- cmake-2.8.4/Modules/FindGLUT.cmake 2011-02-15 17:47:27.017301504 +0000 -+++ cmake-2.8.4-haiku/Modules/FindGLUT.cmake 2011-04-26 07:50:24.890241024 +0000 -@@ -46,12 +46,14 @@ - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib -+ /boot/develop/lib/x86/ - ) -- -+ IF(NOT BEOS) - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi - /usr/openwin/lib - ) -@@ -59,7 +61,7 @@ - FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu - /usr/openwin/lib - ) -- -+ ENDIF(NOT BEOS) - ENDIF (APPLE) - - ENDIF (WIN32) -@@ -69,12 +71,18 @@ - IF(GLUT_glut_LIBRARY) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. -+ IF(BEOS) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ) -+ ELSE(BEOS) - SET( GLUT_LIBRARIES - ${GLUT_glut_LIBRARY} - ${GLUT_Xmu_LIBRARY} - ${GLUT_Xi_LIBRARY} - ${GLUT_cocoa_LIBRARY} - ) -+ ENDIF(BEOS) - SET( GLUT_FOUND "YES" ) - - #The following deprecated settings are for backwards compatibility with CMake1.4 -@@ -84,9 +92,16 @@ - ENDIF(GLUT_glut_LIBRARY) - ENDIF(GLUT_INCLUDE_DIR) - -+IF(BEOS) -+MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ ) -+ELSE(BEOS) - MARK_AS_ADVANCED( - GLUT_INCLUDE_DIR - GLUT_glut_LIBRARY - GLUT_Xmu_LIBRARY - GLUT_Xi_LIBRARY - ) -+ENDIF(BEOS) -diff -urN cmake-2.8.4/Modules/FindLua51.cmake cmake-2.8.4-haiku/Modules/FindLua51.cmake ---- cmake-2.8.4/Modules/FindLua51.cmake 2011-02-15 17:47:27.019660800 +0000 -+++ cmake-2.8.4-haiku/Modules/FindLua51.cmake 2011-04-26 07:50:24.944504832 +0000 -@@ -57,13 +57,13 @@ - - IF(LUA_LIBRARY) - # include the math library for Unix -- IF(UNIX AND NOT APPLE) -+ IF(UNIX AND NOT APPLE AND NOT BEOS) - FIND_LIBRARY(LUA_MATH_LIBRARY m) - SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library - ELSE(UNIX AND NOT APPLE) - SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") -- ENDIF(UNIX AND NOT APPLE) -+ ENDIF(UNIX AND NOT APPLE AND NOT BEOS) - ENDIF(LUA_LIBRARY) - - INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -diff -urN cmake-2.8.4/Modules/FindOpenGL.cmake cmake-2.8.4-haiku/Modules/FindOpenGL.cmake ---- cmake-2.8.4/Modules/FindOpenGL.cmake 2011-02-15 17:47:27.020447232 +0000 -+++ cmake-2.8.4-haiku/Modules/FindOpenGL.cmake 2011-04-26 07:50:25.026214400 +0000 -@@ -80,6 +80,7 @@ - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/develop/headers/os/opengl - ) - - FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -@@ -94,6 +95,7 @@ - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${HPUX_IA_OPENGL_LIB_PATH} -+ /boot/develop/lib/x86/ - ) - - # On Unix OpenGL most certainly always requires X11. -diff -urN cmake-2.8.4/bootstrap cmake-2.8.4-haiku/bootstrap ---- cmake-2.8.4/bootstrap 2011-02-15 17:47:26.054001664 +0000 -+++ cmake-2.8.4-haiku/bootstrap 2011-04-26 07:50:25.222035968 +0000 -@@ -142,7 +142,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch deleted file mode 100644 index e99aeb04f..000000000 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ /dev/null @@ -1,521 +0,0 @@ -diff -ur cmake-2.8.5_orig/bootstrap cmake-2.8.5/bootstrap ---- cmake-2.8.5_orig/bootstrap 2011-07-08 12:21:43.031981568 +0000 -+++ cmake-2.8.5/bootstrap 2011-07-09 17:59:50.059768832 +0000 -@@ -142,7 +142,9 @@ - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/doc/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi -diff -ur cmake-2.8.5_orig/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckForPthreads.c ---- cmake-2.8.5_orig/Modules/CheckForPthreads.c 2011-07-08 12:21:44.040632320 +0000 -+++ cmake-2.8.5/Modules/CheckForPthreads.c 2011-07-09 17:59:50.060817408 +0000 -@@ -16,7 +16,7 @@ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -diff -ur cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in ---- cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in 2011-07-08 12:21:44.047448064 +0000 -+++ cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2011-07-09 17:59:50.062128128 +0000 -@@ -74,12 +74,8 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' --#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+#elif defined(__HAIKU__) - PRINT *, 'INFO:platform[Haiku]' --# if 0 --! Haiku also defines __BEOS__ so we must --! put it prior to the check for __BEOS__ --# endif - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff -ur cmake-2.8.5_orig/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMakePlatformId.h.in ---- cmake-2.8.5_orig/Modules/CMakePlatformId.h.in 2011-07-08 12:21:44.048758784 +0000 -+++ cmake-2.8.5/Modules/CMakePlatformId.h.in 2011-07-09 17:59:50.063176704 +0000 -@@ -35,11 +35,8 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - --#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+#elif defined(__HAIKU__) - # define PLATFORM_ID "Haiku" --/* Haiku also defines __BEOS__ so we must -- put it prior to the check for __BEOS__ --*/ - - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" -diff -ur cmake-2.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cmake ---- cmake-2.8.5_orig/Modules/FindGLUT.cmake 2011-07-08 12:21:44.063438848 +0000 -+++ cmake-2.8.5/Modules/FindGLUT.cmake 2011-07-09 18:02:18.662437888 +0000 -@@ -46,20 +46,22 @@ - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib -+ /boot/develop/lib/x86/ - ) -- -- FIND_LIBRARY( GLUT_Xi_LIBRARY Xi -- /usr/openwin/lib -- ) -- -- FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu -- /usr/openwin/lib -- ) -- -+ IF(NOT BEOS AND NOT HAIKU) -+ FIND_LIBRARY( GLUT_Xi_LIBRARY Xi -+ /usr/openwin/lib -+ ) -+ -+ FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu -+ /usr/openwin/lib -+ ) -+ ENDIF(NOT BEOS AND NOT HAIKU) - ENDIF (APPLE) - - ENDIF (WIN32) -@@ -69,12 +71,18 @@ - IF(GLUT_glut_LIBRARY) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. -- SET( GLUT_LIBRARIES -- ${GLUT_glut_LIBRARY} -- ${GLUT_Xmu_LIBRARY} -- ${GLUT_Xi_LIBRARY} -- ${GLUT_cocoa_LIBRARY} -- ) -+ IF(BEOS OR HAIKU) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ) -+ ELSE(BEOS OR HAIKU) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ${GLUT_Xmu_LIBRARY} -+ ${GLUT_Xi_LIBRARY} -+ ${GLUT_cocoa_LIBRARY} -+ ) -+ ENDIF(BEOS OR HAIKU) - SET( GLUT_FOUND "YES" ) - - #The following deprecated settings are for backwards compatibility with CMake1.4 -@@ -84,9 +92,16 @@ - ENDIF(GLUT_glut_LIBRARY) - ENDIF(GLUT_INCLUDE_DIR) - --MARK_AS_ADVANCED( -- GLUT_INCLUDE_DIR -- GLUT_glut_LIBRARY -- GLUT_Xmu_LIBRARY -- GLUT_Xi_LIBRARY -- ) -+IF(BEOS OR HAIKU) -+ MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ ) -+ELSE(BEOS OR HAIKU) -+ MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ GLUT_Xmu_LIBRARY -+ GLUT_Xi_LIBRARY -+ ) -+ENDIF(BEOS OR HAIKU) -diff -ur cmake-2.8.5_orig/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51.cmake ---- cmake-2.8.5_orig/Modules/FindLua51.cmake 2011-07-08 12:21:44.066060288 +0000 -+++ cmake-2.8.5/Modules/FindLua51.cmake 2011-07-09 17:59:50.090439680 +0000 -@@ -57,13 +57,13 @@ - - IF(LUA_LIBRARY) - # include the math library for Unix -- IF(UNIX AND NOT APPLE) -+ IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - FIND_LIBRARY(LUA_MATH_LIBRARY m) - SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library - ELSE(UNIX AND NOT APPLE) - SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") -- ENDIF(UNIX AND NOT APPLE) -+ ENDIF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - ENDIF(LUA_LIBRARY) - - INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -diff -ur cmake-2.8.5_orig/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenGL.cmake ---- cmake-2.8.5_orig/Modules/FindOpenGL.cmake 2011-07-08 12:21:44.066846720 +0000 -+++ cmake-2.8.5/Modules/FindOpenGL.cmake 2011-07-09 17:59:50.091488256 +0000 -@@ -80,6 +80,7 @@ - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/develop/headers/os/opengl - ) - - FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -@@ -94,6 +95,7 @@ - /usr/openwin/lib - /usr/shlib /usr/X11R6/lib - ${HPUX_IA_OPENGL_LIB_PATH} -+ /boot/develop/lib/x86/ - ) - - # On Unix OpenGL most certainly always requires X11. -diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake ---- cmake-2.8.5_orig/Modules/Platform/Haiku.cmake 2011-07-08 12:21:44.016777216 +0000 -+++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-10 23:52:01.025952256 +0000 -@@ -1,18 +1,25 @@ --SET(BEOS 1) -+SET(HAIKU 1) -+SET(UNIX 1) - --SET(CMAKE_DL_LIBS root be) -+SET(CMAKE_DL_LIBS "") - SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") --SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") - SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") - SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") - --INCLUDE(Platform/UnixPaths) --LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) -+LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/common/non-packaged -+ /boot/common -+ /boot/system -+ ) -+LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/common/non-packaged/lib -+ /boot/common/lib -+ /boot/develop/lib/x86 -+ ) - LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) - LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) - -diff -ur cmake-2.8.5_orig/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx ---- cmake-2.8.5_orig/Source/cmCTest.cxx 2011-07-08 12:21:45.037486592 +0000 -+++ cmake-2.8.5/Source/cmCTest.cxx 2011-07-09 17:59:50.095682560 +0000 -@@ -53,7 +53,7 @@ - #include - #include - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - #include /* disable_debugger() API. */ - #endif - -diff -ur cmake-2.8.5_orig/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExportCommand.cxx ---- cmake-2.8.5_orig/Source/cmExportCommand.cxx 2011-07-08 12:21:45.046923776 +0000 -+++ cmake-2.8.5/Source/cmExportCommand.cxx 2011-07-09 18:36:22.770179072 +0000 -@@ -20,7 +20,8 @@ - #include "cmExportBuildFileGenerator.h" - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmExportCommand::cmExportCommand() -@@ -297,14 +298,15 @@ - const char* hash) - { - #if defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != -+ B_OK) - { - return; - } -- dir.Append("cmake/packages"); -- dir.Append(package.c_str()); -- std::string fname = dir.Path(); -+ std::string fname = dir; -+ fname += "/cmake/packages/"; -+ fname += package; - #else - const char* home = cmSystemTools::GetEnv("HOME"); - if(!home) -diff -ur cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx ---- cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx 2011-07-08 12:21:46.051118080 +0000 -+++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-09 18:26:27.005242880 +0000 -@@ -19,7 +19,9 @@ - #endif - - #if defined(__HAIKU__) --#include -+#include -+#include -+#include - #endif - - void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1292,12 +1294,13 @@ - #if defined(_WIN32) && !defined(__CYGWIN__) - this->LoadPackageRegistryWinUser(); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == -+ B_OK) - { -- dir.Append("cmake/packages"); -- dir.Append(this->Name.c_str()); -- this->LoadPackageRegistryDir(dir.Path()); -+ strlcat(dir, "/cmake/packages/", sizeof(dir)); -+ strlcat(dir, this->Name.c_str(), sizeof(dir)); -+ this->LoadPackageRegistryDir(dir); - } - #else - if(const char* home = cmSystemTools::GetEnv("HOME")) -diff -ur cmake-2.8.5_orig/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocalGenerator.cxx ---- cmake-2.8.5_orig/Source/cmLocalGenerator.cxx 2011-07-08 12:21:46.065273856 +0000 -+++ cmake-2.8.5/Source/cmLocalGenerator.cxx 2011-07-09 18:30:30.565182464 +0000 -@@ -37,7 +37,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ - prefix = prefix_win32.c_str(); - } - #elif defined(__HAIKU__) -+ char dir[B_PATH_NAME_LENGTH]; - if (!prefix) - { -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- prefix = dir.Path(); -+ prefix = dir; - } - else - { -diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx ---- cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx 2011-07-08 12:21:47.017563648 +0000 -+++ cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2011-07-09 18:33:59.244842496 +0000 -@@ -27,7 +27,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1206,10 +1207,10 @@ - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx ---- cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-08 12:21:47.017825792 +0000 -+++ cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-09 17:59:50.096731136 +0000 -@@ -32,7 +32,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -73,7 +73,7 @@ - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff -ur cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/ProcessUNIX.c ---- cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c 2011-07-08 12:21:48.042729472 +0000 -+++ cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2011-07-09 17:59:50.100401152 +0000 -@@ -63,10 +63,6 @@ - #include /* DIR, dirent */ - #include /* isspace */ - --#ifdef __HAIKU__ --#undef __BEOS__ --#endif -- - #if defined(__VMS) - # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK - #else -diff -ur cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/SystemTools.cxx ---- cmake-2.8.5_orig/Source/kwsys/SystemTools.cxx 2011-07-08 12:21:48.044826624 +0000 -+++ cmake-2.8.5/Source/kwsys/SystemTools.cxx 2011-07-09 17:59:50.103284736 +0000 -@@ -150,7 +150,7 @@ - #include - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) -+#if defined(__BEOS__) && !defined(__ZETA__) - #include - #include - -diff -ur cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx ---- cmake-2.8.5_orig/Source/kwsys/testDynamicLoader.cxx 2011-07-08 12:21:49.045613056 +0000 -+++ cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2011-07-09 17:59:50.105119744 +0000 -@@ -15,7 +15,7 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - #include /* disable_debugger() API. */ - #endif - -diff -ur cmake-2.8.5_orig/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/testProcess.c ---- cmake-2.8.5_orig/Source/kwsys/testProcess.c 2011-07-08 12:21:49.046399488 +0000 -+++ cmake-2.8.5/Source/kwsys/testProcess.c 2011-07-09 17:59:50.108265472 +0000 -@@ -32,7 +32,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) -+#if defined(__BEOS__) && !defined(__ZETA__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff -ur cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt ---- cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt 2011-07-08 12:21:50.003670016 +0000 -+++ cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2011-07-09 17:59:50.114294784 +0000 -@@ -52,9 +52,9 @@ - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) --IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") --ENDIF(NOT BEOS AND NOT WIN32) -+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") - ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt ---- cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-08 12:21:50.007864320 +0000 -+++ cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-09 17:59:50.116654080 +0000 -@@ -52,9 +52,9 @@ - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) --IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") --ENDIF(NOT BEOS AND NOT WIN32) -+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") - ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt ---- cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-08 12:21:50.012320768 +0000 -+++ cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-09 17:59:50.119013376 +0000 -@@ -52,9 +52,9 @@ - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) --IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") --ENDIF(NOT BEOS AND NOT WIN32) -+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") - ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff -ur cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c ---- cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c 2011-07-08 12:21:54.052953088 +0000 -+++ cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2011-07-09 17:59:50.122421248 +0000 -@@ -38,7 +38,7 @@ - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff -ur cmake-2.8.5_orig/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl/select.c ---- cmake-2.8.5_orig/Utilities/cmcurl/select.c 2011-07-08 12:21:55.063176704 +0000 -+++ cmake-2.8.5/Utilities/cmcurl/select.c 2011-07-09 17:59:50.125829120 +0000 -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/zconf.h ---- cmake-2.8.5_orig/Utilities/cmzlib/zconf.h 2011-07-08 12:21:58.054001664 +0000 -+++ cmake-2.8.5/Utilities/cmzlib/zconf.h 2011-07-09 17:59:50.128712704 +0000 -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) && !defined (__HAIKU__) -+#if defined (__BEOS__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/zutil.h ---- cmake-2.8.5_orig/Utilities/cmzlib/zutil.h 2011-07-08 12:21:58.054525952 +0000 -+++ cmake-2.8.5/Utilities/cmzlib/zutil.h 2011-07-09 17:59:50.129761280 +0000 -@@ -147,12 +147,6 @@ - # define OS_CODE 0x0f - #endif - --/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ --/* many BeOS workarounds are no longer needed in Haiku */ --#if defined(__HAIKU__) && defined(__BEOS__) --#undef __BEOS__ --#endif -- - #if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif diff --git a/dev-util/cmake/patches/cmake-2.8.5.patchset b/dev-util/cmake/patches/cmake-2.8.5.patchset deleted file mode 100644 index 40215e05f..000000000 --- a/dev-util/cmake/patches/cmake-2.8.5.patchset +++ /dev/null @@ -1,664 +0,0 @@ -From 63b3bcd0d6804a07fe94d9af0fc7a7810fab538d Mon Sep 17 00:00:00 2001 -From: Ingo Weinhold -Date: Sun, 16 Jun 2013 21:42:39 +0200 -Subject: Haiku specific changes - - -diff --git a/Modules/CMakeFortranCompilerId.F.in b/Modules/CMakeFortranCompilerId.F.in -index 4d25de0..f84852a 100644 ---- a/Modules/CMakeFortranCompilerId.F.in -+++ b/Modules/CMakeFortranCompilerId.F.in -@@ -74,12 +74,8 @@ - PRINT *, 'INFO:platform[IRIX]' - #elif defined(__hpux) || defined(__hpux__) - PRINT *, 'INFO:platform[HP-UX]' --#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+#elif defined(__HAIKU__) - PRINT *, 'INFO:platform[Haiku]' --# if 0 --! Haiku also defines __BEOS__ so we must --! put it prior to the check for __BEOS__ --# endif - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - PRINT *, 'INFO:platform[BeOS]' - #elif defined(__QNX__) || defined(__QNXNTO__) -diff --git a/Modules/CMakePlatformId.h.in b/Modules/CMakePlatformId.h.in -index cb3f40a..db98bc3 100644 ---- a/Modules/CMakePlatformId.h.in -+++ b/Modules/CMakePlatformId.h.in -@@ -35,11 +35,8 @@ - #elif defined(__hpux) || defined(__hpux__) - # define PLATFORM_ID "HP-UX" - --#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) -+#elif defined(__HAIKU__) - # define PLATFORM_ID "Haiku" --/* Haiku also defines __BEOS__ so we must -- put it prior to the check for __BEOS__ --*/ - - #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) - # define PLATFORM_ID "BeOS" -diff --git a/Modules/CheckForPthreads.c b/Modules/CheckForPthreads.c -index d831078..02526fb 100644 ---- a/Modules/CheckForPthreads.c -+++ b/Modules/CheckForPthreads.c -@@ -16,7 +16,7 @@ int main(int ac, char*av[]){ - pthread_create(&tid[0], 0, runner, (void*)1); - pthread_create(&tid[1], 0, runner, (void*)2); - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) // (no usleep on BeOS 5.) -+#if defined(__BEOS__) && !defined(__ZETA__) // (no usleep on BeOS 5.) - usleep(1); // for strange behavior on single-processor sun - #endif - -diff --git a/Modules/FindGLUT.cmake b/Modules/FindGLUT.cmake -index af88997..8c0a733 100644 ---- a/Modules/FindGLUT.cmake -+++ b/Modules/FindGLUT.cmake -@@ -46,20 +46,22 @@ ELSE (WIN32) - /usr/openwin/include - /opt/graphics/OpenGL/include - /opt/graphics/OpenGL/contrib/libglut -+ /boot/system/develop/headers/os/opengl - ) - - FIND_LIBRARY( GLUT_glut_LIBRARY glut - /usr/openwin/lib - ) -- -- FIND_LIBRARY( GLUT_Xi_LIBRARY Xi -- /usr/openwin/lib -- ) -- -- FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu -- /usr/openwin/lib -- ) -- -+ -+ IF(NOT BEOS AND NOT HAIKU) -+ FIND_LIBRARY( GLUT_Xi_LIBRARY Xi -+ /usr/openwin/lib -+ ) -+ -+ FIND_LIBRARY( GLUT_Xmu_LIBRARY Xmu -+ /usr/openwin/lib -+ ) -+ ENDIF(NOT BEOS AND NOT HAIKU) - ENDIF (APPLE) - - ENDIF (WIN32) -@@ -69,12 +71,18 @@ IF(GLUT_INCLUDE_DIR) - IF(GLUT_glut_LIBRARY) - # Is -lXi and -lXmu required on all platforms that have it? - # If not, we need some way to figure out what platform we are on. -- SET( GLUT_LIBRARIES -- ${GLUT_glut_LIBRARY} -- ${GLUT_Xmu_LIBRARY} -- ${GLUT_Xi_LIBRARY} -- ${GLUT_cocoa_LIBRARY} -- ) -+ IF(BEOS OR HAIKU) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ) -+ ELSE(BEOS OR HAIKU) -+ SET( GLUT_LIBRARIES -+ ${GLUT_glut_LIBRARY} -+ ${GLUT_Xmu_LIBRARY} -+ ${GLUT_Xi_LIBRARY} -+ ${GLUT_cocoa_LIBRARY} -+ ) -+ ENDIF(BEOS OR HAIKU) - SET( GLUT_FOUND "YES" ) - - #The following deprecated settings are for backwards compatibility with CMake1.4 -@@ -84,9 +92,16 @@ IF(GLUT_INCLUDE_DIR) - ENDIF(GLUT_glut_LIBRARY) - ENDIF(GLUT_INCLUDE_DIR) - --MARK_AS_ADVANCED( -- GLUT_INCLUDE_DIR -- GLUT_glut_LIBRARY -- GLUT_Xmu_LIBRARY -- GLUT_Xi_LIBRARY -- ) -+IF(BEOS OR HAIKU) -+ MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ ) -+ELSE(BEOS OR HAIKU) -+ MARK_AS_ADVANCED( -+ GLUT_INCLUDE_DIR -+ GLUT_glut_LIBRARY -+ GLUT_Xmu_LIBRARY -+ GLUT_Xi_LIBRARY -+ ) -+ENDIF(BEOS OR HAIKU) -diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake -index 123fd5d..5047fbd 100644 ---- a/Modules/FindLua51.cmake -+++ b/Modules/FindLua51.cmake -@@ -57,13 +57,13 @@ FIND_LIBRARY(LUA_LIBRARY - - IF(LUA_LIBRARY) - # include the math library for Unix -- IF(UNIX AND NOT APPLE) -+ IF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - FIND_LIBRARY(LUA_MATH_LIBRARY m) - SET( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") - # For Windows and Mac, don't need to explicitly include the math library - ELSE(UNIX AND NOT APPLE) - SET( LUA_LIBRARIES "${LUA_LIBRARY}" CACHE STRING "Lua Libraries") -- ENDIF(UNIX AND NOT APPLE) -+ ENDIF(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) - ENDIF(LUA_LIBRARY) - - INCLUDE(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) -diff --git a/Modules/FindOpenGL.cmake b/Modules/FindOpenGL.cmake -index 98d8808..1ac4de6 100644 ---- a/Modules/FindOpenGL.cmake -+++ b/Modules/FindOpenGL.cmake -@@ -80,6 +80,7 @@ ELSE (WIN32) - /usr/share/doc/NVIDIA_GLX-1.0/include - /usr/openwin/share/include - /opt/graphics/OpenGL/include /usr/X11R6/include -+ /boot/system/develop/headers/os/opengl - ) - - FIND_PATH(OPENGL_xmesa_INCLUDE_DIR GL/xmesa.h -diff --git a/Modules/Platform/Haiku.cmake b/Modules/Platform/Haiku.cmake -index 8277a24..7eb0bd5 100644 ---- a/Modules/Platform/Haiku.cmake -+++ b/Modules/Platform/Haiku.cmake -@@ -1,20 +1,121 @@ --SET(BEOS 1) -+# process only once -+IF(HAIKU) -+ RETURN() -+ENDIF(HAIKU) - --SET(CMAKE_DL_LIBS root be) -+SET(HAIKU 1) -+SET(UNIX 1) -+ -+SET(CMAKE_DL_LIBS "") - SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") --SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") -+SET(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared") - SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") - SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") -+SET(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,") - SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") -+SET(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic") -+ -+# Determine, if the C or C++ compiler is configured for a secondary -+# architecture. If so, that will change the search paths we set below. We check -+# whether the compiler's library search paths contain a -+# "/boot/system/develop/lib//", which we assume to be the secondary -+# architecture specific subdirectory and extract the name of the architecture -+# accordingly. -+SET(HAIKU_COMPILER ${CMAKE_C_COMPILER}) -+IF ("${HAIKU_COMPILER}" STREQUAL "") -+ SET(HAIKU_COMPILER ${CMAKE_CXX_COMPILER}) -+ENDIF ("${HAIKU_COMPILER}" STREQUAL "") -+EXECUTE_PROCESS( -+ COMMAND ${HAIKU_COMPILER} -print-search-dirs -+ COMMAND sed -ne "/^libraries:/!d; s,libraries: =*\\(.*\\):,\\1,; s,:,\\n,gp" -+ COMMAND sed -ne "/\\/boot\\/system\\/develop\\/lib\\/[^\\/]*\\/$/!d; s,.*/\\([^/]*\\)/$,\\1,; p" -+ OUTPUT_VARIABLE CMAKE_HAIKU_SECONDARY_ARCH) -+STRING(STRIP "${CMAKE_HAIKU_SECONDARY_ARCH}" -+ CMAKE_HAIKU_SECONDARY_ARCH) -+ -+IF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") -+ SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "") -+ UNSET(CMAKE_HAIKU_SECONDARY_ARCH) -+ELSE ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") -+ SET(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "/${CMAKE_HAIKU_SECONDARY_ARCH}") -+ -+ # Override CMAKE_*LIBRARY_ARCHITECTURE. This will cause FIND_LIBRARY to search -+ # the libraries in the correct subdirectory first. It still isn't completely -+ # correct, since the parent directories shouldn't be searched at all. The -+ # primary architecture library might still be found, if there isn't one -+ # installed for the secondary architecture or it is installed in a less -+ # specific location. -+ SET(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) -+ SET(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) -+ SET(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH}) -+ENDIF ("${CMAKE_HAIKU_SECONDARY_ARCH}" STREQUAL "") -+ -+LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH -+ /boot/common/non-packaged -+ /boot/common -+ /boot/system -+ ) -+ -+LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES -+ /boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} -+ /boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} -+ /boot/system/develop/headers/os -+ /boot/system/develop/headers/os/app -+ /boot/system/develop/headers/os/device -+ /boot/system/develop/headers/os/drivers -+ /boot/system/develop/headers/os/game -+ /boot/system/develop/headers/os/interface -+ /boot/system/develop/headers/os/kernel -+ /boot/system/develop/headers/os/locale -+ /boot/system/develop/headers/os/mail -+ /boot/system/develop/headers/os/media -+ /boot/system/develop/headers/os/midi -+ /boot/system/develop/headers/os/midi2 -+ /boot/system/develop/headers/os/net -+ /boot/system/develop/headers/os/opengl -+ /boot/system/develop/headers/os/storage -+ /boot/system/develop/headers/os/support -+ /boot/system/develop/headers/os/translation -+ /boot/system/develop/headers/os/add-ons/graphics -+ /boot/system/develop/headers/os/add-ons/input_server -+ /boot/system/develop/headers/os/add-ons/screen_saver -+ /boot/system/develop/headers/os/add-ons/tracker -+ /boot/system/develop/headers/os/be_apps/Deskbar -+ /boot/system/develop/headers/os/be_apps/NetPositive -+ /boot/system/develop/headers/os/be_apps/Tracker -+ /boot/system/develop/headers/3rdparty -+ /boot/system/develop/headers/bsd -+ /boot/system/develop/headers/glibc -+ /boot/system/develop/headers/gnu -+ /boot/system/develop/headers/posix -+ /boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} -+ ) -+IF (CMAKE_HAIKU_SECONDARY_ARCH) -+ LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES -+ /boot/system/develop/headers -+ ) -+ENDIF (CMAKE_HAIKU_SECONDARY_ARCH) -+ -+LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES -+ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} -+ ) -+ -+LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES -+ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}) -+ -+LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) -+ -+LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES -+ /boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} -+ /boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} -+ /boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR} -+ ) -+ -+LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES} -+ ) - --INCLUDE(Platform/UnixPaths) --LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) --LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) --LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) --LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) --LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) --LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) --LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86) -+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}) - - IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH -diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx -index 7e5b26d..733c521 100644 ---- a/Source/CPack/cmCPackGenerator.cxx -+++ b/Source/CPack/cmCPackGenerator.cxx -@@ -27,7 +27,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - //---------------------------------------------------------------------- -@@ -1206,10 +1207,10 @@ const char* cmCPackGenerator::GetInstallPath() - this->InstallPath += "-"; - this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION"); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- this->InstallPath = dir.Path(); -+ this->InstallPath = dir; - } - else - { -diff --git a/Source/CPack/cmCPackGeneratorFactory.cxx b/Source/CPack/cmCPackGeneratorFactory.cxx -index a04b403..878e8c0 100644 ---- a/Source/CPack/cmCPackGeneratorFactory.cxx -+++ b/Source/CPack/cmCPackGeneratorFactory.cxx -@@ -32,7 +32,7 @@ - #endif - - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - # include "cmCPackDebGenerator.h" - # include "cmCPackRPMGenerator.h" - #endif -@@ -73,7 +73,7 @@ cmCPackGeneratorFactory::cmCPackGeneratorFactory() - cmCPackOSXX11Generator::CreateGenerator); - #endif - #if !defined(_WIN32) && !defined(__APPLE__) \ -- && !defined(__QNXNTO__) && !defined(__BEOS__) -+ && !defined(__QNXNTO__) && !defined(__BEOS__) && !defined(__HAIKU__) - this->RegisterGenerator("DEB", "Debian packages", - cmCPackDebGenerator::CreateGenerator); - this->RegisterGenerator("RPM", "RPM packages", -diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx -index 75a564e..83e3c6e 100644 ---- a/Source/cmCTest.cxx -+++ b/Source/cmCTest.cxx -@@ -53,14 +53,10 @@ - #include - #include - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - --#if defined(__HAIKU__) --#include /* disable_debugger() API. */ --#endif -- - - #define DEBUGOUT std::cout << __LINE__ << " "; std::cout - #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr -diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx -index cb614d4..1954662 100644 ---- a/Source/cmExportCommand.cxx -+++ b/Source/cmExportCommand.cxx -@@ -20,7 +20,8 @@ - #include "cmExportBuildFileGenerator.h" - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmExportCommand::cmExportCommand() -@@ -297,14 +298,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package, - const char* hash) - { - #if defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) != -+ B_OK) - { - return; - } -- dir.Append("cmake/packages"); -- dir.Append(package.c_str()); -- std::string fname = dir.Path(); -+ std::string fname = dir; -+ fname += "/cmake/packages/"; -+ fname += package; - #else - const char* home = cmSystemTools::GetEnv("HOME"); - if(!home) -diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx -index 5f106bc..a2f9823 100644 ---- a/Source/cmFindPackageCommand.cxx -+++ b/Source/cmFindPackageCommand.cxx -@@ -19,7 +19,9 @@ - #endif - - #if defined(__HAIKU__) --#include -+#include -+#include -+#include - #endif - - void cmFindPackageNeedBackwardsCompatibility(const std::string& variable, -@@ -1292,12 +1294,13 @@ void cmFindPackageCommand::AddPrefixesUserRegistry() - #if defined(_WIN32) && !defined(__CYGWIN__) - this->LoadPackageRegistryWinUser(); - #elif defined(__HAIKU__) -- BPath dir; -- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) == B_OK) -+ char dir[B_PATH_NAME_LENGTH]; -+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) == -+ B_OK) - { -- dir.Append("cmake/packages"); -- dir.Append(this->Name.c_str()); -- this->LoadPackageRegistryDir(dir.Path()); -+ strlcat(dir, "/cmake/packages/", sizeof(dir)); -+ strlcat(dir, this->Name.c_str(), sizeof(dir)); -+ this->LoadPackageRegistryDir(dir); - } - #else - if(const char* home = cmSystemTools::GetEnv("HOME")) -diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx -index 7da35eb..5867030 100644 ---- a/Source/cmLocalGenerator.cxx -+++ b/Source/cmLocalGenerator.cxx -@@ -37,7 +37,8 @@ - #include - - #if defined(__HAIKU__) --#include -+#include -+#include - #endif - - cmLocalGenerator::cmLocalGenerator() -@@ -354,12 +355,12 @@ void cmLocalGenerator::GenerateInstallRules() - prefix = prefix_win32.c_str(); - } - #elif defined(__HAIKU__) -+ char dir[B_PATH_NAME_LENGTH]; - if (!prefix) - { -- BPath dir; -- if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) -+ if (find_directory(B_COMMON_DIRECTORY, -1, false, dir, sizeof(dir)) == B_OK) - { -- prefix = dir.Path(); -+ prefix = dir; - } - else - { -diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c -index 9c66a44..6fe4232 100644 ---- a/Source/kwsys/ProcessUNIX.c -+++ b/Source/kwsys/ProcessUNIX.c -@@ -63,10 +63,6 @@ do. - #include /* DIR, dirent */ - #include /* isspace */ - --#ifdef __HAIKU__ --#undef __BEOS__ --#endif -- - #if defined(__VMS) - # define KWSYSPE_VMS_NONBLOCK , O_NONBLOCK - #else -diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx -index eefa7f5..8798615 100644 ---- a/Source/kwsys/SystemTools.cxx -+++ b/Source/kwsys/SystemTools.cxx -@@ -145,12 +145,7 @@ public: - #define _chdir chdir - #endif - --#if defined(__HAIKU__) --#include --#include --#endif -- --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) -+#if defined(__BEOS__) && !defined(__ZETA__) - #include - #include - -diff --git a/Source/kwsys/testDynamicLoader.cxx b/Source/kwsys/testDynamicLoader.cxx -index a7adbca..16b89ad 100644 ---- a/Source/kwsys/testDynamicLoader.cxx -+++ b/Source/kwsys/testDynamicLoader.cxx -@@ -15,14 +15,10 @@ - #include KWSYS_HEADER(ios/iostream) - #include KWSYS_HEADER(stl/string) - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) || defined(__HAIKU__) - #include /* disable_debugger() API. */ - #endif - --#if defined(__HAIKU__) --#include /* disable_debugger() API. */ --#endif -- - // Work-around CMake dependency scanning limitation. This must - // duplicate the above list of headers. - #if 0 -diff --git a/Source/kwsys/testProcess.c b/Source/kwsys/testProcess.c -index 877002a..17a068c 100644 ---- a/Source/kwsys/testProcess.c -+++ b/Source/kwsys/testProcess.c -@@ -32,7 +32,7 @@ - # pragma warn -8060 /* possibly incorrect assignment */ - #endif - --#if defined(__BEOS__) && !defined(__ZETA__) && !defined(__HAIKU__) -+#if defined(__BEOS__) && !defined(__ZETA__) - /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ - # include - static inline void testProcess_usleep(unsigned int msec) -diff --git a/Tests/Complex/Library/CMakeLists.txt b/Tests/Complex/Library/CMakeLists.txt -index 281e48a..7d8adb2 100644 ---- a/Tests/Complex/Library/CMakeLists.txt -+++ b/Tests/Complex/Library/CMakeLists.txt -@@ -52,9 +52,9 @@ DEFINE_PROPERTY( - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) --IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") --ENDIF(NOT BEOS AND NOT WIN32) -+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") - ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff --git a/Tests/ComplexOneConfig/Library/CMakeLists.txt b/Tests/ComplexOneConfig/Library/CMakeLists.txt -index 281e48a..7d8adb2 100644 ---- a/Tests/ComplexOneConfig/Library/CMakeLists.txt -+++ b/Tests/ComplexOneConfig/Library/CMakeLists.txt -@@ -52,9 +52,9 @@ DEFINE_PROPERTY( - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) --IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") --ENDIF(NOT BEOS AND NOT WIN32) -+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") - ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff --git a/Tests/ComplexRelativePaths/Library/CMakeLists.txt b/Tests/ComplexRelativePaths/Library/CMakeLists.txt -index 281e48a..7d8adb2 100644 ---- a/Tests/ComplexRelativePaths/Library/CMakeLists.txt -+++ b/Tests/ComplexRelativePaths/Library/CMakeLists.txt -@@ -52,9 +52,9 @@ DEFINE_PROPERTY( - FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" - ) - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) --IF(NOT BEOS AND NOT WIN32) # No libm on BeOS. -+IF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS. - SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") --ENDIF(NOT BEOS AND NOT WIN32) -+ENDIF(NOT BEOS AND NOT WIN32 AND NOT HAIKU) - GET_TARGET_PROPERTY(FOO_BAR_VAR CMakeTestCLibraryShared FOO) - IF(${FOO_BAR_VAR} MATCHES "BAR") - ELSE(${FOO_BAR_VAR} MATCHES "BAR") -diff --git a/Utilities/cmcurl/CMake/CurlTests.c b/Utilities/cmcurl/CMake/CurlTests.c -index d74a4f0..c5ba7c2 100644 ---- a/Utilities/cmcurl/CMake/CurlTests.c -+++ b/Utilities/cmcurl/CMake/CurlTests.c -@@ -38,7 +38,7 @@ main () - # define PLATFORM_AIX_V3 - #endif - --#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || (defined(__BEOS__) && !defined(__HAIKU__)) -+#if defined(PLATFORM_SUNOS4) || defined(PLATFORM_AIX_V3) || defined(__BEOS__) - #error "O_NONBLOCK does not work on this platform" - #endif - int socket; -diff --git a/Utilities/cmcurl/select.c b/Utilities/cmcurl/select.c -index 51adbcf..82f9dc2 100644 ---- a/Utilities/cmcurl/select.c -+++ b/Utilities/cmcurl/select.c -@@ -39,7 +39,7 @@ - #error "We can't compile without select() support!" - #endif - --#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) - /* BeOS has FD_SET defined in socket.h */ - #include - #endif -diff --git a/Utilities/cmzlib/zconf.h b/Utilities/cmzlib/zconf.h -index 6eb52d1..7a3b6fd 100644 ---- a/Utilities/cmzlib/zconf.h -+++ b/Utilities/cmzlib/zconf.h -@@ -237,7 +237,7 @@ - # endif - #endif - --#if defined (__BEOS__) && !defined (__HAIKU__) -+#if defined (__BEOS__) - # ifdef ZLIB_DLL - # ifdef ZLIB_INTERNAL - # define ZEXPORT __declspec(dllexport) -diff --git a/Utilities/cmzlib/zutil.h b/Utilities/cmzlib/zutil.h -index 74ef1f8..3053cd8 100644 ---- a/Utilities/cmzlib/zutil.h -+++ b/Utilities/cmzlib/zutil.h -@@ -147,12 +147,6 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ - # define OS_CODE 0x0f - #endif - --/* Haiku defines both __HAIKU__ and __BEOS__ (for now) */ --/* many BeOS workarounds are no longer needed in Haiku */ --#if defined(__HAIKU__) && defined(__BEOS__) --#undef __BEOS__ --#endif -- - #if defined(_BEOS_) || defined(RISCOS) - # define fdopen(fd,mode) NULL /* No fdopen() */ - #endif -diff --git a/bootstrap b/bootstrap -index c999888..c573a90 100755 ---- a/bootstrap -+++ b/bootstrap -@@ -142,7 +142,9 @@ if ${cmake_system_mingw}; then - cmake_default_prefix="c:/Program Files/CMake" - fi - elif ${cmake_system_haiku}; then -- cmake_default_prefix=`/bin/finddir B_COMMON_DIRECTORY` -+ cmake_default_prefix=`finddir B_COMMON_DIRECTORY` -+ cmake_man_dir="/documentation/man" -+ cmake_doc_dir="/documentation/packages/cmake-${cmake_version}" - else - cmake_default_prefix="/usr/local" - fi --- -1.7.10.2 -