From 58e493f790e0ed51c83807e14f05e619285fbf07 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 18 Dec 2006 16:04:31 +0000 Subject: [PATCH] update to cmake 2.4.5, quite a few patches vanish since cmake can now build stuff with system libraries, so we no longer have to repair curl/zlib... just xmlrpc which cmake can't find without help. --- devel/cmake/Makefile | 12 +++-- devel/cmake/distinfo | 8 +-- devel/cmake/patches/patch-CMakeLists_txt | 53 +++---------------- .../patches/patch-Modules_FindXMLRPC_cmake | 12 +++++ ...patch-Source_CPack_cmCPackTGZGenerator_cxx | 32 +++-------- ...atch-Source_CTest_cmCTestSubmitHandler_cxx | 12 ----- .../patches/patch-Source_cmCPluginAPI_cxx | 10 ++-- devel/cmake/patches/patch-Source_cmCTest_cxx | 12 ----- ...h-Source_cmCommandArgumentParserHelper_cxx | 12 ++--- .../patches/patch-Source_cmDocumentation_cxx | 8 +-- .../patch-Source_cmGeneratedFileStream_cxx | 40 -------------- .../patch-Source_cmGlobalGenerator_cxx | 8 +-- .../patches/patch-Source_cmIfCommand_cxx | 10 ++-- .../patches/patch-Source_cmListFileLexer_c | 12 ++--- ...h-Source_cmLocalUnixMakefileGenerator3_cxx | 10 ++-- .../cmake/patches/patch-Source_cmMakefile_cxx | 8 +-- .../patches/patch-Source_cmSystemTools_cxx | 48 ++--------------- .../patches/patch-Source_cmXMLParser_cxx | 12 ----- devel/cmake/patches/patch-Source_cmake_cxx | 12 ++--- .../patches/patch-Source_kwsys_ProcessUNIX_c | 30 +++++------ .../patches/patch-Source_kwsys_Registry_cxx | 10 ++-- .../patch-Source_kwsys_SystemTools_cxx | 18 +++---- ...ComplexOneConfig_Executable_CMakeLists_txt | 30 ----------- ...ch-Tests_Complex_Executable_CMakeLists_txt | 30 ----------- .../patches/patch-Utilities_cmtar_libtar_c | 44 --------------- devel/cmake/pkg/PLIST | 20 ++++++- 26 files changed, 133 insertions(+), 380 deletions(-) create mode 100644 devel/cmake/patches/patch-Modules_FindXMLRPC_cmake delete mode 100644 devel/cmake/patches/patch-Source_CTest_cmCTestSubmitHandler_cxx delete mode 100644 devel/cmake/patches/patch-Source_cmCTest_cxx delete mode 100644 devel/cmake/patches/patch-Source_cmGeneratedFileStream_cxx delete mode 100644 devel/cmake/patches/patch-Source_cmXMLParser_cxx delete mode 100644 devel/cmake/patches/patch-Tests_ComplexOneConfig_Executable_CMakeLists_txt delete mode 100644 devel/cmake/patches/patch-Tests_Complex_Executable_CMakeLists_txt delete mode 100644 devel/cmake/patches/patch-Utilities_cmtar_libtar_c diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index f28663bade7..d67fdf58fe4 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2006/07/31 23:55:51 espie Exp $ +# $OpenBSD: Makefile,v 1.3 2006/12/18 16:04:31 espie Exp $ HOMEPAGE= http://www.cmake.org/ CATEGORIES= devel COMMENT= portable build system -DISTNAME= cmake-2.4.3 +DISTNAME= cmake-2.4.5 MASTER_SITES= ${HOMEPAGE}files/v2.4/ MAINTAINER= Marc Espie @@ -18,14 +18,16 @@ CONFIGURE_STYLE= simple CONFIGURE_SCRIPT= ${WRKSRC}/bootstrap SEPARATE_BUILD= simple CONFIGURE_ENV= LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MAKE=make -CONFIGURE_ARGS= --prefix=${LOCALBASE} --docdir=/share/doc/CMake +CONFIGURE_ARGS= --prefix=${LOCALBASE} --docdir=/share/doc/CMake \ + --datadir=/share/CMake --system-libs LIB_DEPENDS= curl::net/curl \ - expat::textproc/expat + expat::textproc/expat \ + xmlrpc,xmlrpc_client,xmlrpc_util,xmlrpc_xmlparse,xmlrpc_xmltok::net/xmlrpc-c -WANTLIB= m curses c stdc++ z +WANTLIB= m curses c stdc++ z crypto pthread ssl # Add these if you need to figure out what's going on. #CONFIGURE_ARGS+= --verbose diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index cd911ee56f4..ddf4f6a726a 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,4 +1,4 @@ -MD5 (cmake-2.4.3.tar.gz) = c9b50c488a24edd5297ffc3230ecd0f2 -RMD160 (cmake-2.4.3.tar.gz) = 6fd64cb5eaf8e4fce28e5c603e15976fbaa1a692 -SHA1 (cmake-2.4.3.tar.gz) = bfd42beb6bed2fd3d1468dcf5851c2e6d60bda7d -SIZE (cmake-2.4.3.tar.gz) = 2983091 +MD5 (cmake-2.4.5.tar.gz) = d10a8df1f936c1efe9106ce046c37264 +RMD160 (cmake-2.4.5.tar.gz) = 36b0896553f8af0b7eb77c0b23fa8e716237d7c0 +SHA1 (cmake-2.4.5.tar.gz) = 87f5d29bd4b3282f3edd1bc1f6210728718afc7d +SIZE (cmake-2.4.5.tar.gz) = 2603795 diff --git a/devel/cmake/patches/patch-CMakeLists_txt b/devel/cmake/patches/patch-CMakeLists_txt index 404eff72835..f264ba2f0b0 100644 --- a/devel/cmake/patches/patch-CMakeLists_txt +++ b/devel/cmake/patches/patch-CMakeLists_txt @@ -1,22 +1,9 @@ -$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- CMakeLists.txt.orig Wed May 17 15:48:52 2006 -+++ CMakeLists.txt Mon Jul 3 14:32:28 2006 -@@ -72,20 +72,29 @@ SUBDIRS(Source/kwsys) - - #----------------------------------------------------------------------------- - # Build zlib library for Curl, CMake, and CTest. --SUBDIRS(Utilities/cmzlib) -+# SUBDIRS(Utilities/cmzlib) - SET(CMAKE_ZLIB_INCLUDES -- "${CMAKE_CURRENT_BINARY_DIR}/Utilities" -+ "/usr/include" - ) --SET(CMAKE_ZLIB_LIBRARIES "cmzlib") -+SET(CMAKE_ZLIB_LIBRARIES "z") - SET(CURL_SPECIAL_LIBZ ${CMAKE_ZLIB_LIBRARIES}) - SET(CURL_SPECIAL_LIBZ_INCLUDES ${CMAKE_ZLIB_INCLUDES}) --SET(CURL_SPECIAL_ZLIB_H "cmzlib/zlib.h") -+SET(CURL_SPECIAL_ZLIB_H "zlib.h") +$OpenBSD: patch-CMakeLists_txt,v 1.2 2006/12/18 16:04:31 espie Exp $ +--- CMakeLists.txt.orig Mon Dec 4 17:03:52 2006 ++++ CMakeLists.txt Sun Dec 17 11:11:52 2006 +@@ -60,6 +60,15 @@ IF(CMAKE_SYSTEM MATCHES "OSF1-V.*") + ENDIF(NOT CMAKE_COMPILER_IS_GNUCXX) + ENDIF(CMAKE_SYSTEM MATCHES "OSF1-V.*") +IF($ENV{LOCALBASE}) +SET(OPENBSD_LOCALBASE $ENV{LOCALBASE}) @@ -28,29 +15,5 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ +LINK_DIRECTORIES("${OPENBSD_LOCALBASE}/lib") + #----------------------------------------------------------------------------- - # Build Curl library for CTest. --SUBDIRS(Utilities/cmcurl) --SET(CMAKE_CURL_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/Utilities") --SET(CMAKE_CURL_LIBRARIES "cmcurl") -+#SUBDIRS(Utilities/cmcurl) -+SET(CMAKE_CURL_INCLUDES "${OPENBSD_LOCALBASE}/include/curl") -+SET(CMAKE_CURL_LIBRARIES "curl") - - #----------------------------------------------------------------------------- - # Build Curl library for CTest. -@@ -95,12 +104,11 @@ SET(CMAKE_TAR_LIBRARIES "cmtar") - - #----------------------------------------------------------------------------- - # Build expat library for CMake and CTest. --SUBDIRS(Utilities/cmexpat) -+#SUBDIRS(Utilities/cmexpat) - SET(CMAKE_EXPAT_INCLUDES -- "${CMAKE_CURRENT_BINARY_DIR}/Utilities" -- "${CMAKE_CURRENT_BINARY_DIR}/Utilities/cmexpat" -+ "${OPENBSD_LOCALBASE}/include" - ) --SET(CMAKE_EXPAT_LIBRARIES "cmexpat") -+SET(CMAKE_EXPAT_LIBRARIES "expat") - - SUBDIRS(Utilities/cmxmlrpc) - SET(CMAKE_XMLRPC_INCLUDES + # Create the kwsys library for CMake. + SET(KWSYS_NAMESPACE cmsys) diff --git a/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake b/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake new file mode 100644 index 00000000000..cdf99474154 --- /dev/null +++ b/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake @@ -0,0 +1,12 @@ +$OpenBSD: patch-Modules_FindXMLRPC_cmake,v 1.1 2006/12/18 16:04:31 espie Exp $ +--- Modules/FindXMLRPC.cmake.orig Sun Dec 17 22:12:54 2006 ++++ Modules/FindXMLRPC.cmake Sun Dec 17 22:13:19 2006 +@@ -96,6 +96,8 @@ IF(XMLRPC_FOUND) + ENDIF("${flag}" MATCHES "^-L") + ENDFOREACH(flag) + ++ # Add system directory, stupid ! ++ SET(XMLRPC_LIBRARY_DIRS ${XMLRPC_LIBRARY_DIRS} "/usr/lib") + # Search for each library needed using the directories given. + FOREACH(name ${XMLRPC_LIBRARY_NAMES}) + # Look for this library. diff --git a/devel/cmake/patches/patch-Source_CPack_cmCPackTGZGenerator_cxx b/devel/cmake/patches/patch-Source_CPack_cmCPackTGZGenerator_cxx index f9e3342d129..9af33498bc7 100644 --- a/devel/cmake/patches/patch-Source_CPack_cmCPackTGZGenerator_cxx +++ b/devel/cmake/patches/patch-Source_CPack_cmCPackTGZGenerator_cxx @@ -1,32 +1,12 @@ -$OpenBSD: patch-Source_CPack_cmCPackTGZGenerator_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/CPack/cmCPackTGZGenerator.cxx.orig Mon Jul 3 13:37:11 2006 -+++ Source/CPack/cmCPackTGZGenerator.cxx Mon Jul 3 13:55:39 2006 -@@ -26,7 +26,7 @@ - #include "cmCPackLog.h" - - #include --#include -+#include - #include - #include // auto_ptr - #include -@@ -94,7 +94,7 @@ int cmCPackTGZ_Data_Open(void *client_da - mydata->ZLibStream.opaque = Z_NULL; - int strategy = Z_DEFAULT_STRATEGY; - if ( deflateInit2(&mydata->ZLibStream, mydata->CompressionLevel, -- Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy) != Z_OK ) -+ Z_DEFLATED, -MAX_WBITS, 8, strategy) != Z_OK ) - { - return -1; - } -@@ -280,8 +280,8 @@ int cmCPackTGZGenerator::GenerateHeader( +$OpenBSD: patch-Source_CPack_cmCPackTGZGenerator_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ +--- Source/CPack/cmCPackTGZGenerator.cxx.orig Mon Dec 4 17:04:00 2006 ++++ Source/CPack/cmCPackTGZGenerator.cxx Sun Dec 17 11:13:44 2006 +@@ -281,7 +281,7 @@ int cmCPackTGZGenerator::GenerateHeader( { const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ char header[11]; - sprintf(header, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], -- Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, OS_CODE); + snprintf(header, sizeof header, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], -+ Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, 3); + Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, 0 /*xflags*/, + 3 /* zlib os code for UNIX, not really used anyway */); os->write(header, 10); - } - return 1; diff --git a/devel/cmake/patches/patch-Source_CTest_cmCTestSubmitHandler_cxx b/devel/cmake/patches/patch-Source_CTest_cmCTestSubmitHandler_cxx deleted file mode 100644 index 6c398718268..00000000000 --- a/devel/cmake/patches/patch-Source_CTest_cmCTestSubmitHandler_cxx +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Source_CTest_cmCTestSubmitHandler_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/CTest/cmCTestSubmitHandler.cxx.orig Mon Jul 3 14:41:07 2006 -+++ Source/CTest/cmCTestSubmitHandler.cxx Mon Jul 3 14:41:15 2006 -@@ -29,7 +29,7 @@ PURPOSE. See the above copyright notice - #include "xmlrpc_client.h" - - // For curl submission --#include "cmcurl/curl/curl.h" -+#include - - #include - diff --git a/devel/cmake/patches/patch-Source_cmCPluginAPI_cxx b/devel/cmake/patches/patch-Source_cmCPluginAPI_cxx index 4d1e4fc2911..4e679ebbd55 100644 --- a/devel/cmake/patches/patch-Source_cmCPluginAPI_cxx +++ b/devel/cmake/patches/patch-Source_cmCPluginAPI_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmCPluginAPI_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/cmCPluginAPI.cxx.orig Tue Jul 18 11:07:26 2006 -+++ Source/cmCPluginAPI.cxx Tue Jul 18 11:08:55 2006 -@@ -409,10 +409,11 @@ char CCONV *cmExpandVariablesInString(vo +$OpenBSD: patch-Source_cmCPluginAPI_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ +--- Source/cmCPluginAPI.cxx.orig Mon Dec 4 17:03:55 2006 ++++ Source/cmCPluginAPI.cxx Sun Dec 17 11:07:03 2006 +@@ -405,10 +405,11 @@ char CCONV *cmExpandVariablesInString(vo mf->ExpandVariablesInString(barf, (escapeQuotes ? true : false), (atOnly ? true : false)); @@ -15,7 +15,7 @@ $OpenBSD: patch-Source_cmCPluginAPI_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp } res[result.size()] = '\0'; return res; -@@ -585,24 +586,27 @@ void CCONV cmSourceFileSetName2(void *ar +@@ -581,24 +582,27 @@ void CCONV cmSourceFileSetName2(void *ar char * CCONV cmGetFilenameWithoutExtension(const char *name) { std::string sres = cmSystemTools::GetFilenameWithoutExtension(name); diff --git a/devel/cmake/patches/patch-Source_cmCTest_cxx b/devel/cmake/patches/patch-Source_cmCTest_cxx deleted file mode 100644 index f6576160807..00000000000 --- a/devel/cmake/patches/patch-Source_cmCTest_cxx +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Source_cmCTest_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/cmCTest.cxx.orig Mon Jul 3 14:38:53 2006 -+++ Source/cmCTest.cxx Mon Jul 3 14:39:08 2006 -@@ -14,7 +14,7 @@ - PURPOSE. See the above copyright notices for more information. - - =========================================================================*/ --#include "cmcurl/curl/curl.h" -+#include - - #include "cmCTest.h" - #include "cmake.h" diff --git a/devel/cmake/patches/patch-Source_cmCommandArgumentParserHelper_cxx b/devel/cmake/patches/patch-Source_cmCommandArgumentParserHelper_cxx index 1ffbacda393..a2d55179110 100644 --- a/devel/cmake/patches/patch-Source_cmCommandArgumentParserHelper_cxx +++ b/devel/cmake/patches/patch-Source_cmCommandArgumentParserHelper_cxx @@ -1,6 +1,6 @@ -$OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/cmCommandArgumentParserHelper.cxx.orig Wed May 17 15:48:52 2006 -+++ Source/cmCommandArgumentParserHelper.cxx Mon Jul 3 12:42:54 2006 +$OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ +--- Source/cmCommandArgumentParserHelper.cxx.orig Mon Dec 4 17:03:54 2006 ++++ Source/cmCommandArgumentParserHelper.cxx Sun Dec 17 11:07:03 2006 @@ -29,12 +29,12 @@ cmCommandArgumentParserHelper::cmCommand this->FileName = 0; @@ -19,8 +19,8 @@ $OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.1.1.1 2006/07/20 09 + strlcpy(this->BSLASHVariable, "\\", sizeof(this->BSLASHVariable)); this->NoEscapeMode = false; - } -@@ -57,8 +57,7 @@ char* cmCommandArgumentParserHelper::Add + this->ReplaceAtSyntax = false; +@@ -58,8 +58,7 @@ char* cmCommandArgumentParserHelper::Add { return this->EmptyVariable; } @@ -30,7 +30,7 @@ $OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.1.1.1 2006/07/20 09 this->Variables.push_back(stVal); return stVal; } -@@ -127,8 +126,8 @@ char* cmCommandArgumentParserHelper::Com +@@ -143,8 +142,8 @@ char* cmCommandArgumentParserHelper::Com } size_t len = strlen(in1) + strlen(in2) + 1; char* out = new char [ len ]; diff --git a/devel/cmake/patches/patch-Source_cmDocumentation_cxx b/devel/cmake/patches/patch-Source_cmDocumentation_cxx index 1b8369cba0c..ff4f581e7eb 100644 --- a/devel/cmake/patches/patch-Source_cmDocumentation_cxx +++ b/devel/cmake/patches/patch-Source_cmDocumentation_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmDocumentation_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/cmDocumentation.cxx.orig Wed May 17 15:48:53 2006 -+++ Source/cmDocumentation.cxx Mon Jul 3 15:35:55 2006 -@@ -315,11 +315,11 @@ bool cmDocumentation::CreateSingleModule +$OpenBSD: patch-Source_cmDocumentation_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ +--- Source/cmDocumentation.cxx.orig Mon Dec 4 17:03:55 2006 ++++ Source/cmDocumentation.cxx Sun Dec 17 11:07:03 2006 +@@ -336,11 +336,11 @@ bool cmDocumentation::CreateSingleModule { return false; } diff --git a/devel/cmake/patches/patch-Source_cmGeneratedFileStream_cxx b/devel/cmake/patches/patch-Source_cmGeneratedFileStream_cxx deleted file mode 100644 index b8eedb7f624..00000000000 --- a/devel/cmake/patches/patch-Source_cmGeneratedFileStream_cxx +++ /dev/null @@ -1,40 +0,0 @@ -$OpenBSD: patch-Source_cmGeneratedFileStream_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/cmGeneratedFileStream.cxx.orig Mon Jul 3 13:15:38 2006 -+++ Source/cmGeneratedFileStream.cxx Mon Jul 3 13:16:03 2006 -@@ -27,7 +27,7 @@ - #endif - - #if defined(CMAKE_BUILD_WITH_CMAKE) --# include -+# include - #endif - - //---------------------------------------------------------------------------- -@@ -213,7 +213,7 @@ void cmGeneratedFileStreamBase::Close() - int cmGeneratedFileStreamBase::CompressFile(const char* oldname, - const char* newname) - { -- gzFile gf = cm_zlib_gzopen(newname, "w"); -+ gzFile gf = gzopen(newname, "w"); - if ( !gf ) - { - return 0; -@@ -228,15 +228,15 @@ int cmGeneratedFileStreamBase::CompressF - char buffer[BUFFER_SIZE]; - while ( (res = fread(buffer, 1, BUFFER_SIZE, ifs)) > 0 ) - { -- if ( !cm_zlib_gzwrite(gf, buffer, res) ) -+ if ( !gzwrite(gf, buffer, res) ) - { - fclose(ifs); -- cm_zlib_gzclose(gf); -+ gzclose(gf); - return 0; - } - } - fclose(ifs); -- cm_zlib_gzclose(gf); -+ gzclose(gf); - return 1; - } - #else diff --git a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx index 8b5e192c01d..ac3dc956779 100644 --- a/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx +++ b/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ ---- Source/cmGlobalGenerator.cxx.orig Mon Jul 31 16:49:57 2006 -+++ Source/cmGlobalGenerator.cxx Tue Aug 1 00:32:19 2006 -@@ -614,7 +614,7 @@ void cmGlobalGenerator::Configure() +$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.3 2006/12/18 16:04:31 espie Exp $ +--- Source/cmGlobalGenerator.cxx.orig Mon Dec 4 17:03:56 2006 ++++ Source/cmGlobalGenerator.cxx Sun Dec 17 11:07:03 2006 +@@ -644,7 +644,7 @@ void cmGlobalGenerator::Configure() // update the cache entry for the number of local generators, this is used // for progress char num[100]; diff --git a/devel/cmake/patches/patch-Source_cmIfCommand_cxx b/devel/cmake/patches/patch-Source_cmIfCommand_cxx index d007e47901c..c4ab4199ea4 100644 --- a/devel/cmake/patches/patch-Source_cmIfCommand_cxx +++ b/devel/cmake/patches/patch-Source_cmIfCommand_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmIfCommand_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ ---- Source/cmIfCommand.cxx.orig Mon Jul 31 16:49:57 2006 -+++ Source/cmIfCommand.cxx Tue Aug 1 00:32:19 2006 -@@ -159,8 +159,7 @@ bool cmIfCommand::IsTrue(const std::vect +$OpenBSD: patch-Source_cmIfCommand_cxx,v 1.3 2006/12/18 16:04:31 espie Exp $ +--- Source/cmIfCommand.cxx.orig Mon Dec 4 17:03:57 2006 ++++ Source/cmIfCommand.cxx Sun Dec 17 11:07:03 2006 +@@ -206,8 +206,7 @@ bool cmIfCommand::IsTrue(const std::vect const char *def; const char *def2; const char* msg = "Unknown arguments specified"; @@ -11,7 +11,7 @@ $OpenBSD: patch-Source_cmIfCommand_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ // handle empty invocation if (args.size() < 1) -@@ -313,8 +312,7 @@ bool cmIfCommand::IsTrue(const std::vect +@@ -360,8 +359,7 @@ bool cmIfCommand::IsTrue(const std::vect cmOStringStream error; error << "Regular expression \"" << rex << "\" cannot compile"; delete [] *errorString; diff --git a/devel/cmake/patches/patch-Source_cmListFileLexer_c b/devel/cmake/patches/patch-Source_cmListFileLexer_c index 284417b0529..5e3ea16812c 100644 --- a/devel/cmake/patches/patch-Source_cmListFileLexer_c +++ b/devel/cmake/patches/patch-Source_cmListFileLexer_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmListFileLexer_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/cmListFileLexer.c.orig Tue Jul 18 10:44:13 2006 -+++ Source/cmListFileLexer.c Tue Jul 18 10:46:38 2006 -@@ -2109,7 +2109,7 @@ static void cmListFileLexerSetToken(cmLi +$OpenBSD: patch-Source_cmListFileLexer_c,v 1.2 2006/12/18 16:04:31 espie Exp $ +--- Source/cmListFileLexer.c.orig Mon Dec 4 17:03:58 2006 ++++ Source/cmListFileLexer.c Sun Dec 17 11:07:03 2006 +@@ -2088,7 +2088,7 @@ static void cmListFileLexerSetToken(cmLi { if(text && length < lexer->size) { @@ -10,7 +10,7 @@ $OpenBSD: patch-Source_cmListFileLexer_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp lexer->token.length = length; return; } -@@ -2142,7 +2142,7 @@ static void cmListFileLexerAppend(cmList +@@ -2121,7 +2121,7 @@ static void cmListFileLexerAppend(cmList newSize = lexer->token.length + length + 1; if(lexer->token.text && newSize <= lexer->size) { @@ -19,7 +19,7 @@ $OpenBSD: patch-Source_cmListFileLexer_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp lexer->token.length += length; return; } -@@ -2260,11 +2260,11 @@ int cmListFileLexer_SetString(cmListFile +@@ -2239,11 +2239,11 @@ int cmListFileLexer_SetString(cmListFile cmListFileLexerDestroy(lexer); if(text) { diff --git a/devel/cmake/patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx b/devel/cmake/patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx index a74ce66a05d..6ffa8e7b83b 100644 --- a/devel/cmake/patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx +++ b/devel/cmake/patches/patch-Source_cmLocalUnixMakefileGenerator3_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmLocalUnixMakefileGenerator3_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ ---- Source/cmLocalUnixMakefileGenerator3.cxx.orig Mon Jul 31 16:49:57 2006 -+++ Source/cmLocalUnixMakefileGenerator3.cxx Tue Aug 1 00:33:42 2006 -@@ -1105,7 +1105,7 @@ cmLocalUnixMakefileGenerator3 +$OpenBSD: patch-Source_cmLocalUnixMakefileGenerator3_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ +--- Source/cmLocalUnixMakefileGenerator3.cxx.orig Mon Dec 4 17:03:58 2006 ++++ Source/cmLocalUnixMakefileGenerator3.cxx Sun Dec 17 11:07:03 2006 +@@ -1140,7 +1140,7 @@ cmLocalUnixMakefileGenerator3 while(this->ShortMakeVariableMap.count(ret) && ni < 1000) { ++ni; @@ -10,7 +10,7 @@ $OpenBSD: patch-Source_cmLocalUnixMakefileGenerator3_cxx,v 1.2 2006/07/31 23:55: ret = unmodified + buffer; } this->ShortMakeVariableMap[ret] = "1"; -@@ -1133,12 +1133,12 @@ cmLocalUnixMakefileGenerator3 +@@ -1168,12 +1168,12 @@ cmLocalUnixMakefileGenerator3 } char buffer[5]; int ni = 0; diff --git a/devel/cmake/patches/patch-Source_cmMakefile_cxx b/devel/cmake/patches/patch-Source_cmMakefile_cxx index 8635e97a9e8..73037d994bb 100644 --- a/devel/cmake/patches/patch-Source_cmMakefile_cxx +++ b/devel/cmake/patches/patch-Source_cmMakefile_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmMakefile_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ ---- Source/cmMakefile.cxx.orig Mon Jul 31 16:49:57 2006 -+++ Source/cmMakefile.cxx Tue Aug 1 00:32:19 2006 -@@ -1908,9 +1908,9 @@ void cmMakefile::AddDefaultDefinitions() +$OpenBSD: patch-Source_cmMakefile_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ +--- Source/cmMakefile.cxx.orig Mon Dec 4 17:03:58 2006 ++++ Source/cmMakefile.cxx Sun Dec 17 11:07:03 2006 +@@ -1983,9 +1983,9 @@ void cmMakefile::AddDefaultDefinitions() #endif char temp[1024]; diff --git a/devel/cmake/patches/patch-Source_cmSystemTools_cxx b/devel/cmake/patches/patch-Source_cmSystemTools_cxx index 5e2c78095fd..d0137da2fe1 100644 --- a/devel/cmake/patches/patch-Source_cmSystemTools_cxx +++ b/devel/cmake/patches/patch-Source_cmSystemTools_cxx @@ -1,15 +1,6 @@ -$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ ---- Source/cmSystemTools.cxx.orig Mon Jul 31 16:49:57 2006 -+++ Source/cmSystemTools.cxx Tue Aug 1 00:34:13 2006 -@@ -48,7 +48,7 @@ - # include - # include // auto_ptr - # include --# include -+# include - #endif - - #if defined(__sgi) && !defined(__GNUC__) +$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ +--- Source/cmSystemTools.cxx.orig Mon Dec 4 17:04:00 2006 ++++ Source/cmSystemTools.cxx Sun Dec 17 11:07:03 2006 @@ -1274,12 +1274,18 @@ public: } }; @@ -40,39 +31,6 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ //sprintf(buffer, "&#x%0x;", (unsigned int)ch); result.insert(result.end(), buffer, buffer+strlen(buffer)); } -@@ -1439,7 +1445,7 @@ int cmSystemToolsGZStructOpen(void* call - } - #endif - -- gzf->GZFile = cm_zlib_gzdopen(fd, gzoflags); -+ gzf->GZFile = gzdopen(fd, gzoflags); - if (!gzf->GZFile) - { - errno = ENOMEM; -@@ -1452,20 +1458,20 @@ int cmSystemToolsGZStructOpen(void* call - int cmSystemToolsGZStructClose(void* call_data) - { - cmSystemToolsGZStruct* gzf = static_cast(call_data); -- return cm_zlib_gzclose(gzf->GZFile); -+ return gzclose(gzf->GZFile); - } - - ssize_t cmSystemToolsGZStructRead(void* call_data, void* buf, size_t count) - { - cmSystemToolsGZStruct* gzf = static_cast(call_data); -- return cm_zlib_gzread(gzf->GZFile, buf, count); -+ return gzread(gzf->GZFile, buf, count); - } - - ssize_t cmSystemToolsGZStructWrite(void* call_data, const void* buf, - size_t count) - { - cmSystemToolsGZStruct* gzf = static_cast(call_data); -- return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count); -+ return gzwrite(gzf->GZFile, (void*)buf, count); - } - - #endif @@ -1489,9 +1495,8 @@ bool cmSystemTools::CreateTar(const char }; diff --git a/devel/cmake/patches/patch-Source_cmXMLParser_cxx b/devel/cmake/patches/patch-Source_cmXMLParser_cxx deleted file mode 100644 index 715a5b650bf..00000000000 --- a/devel/cmake/patches/patch-Source_cmXMLParser_cxx +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-Source_cmXMLParser_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/cmXMLParser.cxx.orig Mon Jul 3 14:37:10 2006 -+++ Source/cmXMLParser.cxx Mon Jul 3 14:37:18 2006 -@@ -16,7 +16,7 @@ - =========================================================================*/ - #include "cmXMLParser.h" - --#include -+#include - #include - - //---------------------------------------------------------------------------- diff --git a/devel/cmake/patches/patch-Source_cmake_cxx b/devel/cmake/patches/patch-Source_cmake_cxx index ae3006a491f..94be96af1e1 100644 --- a/devel/cmake/patches/patch-Source_cmake_cxx +++ b/devel/cmake/patches/patch-Source_cmake_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_cmake_cxx,v 1.2 2006/07/31 23:55:52 espie Exp $ ---- Source/cmake.cxx.orig Mon Jul 31 16:49:56 2006 -+++ Source/cmake.cxx Tue Aug 1 00:32:19 2006 -@@ -1455,7 +1455,7 @@ int cmake::Configure() +$OpenBSD: patch-Source_cmake_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ +--- Source/cmake.cxx.orig Mon Dec 4 17:03:54 2006 ++++ Source/cmake.cxx Sun Dec 17 11:07:03 2006 +@@ -1487,7 +1487,7 @@ int cmake::Configure() if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY")) { char ver[256]; @@ -10,7 +10,7 @@ $OpenBSD: patch-Source_cmake_cxx,v 1.2 2006/07/31 23:55:52 espie Exp $ cmMakefile::GetMinorVersion()); this->CacheManager->AddCacheEntry ("CMAKE_BACKWARDS_COMPATIBILITY",ver, -@@ -1821,7 +1821,7 @@ int cmake::DumpDocumentationToFile(std:: +@@ -1852,7 +1852,7 @@ int cmake::DumpDocumentationToFile(std:: const char *terse; const char *full; char tmp[1024]; @@ -19,7 +19,7 @@ $OpenBSD: patch-Source_cmake_cxx,v 1.2 2006/07/31 23:55:52 espie Exp $ cmake::GetMinorVersion(), cmVersion::GetReleaseVersion().c_str()); f << "\n"; f << "

Documentation for commands of CMake " << tmp << "

\n"; -@@ -1928,7 +1928,7 @@ int cmake::LoadCache() +@@ -1959,7 +1959,7 @@ int cmake::LoadCache() if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY")) { char ver[256]; diff --git a/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX_c b/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX_c index 6e63ad29814..07916bd482d 100644 --- a/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX_c +++ b/devel/cmake/patches/patch-Source_kwsys_ProcessUNIX_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ ---- Source/kwsys/ProcessUNIX.c.orig Mon Jul 31 16:49:59 2006 -+++ Source/kwsys/ProcessUNIX.c Tue Aug 1 01:03:42 2006 -@@ -430,12 +430,13 @@ int kwsysProcess_SetWorkingDirectory(kws +$OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $ +--- Source/kwsys/ProcessUNIX.c.orig Mon Dec 4 17:04:05 2006 ++++ Source/kwsys/ProcessUNIX.c Sun Dec 17 11:07:03 2006 +@@ -457,12 +457,13 @@ int kwsysProcess_SetWorkingDirectory(kws } if(dir) { @@ -17,7 +17,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ } return 1; } -@@ -462,12 +463,13 @@ int kwsysProcess_SetPipeFile(kwsysProces +@@ -489,12 +490,13 @@ int kwsysProcess_SetPipeFile(kwsysProces } if(file) { @@ -32,8 +32,8 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ + strlcpy(*pfile, file, sz); } - /* If we are redirecting the pipe, do not share it. */ -@@ -600,7 +602,7 @@ void kwsysProcess_Execute(kwsysProcess* + /* If we are redirecting the pipe, do not share it or use a native +@@ -670,7 +672,7 @@ void kwsysProcess_Execute(kwsysProcess* /* Initialize the control structure for a new process. */ if(!kwsysProcessInitialize(cp)) { @@ -42,7 +42,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ cp->State = kwsysProcess_State_Error; return; } -@@ -938,7 +940,7 @@ int kwsysProcess_WaitForData(kwsysProces +@@ -1021,7 +1023,7 @@ int kwsysProcess_WaitForData(kwsysProces { /* Select returned an error. Leave the error description in the pipe buffer. */ @@ -51,7 +51,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ /* Kill the children now. */ kwsysProcess_Kill(cp); -@@ -1063,7 +1065,7 @@ int kwsysProcess_WaitForExit(kwsysProces +@@ -1146,7 +1148,7 @@ int kwsysProcess_WaitForExit(kwsysProces else { /* Error getting the child return code. */ @@ -60,7 +60,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ cp->State = kwsysProcess_State_Error; } -@@ -1139,7 +1141,7 @@ static int kwsysProcessInitialize(kwsysP +@@ -1222,7 +1224,7 @@ static int kwsysProcessInitialize(kwsysP cp->ExitCode = 1; cp->ExitValue = 1; cp->ErrorMessage[0] = 0; @@ -69,7 +69,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ if(cp->ForkPIDs) { -@@ -1482,7 +1484,7 @@ static void kwsysProcessDestroy(kwsysPro +@@ -1589,7 +1591,7 @@ static void kwsysProcessDestroy(kwsysPro else if(result < 0 && cp->State != kwsysProcess_State_Error) { /* Unexpected error. Report the first time this happens. */ @@ -78,7 +78,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ cp->State = kwsysProcess_State_Error; } } -@@ -1657,7 +1659,7 @@ static kwsysProcessTime kwsysProcessTime +@@ -1784,7 +1786,7 @@ static kwsysProcessTime kwsysProcessTime /*--------------------------------------------------------------------------*/ #define KWSYSPE_CASE(type, str) \ cp->ExitException = kwsysProcess_Exception_##type; \ @@ -87,7 +87,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ static void kwsysProcessSetExitException(kwsysProcess* cp, int sig) { switch (sig) -@@ -1776,7 +1778,8 @@ static void kwsysProcessSetExitException +@@ -1903,7 +1905,8 @@ static void kwsysProcessSetExitException #endif default: cp->ExitException = kwsysProcess_Exception_Other; @@ -97,7 +97,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ break; } } -@@ -1789,8 +1792,8 @@ static void kwsysProcessSetExitException +@@ -1916,8 +1919,8 @@ static void kwsysProcessSetExitException static void kwsysProcessChildErrorExit(int errorPipe) { /* Construct the error message. */ @@ -108,7 +108,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.2 2006/07/31 23:55:52 espie Exp $ /* Report the error to the parent through the special pipe. */ write(errorPipe, buffer, strlen(buffer)); -@@ -2018,7 +2021,7 @@ static void kwsysProcessKill(pid_t proce +@@ -2145,7 +2148,7 @@ static void kwsysProcessKill(pid_t proce if(sscanf(d->d_name, "%d", &pid) == 1 && pid != 0) { struct stat finfo; diff --git a/devel/cmake/patches/patch-Source_kwsys_Registry_cxx b/devel/cmake/patches/patch-Source_kwsys_Registry_cxx index cb0ae3b4906..5f9ca421fe9 100644 --- a/devel/cmake/patches/patch-Source_kwsys_Registry_cxx +++ b/devel/cmake/patches/patch-Source_kwsys_Registry_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_kwsys_Registry_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Source/kwsys/Registry.cxx.orig Tue Jul 18 10:50:35 2006 -+++ Source/kwsys/Registry.cxx Tue Jul 18 10:50:55 2006 -@@ -754,7 +754,7 @@ kwsys_stl::string RegistryHelper::Encode +$OpenBSD: patch-Source_kwsys_Registry_cxx,v 1.2 2006/12/18 16:04:32 espie Exp $ +--- Source/kwsys/Registry.cxx.orig Mon Dec 4 17:04:05 2006 ++++ Source/kwsys/Registry.cxx Sun Dec 17 11:07:03 2006 +@@ -756,7 +756,7 @@ kwsys_stl::string RegistryHelper::Encode { case '%': case '=': case '\n': case '\r': case '\t': char buffer[4]; @@ -10,7 +10,7 @@ $OpenBSD: patch-Source_kwsys_Registry_cxx,v 1.1.1.1 2006/07/20 09:23:13 espie Ex ostr << buffer; break; default: -@@ -775,7 +775,7 @@ kwsys_stl::string RegistryHelper::Encode +@@ -777,7 +777,7 @@ kwsys_stl::string RegistryHelper::Encode { case '%': case '=': case '\n': case '\r': case '\t': char buffer[4]; diff --git a/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx b/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx index de85e8fa843..77e2fcae07d 100644 --- a/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx +++ b/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx @@ -1,7 +1,7 @@ -$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.2 2006/07/31 23:55:52 espie Exp $ ---- Source/kwsys/SystemTools.cxx.orig Mon Jul 31 16:49:59 2006 -+++ Source/kwsys/SystemTools.cxx Tue Aug 1 00:32:20 2006 -@@ -919,13 +919,14 @@ char* SystemTools::AppendStrings(const c +$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ +--- Source/kwsys/SystemTools.cxx.orig Mon Dec 4 17:04:05 2006 ++++ Source/kwsys/SystemTools.cxx Sun Dec 17 11:07:03 2006 +@@ -923,13 +923,14 @@ char* SystemTools::AppendStrings(const c return SystemTools::DuplicateString(str1); } size_t len1 = strlen(str1); @@ -19,7 +19,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.2 2006/07/31 23:55:52 espie Exp return newstr; } -@@ -946,14 +947,15 @@ char* SystemTools::AppendStrings( +@@ -950,14 +951,15 @@ char* SystemTools::AppendStrings( } size_t len1 = strlen(str1), len2 = strlen(str2); @@ -39,7 +39,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.2 2006/07/31 23:55:52 espie Exp return newstr; } -@@ -1121,8 +1123,10 @@ char* SystemTools::DuplicateString(const +@@ -1125,8 +1127,10 @@ char* SystemTools::DuplicateString(const { if (str) { @@ -52,7 +52,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.2 2006/07/31 23:55:52 espie Exp } return NULL; } -@@ -1783,7 +1787,7 @@ bool SystemTools::ConvertDateMacroString +@@ -1801,7 +1805,7 @@ bool SystemTools::ConvertDateMacroString static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; char buffer[12]; @@ -61,7 +61,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.2 2006/07/31 23:55:52 espie Exp buffer[3] = 0; char *ptr = strstr(month_names, buffer); -@@ -1834,7 +1838,7 @@ bool SystemTools::ConvertTimeStampMacroS +@@ -1852,7 +1856,7 @@ bool SystemTools::ConvertTimeStampMacroS static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; char buffer[27]; @@ -70,7 +70,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.2 2006/07/31 23:55:52 espie Exp buffer[7] = 0; char *ptr = strstr(month_names, buffer + 4); -@@ -3245,12 +3249,12 @@ bool SystemTools::GetShortPath(const cha +@@ -3291,12 +3295,12 @@ bool SystemTools::GetShortPath(const cha // if the path passed in has quotes around it, first remove the quotes if (path[0] == '"' && path[strlen(path)-1] == '"') { diff --git a/devel/cmake/patches/patch-Tests_ComplexOneConfig_Executable_CMakeLists_txt b/devel/cmake/patches/patch-Tests_ComplexOneConfig_Executable_CMakeLists_txt deleted file mode 100644 index ef2362fd295..00000000000 --- a/devel/cmake/patches/patch-Tests_ComplexOneConfig_Executable_CMakeLists_txt +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-Tests_ComplexOneConfig_Executable_CMakeLists_txt,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Tests/ComplexOneConfig/Executable/CMakeLists.txt.orig Wed May 17 15:48:55 2006 -+++ Tests/ComplexOneConfig/Executable/CMakeLists.txt Thu Jul 20 10:46:12 2006 -@@ -10,9 +10,15 @@ IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) - # Link to CMake lib - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys) -- LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat) -- LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) -+ IF($ENV{LOCALBASE}) -+ SET(OPENBSD_LOCALBASE $ENV{LOCALBASE}) -+ ELSE($ENV{LOCALBASE}) -+ SET(OPENBSD_LOCALBASE /usr/local) -+ ENDIF($ENV{LOCALBASE}) -+ -+ # to find expat and curl -+ LINK_DIRECTORIES("${OPENBSD_LOCALBASE}/lib") - ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) - - # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to -@@ -24,7 +30,7 @@ ADD_EXECUTABLE(complex complex testcflag - # Sub1/NameConflictTest.c Sub2/NameConflictTest.c) - ADD_EXECUTABLE(complex.file complex.file.cxx) - IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) -- TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) -+ TARGET_LINK_LIBRARIES(complex CMakeLib cmsys expat z cmtar) - ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) - - IF (UNIX) diff --git a/devel/cmake/patches/patch-Tests_Complex_Executable_CMakeLists_txt b/devel/cmake/patches/patch-Tests_Complex_Executable_CMakeLists_txt deleted file mode 100644 index 6ad8a62c68e..00000000000 --- a/devel/cmake/patches/patch-Tests_Complex_Executable_CMakeLists_txt +++ /dev/null @@ -1,30 +0,0 @@ -$OpenBSD: patch-Tests_Complex_Executable_CMakeLists_txt,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ ---- Tests/Complex/Executable/CMakeLists.txt.orig Wed May 17 15:48:55 2006 -+++ Tests/Complex/Executable/CMakeLists.txt Thu Jul 20 10:46:11 2006 -@@ -10,9 +10,15 @@ IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) - # Link to CMake lib - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Source/kwsys) -- LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmexpat) -- LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmzlib) - LINK_DIRECTORIES(${Complex_BINARY_DIR}/../../Utilities/cmtar) -+ IF($ENV{LOCALBASE}) -+ SET(OPENBSD_LOCALBASE $ENV{LOCALBASE}) -+ ELSE($ENV{LOCALBASE}) -+ SET(OPENBSD_LOCALBASE /usr/local) -+ ENDIF($ENV{LOCALBASE}) -+ -+ # to find expat and curl -+ LINK_DIRECTORIES("${OPENBSD_LOCALBASE}/lib") - ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) - - # Use LINK_LIBRARIES instead of TARGET_LINK_LIBRARIES to -@@ -24,7 +30,7 @@ ADD_EXECUTABLE(complex complex testcflag - # Sub1/NameConflictTest.c Sub2/NameConflictTest.c) - ADD_EXECUTABLE(complex.file complex.file.cxx) - IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) -- TARGET_LINK_LIBRARIES(complex CMakeLib cmsys cmexpat cmzlib cmtar) -+ TARGET_LINK_LIBRARIES(complex CMakeLib cmsys expat z cmtar) - ENDIF(NOT CMAKE_TEST_DIFFERENT_GENERATOR) - - IF (UNIX) diff --git a/devel/cmake/patches/patch-Utilities_cmtar_libtar_c b/devel/cmake/patches/patch-Utilities_cmtar_libtar_c deleted file mode 100644 index 1df32bee396..00000000000 --- a/devel/cmake/patches/patch-Utilities_cmtar_libtar_c +++ /dev/null @@ -1,44 +0,0 @@ -$OpenBSD: patch-Utilities_cmtar_libtar_c,v 1.2 2006/07/31 23:55:52 espie Exp $ ---- Utilities/cmtar/libtar.c.orig Mon Jul 31 16:50:01 2006 -+++ Utilities/cmtar/libtar.c Tue Aug 1 00:37:04 2006 -@@ -44,7 +44,7 @@ - # define cm_zlib_gzwrite gzwrite - - #else --# include -+# include - #endif - #endif - -@@ -117,7 +117,7 @@ static int libtar_gzopen(void* call_data - } - #endif - -- gzf->GZFile = cm_zlib_gzdopen(fd, gzoflags); -+ gzf->GZFile = gzdopen(fd, gzoflags); - if (!gzf->GZFile) - { - errno = ENOMEM; -@@ -130,19 +130,19 @@ static int libtar_gzopen(void* call_data - static int libtar_gzclose(void* call_data) - { - struct gzStruct* gzf = (struct gzStruct*)call_data; -- return cm_zlib_gzclose(gzf->GZFile); -+ return gzclose(gzf->GZFile); - } - - static ssize_t libtar_gzread(void* call_data, void* buf, size_t count) - { - struct gzStruct* gzf = (struct gzStruct*)call_data; -- return cm_zlib_gzread(gzf->GZFile, buf, count); -+ return gzread(gzf->GZFile, buf, count); - } - - static ssize_t libtar_gzwrite(void* call_data, const void* buf, size_t count) - { - struct gzStruct* gzf = (struct gzStruct*)call_data; -- return cm_zlib_gzwrite(gzf->GZFile, (void*)buf, count); -+ return gzwrite(gzf->GZFile, (void*)buf, count); - } - - tartype_t gztype = { diff --git a/devel/cmake/pkg/PLIST b/devel/cmake/pkg/PLIST index 3244b5f525a..3af80342914 100644 --- a/devel/cmake/pkg/PLIST +++ b/devel/cmake/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.2 2006/07/31 23:55:52 espie Exp $ +@comment $OpenBSD: PLIST,v 1.3 2006/12/18 16:04:32 espie Exp $ bin/ccmake bin/cmake bin/cpack @@ -20,6 +20,7 @@ share/CMake/Modules/CMakeCXXCompiler.cmake.in share/CMake/Modules/CMakeCXXInformation.cmake share/CMake/Modules/CMakeCommonLanguageInclude.cmake share/CMake/Modules/CMakeConfigurableFile.in +share/CMake/Modules/CMakeDependentOption.cmake share/CMake/Modules/CMakeDetermineCCompiler.cmake share/CMake/Modules/CMakeDetermineCXXCompiler.cmake share/CMake/Modules/CMakeDetermineFortranCompiler.cmake @@ -53,6 +54,8 @@ share/CMake/Modules/CMakeTestJavaCompiler.cmake share/CMake/Modules/CMakeTestNMakeCLVersion.c share/CMake/Modules/CMakeTestRCCompiler.cmake share/CMake/Modules/CMakeUnixFindMake.cmake +share/CMake/Modules/CMakeVCManifest.cmake +share/CMake/Modules/CMakeVCManifestExe.cmake share/CMake/Modules/CMakeVS6BackwardCompatibility.cmake share/CMake/Modules/CMakeVS6FindMake.cmake share/CMake/Modules/CMakeVS71FindMake.cmake @@ -65,8 +68,12 @@ share/CMake/Modules/CPack.STGZ_Header.sh.in share/CMake/Modules/CPack.cmake share/CMake/Modules/CTest.cmake share/CMake/Modules/CTestTargets.cmake +share/CMake/Modules/CheckCCompilerFlag.cmake share/CMake/Modules/CheckCSourceCompiles.cmake +share/CMake/Modules/CheckCSourceRuns.cmake +share/CMake/Modules/CheckCXXCompilerFlag.cmake share/CMake/Modules/CheckCXXSourceCompiles.cmake +share/CMake/Modules/CheckCXXSourceRuns.cmake share/CMake/Modules/CheckForPthreads.c share/CMake/Modules/CheckFunctionExists.c share/CMake/Modules/CheckFunctionExists.cmake @@ -87,30 +94,38 @@ share/CMake/Modules/Dart.cmake share/CMake/Modules/DartConfiguration.tcl.in share/CMake/Modules/Documentation.cmake share/CMake/Modules/DummyCXXFile.cxx +share/CMake/Modules/FindASPELL.cmake share/CMake/Modules/FindAVIFile.cmake +share/CMake/Modules/FindBZip2.cmake share/CMake/Modules/FindBoost.cmake share/CMake/Modules/FindCABLE.cmake +share/CMake/Modules/FindCURL.cmake share/CMake/Modules/FindCurses.cmake share/CMake/Modules/FindCygwin.cmake share/CMake/Modules/FindDCMTK.cmake share/CMake/Modules/FindDart.cmake share/CMake/Modules/FindDoxygen.cmake +share/CMake/Modules/FindEXPAT.cmake share/CMake/Modules/FindFLTK.cmake share/CMake/Modules/FindGCCXML.cmake share/CMake/Modules/FindGLU.cmake share/CMake/Modules/FindGLUT.cmake share/CMake/Modules/FindGTK.cmake share/CMake/Modules/FindGnuplot.cmake +share/CMake/Modules/FindHSPELL.cmake share/CMake/Modules/FindHTMLHelp.cmake share/CMake/Modules/FindITK.cmake share/CMake/Modules/FindImageMagick.cmake share/CMake/Modules/FindJNI.cmake share/CMake/Modules/FindJPEG.cmake +share/CMake/Modules/FindJasper.cmake share/CMake/Modules/FindJava.cmake share/CMake/Modules/FindKDE.cmake share/CMake/Modules/FindKDE3.cmake share/CMake/Modules/FindKDE4.cmake share/CMake/Modules/FindLATEX.cmake +share/CMake/Modules/FindLibXml2.cmake +share/CMake/Modules/FindLibXslt.cmake share/CMake/Modules/FindMFC.cmake share/CMake/Modules/FindMPEG.cmake share/CMake/Modules/FindMPEG2.cmake @@ -119,6 +134,7 @@ share/CMake/Modules/FindMatlab.cmake share/CMake/Modules/FindMotif.cmake share/CMake/Modules/FindOpenAL.cmake share/CMake/Modules/FindOpenGL.cmake +share/CMake/Modules/FindOpenSSL.cmake share/CMake/Modules/FindPHP4.cmake share/CMake/Modules/FindPNG.cmake share/CMake/Modules/FindPerl.cmake @@ -139,6 +155,7 @@ share/CMake/Modules/FindSDL_sound.cmake share/CMake/Modules/FindSDL_ttf.cmake share/CMake/Modules/FindSWIG.cmake share/CMake/Modules/FindSelfPackers.cmake +share/CMake/Modules/FindSubversion.cmake share/CMake/Modules/FindTCL.cmake share/CMake/Modules/FindTIFF.cmake share/CMake/Modules/FindTclsh.cmake @@ -148,6 +165,7 @@ share/CMake/Modules/FindVTK.cmake share/CMake/Modules/FindWget.cmake share/CMake/Modules/FindWish.cmake share/CMake/Modules/FindX11.cmake +share/CMake/Modules/FindXMLRPC.cmake share/CMake/Modules/FindZLIB.cmake share/CMake/Modules/FindwxWidgets.cmake share/CMake/Modules/FindwxWindows.cmake