From 588f7769ed3a817dcb4de1b88a80de4fa3ab265f Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 28 Apr 2013 19:12:03 +0200 Subject: [PATCH] Convert cmake 2.8.5 recipe to an actual recipe Also adjust the patch according to the new directory layout for development files and simplify in a few places. --- dev-util/cmake/cmake-2.8.5.recipe | 55 +++-- dev-util/cmake/patches/cmake-2.8.5.patch | 266 ++++++++++++++--------- 2 files changed, 203 insertions(+), 118 deletions(-) diff --git a/dev-util/cmake/cmake-2.8.5.recipe b/dev-util/cmake/cmake-2.8.5.recipe index dde87fa24..cd8943eec 100644 --- a/dev-util/cmake/cmake-2.8.5.recipe +++ b/dev-util/cmake/cmake-2.8.5.recipe @@ -1,30 +1,49 @@ -DESCRIPTION="cmake - Cross platform Make" +SUMMARY="Cross platform Make" +DESCRIPTION="CMake is a cross-platform, open-source build system. It is a family of tools designed to build, test and package software. CMake is used to control the software compilation process using simple platform and compiler independent configuration files. CMake generates native makefiles and workspaces that can be used in the compiler environment of your choice." HOMEPAGE="http://www.cmake.org" +LICENSE="CMake" +COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." SRC_URI="http://www.cmake.org/files/v2.8/cmake-2.8.5.tar.gz" CHECKSUM_MD5="3c5d32cec0f4c2dc45f4c2e84f4a20c5" -REVISION="1" -STATUS_HAIKU="stable" -DEPEND="" +REVISION="3" +ARCHITECTURES="x86_gcc2 ?x86" + +PATCHES="cmake-2.8.5.patch" + +PROVIDES=" + cmake = $portVersion compat >= 2.8 + cmd:cmake = $portVersion compat >= 2.8 + cmd:cpack = $portVersion compat >= 2.8 + cmd:ctest = $portVersion compat >= 2.8 + " +REQUIRES=" + haiku >= $haikuVersion + " +BUILD_REQUIRES=" + cmd:gcc + cmd:grep + cmd:ld + cmd:libtool + cmd:make + cmd:sed + " +BUILD_PREREQUIRES=" + haiku_devel >= $haikuVersion + " + +SOURCE_DIR="$portVersionedName" + BUILD() { - cd cmake-2.8.5 - # cmake appends the prefix to mandir and datadir - # so using ../../ to back that part out but for some reason - # the doc was also picking up /boot, so had to back it out 3 times - # this seems to work but might still need some further adjusting -# sed -i 's/${CMAKE_DATA_DIR}\/include cmCPluginAPI.h/${CMAKE_PREFIX_DIR}\/include cmCPluginAPI.h/g' Source/CMakeLists.txt - ./configure --prefix=`finddir B_COMMON_DIRECTORY` \ - --datadir=/data/cmake \ - --docdir=/documentation/doc/CMake \ - --mandir=/documentation/man - make + ./configure --prefix=$prefix \ + --datadir=/$relativeDataDir/cmake \ + --docdir=/$relativeDocDir \ + --mandir=/$relativeManDir + make $jobArgs } INSTALL() { - cd cmake-2.8.5 make install } -LICENSE="CMake" -COPYRIGHT="2002-2011 Kitware, Inc., Insight Consortium, All rights reserved." diff --git a/dev-util/cmake/patches/cmake-2.8.5.patch b/dev-util/cmake/patches/cmake-2.8.5.patch index 9cd379392..b1b016368 100644 --- a/dev-util/cmake/patches/cmake-2.8.5.patch +++ b/dev-util/cmake/patches/cmake-2.8.5.patch @@ -1,6 +1,6 @@ -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 +diff -ur orig/cmake-2.8.5/bootstrap cmake-2.8.5/bootstrap +--- orig/cmake-2.8.5/bootstrap 2011-07-08 14:21:43.006815744 +0200 ++++ cmake-2.8.5/bootstrap 2013-04-28 15:17:09.327680000 +0200 @@ -142,7 +142,9 @@ cmake_default_prefix="c:/Program Files/CMake" fi @@ -8,13 +8,13 @@ diff -ur cmake-2.8.5_orig/bootstrap cmake-2.8.5/bootstrap - 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}" ++ cmake_doc_dir="/documentation/packages/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 +diff -ur orig/cmake-2.8.5/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckForPthreads.c +--- orig/cmake-2.8.5/Modules/CheckForPthreads.c 2011-07-08 14:21:44.015204352 +0200 ++++ cmake-2.8.5/Modules/CheckForPthreads.c 2013-04-28 15:17:09.328204288 +0200 @@ -16,7 +16,7 @@ pthread_create(&tid[0], 0, runner, (void*)1); pthread_create(&tid[1], 0, runner, (void*)2); @@ -24,9 +24,9 @@ diff -ur cmake-2.8.5_orig/Modules/CheckForPthreads.c cmake-2.8.5/Modules/CheckFo 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 +diff -ur orig/cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in +--- orig/cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2011-07-08 14:21:44.022282240 +0200 ++++ cmake-2.8.5/Modules/CMakeFortranCompilerId.F.in 2013-04-28 15:17:09.328990720 +0200 @@ -74,12 +74,8 @@ PRINT *, 'INFO:platform[IRIX]' #elif defined(__hpux) || defined(__hpux__) @@ -41,9 +41,9 @@ diff -ur cmake-2.8.5_orig/Modules/CMakeFortranCompilerId.F.in cmake-2.8.5/Module #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 +diff -ur orig/cmake-2.8.5/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMakePlatformId.h.in +--- orig/cmake-2.8.5/Modules/CMakePlatformId.h.in 2011-07-08 14:21:44.023330816 +0200 ++++ cmake-2.8.5/Modules/CMakePlatformId.h.in 2013-04-28 15:17:09.329777152 +0200 @@ -35,11 +35,8 @@ #elif defined(__hpux) || defined(__hpux__) # define PLATFORM_ID "HP-UX" @@ -57,19 +57,18 @@ diff -ur cmake-2.8.5_orig/Modules/CMakePlatformId.h.in cmake-2.8.5/Modules/CMake #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 +diff -ur orig/cmake-2.8.5/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cmake +--- orig/cmake-2.8.5/Modules/FindGLUT.cmake 2011-07-08 14:21:44.038273024 +0200 ++++ cmake-2.8.5/Modules/FindGLUT.cmake 2013-04-28 15:17:09.330301440 +0200 @@ -46,20 +46,22 @@ /usr/openwin/include /opt/graphics/OpenGL/include /opt/graphics/OpenGL/contrib/libglut -+ /boot/develop/headers/os/opengl ++ /boot/system/develop/headers/os/opengl ) FIND_LIBRARY( GLUT_glut_LIBRARY glut /usr/openwin/lib -+ /boot/develop/lib/x86/ ) - - FIND_LIBRARY( GLUT_Xi_LIBRARY Xi @@ -80,6 +79,7 @@ diff -ur cmake-2.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cm - /usr/openwin/lib - ) - ++ + IF(NOT BEOS AND NOT HAIKU) + FIND_LIBRARY( GLUT_Xi_LIBRARY Xi + /usr/openwin/lib @@ -140,9 +140,9 @@ diff -ur cmake-2.8.5_orig/Modules/FindGLUT.cmake cmake-2.8.5/Modules/FindGLUT.cm + 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 +diff -ur orig/cmake-2.8.5/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51.cmake +--- orig/cmake-2.8.5/Modules/FindLua51.cmake 2011-07-08 14:21:44.040632320 +0200 ++++ cmake-2.8.5/Modules/FindLua51.cmake 2013-04-28 15:17:09.330825728 +0200 @@ -57,13 +57,13 @@ IF(LUA_LIBRARY) @@ -159,29 +159,21 @@ diff -ur cmake-2.8.5_orig/Modules/FindLua51.cmake cmake-2.8.5/Modules/FindLua51. 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 +diff -ur orig/cmake-2.8.5/Modules/FindOpenGL.cmake cmake-2.8.5/Modules/FindOpenGL.cmake +--- orig/cmake-2.8.5/Modules/FindOpenGL.cmake 2011-07-08 14:21:44.041418752 +0200 ++++ cmake-2.8.5/Modules/FindOpenGL.cmake 2013-04-28 15:17:09.331612160 +0200 @@ -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 ++ /boot/system/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-09 17:59:50.092798976 +0000 -@@ -1,20 +1,27 @@ +diff -ur orig/cmake-2.8.5/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platform/Haiku.cmake +--- orig/cmake-2.8.5/Modules/Platform/Haiku.cmake 2011-07-08 14:21:44.058458112 +0200 ++++ cmake-2.8.5/Modules/Platform/Haiku.cmake 2013-04-28 15:57:05.984875008 +0200 +@@ -1,20 +1,82 @@ -SET(BEOS 1) +SET(HAIKU 1) +SET(UNIX 1) @@ -210,31 +202,93 @@ diff -ur cmake-2.8.5_orig/Modules/Platform/Haiku.cmake cmake-2.8.5/Modules/Platf + /boot/common + /boot/system + ) -+LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES -+ /boot/common/non-packaged/lib -+ /boot/common/lib -+ /boot/system/develop/lib/x86 ++ ++LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES ++ /boot/common/non-packaged/develop/headers ++ /boot/common/non-packaged/include ++ # TODO: To be removed ++ /boot/common/develop/headers ++ /boot/common/include ++ # TODO: To be removed ++ /boot/common/develop/headers ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ /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 ++ ) ++ ++LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES ++ ${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES} ++ /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 ++ ) ++ ++LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES}) ++ ++LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ++ /boot/common/non-packaged/develop/lib ++ /boot/common/develop/lib ++ /boot/system/develop/lib + ) -+LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/system/develop/headers/3rdparty) -+LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/system/develop/lib/x86) IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH -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 @@ +diff -ur orig/cmake-2.8.5/Source/cmCTest.cxx cmake-2.8.5/Source/cmCTest.cxx +--- orig/cmake-2.8.5/Source/cmCTest.cxx 2011-07-08 14:21:45.012320768 +0200 ++++ cmake-2.8.5/Source/cmCTest.cxx 2013-04-28 15:17:09.334757888 +0200 +@@ -53,14 +53,10 @@ #include #include -#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) #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 +-#if defined(__HAIKU__) +-#include /* disable_debugger() API. */ +-#endif +- + + #define DEBUGOUT std::cout << __LINE__ << " "; std::cout + #define DEBUGERR std::cerr << __LINE__ << " "; std::cerr +diff -ur orig/cmake-2.8.5/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExportCommand.cxx +--- orig/cmake-2.8.5/Source/cmExportCommand.cxx 2011-07-08 14:21:45.021757952 +0200 ++++ cmake-2.8.5/Source/cmExportCommand.cxx 2013-04-28 15:17:09.335544320 +0200 @@ -20,7 +20,8 @@ #include "cmExportBuildFileGenerator.h" @@ -266,9 +320,9 @@ diff -ur cmake-2.8.5_orig/Source/cmExportCommand.cxx cmake-2.8.5/Source/cmExport #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 +diff -ur orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmFindPackageCommand.cxx +--- orig/cmake-2.8.5/Source/cmFindPackageCommand.cxx 2011-07-08 14:21:46.025690112 +0200 ++++ cmake-2.8.5/Source/cmFindPackageCommand.cxx 2013-04-28 15:17:09.336855040 +0200 @@ -19,7 +19,9 @@ #endif @@ -299,9 +353,9 @@ diff -ur cmake-2.8.5_orig/Source/cmFindPackageCommand.cxx cmake-2.8.5/Source/cmF } #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 +diff -ur orig/cmake-2.8.5/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocalGenerator.cxx +--- orig/cmake-2.8.5/Source/cmLocalGenerator.cxx 2011-07-08 14:21:46.039845888 +0200 ++++ cmake-2.8.5/Source/cmLocalGenerator.cxx 2013-04-28 15:17:09.338427904 +0200 @@ -37,7 +37,8 @@ #include @@ -328,9 +382,9 @@ diff -ur cmake-2.8.5_orig/Source/cmLocalGenerator.cxx cmake-2.8.5/Source/cmLocal } 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 +diff -ur orig/cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx +--- orig/cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2011-07-08 14:21:47.059244544 +0200 ++++ cmake-2.8.5/Source/CPack/cmCPackGenerator.cxx 2013-04-28 15:17:09.339476480 +0200 @@ -27,7 +27,8 @@ #include @@ -355,9 +409,9 @@ diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGenerator.cxx cmake-2.8.5/Source/C } 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 +diff -ur orig/cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx +--- orig/cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2011-07-08 14:21:47.059506688 +0200 ++++ cmake-2.8.5/Source/CPack/cmCPackGeneratorFactory.cxx 2013-04-28 15:17:09.340262912 +0200 @@ -32,7 +32,7 @@ #endif @@ -376,9 +430,9 @@ diff -ur cmake-2.8.5_orig/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.8.5/S 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 +diff -ur orig/cmake-2.8.5/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/ProcessUNIX.c +--- orig/cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2011-07-08 14:21:48.017301504 +0200 ++++ cmake-2.8.5/Source/kwsys/ProcessUNIX.c 2013-04-28 15:17:09.341835776 +0200 @@ -63,10 +63,6 @@ #include /* DIR, dirent */ #include /* isspace */ @@ -390,33 +444,45 @@ diff -ur cmake-2.8.5_orig/Source/kwsys/ProcessUNIX.c cmake-2.8.5/Source/kwsys/Pr #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 +diff -ur orig/cmake-2.8.5/Source/kwsys/SystemTools.cxx cmake-2.8.5/Source/kwsys/SystemTools.cxx +--- orig/cmake-2.8.5/Source/kwsys/SystemTools.cxx 2011-07-08 14:21:48.019398656 +0200 ++++ cmake-2.8.5/Source/kwsys/SystemTools.cxx 2013-04-28 15:17:09.343670784 +0200 +@@ -145,12 +145,7 @@ + #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 -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 @@ +diff -ur orig/cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx +--- orig/cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2011-07-08 14:21:49.020447232 +0200 ++++ cmake-2.8.5/Source/kwsys/testDynamicLoader.cxx 2013-04-28 15:17:09.344719360 +0200 +@@ -15,14 +15,10 @@ #include KWSYS_HEADER(ios/iostream) #include KWSYS_HEADER(stl/string) -#if defined(__BEOS__) && !defined(__HAIKU__) -+#if defined(__BEOS__) ++#if defined(__BEOS__) || defined(__HAIKU__) #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 +-#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 -ur orig/cmake-2.8.5/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/testProcess.c +--- orig/cmake-2.8.5/Source/kwsys/testProcess.c 2011-07-08 14:21:49.020971520 +0200 ++++ cmake-2.8.5/Source/kwsys/testProcess.c 2013-04-28 15:17:09.345767936 +0200 @@ -32,7 +32,7 @@ # pragma warn -8060 /* possibly incorrect assignment */ #endif @@ -426,9 +492,9 @@ diff -ur cmake-2.8.5_orig/Source/kwsys/testProcess.c cmake-2.8.5/Source/kwsys/te /* 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 +diff -ur orig/cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt +--- orig/cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2011-07-08 14:21:50.045350912 +0200 ++++ cmake-2.8.5/Tests/Complex/Library/CMakeLists.txt 2013-04-28 15:17:09.346292224 +0200 @@ -52,9 +52,9 @@ FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) @@ -441,9 +507,9 @@ diff -ur cmake-2.8.5_orig/Tests/Complex/Library/CMakeLists.txt cmake-2.8.5/Tests 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 +diff -ur orig/cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt +--- orig/cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2011-07-08 14:21:50.049807360 +0200 ++++ cmake-2.8.5/Tests/ComplexOneConfig/Library/CMakeLists.txt 2013-04-28 15:17:09.347078656 +0200 @@ -52,9 +52,9 @@ FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) @@ -456,9 +522,9 @@ diff -ur cmake-2.8.5_orig/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2. 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 +diff -ur orig/cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt +--- orig/cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2011-07-08 14:21:50.054001664 +0200 ++++ cmake-2.8.5/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2013-04-28 15:17:09.347865088 +0200 @@ -52,9 +52,9 @@ FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" ) @@ -471,9 +537,9 @@ diff -ur cmake-2.8.5_orig/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmak 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 +diff -ur orig/cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c +--- orig/cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2011-07-08 14:21:54.027262976 +0200 ++++ cmake-2.8.5/Utilities/cmcurl/CMake/CurlTests.c 2013-04-28 15:17:09.348913664 +0200 @@ -38,7 +38,7 @@ # define PLATFORM_AIX_V3 #endif @@ -483,9 +549,9 @@ diff -ur cmake-2.8.5_orig/Utilities/cmcurl/CMake/CurlTests.c cmake-2.8.5/Utiliti #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 +diff -ur orig/cmake-2.8.5/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl/select.c +--- orig/cmake-2.8.5/Utilities/cmcurl/select.c 2011-07-08 14:21:55.037486592 +0200 ++++ cmake-2.8.5/Utilities/cmcurl/select.c 2013-04-28 15:17:09.349437952 +0200 @@ -39,7 +39,7 @@ #error "We can't compile without select() support!" #endif @@ -495,9 +561,9 @@ diff -ur cmake-2.8.5_orig/Utilities/cmcurl/select.c cmake-2.8.5/Utilities/cmcurl /* 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 +diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/zconf.h +--- orig/cmake-2.8.5/Utilities/cmzlib/zconf.h 2011-07-08 14:21:58.028311552 +0200 ++++ cmake-2.8.5/Utilities/cmzlib/zconf.h 2013-04-28 15:17:09.350224384 +0200 @@ -237,7 +237,7 @@ # endif #endif @@ -507,9 +573,9 @@ diff -ur cmake-2.8.5_orig/Utilities/cmzlib/zconf.h cmake-2.8.5/Utilities/cmzlib/ # 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 +diff -ur orig/cmake-2.8.5/Utilities/cmzlib/zutil.h cmake-2.8.5/Utilities/cmzlib/zutil.h +--- orig/cmake-2.8.5/Utilities/cmzlib/zutil.h 2011-07-08 14:21:58.029097984 +0200 ++++ cmake-2.8.5/Utilities/cmzlib/zutil.h 2013-04-28 15:17:09.350748672 +0200 @@ -147,12 +147,6 @@ # define OS_CODE 0x0f #endif