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

Update to cmake-2.8.7.

Browse Source 
Tested in a bulk build by naddy@
This commit is contained in:
dcoppa 2012-01-07 22:14:51 +00:00
parent bf9111f925
commit 0b7f7a5fee
11 changed files with 99 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/cmake/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.48 2011/12/05 21:44:02 sthen Exp $
# $OpenBSD: Makefile,v 1.49 2012/01/07 22:14:51 dcoppa Exp $
VMEM_WARNING = Yes
BROKEN-arm = build fails since move to gcc4
@ -6,8 +6,7 @@ BROKEN-arm = build fails since move to gcc4
HOMEPAGE = http://www.cmake.org/
CATEGORIES = devel
COMMENT = portable build system
DISTNAME = cmake-2.8.6
REVISION = 0
DISTNAME = cmake-2.8.7
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dcoppa@openbsd.org>

10
devel/cmake/distinfo
View File

@ -1,5 +1,5 @@
MD5 (cmake-2.8.6.tar.gz) = IUfaRS/ZISu5tFQqnu6dWw==
RMD160 (cmake-2.8.6.tar.gz) = wwlaR3Y2dJb4lbgHX9o3NWjwGHg=
SHA1 (cmake-2.8.6.tar.gz) = fCy9QtJ+JlgM1JI4khl7hLKpBnU=
SHA256 (cmake-2.8.6.tar.gz) = 5pmbgaw2fYX/sPabbEoO+W+V3BVO/TWS+c/rrN91co4=
SIZE (cmake-2.8.6.tar.gz) = 5583905
MD5 (cmake-2.8.7.tar.gz) = 4bI3rq7YgPZd7JwgYCRS9g==
RMD160 (cmake-2.8.7.tar.gz) = E7GI51FS/u9OVpKAfjqefDSyb+M=
SHA1 (cmake-2.8.7.tar.gz) = 0gYYK0VPTR3esPEdfRvopm5cJGQ=
SHA256 (cmake-2.8.7.tar.gz) = EwkjBT2P4aKuAyo/CQIfkCS/KdegTtEK4EZH/wDs9Z8=
SIZE (cmake-2.8.7.tar.gz) = 5667409

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

@ -1,7 +1,7 @@
$OpenBSD: patch-CMakeLists_txt,v 1.8 2011/10/14 17:22:10 dcoppa Exp $
--- CMakeLists.txt.orig Tue Oct 4 18:09:24 2011
+++ CMakeLists.txt Fri Oct 7 11:48:23 2011
@@ -252,6 +252,15 @@ MACRO (CMAKE_BUILD_UTILITIES)
$OpenBSD: patch-CMakeLists_txt,v 1.9 2012/01/07 22:14:51 dcoppa Exp $
--- CMakeLists.txt.orig Fri Dec 30 17:49:56 2011
+++ CMakeLists.txt Mon Jan 2 14:50:01 2012
@@ -258,6 +258,15 @@ MACRO (CMAKE_BUILD_UTILITIES)
# (a macro defined in this file)
CMAKE_HANDLE_SYSTEM_LIBRARIES()
@ -17,7 +17,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.8 2011/10/14 17:22:10 dcoppa Exp $
#---------------------------------------------------------------------
# Build zlib library for Curl, CMake, and CTest.
SET(CMAKE_ZLIB_HEADER "cm_zlib.h")
@@ -390,26 +399,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
@@ -396,26 +405,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
ELSE (UNIX)
SET(BUILD_CursesDialog 0)
ENDIF (UNIX)

22
devel/cmake/patches/patch-Modules_CMakeDetermineJavaCompiler_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.2 2011/10/14 17:22:10 dcoppa Exp $
--- Modules/CMakeDetermineJavaCompiler.cmake.orig Tue Oct 4 18:09:24 2011
+++ Modules/CMakeDetermineJavaCompiler.cmake Fri Oct 14 09:40:03 2011
$OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.3 2012/01/07 22:14:51 dcoppa Exp $
--- Modules/CMakeDetermineJavaCompiler.cmake.orig Fri Dec 30 17:49:56 2011
+++ Modules/CMakeDetermineJavaCompiler.cmake Tue Jan 3 11:26:41 2012
@@ -16,6 +16,8 @@
# NOTE, a generator may set CMAKE_Java_COMPILER before
# loading this file to force a compiler.
@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.2 2011/10/14 17:22:
IF(NOT CMAKE_Java_COMPILER)
# prefer the environment variable CC
IF($ENV{JAVA_COMPILER} MATCHES ".+")
@@ -42,28 +44,41 @@ IF(NOT CMAKE_Java_COMPILER)
@@ -42,28 +44,43 @@ IF(NOT CMAKE_Java_COMPILER)
ENDIF(NOT EXISTS ${CMAKE_Java_ARCHIVE_INIT})
ENDIF($ENV{JAVA_ARCHIVE} MATCHES ".+")
@ -37,13 +37,16 @@ $OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.2 2011/10/14 17:22:
- /opt/sun-jdk-1.5.0.04/bin
- )
+ IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(Java_BIN_PATH ${LOCALBASE}/jdk-1.5.0/bin)
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ IF(MODJAVA_VER MATCHES "^1\\.6$")
+ SET(Java_BIN_PATH ${LOCALBASE}/jdk-1.6.0/bin)
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6\\+$")
+ SET(Java_BIN_PATH
+ ${LOCALBASE}/jdk-1.7.0/bin
+ ${LOCALBASE}/jdk-1.6.0/bin
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.6$")
+ SET(Java_BIN_PATH ${LOCALBASE}/jdk-1.7.0/bin)
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ ENDIF(MODJAVA_VER MATCHES "^1\\.6$")
+ ELSE(MODJAVA_VER)
+ SET(Java_BIN_PATH
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
@ -57,7 +60,6 @@ $OpenBSD: patch-Modules_CMakeDetermineJavaCompiler_cmake,v 1.2 2011/10/14 17:22:
+ $ENV{JAVA_HOME}/bin
+ ${LOCALBASE}/jdk-1.7.0/bin
+ ${LOCALBASE}/jdk-1.6.0/bin
+ ${LOCALBASE}/jdk-1.5.0/bin
+ /usr/bin
+ /usr/lib/java/bin
+ /usr/share/java/bin

42
devel/cmake/patches/patch-Modules_FindJNI_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.4 2011/10/14 17:22:10 dcoppa Exp $
--- Modules/FindJNI.cmake.orig Tue Oct 4 18:09:24 2011
+++ Modules/FindJNI.cmake Fri Oct 14 09:48:33 2011
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.5 2012/01/07 22:14:51 dcoppa Exp $
--- Modules/FindJNI.cmake.orig Fri Dec 30 17:49:56 2011
+++ Modules/FindJNI.cmake Tue Jan 3 10:57:13 2012
@@ -26,6 +26,8 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
@ -48,22 +48,24 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.4 2011/10/14 17:22:10 dcoppa Exp $
- /usr/lib/jvm/default-java/lib
- )
+IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${LOCALBASE}/jdk-1.5.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.5.0/lib/{libarch}
+ )
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ IF(MODJAVA_VER MATCHES "^1\\.6$")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${LOCALBASE}/jdk-1.6.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.6.0/lib/{libarch}
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6\\+$")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
+ ${LOCALBASE}/jdk-1.6.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.6.0/lib/{libarch}
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.6$")
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
+ )
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ ENDIF(MODJAVA_VER MATCHES "^1\\.6$")
+ELSE(MODJAVA_VER)
+ SET(JAVA_AWT_LIBRARY_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
@ -78,10 +80,8 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.4 2011/10/14 17:22:10 dcoppa Exp $
+ ${_JAVA_HOME}
+ ${LOCALBASE}/jdk-1.7.0/jre/lib/{libarch}
+ ${LOCALBASE}/jdk-1.6.0/jre/lib/{libarch}
+ ${LOCALBASE}/jdk-1.5.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.7.0/lib/{libarch}
+ ${LOCALBASE}/jre-1.6.0/lib/{libarch}
+ ${LOCALBASE}/jre-1.5.0/lib/{libarch}
+ /usr/lib
+ /usr/local/lib
+ /usr/lib/jvm/java/lib
@ -112,19 +112,20 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.4 2011/10/14 17:22:10 dcoppa Exp $
ENDFOREACH(dir)
+IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${LOCALBASE}/jdk-1.5.0/include
+ )
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ IF(MODJAVA_VER MATCHES "^1\\.6$")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${LOCALBASE}/jdk-1.6.0/include
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6\\+$")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${LOCALBASE}/jdk-1.7.0/include
+ ${LOCALBASE}/jdk-1.6.0/include
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.6$")
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ ${LOCALBASE}/jdk-1.7.0/include
+ )
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ ENDIF(MODJAVA_VER MATCHES "^1\\.6$")
+ELSE(MODJAVA_VER)
+ SET(JAVA_AWT_INCLUDE_DIRECTORIES
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
@ -133,7 +134,6 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v 1.4 2011/10/14 17:22:10 dcoppa Exp $
+ ${_JAVA_HOME}/include
+ ${LOCALBASE}/jdk-1.7.0/include
+ ${LOCALBASE}/jdk-1.6.0/include
+ ${LOCALBASE}/jdk-1.5.0/include
+ /usr/include
+ /usr/local/include
+ /usr/lib/java/include

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_FindJava_cmake,v 1.5 2011/10/14 17:22:10 dcoppa Exp $
--- Modules/FindJava.cmake.orig Tue Oct 4 18:09:24 2011
+++ Modules/FindJava.cmake Fri Oct 14 09:54:02 2011
$OpenBSD: patch-Modules_FindJava_cmake,v 1.6 2012/01/07 22:14:51 dcoppa Exp $
--- Modules/FindJava.cmake.orig Fri Dec 30 17:49:56 2011
+++ Modules/FindJava.cmake Tue Jan 3 11:03:39 2012
@@ -56,6 +56,8 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.5 2011/10/14 17:22:10 dcoppa Exp $
# The HINTS option should only be used for values computed from the system.
SET(_JAVA_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\2.0;JavaHome]/bin"
@@ -68,19 +70,32 @@ SET(_JAVA_HINTS
@@ -68,19 +70,34 @@ SET(_JAVA_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
$ENV{JAVA_HOME}/bin
)
@ -28,20 +28,22 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.5 2011/10/14 17:22:10 dcoppa Exp $
- /opt/sun-jdk-1.5.0.04/bin
- )
+IF(MODJAVA_VER)
+ IF(MODJAVA_VER MATCHES "^1\\.5.*")
+ SET(_JAVA_PATHS ${LOCALBASE}/jdk-1.5.0/bin)
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*")
+ IF(MODJAVA_VER MATCHES "^1\\.6$")
+ SET(_JAVA_PATHS ${LOCALBASE}/jdk-1.6.0/bin)
+ ELSE(MODJAVA_VER MATCHES "^1\\.5.*")
+ ELSEIF(MODJAVA_VER MATCHES "^1\\.6\\+$")
+ SET(_JAVA_PATHS
+ ${LOCALBASE}/jdk-1.7.0/bin
+ ${LOCALBASE}/jdk-1.6.0/bin
+ )
+ ELSE(MODJAVA_VER MATCHES "^1\\.6$")
+ SET(_JAVA_PATHS ${LOCALBASE}/jdk-1.7.0/bin)
+ ENDIF(MODJAVA_VER MATCHES "^1\\.5.*")
+ ENDIF(MODJAVA_VER MATCHES "^1\\.6$")
+ELSE(MODJAVA_VER)
+ # Hard-coded guesses should still go in PATHS. This ensures that the user
+ # environment can always override hard guesses.
+ SET(_JAVA_PATHS
+ ${LOCALBASE}/jdk-1.7.0/bin
+ ${LOCALBASE}/jdk-1.6.0/bin
+ ${LOCALBASE}/jdk-1.5.0/bin
+ /usr/lib/java/bin
+ /usr/share/java/bin
+ /usr/local/java/bin
@ -56,7 +58,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.5 2011/10/14 17:22:10 dcoppa Exp $
FIND_PROGRAM(Java_JAVA_EXECUTABLE
NAMES java
HINTS ${_JAVA_HINTS}
@@ -107,6 +122,7 @@ IF(Java_JAVA_EXECUTABLE)
@@ -107,6 +124,7 @@ IF(Java_JAVA_EXECUTABLE)
# 2. OpenJDK 1.6
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
@ -64,7 +66,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.5 2011/10/14 17:22:10 dcoppa Exp $
IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+)[oem-]*\".*"
@@ -114,6 +130,10 @@ IF(Java_JAVA_EXECUTABLE)
@@ -114,6 +132,10 @@ IF(Java_JAVA_EXECUTABLE)
ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
# Kaffe style
STRING( REGEX REPLACE "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+).*"

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

@ -1,23 +1,6 @@
$OpenBSD: patch-Modules_FindRuby_cmake,v 1.2 2011/12/03 13:38:43 dcoppa Exp $
$OpenBSD: patch-Modules_FindRuby_cmake,v 1.3 2012/01/07 22:14:51 dcoppa Exp $
--- Modules/FindRuby.cmake.orig Tue Oct 4 18:09:24 2011
+++ Modules/FindRuby.cmake Sat Dec 3 14:16:36 2011
@@ -30,11 +30,11 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
+# RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"archdir"@:>@)'`
+# RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitearchdir"@:>@)'`
+# RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"sitelibdir"@:>@)'`
+# RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"libdir"@:>@)'`
+# RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",RbConfig::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
# uncomment the following line to get debug output for this file
# SET(_RUBY_DEBUG_OUTPUT TRUE)
@@ -62,36 +62,36 @@ FIND_PROGRAM(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EX
IF(RUBY_EXECUTABLE AND NOT RUBY_MAJOR_VERSION)
@ -78,12 +61,3 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v 1.2 2011/12/03 13:38:43 dcoppa Exp $
OUTPUT_VARIABLE RUBY_VENDORARCH_DIR)
ENDIF(RUBY_HAS_VENDOR_RUBY)
@@ -180,7 +180,7 @@ ENDIF( ${Ruby_FIND_VERSION_SHORT_NODOT} GREATER 18 OR
# Determine the list of possible names for the ruby library
-SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT})
+SET(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT})
IF(WIN32)
SET( _RUBY_MSVC_RUNTIME "" )

38
devel/cmake/patches/patch-Modules_Qt4Macros_cmake
View File

@ -1,38 +0,0 @@
$OpenBSD: patch-Modules_Qt4Macros_cmake,v 1.4 2011/09/20 11:32:36 dcoppa Exp $
--- Modules/Qt4Macros.cmake.orig Fri Jul 8 14:21:44 2011
+++ Modules/Qt4Macros.cmake Fri Sep 9 09:49:49 2011
@@ -133,6 +133,8 @@ MACRO (QT4_GENERATE_MOC infile outfile )
ENDIF(NOT IS_ABSOLUTE "${outfile}")
QT4_CREATE_MOC_COMMAND(${abs_infile} ${_outfile} "${moc_flags}" "")
SET_SOURCE_FILES_PROPERTIES(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file
+
+ MACRO_ADD_FILE_DEPENDENCIES(${abs_infile} ${outfile})
ENDMACRO (QT4_GENERATE_MOC)
@@ -216,9 +218,22 @@ MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _base
SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp)
SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc)
- # handling more arguments (as in FindQt4.cmake from KDE4) will come soon, then
- # _params will be used for more than just -m
- SET(_params -m)
+ GET_SOURCE_FILE_PROPERTY(_nonamespace ${_interface} NO_NAMESPACE)
+ IF ( _nonamespace )
+ SET(_params -N -m)
+ ELSE ( _nonamespace )
+ SET(_params -m)
+ ENDIF ( _nonamespace )
+
+ GET_SOURCE_FILE_PROPERTY(_classname ${_interface} CLASSNAME)
+ IF ( _classname )
+ SET(_params ${_params} -c ${_classname})
+ ENDIF ( _classname )
+
+ GET_SOURCE_FILE_PROPERTY(_include ${_interface} INCLUDE)
+ IF ( _include )
+ SET(_params ${_params} -i ${_include})
+ ENDIF ( _include )
ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header}
COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile}

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

@ -1,9 +1,9 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.10 2011/10/14 17:22:10 dcoppa Exp $
--- Source/cmTarget.cxx.orig Tue Oct 4 18:09:25 2011
+++ Source/cmTarget.cxx Fri Oct 7 09:15:20 2011
@@ -3320,6 +3320,36 @@ void cmTarget::GetLibraryNames(std::string& name,
std::string suffix;
this->GetFullNameInternal(config, false, prefix, base, suffix);
$OpenBSD: patch-Source_cmTarget_cxx,v 1.11 2012/01/07 22:14:51 dcoppa Exp $
--- Source/cmTarget.cxx.orig Fri Dec 30 17:49:57 2011
+++ Source/cmTarget.cxx Sat Jan 7 22:13:14 2012
@@ -3379,9 +3379,43 @@ void cmTarget::GetLibraryNames(std::string& name,
// The library name.
name = prefix+base+suffix;
+#if defined(__OpenBSD__)
+ // Override shared library version using LIBxxx_VERSION
@ -14,7 +14,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.10 2011/10/14 17:22:10 dcoppa Exp $
+ std::string env_name = "LIB" + base + "_VERSION";
+ char *env_vers_cstr = getenv(env_name.c_str());
+
+ if (env_vers_cstr != NULL) {
+ if (env_vers_cstr && strlen(env_vers_cstr) > 0) {
+ // This means an override is present.
+ std::string env_vers = std::string(env_vers_cstr);
+
@ -29,40 +29,43 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.10 2011/10/14 17:22:10 dcoppa Exp $
+ this->Makefile->IssueMessage(cmake::FATAL_ERROR,
+ msg.c_str());
+ } else {
+ soversion = version = env_vers_cstr;
+ version = env_vers_cstr;
+ }
+ }
+ }
+#endif
+
// The library name.
name = prefix+base+suffix;
// The library's soname.
this->ComputeVersionedName(soName, prefix, base, suffix,
+ name, version);
+#else
+ // The library's soname.
+ this->ComputeVersionedName(soName, prefix, base, suffix,
name, soversion);
+#endif
@@ -3354,8 +3384,27 @@ void cmTarget::GetLibraryNames(std::string& name,
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix,
@@ -3414,7 +3448,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
if(version)
{
realName += ".";
vName += ".";
+#if defined(__OpenBSD__)
+ // OpenBSD-style versioning scheme for shared libraries.
+ // OpenBSD-style versioning for shared libraries.
+ // Convert libname.so.X.X.X to libname.so.X.X
+ int j = 0;
+ for (int i = 0; i < (int)strlen(version); i++)
+ for (int i = 0; i < (int)strlen(version); i++)
+ {
+ if (version[i] == '.')
+ if (version[i] == '.')
+ {
+ j++;
+ if (j == 2)
+ {
+ j++;
+ if (j == 2)
+ break;
+ }
+ }
+ realName += version[i];
+ vName += version[i];
+ }
+ }
+#else
realName += version;
}
vName += version;
+#endif
else if(soversion)
{
realName += ".";
}
vName += this->IsApple? suffix : std::string();
}

11
devel/cmake/patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt
View File

@ -1,11 +0,0 @@
$OpenBSD: patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt,v 1.1 2011/10/14 17:22:10 dcoppa Exp $
--- Tests/FindPackageModeMakefileTest/CMakeLists.txt.orig Sun Oct 9 18:10:56 2011
+++ Tests/FindPackageModeMakefileTest/CMakeLists.txt Sun Oct 9 18:15:25 2011
@@ -7,6 +7,7 @@ if(UNIX AND "${CMAKE_GENERATOR}" MATCHES "Makefile")
# is AFAIK a GNU make extension. Alex
execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} -v
OUTPUT_VARIABLE makeVersionOutput
+ ERROR_QUIET
TIMEOUT 10)
string(TOUPPER "${makeVersionOutput}" MAKE_VERSION_OUTPUT)
if("${MAKE_VERSION_OUTPUT}" MATCHES ".*GNU MAKE.*")

10
devel/cmake/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.15 2011/10/14 17:22:10 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.16 2012/01/07 22:14:51 dcoppa Exp $
@bin bin/ccmake
@bin bin/cmake
@bin bin/cpack
@ -205,6 +205,7 @@ share/cmake/Modules/Compiler/SunPro-ASM.cmake
share/cmake/Modules/Compiler/SunPro-C.cmake
share/cmake/Modules/Compiler/SunPro-CXX.cmake
share/cmake/Modules/Compiler/SunPro-Fortran.cmake
share/cmake/Modules/Compiler/TinyCC-C.cmake
share/cmake/Modules/Compiler/VisualAge-C.cmake
share/cmake/Modules/Compiler/VisualAge-CXX.cmake
share/cmake/Modules/Compiler/VisualAge-Fortran.cmake
@ -215,6 +216,7 @@ share/cmake/Modules/Compiler/XL-Fortran.cmake
share/cmake/Modules/Compiler/XL.cmake
share/cmake/Modules/Dart.cmake
share/cmake/Modules/DartConfiguration.tcl.in
share/cmake/Modules/DeployQt4.cmake
share/cmake/Modules/Documentation.cmake
share/cmake/Modules/DummyCXXFile.cxx
share/cmake/Modules/ExternalProject.cmake
@ -451,6 +453,8 @@ 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/GNUtoMS_lib.bat.in
share/cmake/Modules/Platform/GNUtoMS_lib.cmake
share/cmake/Modules/Platform/Generic-ADSP-ASM.cmake
share/cmake/Modules/Platform/Generic-ADSP-C.cmake
share/cmake/Modules/Platform/Generic-ADSP-CXX.cmake
@ -491,6 +495,7 @@ share/cmake/Modules/Platform/Linux-PathScale-CXX.cmake
share/cmake/Modules/Platform/Linux-PathScale-Fortran.cmake
share/cmake/Modules/Platform/Linux-PathScale.cmake
share/cmake/Modules/Platform/Linux-SunPro-CXX.cmake
share/cmake/Modules/Platform/Linux-TinyCC-C.cmake
share/cmake/Modules/Platform/Linux-VisualAge-C.cmake
share/cmake/Modules/Platform/Linux-VisualAge-CXX.cmake
share/cmake/Modules/Platform/Linux-VisualAge-Fortran.cmake
@ -522,8 +527,11 @@ share/cmake/Modules/Platform/Windows-Borland-C.cmake
share/cmake/Modules/Platform/Windows-Borland-CXX.cmake
share/cmake/Modules/Platform/Windows-Borland.cmake
share/cmake/Modules/Platform/Windows-G95-Fortran.cmake
share/cmake/Modules/Platform/Windows-GNU-C-ABI.cmake
share/cmake/Modules/Platform/Windows-GNU-C.cmake
share/cmake/Modules/Platform/Windows-GNU-CXX-ABI.cmake
share/cmake/Modules/Platform/Windows-GNU-CXX.cmake
share/cmake/Modules/Platform/Windows-GNU-Fortran-ABI.cmake
share/cmake/Modules/Platform/Windows-GNU-Fortran.cmake
share/cmake/Modules/Platform/Windows-GNU.cmake
share/cmake/Modules/Platform/Windows-Intel-ASM.cmake