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

minor update to 2.4.8 (all tests pass now)

Browse Source
This commit is contained in:
espie 2008-01-26 21:26:32 +00:00
parent 8b0e85a4cd
commit 41cf57d3f6
12 changed files with 70 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/cmake/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.13 2007/08/25 08:35:20 espie Exp $
# $OpenBSD: Makefile,v 1.14 2008/01/26 21:26:32 espie Exp $
HOMEPAGE= http://www.cmake.org/
CATEGORIES= devel
COMMENT= portable build system
DISTNAME= cmake-2.4.7
DISTNAME= cmake-2.4.8
PKGNAME= ${DISTNAME}
MASTER_SITES= ${HOMEPAGE}files/v2.4/
MAINTAINER= Marc Espie <espie@openbsd.org>

10
devel/cmake/distinfo
View File

@ -1,5 +1,5 @@
MD5 (cmake-2.4.7.tar.gz) = RHbEI7j3QmYTaWTkLqiAKA==
RMD160 (cmake-2.4.7.tar.gz) = f+0XbELznCXh1MdhQ2qk1aimTjo=
SHA1 (cmake-2.4.7.tar.gz) = cjCP3RMdWlrRxhd2nBakF+vsAAQ=
SHA256 (cmake-2.4.7.tar.gz) = L9X+spS5M646AHG4x6OWeXz3nf5rD/7/h4jgf/QQfVY=
SIZE (cmake-2.4.7.tar.gz) = 2600960
MD5 (cmake-2.4.8.tar.gz) = 9d0GHDF2WkncF66L3JhneQ==
RMD160 (cmake-2.4.8.tar.gz) = P3X3eg7KTB4eRQawDFbKRB94yFM=
SHA1 (cmake-2.4.8.tar.gz) = XSU7EoJ0zJUXvOkvwleY1VuqJTs=
SHA256 (cmake-2.4.8.tar.gz) = 8gYH1PMzdupkgwdoFjBXRmLQw/WdiKegKtVHtjIGMfE=
SIZE (cmake-2.4.8.tar.gz) = 2608800

20
devel/cmake/patches/patch-Modules_FindQt4_cmake
View File

@ -1,16 +1,16 @@
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.4 2007/08/25 08:35:20 espie Exp $
--- Modules/FindQt4.cmake.orig Mon Jul 16 23:12:30 2007
+++ Modules/FindQt4.cmake Sun Aug 12 16:02:01 2007
@@ -174,7 +174,7 @@ SET(QT_USE_FILE ${CMAKE_ROOT}/Modules/UseQt4.cmake)
SET( QT_DEFINITIONS "")
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.5 2008/01/26 21:26:32 espie Exp $
--- Modules/FindQt4.cmake.orig Mon Jan 21 19:59:51 2008
+++ Modules/FindQt4.cmake Sat Jan 26 20:48:28 2008
@@ -250,7 +250,7 @@ ENDMACRO(QT_QUERY_QMAKE)
GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trolltech\\Versions;DefaultQtVersion]" NAME)
# check for qmake
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake-qt4 PATHS
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake qmake-qt4 PATHS
-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 PATHS
+FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake qmake4 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
@@ -884,7 +884,8 @@ IF (QT4_QMAKE_FOUND)
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
@@ -1129,7 +1129,8 @@ IF (QT4_QMAKE_FOUND)
###############################################
SET(QT_GUI_LIB_DEPENDENCIES "")
@ -20,7 +20,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v 1.4 2007/08/25 08:35:20 espie Exp $
# shared build needs -DQT_SHARED
IF(NOT QT_CONFIG MATCHES "static")
@@ -899,7 +900,37 @@ IF (QT4_QMAKE_FOUND)
@@ -1144,7 +1145,37 @@ IF (QT4_QMAKE_FOUND)
FIND_LIBRARY(QT_PNG_LIBRARY NAMES png)
SET(QT_GUI_LIB_DEPENDENCIES ${QT_GUI_LIB_DEPENDENCIES} ${QT_PNG_LIBRARY})
MARK_AS_ADVANCED(QT_PNG_LIBRARY)

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_CPack_cmCPackTGZGenerator_cxx,v 1.3 2007/03/20 11:23:10 espie Exp $
--- Source/CPack/cmCPackTGZGenerator.cxx.orig Wed Jan 10 18:59:13 2007
+++ Source/CPack/cmCPackTGZGenerator.cxx Sun Mar 18 13:52:02 2007
@@ -281,7 +281,7 @@ int cmCPackTGZGenerator::GenerateHeader(std::ostream*
$OpenBSD: patch-Source_CPack_cmCPackTGZGenerator_cxx,v 1.4 2008/01/26 21:26:32 espie Exp $
--- Source/CPack/cmCPackTGZGenerator.cxx.orig Mon Jan 21 19:59:53 2008
+++ Source/CPack/cmCPackTGZGenerator.cxx Sat Jan 26 20:47:17 2008
@@ -287,7 +287,7 @@ int cmCPackTGZGenerator::GenerateHeader(std::ostream*
{
const int gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */
char header[11];

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Source_cmIfCommand_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
--- Source/cmIfCommand.cxx.orig Mon Jul 16 23:12:31 2007
+++ Source/cmIfCommand.cxx Sun Aug 12 16:02:01 2007
$OpenBSD: patch-Source_cmIfCommand_cxx,v 1.6 2008/01/26 21:26:32 espie Exp $
--- Source/cmIfCommand.cxx.orig Mon Jan 21 19:59:52 2008
+++ Source/cmIfCommand.cxx Sat Jan 26 20:47:17 2008
@@ -220,8 +220,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string
const char *def;
const char *def2;
@ -11,7 +11,7 @@ $OpenBSD: patch-Source_cmIfCommand_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
// handle empty invocation
if (args.size() < 1)
@@ -374,8 +373,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string
@@ -390,8 +389,7 @@ bool cmIfCommand::IsTrue(const std::vector<std::string
cmOStringStream error;
error << "Regular expression \"" << rex << "\" cannot compile";
delete [] *errorString;

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmMakefile_cxx,v 1.4 2007/08/25 08:35:20 espie Exp $
--- Source/cmMakefile.cxx.orig Mon Jul 16 23:12:31 2007
+++ Source/cmMakefile.cxx Sun Aug 12 16:02:02 2007
@@ -1874,9 +1874,9 @@ void cmMakefile::AddDefaultDefinitions()
$OpenBSD: patch-Source_cmMakefile_cxx,v 1.5 2008/01/26 21:26:32 espie Exp $
--- Source/cmMakefile.cxx.orig Mon Jan 21 19:59:53 2008
+++ Source/cmMakefile.cxx Sat Jan 26 20:47:17 2008
@@ -1884,9 +1884,9 @@ void cmMakefile::AddDefaultDefinitions()
#endif
char temp[1024];

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

@ -1,10 +1,10 @@
$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
--- Source/cmSystemTools.cxx.orig Mon Jul 16 23:12:31 2007
+++ Source/cmSystemTools.cxx Sun Aug 12 16:02:02 2007
@@ -1364,12 +1364,18 @@ class cmDeletingCharVector : public std::vector<char*>
}
$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.6 2008/01/26 21:26:32 espie Exp $
--- Source/cmSystemTools.cxx.orig Sat Jan 26 20:49:32 2008
+++ Source/cmSystemTools.cxx Sat Jan 26 20:52:09 2008
@@ -1365,11 +1365,18 @@ class cmDeletingCharVector : public std::vector<char*>
};
+char* cmSystemTools::dupstring(const char* src)
+{
+ size_t sz = strlen(src)+1;
@ -12,7 +12,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
+ strlcpy(dest, src, sz);
+ return dest;
+}
+
bool cmSystemTools::PutEnv(const char* value)
{
static cmDeletingCharVector localEnvironment;
@ -22,7 +22,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
int ret = putenv(envVar);
// save the pointer in the static vector so that it can
// be deleted on exit
@@ -1428,7 +1434,7 @@ std::string cmSystemTools::MakeXMLSafe(const char* str
@@ -1428,7 +1435,7 @@ std::string cmSystemTools::MakeXMLSafe(const char* str
&& ch != '\r' )
{
char buffer[33];
@ -31,7 +31,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
//sprintf(buffer, "&#x%0x;", (unsigned int)ch);
result.insert(result.end(), buffer, buffer+strlen(buffer));
}
@@ -1579,9 +1585,8 @@ bool cmSystemTools::CreateTar(const char* outFileName,
@@ -1579,9 +1586,8 @@ bool cmSystemTools::CreateTar(const char* outFileName,
};
// Ok, this libtar is not const safe. for now use auto_ptr hack
@ -39,10 +39,10 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
+ char* realName = dupstring(outFileName);
std::auto_ptr<char> realNamePtr(realName);
- strcpy(realName, outFileName);
if (tar_open(&t, realName,
(gzip? &gztype : NULL),
O_WRONLY | O_CREAT, 0644,
@@ -1651,9 +1656,8 @@ bool cmSystemTools::ExtractTar(const char* outFileName
int options = 0;
if(verbose)
{
@@ -1658,9 +1664,8 @@ bool cmSystemTools::ExtractTar(const char* outFileName
};
// Ok, this libtar is not const safe. for now use auto_ptr hack
@ -53,7 +53,7 @@ $OpenBSD: patch-Source_cmSystemTools_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
if (tar_open(&t, realName,
(gzip? &gztype : NULL),
O_RDONLY
@@ -1705,9 +1709,8 @@ bool cmSystemTools::ListTar(const char* outFileName,
@@ -1712,9 +1717,8 @@ bool cmSystemTools::ListTar(const char* outFileName,
};
// Ok, this libtar is not const safe. for now use auto_ptr hack

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.2 2007/08/25 08:35:20 espie Exp $
--- Source/cmTarget.cxx.orig Mon Jul 16 23:12:31 2007
+++ Source/cmTarget.cxx Sun Aug 12 16:02:02 2007
@@ -1474,6 +1474,46 @@ void cmTarget::GetLibraryNamesInternal(std::string& na
$OpenBSD: patch-Source_cmTarget_cxx,v 1.3 2008/01/26 21:26:32 espie Exp $
--- Source/cmTarget.cxx.orig Mon Jan 21 19:59:53 2008
+++ Source/cmTarget.cxx Sat Jan 26 20:47:17 2008
@@ -1480,6 +1480,46 @@ void cmTarget::GetLibraryNamesInternal(std::string& na
realName += suffix;
#endif

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmake_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
--- Source/cmake.cxx.orig Mon Jul 16 23:12:30 2007
+++ Source/cmake.cxx Sun Aug 12 16:02:02 2007
@@ -1499,7 +1499,7 @@ int cmake::Configure()
$OpenBSD: patch-Source_cmake_cxx,v 1.6 2008/01/26 21:26:32 espie Exp $
--- Source/cmake.cxx.orig Mon Jan 21 19:59:52 2008
+++ Source/cmake.cxx Sat Jan 26 20:47:18 2008
@@ -1532,7 +1532,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.5 2007/08/25 08:35:20 espie Exp $
cmMakefile::GetMinorVersion());
this->CacheManager->AddCacheEntry
("CMAKE_BACKWARDS_COMPATIBILITY",ver,
@@ -1864,7 +1864,7 @@ int cmake::DumpDocumentationToFile(std::ostream& f)
@@ -1897,7 +1897,7 @@ int cmake::DumpDocumentationToFile(std::ostream& f)
const char *terse;
const char *full;
char tmp[1024];
@ -19,7 +19,7 @@ $OpenBSD: patch-Source_cmake_cxx,v 1.5 2007/08/25 08:35:20 espie Exp $
cmake::GetMinorVersion(), cmVersion::GetReleaseVersion().c_str());
f << "<html>\n";
f << "<h1>Documentation for commands of CMake " << tmp << "</h1>\n";
@@ -1971,7 +1971,7 @@ int cmake::LoadCache()
@@ -2008,7 +2008,7 @@ int cmake::LoadCache()
if(!this->CacheManager->GetCacheValue("CMAKE_BACKWARDS_COMPATIBILITY"))
{
char ver[256];

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.6 2007/08/25 08:35:20 espie Exp $
--- Source/kwsys/SystemTools.cxx.orig Mon Jul 16 23:12:33 2007
+++ Source/kwsys/SystemTools.cxx Sun Aug 12 16:02:02 2007
@@ -366,7 +366,9 @@ bool SystemTools::MakeDirectory(const char* path)
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.7 2008/01/26 21:26:32 espie Exp $
--- Source/kwsys/SystemTools.cxx.orig Mon Jan 21 19:59:55 2008
+++ Source/kwsys/SystemTools.cxx Sat Jan 26 20:47:18 2008
@@ -371,7 +371,9 @@ bool SystemTools::MakeDirectory(const char* path)
while((pos = dir.find('/', pos)) != kwsys_stl::string::npos)
{
topdir = dir.substr(0, pos);
@ -12,7 +12,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.6 2007/08/25 08:35:20 espie Exp
pos++;
}
if(dir[dir.size()-1] == '/')
@@ -928,13 +930,14 @@ char* SystemTools::AppendStrings(const char* str1, con
@@ -963,13 +965,14 @@ char* SystemTools::AppendStrings(const char* str1, con
return SystemTools::DuplicateString(str1);
}
size_t len1 = strlen(str1);
@ -30,7 +30,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.6 2007/08/25 08:35:20 espie Exp
return newstr;
}
@@ -955,14 +958,15 @@ char* SystemTools::AppendStrings(
@@ -990,14 +993,15 @@ char* SystemTools::AppendStrings(
}
size_t len1 = strlen(str1), len2 = strlen(str2);
@ -50,7 +50,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.6 2007/08/25 08:35:20 espie Exp
return newstr;
}
@@ -1130,8 +1134,10 @@ char* SystemTools::DuplicateString(const char* str)
@@ -1165,8 +1169,10 @@ char* SystemTools::DuplicateString(const char* str)
{
if (str)
{
@ -63,7 +63,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.6 2007/08/25 08:35:20 espie Exp
}
return NULL;
}
@@ -1828,7 +1834,7 @@ bool SystemTools::ConvertDateMacroString(const char *s
@@ -1863,7 +1869,7 @@ bool SystemTools::ConvertDateMacroString(const char *s
static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
char buffer[12];
@ -72,7 +72,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.6 2007/08/25 08:35:20 espie Exp
buffer[3] = 0;
char *ptr = strstr(month_names, buffer);
@@ -1879,7 +1885,7 @@ bool SystemTools::ConvertTimeStampMacroString(const ch
@@ -1914,7 +1920,7 @@ bool SystemTools::ConvertTimeStampMacroString(const ch
static char month_names[] = "JanFebMarAprMayJunJulAugSepOctNovDec";
char buffer[27];
@ -81,7 +81,7 @@ $OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.6 2007/08/25 08:35:20 espie Exp
buffer[7] = 0;
char *ptr = strstr(month_names, buffer + 4);
@@ -3384,12 +3390,12 @@ bool SystemTools::GetShortPath(const char* path, kwsys
@@ -3412,12 +3418,12 @@ bool SystemTools::GetShortPath(const char* path, kwsys
// if the path passed in has quotes around it, first remove the quotes
if (path[0] == '"' && path[strlen(path)-1] == '"')
{

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Utilities_cmtar_encode_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp $
--- Utilities/cmtar/encode.c.orig Mon Jul 3 15:14:22 2006
+++ Utilities/cmtar/encode.c Mon Jul 3 15:16:08 2006
$OpenBSD: patch-Utilities_cmtar_encode_c,v 1.2 2008/01/26 21:26:32 espie Exp $
--- Utilities/cmtar/encode.c.orig Mon Jan 21 19:59:58 2008
+++ Utilities/cmtar/encode.c Sat Jan 26 20:47:18 2008
@@ -91,7 +91,7 @@ th_set_path(TAR *t, char *pathname)
t->th_buf.gnu_longname = NULL;
@ -8,7 +8,7 @@ $OpenBSD: patch-Utilities_cmtar_encode_c,v 1.1.1.1 2006/07/20 09:23:13 espie Exp
- strcpy(suffix, "/");
+ strlcpy(suffix, "/", sizeof suffix);
if (strlen(pathname) > T_NAMELEN && (t->options & TAR_GNU))
if (strlen(pathname)+strlen(suffix) >= T_NAMELEN && (t->options & TAR_GNU))
{
@@ -135,7 +135,7 @@ th_set_link(TAR *t, char *linkname)
{

5
devel/cmake/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.4 2007/08/25 08:35:20 espie Exp $
@comment $OpenBSD: PLIST,v 1.5 2008/01/26 21:26:32 espie Exp $
bin/ccmake
bin/cmake
bin/cpack
@ -62,6 +62,7 @@ share/CMake/Modules/CMakeVS71FindMake.cmake
share/CMake/Modules/CMakeVS7BackwardCompatibility.cmake
share/CMake/Modules/CMakeVS7FindMake.cmake
share/CMake/Modules/CMakeVS8FindMake.cmake
share/CMake/Modules/CMakeVS9FindMake.cmake
share/CMake/Modules/CPack.Description.plist.in
share/CMake/Modules/CPack.Info.plist.in
share/CMake/Modules/CPack.STGZ_Header.sh.in
@ -183,7 +184,9 @@ share/CMake/Modules/Platform/CYGWIN-g77.cmake
share/CMake/Modules/Platform/CYGWIN.cmake
share/CMake/Modules/Platform/Darwin-xlc.cmake
share/CMake/Modules/Platform/Darwin.cmake
share/CMake/Modules/Platform/DragonFly.cmake
share/CMake/Modules/Platform/FreeBSD.cmake
share/CMake/Modules/Platform/GNU.cmake
share/CMake/Modules/Platform/HP-UX.cmake
share/CMake/Modules/Platform/IRIX.cmake
share/CMake/Modules/Platform/IRIX64.cmake