From dff86cb41731910a845584d20ab2a8db69850bba Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Fri, 12 Sep 2008 22:28:49 +0000 Subject: [PATCH] Fix for cmSystemTools.cxx and a couple other files. --- dev-util/cmake/cmake-2.6.1-haiku-2.diff | 119 ++++++++++++++++-------- 1 file changed, 82 insertions(+), 37 deletions(-) diff --git a/dev-util/cmake/cmake-2.6.1-haiku-2.diff b/dev-util/cmake/cmake-2.6.1-haiku-2.diff index 208f5033a..a86b84d93 100644 --- a/dev-util/cmake/cmake-2.6.1-haiku-2.diff +++ b/dev-util/cmake/cmake-2.6.1-haiku-2.diff @@ -1,35 +1,31 @@ diff -urN cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in --- cmake-2.6.1/Modules/CMakeFortranCompilerId.F90.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-09-10 15:33:56.000000000 +0000 -@@ -50,6 +50,10 @@ ++++ cmake-2.6.1-haiku/Modules/CMakeFortranCompilerId.F90.in 2008-09-12 15:11:49.000000000 +0000 +@@ -50,6 +50,8 @@ PRINT *, 'INFO:platform[IRIX]' #elif defined(__hpux) || defined(__hpux__) PRINT *, 'INFO:platform[HP-UX]' +#elif defined(__HAIKU) || defined(__HAIKU__) || defined(_HAIKU) + PRINT *, 'INFO:platform[Haiku]' -+! Haiku also defines __BEOS__ so we must -+! put it prior to the check for __BEOS__ #elif defined(__BeOS) || defined(__BEOS__) || defined(_BEOS) PRINT *, 'INFO:platform[BeOS]' #elif defined(__QNX__) || defined(__QNXNTO__) diff -urN cmake-2.6.1/Modules/CMakePlatformId.h.in cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in --- cmake-2.6.1/Modules/CMakePlatformId.h.in 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in 2008-09-10 15:33:56.000000000 +0000 -@@ -35,6 +35,11 @@ ++++ cmake-2.6.1-haiku/Modules/CMakePlatformId.h.in 2008-09-12 15:12:47.000000000 +0000 +@@ -35,6 +35,9 @@ #elif defined(__hpux) || defined(__hpux__) # define PLATFORM_ID "HP-UX" +#elif defined(__HAIKU) || defined(__HAIKU__) || 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 -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/CheckForPthreads.c --- cmake-2.6.1/Modules/CheckForPthreads.c 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c 2008-09-10 15:33:56.000000000 +0000 ++++ cmake-2.6.1-haiku/Modules/CheckForPthreads.c 2008-09-12 15:07:32.000000000 +0000 @@ -16,7 +16,7 @@ pthread_create(&tid[0], 0, runner, (void*)1); pthread_create(&tid[1], 0, runner, (void*)2); @@ -41,7 +37,7 @@ diff -urN cmake-2.6.1/Modules/CheckForPthreads.c cmake-2.6.1-haiku/Modules/Check diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake --- cmake-2.6.1/Modules/Platform/Haiku.cmake 1970-01-01 00:00:00.000000000 +0000 -+++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Modules/Platform/Haiku.cmake 2008-09-12 15:07:32.000000000 +0000 @@ -0,0 +1,14 @@ +SET(BEOS 1) + @@ -59,7 +55,7 @@ diff -urN cmake-2.6.1/Modules/Platform/Haiku.cmake cmake-2.6.1-haiku/Modules/Pla +INCLUDE(Platform/UnixPaths) diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx --- cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/CPack/cmCPackGeneratorFactory.cxx 2008-09-12 15:07:32.000000000 +0000 @@ -36,7 +36,7 @@ #endif @@ -81,7 +77,7 @@ diff -urN cmake-2.6.1/Source/CPack/cmCPackGeneratorFactory.cxx cmake-2.6.1-haiku this->RegisterGenerator("RPM", "RPM packages", diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx --- cmake-2.6.1/Source/cmCTest.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmCTest.cxx 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/cmCTest.cxx 2008-09-12 15:07:32.000000000 +0000 @@ -49,10 +49,15 @@ #include // auto_ptr @@ -110,7 +106,7 @@ diff -urN cmake-2.6.1/Source/cmCTest.cxx cmake-2.6.1-haiku/Source/cmCTest.cxx } diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx --- cmake-2.6.1/Source/cmDependsJavaLexer.cxx 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.cxx 2008-09-12 15:07:33.000000000 +0000 @@ -23,7 +23,7 @@ #include #include @@ -122,7 +118,7 @@ diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.cxx cmake-2.6.1-haiku/Source/cmD diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h --- cmake-2.6.1/Source/cmDependsJavaLexer.h 2008-08-01 15:34:51.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/cmDependsJavaLexer.h 2008-09-12 15:07:33.000000000 +0000 @@ -38,7 +38,7 @@ #include #include @@ -134,8 +130,41 @@ diff -urN cmake-2.6.1/Source/cmDependsJavaLexer.h cmake-2.6.1-haiku/Source/cmDep diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystemTools.cxx --- cmake-2.6.1/Source/cmSystemTools.cxx 2008-08-01 15:34:53.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx 2008-09-10 15:34:37.000000000 +0000 -@@ -970,11 +970,13 @@ ++++ cmake-2.6.1-haiku/Source/cmSystemTools.cxx 2008-09-12 15:10:22.000000000 +0000 +@@ -910,7 +910,7 @@ + fflush(stdout); + fflush(stderr); + +-#ifdef __BEOS__ ++#if defined __BEOS__ && !defined __HAIKU__ + beos_seen_signal = false; + signal(SIGCHLD, beos_popen_workaround); + #endif +@@ -918,7 +918,7 @@ + FILE* cpipe = popen(command, "r"); + if(!cpipe) + { +-#ifdef __BEOS__ ++#if defined __BEOS__ && !defined __HAIKU__ + signal(SIGCHLD, SIG_DFL); + #endif + return false; +@@ -931,12 +931,13 @@ + cmSystemTools::Stdout(buffer); + } + output += buffer; ++ buffer[0] = 0; + fgets(buffer, BUFFER_SIZE, cpipe); + } + + retVal = pclose(cpipe); + +-#ifdef __BEOS__ ++#if defined __BEOS__ && !defined __HAIKU__ + for (int i = 0; (!beos_seen_signal) && (i < 3); i++) + { + ::sleep(1); // signals should interrupt this... +@@ -970,11 +971,13 @@ error << "SIGFPE"; break; #endif @@ -149,7 +178,7 @@ diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystem #ifdef SIGSEGV case SIGSEGV: error << "SIGSEGV"; -@@ -1696,7 +1698,7 @@ +@@ -1696,7 +1699,7 @@ } // no fchmod on BeOS 5...do pathname instead. @@ -160,7 +189,7 @@ diff -urN cmake-2.6.1/Source/cmSystemTools.cxx cmake-2.6.1-haiku/Source/cmSystem return -1; diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx --- cmake-2.6.1/Source/kwsys/DynamicLoader.cxx 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/kwsys/DynamicLoader.cxx 2008-09-12 15:07:33.000000000 +0000 @@ -335,11 +335,21 @@ #endif //_WIN32 @@ -187,7 +216,7 @@ diff -urN cmake-2.6.1/Source/kwsys/DynamicLoader.cxx cmake-2.6.1-haiku/Source/kw namespace KWSYS_NAMESPACE diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c --- cmake-2.6.1/Source/kwsys/ProcessUNIX.c 2008-08-01 15:34:54.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/kwsys/ProcessUNIX.c 2008-09-12 15:07:33.000000000 +0000 @@ -75,7 +75,7 @@ typedef int kwsysProcess_ssize_t; #endif @@ -197,9 +226,25 @@ diff -urN cmake-2.6.1/Source/kwsys/ProcessUNIX.c cmake-2.6.1-haiku/Source/kwsys/ /* BeOS 5 doesn't have usleep(), but it has snooze(), which is identical. */ # include static inline void kwsysProcess_usleep(unsigned int msec) +@@ -2534,6 +2534,7 @@ + } + + /* If this is the first process, enable the signal handler. */ ++#ifndef __HAIKU__ + if(newProcesses.Count == 1) + { + /* Install our handler for SIGCHLD. Repeat call until it is not +@@ -2554,6 +2555,7 @@ + &kwsysProcessesOldSigChldAction) < 0) && + (errno == EINTR)); + } ++#endif + } + + return 1; diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx --- cmake-2.6.1/Source/kwsys/SystemTools.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/kwsys/SystemTools.cxx 2008-09-12 15:07:33.000000000 +0000 @@ -131,7 +131,12 @@ #define _chdir chdir #endif @@ -216,7 +261,7 @@ diff -urN cmake-2.6.1/Source/kwsys/SystemTools.cxx cmake-2.6.1-haiku/Source/kwsy diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx --- cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/kwsys/testDynamicLoader.cxx 2008-09-12 15:07:33.000000000 +0000 @@ -17,10 +17,14 @@ #include KWSYS_HEADER(ios/iostream) #include KWSYS_HEADER(stl/string) @@ -235,7 +280,7 @@ diff -urN cmake-2.6.1/Source/kwsys/testDynamicLoader.cxx cmake-2.6.1-haiku/Sourc #if 0 diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/testProcess.c --- cmake-2.6.1/Source/kwsys/testProcess.c 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Source/kwsys/testProcess.c 2008-09-12 15:07:33.000000000 +0000 @@ -34,7 +34,7 @@ # pragma warn -8060 /* possibly incorrect assignment */ #endif @@ -247,7 +292,7 @@ diff -urN cmake-2.6.1/Source/kwsys/testProcess.c cmake-2.6.1-haiku/Source/kwsys/ static inline void testProcess_usleep(unsigned int msec) diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt --- cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt 2008-08-01 15:34:55.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt 2008-09-10 15:34:37.000000000 +0000 ++++ cmake-2.6.1-haiku/Tests/Complex/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 @@ -53,7 +53,9 @@ ) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) @@ -261,12 +306,12 @@ diff -urN cmake-2.6.1/Tests/Complex/Library/CMakeLists.txt cmake-2.6.1-haiku/Tes IF(${FOO_BAR_VAR} MATCHES "BAR") diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt --- cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Tests/ComplexOneConfig/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 @@ -53,7 +53,9 @@ ) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) IF(NOT BEOS) # No libm on BeOS. -+ IF(NOT HAIKU) # No libm on Haiku. ++ IF(NOT HAIKU) # No limb on Haiku. SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") + ENDIF(NOT HAIKU) ENDIF(NOT BEOS) @@ -274,7 +319,7 @@ diff -urN cmake-2.6.1/Tests/ComplexOneConfig/Library/CMakeLists.txt cmake-2.6.1- IF(${FOO_BAR_VAR} MATCHES "BAR") diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt --- cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-08-01 15:34:56.000000000 +0000 -+++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Tests/ComplexRelativePaths/Library/CMakeLists.txt 2008-09-12 15:07:33.000000000 +0000 @@ -53,7 +53,9 @@ ) SET_TARGET_PROPERTIES(CMakeTestCLibraryShared PROPERTIES FOO BAR) @@ -287,7 +332,7 @@ diff -urN cmake-2.6.1/Tests/ComplexRelativePaths/Library/CMakeLists.txt cmake-2. IF(${FOO_BAR_VAR} MATCHES "BAR") diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c --- cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmcurl/CMake/CurlTests.c 2008-09-12 15:07:34.000000000 +0000 @@ -38,7 +38,7 @@ # define PLATFORM_AIX_V3 #endif @@ -299,7 +344,7 @@ diff -urN cmake-2.6.1/Utilities/cmcurl/CMake/CurlTests.c cmake-2.6.1-haiku/Utili int socket; diff -urN cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt --- cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt 2008-09-10 15:32:49.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmcurl/CMakeLists.txt 2008-09-12 15:07:34.000000000 +0000 @@ -165,6 +165,8 @@ CHECK_LIBRARY_EXISTS_CONCAT("bnetapi" closesocket HAVE_LIBBNETAPI) ENDIF(BEOS) @@ -311,7 +356,7 @@ diff -urN cmake-2.6.1/Utilities/cmcurl/CMakeLists.txt cmake-2.6.1-haiku/Utilitie ENDIF(NOT NOT_NEED_LIBNSL) diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h --- cmake-2.6.1/Utilities/cmcurl/curl/curl.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmcurl/curl/curl.h 2008-09-12 15:07:34.000000000 +0000 @@ -1133,7 +1133,7 @@ } #endif @@ -323,7 +368,7 @@ diff -urN cmake-2.6.1/Utilities/cmcurl/curl/curl.h cmake-2.6.1-haiku/Utilities/c diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c --- cmake-2.6.1/Utilities/cmcurl/if2ip.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmcurl/if2ip.c 2008-09-12 15:07:34.000000000 +0000 @@ -39,7 +39,7 @@ */ #if !defined(WIN32) && !defined(__BEOS__) && !defined(__CYGWIN__) && \ @@ -335,7 +380,7 @@ diff -urN cmake-2.6.1/Utilities/cmcurl/if2ip.c cmake-2.6.1-haiku/Utilities/cmcur #include diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcurl/select.c --- cmake-2.6.1/Utilities/cmcurl/select.c 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmcurl/select.c 2008-09-12 15:07:34.000000000 +0000 @@ -39,7 +39,7 @@ #error "We can't compile without select() support!" #endif @@ -347,7 +392,7 @@ diff -urN cmake-2.6.1/Utilities/cmcurl/select.c cmake-2.6.1-haiku/Utilities/cmcu #endif diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcurl/setup.h --- cmake-2.6.1/Utilities/cmcurl/setup.h 2008-08-01 15:34:57.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmcurl/setup.h 2008-09-12 15:07:34.000000000 +0000 @@ -264,7 +264,7 @@ #else /* MSDOS */ @@ -359,7 +404,7 @@ diff -urN cmake-2.6.1/Utilities/cmcurl/setup.h cmake-2.6.1-haiku/Utilities/cmcur #define sclose(x) close(x) diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar/libtar.c --- cmake-2.6.1/Utilities/cmtar/libtar.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmtar/libtar.c 2008-09-12 15:07:34.000000000 +0000 @@ -98,8 +98,8 @@ { return -1; @@ -373,7 +418,7 @@ diff -urN cmake-2.6.1/Utilities/cmtar/libtar.c cmake-2.6.1-haiku/Utilities/cmtar return -1; diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c --- cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmxmlrpc/xmlrpc_curl_transport.c 2008-09-12 15:07:34.000000000 +0000 @@ -10,7 +10,7 @@ #include "xmlrpc_config.h" @@ -385,7 +430,7 @@ diff -urN cmake-2.6.1/Utilities/cmxmlrpc/xmlrpc_curl_transport.c cmake-2.6.1-hai #endif diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h --- cmake-2.6.1/Utilities/cmzlib/zconf.h 2008-08-01 15:34:58.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmzlib/zconf.h 2008-09-12 15:07:34.000000000 +0000 @@ -237,7 +237,7 @@ # endif #endif @@ -397,7 +442,7 @@ diff -urN cmake-2.6.1/Utilities/cmzlib/zconf.h cmake-2.6.1-haiku/Utilities/cmzli # define ZEXPORT __declspec(dllexport) diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h --- cmake-2.6.1/Utilities/cmzlib/zutil.h 2008-08-01 15:34:59.000000000 +0000 -+++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/Utilities/cmzlib/zutil.h 2008-09-12 15:07:34.000000000 +0000 @@ -147,7 +147,13 @@ # define OS_CODE 0x0f #endif @@ -415,7 +460,7 @@ diff -urN cmake-2.6.1/Utilities/cmzlib/zutil.h cmake-2.6.1-haiku/Utilities/cmzli diff -urN cmake-2.6.1/bootstrap cmake-2.6.1-haiku/bootstrap --- cmake-2.6.1/bootstrap 2008-08-01 15:34:50.000000000 +0000 -+++ cmake-2.6.1-haiku/bootstrap 2008-09-10 15:34:40.000000000 +0000 ++++ cmake-2.6.1-haiku/bootstrap 2008-09-12 15:07:34.000000000 +0000 @@ -73,6 +73,13 @@ cmake_system_beos=false fi