cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

find qmake4, not qmake...

Browse Source 
regen other patches with new diff.
This commit is contained in:
espie 2007-03-20 11:23:10 +00:00
parent 487295d6ff
commit 8063f8ee22
19 changed files with 117 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devel/cmake/patches/patch-Modules_FindQt4_cmake Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.1 2007/03/20 11:23:10 espie Exp $
--- Modules/FindQt4.cmake.orig Tue Mar 20 12:20:58 2007
+++ Modules/FindQt4.cmake Tue Mar 20 12:21:06 2007
@@ -174,7 +174,7 @@ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
SET( QT_DEFINITIONS "")
# check for qmake
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake qmake-qt4 PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
$ENV{QTDIR}/bin

8
devel/cmake/patches/patch-Source_CPack_cmCPackTGZGenerator_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_CPack_cmCPackTGZGenerator_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ $OpenBSD: patch-Source_CPack_cmCPackTGZGenerator_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/CPack/cmCPackTGZGenerator.cxx.orig Mon Dec 4 17:04:00 2006 --- Source/CPack/cmCPackTGZGenerator.cxx.orig Wed Jan 10 18:59:13 2007
+++ Source/CPack/cmCPackTGZGenerator.cxx Sun Dec 17 11:13:44 2006 +++ Source/CPack/cmCPackTGZGenerator.cxx Sun Mar 18 13:52:02 2007
@@ -281,7 +281,7 @@ int cmCPackTGZGenerator::GenerateHeader( @@ -281,7 +281,7 @@ int cmCPackTGZGenerator::GenerateHeader(std::ostream*
{ {
const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
char header[11]; char header[11];

10
devel/cmake/patches/patch-Source_cmCPluginAPI_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmCPluginAPI_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ $OpenBSD: patch-Source_cmCPluginAPI_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmCPluginAPI.cxx.orig Mon Dec 4 17:03:55 2006 --- Source/cmCPluginAPI.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmCPluginAPI.cxx Sun Dec 17 11:07:03 2006 +++ Source/cmCPluginAPI.cxx Sun Mar 18 13:52:02 2007
@@ -405,10 +405,11 @@ char CCONV *cmExpandVariablesInString(vo @@ -405,10 +405,11 @@ char CCONV *cmExpandVariablesInString(void *arg, const
mf->ExpandVariablesInString(barf, mf->ExpandVariablesInString(barf,
(escapeQuotes ? true : false), (escapeQuotes ? true : false),
(atOnly ? true : false)); (atOnly ? true : false));
@ -15,7 +15,7 @@ $OpenBSD: patch-Source_cmCPluginAPI_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $
} }
res[result.size()] = '\0'; res[result.size()] = '\0';
return res; return res;
@@ -581,24 +582,27 @@ void CCONV cmSourceFileSetName2(void *ar @@ -581,24 +582,27 @@ void CCONV cmSourceFileSetName2(void *arg, const char*
char * CCONV cmGetFilenameWithoutExtension(const char *name) char * CCONV cmGetFilenameWithoutExtension(const char *name)
{ {
std::string sres = cmSystemTools::GetFilenameWithoutExtension(name); std::string sres = cmSystemTools::GetFilenameWithoutExtension(name);

12
devel/cmake/patches/patch-Source_cmCommandArgumentParserHelper_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ $OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmCommandArgumentParserHelper.cxx.orig Mon Dec 4 17:03:54 2006 --- Source/cmCommandArgumentParserHelper.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmCommandArgumentParserHelper.cxx Sun Dec 17 11:07:03 2006 +++ Source/cmCommandArgumentParserHelper.cxx Sun Mar 18 13:52:02 2007
@@ -29,12 +29,12 @@ cmCommandArgumentParserHelper::cmCommand @@ -29,12 +29,12 @@ cmCommandArgumentParserHelper::cmCommandArgumentParser
this->FileName = 0; this->FileName = 0;
this->EmptyVariable[0] = 0; this->EmptyVariable[0] = 0;
@ -20,7 +20,7 @@ $OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.2 2006/12/18 16:04:
this->NoEscapeMode = false; this->NoEscapeMode = false;
this->ReplaceAtSyntax = false; this->ReplaceAtSyntax = false;
@@ -58,8 +58,7 @@ char* cmCommandArgumentParserHelper::Add @@ -58,8 +58,7 @@ char* cmCommandArgumentParserHelper::AddString(const c
{ {
return this->EmptyVariable; return this->EmptyVariable;
} }
@ -30,7 +30,7 @@ $OpenBSD: patch-Source_cmCommandArgumentParserHelper_cxx,v 1.2 2006/12/18 16:04:
this->Variables.push_back(stVal); this->Variables.push_back(stVal);
return stVal; return stVal;
} }
@@ -143,8 +142,8 @@ char* cmCommandArgumentParserHelper::Com @@ -143,8 +142,8 @@ char* cmCommandArgumentParserHelper::CombineUnions(cha
} }
size_t len = strlen(in1) + strlen(in2) + 1; size_t len = strlen(in1) + strlen(in2) + 1;
char* out = new char [ len ]; char* out = new char [ len ];

8
devel/cmake/patches/patch-Source_cmDocumentation_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmDocumentation_cxx,v 1.2 2006/12/18 16:04:31 espie Exp $ $OpenBSD: patch-Source_cmDocumentation_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmDocumentation.cxx.orig Mon Dec 4 17:03:55 2006 --- Source/cmDocumentation.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmDocumentation.cxx Sun Dec 17 11:07:03 2006 +++ Source/cmDocumentation.cxx Sun Mar 18 13:52:02 2007
@@ -336,11 +336,11 @@ bool cmDocumentation::CreateSingleModule @@ -336,11 +336,11 @@ bool cmDocumentation::CreateSingleModule(const char* f
{ {
return false; return false;
} }

10
devel/cmake/patches/patch-Source_cmFindLibraryCommand_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ $OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmFindLibraryCommand.cxx.orig Mon Jul 31 16:49:57 2006 --- Source/cmFindLibraryCommand.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmFindLibraryCommand.cxx Tue Aug 1 00:32:19 2006 +++ Source/cmFindLibraryCommand.cxx Sun Mar 18 13:52:02 2007
@@ -139,11 +139,53 @@ void cmFindLibraryCommand::AddLib64Paths @@ -139,11 +139,53 @@ void cmFindLibraryCommand::AddLib64Paths()
} }
} }
@ -55,7 +55,7 @@ $OpenBSD: patch-Source_cmFindLibraryCommand_cxx,v 1.2 2006/07/31 23:55:51 espie
if(ff == "FIRST" || ff == "LAST") if(ff == "FIRST" || ff == "LAST")
{ {
supportFrameworks = true; supportFrameworks = true;
@@ -194,6 +236,16 @@ std::string cmFindLibraryCommand::FindLi @@ -194,6 +236,16 @@ std::string cmFindLibraryCommand::FindLibrary(const ch
tryPath += *prefix; tryPath += *prefix;
tryPath += name; tryPath += name;
tryPath += *suffix; tryPath += *suffix;

10
devel/cmake/patches/patch-Source_cmIfCommand_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmIfCommand_cxx,v 1.3 2006/12/18 16:04:31 espie Exp $ $OpenBSD: patch-Source_cmIfCommand_cxx,v 1.4 2007/03/20 11:23:10 espie Exp $
--- Source/cmIfCommand.cxx.orig Mon Dec 4 17:03:57 2006 --- Source/cmIfCommand.cxx.orig Wed Jan 10 18:59:13 2007
+++ Source/cmIfCommand.cxx Sun Dec 17 11:07:03 2006 +++ Source/cmIfCommand.cxx Sun Mar 18 13:52:02 2007
@@ -206,8 +206,7 @@ bool cmIfCommand::IsTrue(const std::vect @@ -206,8 +206,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string
const char *def; const char *def;
const char *def2; const char *def2;
const char* msg = "Unknown arguments specified"; const char* msg = "Unknown arguments specified";
@ -11,7 +11,7 @@ $OpenBSD: patch-Source_cmIfCommand_cxx,v 1.3 2006/12/18 16:04:31 espie Exp $
// handle empty invocation // handle empty invocation
if (args.size() < 1) if (args.size() < 1)
@@ -360,8 +359,7 @@ bool cmIfCommand::IsTrue(const std::vect @@ -360,8 +359,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string
cmOStringStream error; cmOStringStream error;
error << "Regular expression \"" << rex << "\" cannot compile"; error << "Regular expression \"" << rex << "\" cannot compile";
delete [] *errorString; delete [] *errorString;

12
devel/cmake/patches/patch-Source_cmListFileLexer_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmListFileLexer_c,v 1.2 2006/12/18 16:04:31 espie Exp $ $OpenBSD: patch-Source_cmListFileLexer_c,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmListFileLexer.c.orig Mon Dec 4 17:03:58 2006 --- Source/cmListFileLexer.c.orig Wed Jan 10 18:59:13 2007
+++ Source/cmListFileLexer.c Sun Dec 17 11:07:03 2006 +++ Source/cmListFileLexer.c Sun Mar 18 13:52:03 2007
@@ -2088,7 +2088,7 @@ static void cmListFileLexerSetToken(cmLi @@ -2088,7 +2088,7 @@ static void cmListFileLexerSetToken(cmListFileLexer* l
{ {
if(text && length < lexer->size) if(text && length < lexer->size)
{ {
@ -10,7 +10,7 @@ $OpenBSD: patch-Source_cmListFileLexer_c,v 1.2 2006/12/18 16:04:31 espie Exp $
lexer->token.length = length; lexer->token.length = length;
return; return;
} }
@@ -2121,7 +2121,7 @@ static void cmListFileLexerAppend(cmList @@ -2121,7 +2121,7 @@ static void cmListFileLexerAppend(cmListFileLexer* lex
newSize = lexer->token.length + length + 1; newSize = lexer->token.length + length + 1;
if(lexer->token.text && newSize <= lexer->size) if(lexer->token.text && newSize <= lexer->size)
{ {
@ -19,7 +19,7 @@ $OpenBSD: patch-Source_cmListFileLexer_c,v 1.2 2006/12/18 16:04:31 espie Exp $
lexer->token.length += length; lexer->token.length += length;
return; return;
} }
@@ -2239,11 +2239,11 @@ int cmListFileLexer_SetString(cmListFile @@ -2239,11 +2239,11 @@ int cmListFileLexer_SetString(cmListFileLexer* lexer,
cmListFileLexerDestroy(lexer); cmListFileLexerDestroy(lexer);
if(text) if(text)
{ {

16
devel/cmake/patches/patch-Source_cmSystemTools_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.4 2007/03/20 11:23:10 espie Exp $
--- Source/cmSystemTools.cxx.orig Mon Dec 4 17:04:00 2006 --- Source/cmSystemTools.cxx.orig Wed Jan 10 18:59:13 2007
+++ Source/cmSystemTools.cxx Sun Dec 17 11:07:03 2006 +++ Source/cmSystemTools.cxx Sun Mar 18 13:52:03 2007
@@ -1274,12 +1274,18 @@ public: @@ -1274,12 +1274,18 @@ class cmDeletingCharVector : public std::vector<char*>
} }
}; };
@ -22,7 +22,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $
int ret = putenv(envVar); int ret = putenv(envVar);
// save the pointer in the static vector so that it can // save the pointer in the static vector so that it can
// be deleted on exit // be deleted on exit
@@ -1338,7 +1344,7 @@ std::string cmSystemTools::MakeXMLSafe(c @@ -1338,7 +1344,7 @@ std::string cmSystemTools::MakeXMLSafe(const char* str
&& ch != '\r' ) && ch != '\r' )
{ {
char buffer[33]; char buffer[33];
@ -31,7 +31,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $
//sprintf(buffer, "&#x%0x;", (unsigned int)ch); //sprintf(buffer, "&#x%0x;", (unsigned int)ch);
result.insert(result.end(), buffer, buffer+strlen(buffer)); result.insert(result.end(), buffer, buffer+strlen(buffer));
} }
@@ -1489,9 +1495,8 @@ bool cmSystemTools::CreateTar(const char @@ -1489,9 +1495,8 @@ bool cmSystemTools::CreateTar(const char* outFileName,
}; };
// Ok, this libtar is not const safe. for now use auto_ptr hack // Ok, this libtar is not const safe. for now use auto_ptr hack
@ -42,7 +42,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $
if (tar_open(&t, realName, if (tar_open(&t, realName,
(gzip? &gztype : NULL), (gzip? &gztype : NULL),
O_WRONLY | O_CREAT, 0644, O_WRONLY | O_CREAT, 0644,
@@ -1561,9 +1566,8 @@ bool cmSystemTools::ExtractTar(const cha @@ -1561,9 +1566,8 @@ bool cmSystemTools::ExtractTar(const char* outFileName
}; };
// Ok, this libtar is not const safe. for now use auto_ptr hack // Ok, this libtar is not const safe. for now use auto_ptr hack
@ -53,7 +53,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $
if (tar_open(&t, realName, if (tar_open(&t, realName,
(gzip? &gztype : NULL), (gzip? &gztype : NULL),
O_RDONLY O_RDONLY
@@ -1615,9 +1619,8 @@ bool cmSystemTools::ListTar(const char* @@ -1615,9 +1619,8 @@ bool cmSystemTools::ListTar(const char* outFileName,
}; };
// Ok, this libtar is not const safe. for now use auto_ptr hack // Ok, this libtar is not const safe. for now use auto_ptr hack

8
devel/cmake/patches/patch-Source_cmSystemTools_h
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmSystemTools_h,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ $OpenBSD: patch-Source_cmSystemTools_h,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Source/cmSystemTools.h.orig Mon Jul 3 12:38:46 2006 --- Source/cmSystemTools.h.orig Wed Jan 10 18:59:13 2007
+++ Source/cmSystemTools.h Mon Jul 3 12:39:59 2006 +++ Source/cmSystemTools.h Sun Mar 18 13:52:03 2007
@@ -65,6 +65,10 @@ public: @@ -65,6 +65,10 @@ class cmSystemTools: public cmsys::SystemTools (public
*/ */
static std::string RemoveEscapes(const char*); static std::string RemoveEscapes(const char*);

8
devel/cmake/patches/patch-Source_cmTryRunCommand_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmTryRunCommand_cxx,v 1.2 2006/07/31 23:55:51 espie Exp $ $OpenBSD: patch-Source_cmTryRunCommand_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/cmTryRunCommand.cxx.orig Mon Jul 31 16:49:57 2006 --- Source/cmTryRunCommand.cxx.orig Wed Jan 10 18:59:13 2007
+++ Source/cmTryRunCommand.cxx Tue Aug 1 00:32:19 2006 +++ Source/cmTryRunCommand.cxx Sun Mar 18 13:52:03 2007
@@ -140,11 +140,11 @@ bool cmTryRunCommand::InitialPass(std::v @@ -140,11 +140,11 @@ bool cmTryRunCommand::InitialPass(std::vector<std::str
char retChar[1000]; char retChar[1000];
if(worked) if(worked)
{ {

8
devel/cmake/patches/patch-Source_cmake_cxx
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Source_cmake_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ $OpenBSD: patch-Source_cmake_cxx,v 1.4 2007/03/20 11:23:10 espie Exp $
--- Source/cmake.cxx.orig Mon Dec 4 17:03:54 2006 --- Source/cmake.cxx.orig Wed Jan 10 18:59:12 2007
+++ Source/cmake.cxx Sun Dec 17 11:07:03 2006 +++ Source/cmake.cxx Sun Mar 18 13:52:03 2007
@@ -1487,7 +1487,7 @@ int cmake::Configure() @@ -1487,7 +1487,7 @@ int cmake::Configure()
if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY")) if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{ {
@ -10,7 +10,7 @@ $OpenBSD: patch-Source_cmake_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $
cmMakefile::GetMinorVersion()); cmMakefile::GetMinorVersion());
this->CacheManager->AddCacheEntry this->CacheManager->AddCacheEntry
("CMAKE_BACKWARDS_COMPATIBILITY",ver, ("CMAKE_BACKWARDS_COMPATIBILITY",ver,
@@ -1852,7 +1852,7 @@ int cmake::DumpDocumentationToFile(std:: @@ -1852,7 +1852,7 @@ int cmake::DumpDocumentationToFile(std::ostream& f)
const char *terse; const char *terse;
const char *full; const char *full;
char tmp[1024]; char tmp[1024];

10
devel/cmake/patches/patch-Source_kwsys_CommandLineArguments_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_kwsys_CommandLineArguments_cxx,v 1.2 2006/07/31 23:55:52 espie Exp $ $OpenBSD: patch-Source_kwsys_CommandLineArguments_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/kwsys/CommandLineArguments.cxx.orig Mon Jul 31 16:49:59 2006 --- Source/kwsys/CommandLineArguments.cxx.orig Wed Jan 10 18:59:15 2007
+++ Source/kwsys/CommandLineArguments.cxx Tue Aug 1 00:32:19 2006 +++ Source/kwsys/CommandLineArguments.cxx Sun Mar 18 13:52:03 2007
@@ -333,16 +333,18 @@ void CommandLineArguments::GetRemainingA @@ -333,16 +333,18 @@ void CommandLineArguments::GetRemainingArguments(int*
// Copy Argv0 as the first argument // Copy Argv0 as the first argument
char** args = new char*[ size ]; char** args = new char*[ size ];
@ -24,7 +24,7 @@ $OpenBSD: patch-Source_kwsys_CommandLineArguments_cxx,v 1.2 2006/07/31 23:55:52
cnt ++; cnt ++;
} }
*argc = cnt; *argc = cnt;
@@ -594,7 +596,7 @@ void CommandLineArguments::GenerateHelp( @@ -594,7 +596,7 @@ void CommandLineArguments::GenerateHelp()
// Create format for that string // Create format for that string
char format[80]; char format[80];

28
devel/cmake/patches/patch-Source_kwsys_ProcessUNIX_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.4 2007/03/20 11:23:10 espie Exp $
--- Source/kwsys/ProcessUNIX.c.orig Mon Dec 4 17:04:05 2006 --- Source/kwsys/ProcessUNIX.c.orig Wed Jan 10 18:59:15 2007
+++ Source/kwsys/ProcessUNIX.c Sun Dec 17 11:07:03 2006 +++ Source/kwsys/ProcessUNIX.c Sun Mar 18 13:52:03 2007
@@ -457,12 +457,13 @@ int kwsysProcess_SetWorkingDirectory(kws @@ -457,12 +457,13 @@ int kwsysProcess_SetWorkingDirectory(kwsysProcess* cp,
} }
if(dir) if(dir)
{ {
@ -17,7 +17,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
} }
return 1; return 1;
} }
@@ -489,12 +490,13 @@ int kwsysProcess_SetPipeFile(kwsysProces @@ -489,12 +490,13 @@ int kwsysProcess_SetPipeFile(kwsysProcess* cp, int prP
} }
if(file) if(file)
{ {
@ -33,7 +33,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
} }
/* If we are redirecting the pipe, do not share it or use a native /* If we are redirecting the pipe, do not share it or use a native
@@ -670,7 +672,7 @@ void kwsysProcess_Execute(kwsysProcess* @@ -670,7 +672,7 @@ void kwsysProcess_Execute(kwsysProcess* cp)
/* Initialize the control structure for a new process. */ /* Initialize the control structure for a new process. */
if(!kwsysProcessInitialize(cp)) if(!kwsysProcessInitialize(cp))
{ {
@ -42,7 +42,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
cp->State = kwsysProcess_State_Error; cp->State = kwsysProcess_State_Error;
return; return;
} }
@@ -1021,7 +1023,7 @@ int kwsysProcess_WaitForData(kwsysProces @@ -1021,7 +1023,7 @@ int kwsysProcess_WaitForData(kwsysProcess* cp, char**
{ {
/* Select returned an error. Leave the error description in the /* Select returned an error. Leave the error description in the
pipe buffer. */ pipe buffer. */
@ -51,7 +51,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
/* Kill the children now. */ /* Kill the children now. */
kwsysProcess_Kill(cp); kwsysProcess_Kill(cp);
@@ -1146,7 +1148,7 @@ int kwsysProcess_WaitForExit(kwsysProces @@ -1146,7 +1148,7 @@ int kwsysProcess_WaitForExit(kwsysProcess* cp, double*
else else
{ {
/* Error getting the child return code. */ /* Error getting the child return code. */
@ -60,7 +60,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
cp->State = kwsysProcess_State_Error; cp->State = kwsysProcess_State_Error;
} }
@@ -1222,7 +1224,7 @@ static int kwsysProcessInitialize(kwsysP @@ -1222,7 +1224,7 @@ static int kwsysProcessInitialize(kwsysProcess* cp)
cp->ExitCode = 1; cp->ExitCode = 1;
cp->ExitValue = 1; cp->ExitValue = 1;
cp->ErrorMessage[0] = 0; cp->ErrorMessage[0] = 0;
@ -69,7 +69,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
if(cp->ForkPIDs) if(cp->ForkPIDs)
{ {
@@ -1589,7 +1591,7 @@ static void kwsysProcessDestroy(kwsysPro @@ -1589,7 +1591,7 @@ static void kwsysProcessDestroy(kwsysProcess* cp)
else if(result < 0 && cp->State != kwsysProcess_State_Error) else if(result < 0 && cp->State != kwsysProcess_State_Error)
{ {
/* Unexpected error. Report the first time this happens. */ /* Unexpected error. Report the first time this happens. */
@ -78,7 +78,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
cp->State = kwsysProcess_State_Error; cp->State = kwsysProcess_State_Error;
} }
} }
@@ -1784,7 +1786,7 @@ static kwsysProcessTime kwsysProcessTime @@ -1784,7 +1786,7 @@ static kwsysProcessTime kwsysProcessTimeSubtract(kwsys
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
#define KWSYSPE_CASE(type, str) \ #define KWSYSPE_CASE(type, str) \
cp->ExitException = kwsysProcess_Exception_##type; \ cp->ExitException = kwsysProcess_Exception_##type; \
@ -87,7 +87,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
static void kwsysProcessSetExitException(kwsysProcess* cp, int sig) static void kwsysProcessSetExitException(kwsysProcess* cp, int sig)
{ {
switch (sig) switch (sig)
@@ -1903,7 +1905,8 @@ static void kwsysProcessSetExitException @@ -1903,7 +1905,8 @@ static void kwsysProcessSetExitException(kwsysProcess*
#endif #endif
default: default:
cp->ExitException = kwsysProcess_Exception_Other; cp->ExitException = kwsysProcess_Exception_Other;
@ -97,7 +97,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
break; break;
} }
} }
@@ -1916,8 +1919,8 @@ static void kwsysProcessSetExitException @@ -1916,8 +1919,8 @@ static void kwsysProcessSetExitException(kwsysProcess*
static void kwsysProcessChildErrorExit(int errorPipe) static void kwsysProcessChildErrorExit(int errorPipe)
{ {
/* Construct the error message. */ /* Construct the error message. */
@ -108,7 +108,7 @@ $OpenBSD: patch-Source_kwsys_ProcessUNIX_c,v 1.3 2006/12/18 16:04:32 espie Exp $
/* Report the error to the parent through the special pipe. */ /* Report the error to the parent through the special pipe. */
write(errorPipe, buffer, strlen(buffer)); write(errorPipe, buffer, strlen(buffer));
@@ -2145,7 +2148,7 @@ static void kwsysProcessKill(pid_t proce @@ -2145,7 +2148,7 @@ static void kwsysProcessKill(pid_t process_id)
if(sscanf(d->d_name, "%d", &pid) == 1 && pid != 0) if(sscanf(d->d_name, "%d", &pid) == 1 && pid != 0)
{ {
struct stat finfo; struct stat finfo;

10
devel/cmake/patches/patch-Source_kwsys_Registry_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_kwsys_Registry_cxx,v 1.2 2006/12/18 16:04:32 espie Exp $ $OpenBSD: patch-Source_kwsys_Registry_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/kwsys/Registry.cxx.orig Mon Dec 4 17:04:05 2006 --- Source/kwsys/Registry.cxx.orig Wed Jan 10 18:59:15 2007
+++ Source/kwsys/Registry.cxx Sun Dec 17 11:07:03 2006 +++ Source/kwsys/Registry.cxx Sun Mar 18 13:52:03 2007
@@ -756,7 +756,7 @@ kwsys_stl::string RegistryHelper::Encode @@ -756,7 +756,7 @@ kwsys_stl::string RegistryHelper::EncodeKey(const char
{ {
case '%': case '=': case '\n': case '\r': case '\t': case '%': case '=': case '\n': case '\r': case '\t':
char buffer[4]; char buffer[4];
@ -10,7 +10,7 @@ $OpenBSD: patch-Source_kwsys_Registry_cxx,v 1.2 2006/12/18 16:04:32 espie Exp $
ostr << buffer; ostr << buffer;
break; break;
default: default:
@@ -777,7 +777,7 @@ kwsys_stl::string RegistryHelper::Encode @@ -777,7 +777,7 @@ kwsys_stl::string RegistryHelper::EncodeValue(const ch
{ {
case '%': case '=': case '\n': case '\r': case '\t': case '%': case '=': case '\n': case '\r': case '\t':
char buffer[4]; char buffer[4];

16
devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp $ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.4 2007/03/20 11:23:10 espie Exp $
--- Source/kwsys/SystemTools.cxx.orig Mon Dec 4 17:04:05 2006 --- Source/kwsys/SystemTools.cxx.orig Wed Jan 10 18:59:15 2007
+++ Source/kwsys/SystemTools.cxx Sun Dec 17 11:07:03 2006 +++ Source/kwsys/SystemTools.cxx Sun Mar 18 13:52:03 2007
@@ -923,13 +923,14 @@ char* SystemTools::AppendStrings(const c @@ -923,13 +923,14 @@ char* SystemTools::AppendStrings(const char* str1, con
return SystemTools::DuplicateString(str1); return SystemTools::DuplicateString(str1);
} }
size_t len1 = strlen(str1); size_t len1 = strlen(str1);
@ -39,7 +39,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp
return newstr; return newstr;
} }
@@ -1125,8 +1127,10 @@ char* SystemTools::DuplicateString(const @@ -1125,8 +1127,10 @@ char* SystemTools::DuplicateString(const char* str)
{ {
if (str) if (str)
{ {
@ -52,7 +52,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp
} }
return NULL; return NULL;
} }
@@ -1801,7 +1805,7 @@ bool SystemTools::ConvertDateMacroString @@ -1801,7 +1805,7 @@ bool SystemTools::ConvertDateMacroString(const char *s
static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
char buffer[12]; char buffer[12];
@ -61,7 +61,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp
buffer[3] = 0; buffer[3] = 0;
char *ptr = strstr(month_names, buffer); char *ptr = strstr(month_names, buffer);
@@ -1852,7 +1856,7 @@ bool SystemTools::ConvertTimeStampMacroS @@ -1852,7 +1856,7 @@ bool SystemTools::ConvertTimeStampMacroString(const ch
static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec"; static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
char buffer[27]; char buffer[27];
@ -70,7 +70,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.3 2006/12/18 16:04:32 espie Exp
buffer[7] = 0; buffer[7] = 0;
char *ptr = strstr(month_names, buffer + 4); char *ptr = strstr(month_names, buffer + 4);
@@ -3291,12 +3295,12 @@ bool SystemTools::GetShortPath(const cha @@ -3291,12 +3295,12 @@ bool SystemTools::GetShortPath(const char* path, kwsys
// if the path passed in has quotes around it, first remove the quotes // if the path passed in has quotes around it, first remove the quotes
if (path[0] == '"' && path[strlen(path)-1] == '"') if (path[0] == '"' && path[strlen(path)-1] == '"')
{ {

16
devel/cmake/patches/patch-Utilities_cmxmlrpc_xmlrpc_client_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_client_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_client_c,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Utilities/cmxmlrpc/xmlrpc_client.c.orig Mon Jul 3 15:18:04 2006 --- Utilities/cmxmlrpc/xmlrpc_client.c.orig Wed Jan 10 18:59:18 2007
+++ Utilities/cmxmlrpc/xmlrpc_client.c Mon Jul 3 15:21:48 2006 +++ Utilities/cmxmlrpc/xmlrpc_client.c Sun Mar 18 13:52:03 2007
@@ -547,6 +547,7 @@ xmlrpc_server_info_new (xmlrpc_env * con @@ -547,6 +547,7 @@ xmlrpc_server_info_new (xmlrpc_env * const env,
xmlrpc_server_info *server; xmlrpc_server_info *server;
char *url_copy; char *url_copy;
@ -9,7 +9,7 @@ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_client_c,v 1.1.1.1 2006/07/20 09:23:13
/* Error-handling preconditions. */ /* Error-handling preconditions. */
url_copy = NULL; url_copy = NULL;
@@ -559,12 +560,13 @@ xmlrpc_server_info_new (xmlrpc_env * con @@ -559,12 +560,13 @@ xmlrpc_server_info_new (xmlrpc_env * const env,
XMLRPC_FAIL_IF_NULL(server, env, XMLRPC_INTERNAL_ERROR, XMLRPC_FAIL_IF_NULL(server, env, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for xmlrpc_server_info"); "Couldn't allocate memory for xmlrpc_server_info");
memset(server, 0, sizeof(xmlrpc_server_info)); memset(server, 0, sizeof(xmlrpc_server_info));
@ -25,7 +25,7 @@ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_client_c,v 1.1.1.1 2006/07/20 09:23:13
server->_server_url = url_copy; server->_server_url = url_copy;
server->_http_basic_auth = NULL; server->_http_basic_auth = NULL;
@@ -584,6 +586,7 @@ xmlrpc_server_info * xmlrpc_server_info_ @@ -584,6 +586,7 @@ xmlrpc_server_info * xmlrpc_server_info_copy(xmlrpc_en
{ {
xmlrpc_server_info *server; xmlrpc_server_info *server;
char *url_copy, *auth_copy; char *url_copy, *auth_copy;
@ -33,7 +33,7 @@ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_client_c,v 1.1.1.1 2006/07/20 09:23:13
XMLRPC_ASSERT_ENV_OK(env); XMLRPC_ASSERT_ENV_OK(env);
XMLRPC_ASSERT_PTR_OK(aserver); XMLRPC_ASSERT_PTR_OK(aserver);
@@ -596,17 +599,19 @@ xmlrpc_server_info * xmlrpc_server_info_ @@ -596,17 +599,19 @@ xmlrpc_server_info * xmlrpc_server_info_copy(xmlrpc_en
server = (xmlrpc_server_info*) malloc(sizeof(xmlrpc_server_info)); server = (xmlrpc_server_info*) malloc(sizeof(xmlrpc_server_info));
XMLRPC_FAIL_IF_NULL(server, env, XMLRPC_INTERNAL_ERROR, XMLRPC_FAIL_IF_NULL(server, env, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for xmlrpc_server_info"); "Couldn't allocate memory for xmlrpc_server_info");
@ -57,7 +57,7 @@ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_client_c,v 1.1.1.1 2006/07/20 09:23:13
server->_http_basic_auth = auth_copy; server->_http_basic_auth = auth_copy;
cleanup: cleanup:
@@ -935,9 +940,7 @@ xmlrpc_server_info_set_basic_auth(xmlrpc @@ -935,9 +940,7 @@ xmlrpc_server_info_set_basic_auth(xmlrpc_env *
raw_token = (char*) malloc(raw_token_len + 1); raw_token = (char*) malloc(raw_token_len + 1);
XMLRPC_FAIL_IF_NULL(raw_token, envP, XMLRPC_INTERNAL_ERROR, XMLRPC_FAIL_IF_NULL(raw_token, envP, XMLRPC_INTERNAL_ERROR,
"Couldn't allocate memory for auth token"); "Couldn't allocate memory for auth token");

10
devel/cmake/patches/patch-Utilities_cmxmlrpc_xmlrpc_curl_transport_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_curl_transport_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_curl_transport_c,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Utilities/cmxmlrpc/xmlrpc_curl_transport.c.orig Wed May 17 15:48:56 2006 --- Utilities/cmxmlrpc/xmlrpc_curl_transport.c.orig Wed Jan 10 18:59:18 2007
+++ Utilities/cmxmlrpc/xmlrpc_curl_transport.c Mon Jul 3 15:23:09 2006 +++ Utilities/cmxmlrpc/xmlrpc_curl_transport.c Sun Mar 18 13:52:03 2007
@@ -27,9 +27,9 @@ @@ -27,9 +27,9 @@
# include "xmlrpc_pthreads.h" # include "xmlrpc_pthreads.h"
#endif #endif
@ -14,7 +14,7 @@ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_curl_transport_c,v 1.1.1.1 2006/07/20
#ifndef WIN32 #ifndef WIN32
# include <unistd.h> # include <unistd.h>
@@ -290,11 +290,11 @@ setupCurlSession(xmlrpc_env * cons @@ -290,11 +290,11 @@ setupCurlSession(xmlrpc_env * const envP,
proxy_type = 1; proxy_type = 1;
if (getenv("HTTP_PROXY_PORT") ) if (getenv("HTTP_PROXY_PORT") )
{ {
@ -28,7 +28,7 @@ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_curl_transport_c,v 1.1.1.1 2006/07/20
} }
if ( getenv("HTTP_PROXY_TYPE") ) if ( getenv("HTTP_PROXY_TYPE") )
{ {
@@ -314,12 +314,12 @@ setupCurlSession(xmlrpc_env * cons @@ -314,12 +314,12 @@ setupCurlSession(xmlrpc_env * const envP,
} }
if ( getenv("HTTP_PROXY_USER") ) if ( getenv("HTTP_PROXY_USER") )
{ {

10
devel/cmake/patches/patch-Utilities_cmxmlrpc_xmlrpc_parse_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_parse_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_parse_c,v 1.2 2007/03/20 11:23:10 espie Exp $
--- Utilities/cmxmlrpc/xmlrpc_parse.c.orig Tue Jul 18 11:06:02 2006 --- Utilities/cmxmlrpc/xmlrpc_parse.c.orig Wed Jan 10 18:59:18 2007
+++ Utilities/cmxmlrpc/xmlrpc_parse.c Tue Jul 18 11:06:37 2006 +++ Utilities/cmxmlrpc/xmlrpc_parse.c Sun Mar 18 13:52:03 2007
@@ -579,6 +579,7 @@ xmlrpc_parse_call(xmlrpc_env * const @@ -579,6 +579,7 @@ xmlrpc_parse_call(xmlrpc_env * const envP,
size_t call_child_count; size_t call_child_count;
char * outMethodName; char * outMethodName;
xmlrpc_value * outParamArrayP; xmlrpc_value * outParamArrayP;
@ -9,7 +9,7 @@ $OpenBSD: patch-Utilities_cmxmlrpc_xmlrpc_parse_c,v 1.1.1.1 2006/07/20 09:23:13
XMLRPC_ASSERT_ENV_OK(envP); XMLRPC_ASSERT_ENV_OK(envP);
XMLRPC_ASSERT(xml_data != NULL); XMLRPC_ASSERT(xml_data != NULL);
@@ -618,10 +619,11 @@ xmlrpc_parse_call(xmlrpc_env * const @@ -618,10 +619,11 @@ xmlrpc_parse_call(xmlrpc_env * const envP,
xmlrpc_validate_utf8(envP, cdata, strlen(cdata)); xmlrpc_validate_utf8(envP, cdata, strlen(cdata));
XMLRPC_FAIL_IF_FAULT(envP); XMLRPC_FAIL_IF_FAULT(envP);
#endif /* HAVE_UNICODE_WCHAR */ #endif /* HAVE_UNICODE_WCHAR */