cmake: Updated (2.4.6 -> 2.6.1)

develop/cmake/cmake-conf.in

@@ -0,0 +1,15 @@
+# --- SDE-COPYRIGHT-NOTE-BEGIN ---
+# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
+#
+# Filename: package/.../cmake/cmake-conf.in
+# Copyright (C) 2008 The OpenSDE Project
+#
+# More information can be found in the files COPYING and README.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 2 of the License. A copy of the
+# GNU General Public License can be found in the file COPYING.
+# --- SDE-COPYRIGHT-NOTE-END ---
+
+hook_add preconf 5 'mkdir build; cd build; cmake -DCMAKE_INSTALL_PREFIX=/$prefix -DCMAKE_LIBRARY_PATH=$libdir ..'

develop/cmake/cmake.desc

@@ -1,9 +1,8 @@
-
 [COPY] --- SDE-COPYRIGHT-NOTE-BEGIN ---
 [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 [COPY]
 [COPY] Filename: package/.../cmake/cmake.desc
-[COPY] Copyright (C) 2006 - 2007 The OpenSDE Project
+[COPY] Copyright (C) 2006 - 2008 The OpenSDE Project
 [COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
 [COPY] Copyright (C) 1998 - 2003 Clifford Wolf
 [COPY]
@@ -31,8 +30,7 @@
 
 [L] BSD
 [S] Stable
-[V] 2.4.6
+[V] 2.6.1
 [P] X -----5---9 125.000
 
-[D] 293236451 cmake-2.4.6.tar.gz http://www.cmake.org/files/v2.4/
-
+[D] 3827461390 cmake-2.6.1.tar.gz http://www.cmake.org/files/v2.6/

develop/cmake/uname.patch

@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../cmake/uname.patch
-# Copyright (C) 2006 The OpenSDE Project
+# Copyright (C) 2006 - 2008 The OpenSDE Project
 # Copyright (C) 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -15,23 +15,28 @@
 # version.
 # --- SDE-COPYRIGHT-NOTE-END ---
 
-diff -Nur cmake-2.4.3-orig/Modules/CMakeDetermineSystem.cmake cmake-2.4.3/Modules/CMakeDetermineSystem.cmake
---- cmake-2.4.3-orig/Modules/CMakeDetermineSystem.cmake	2006-07-31 17:49:56.000000000 +0300
-+++ cmake-2.4.3/Modules/CMakeDetermineSystem.cmake	2006-08-20 22:24:28.000000000 +0300
-@@ -29,12 +29,12 @@
- IF(UNIX)
+diff -Nur cmake-2.6.1-orig/Modules/CMakeDetermineSystem.cmake cmake-2.6.1/Modules/CMakeDetermineSystem.cmake
+--- cmake-2.6.1-orig/Modules/CMakeDetermineSystem.cmake	2008-08-31 11:22:20.000000000 +0200
++++ cmake-2.6.1/Modules/CMakeDetermineSystem.cmake	2008-08-31 11:25:26.000000000 +0200
+@@ -31,16 +31,16 @@
+ IF(CMAKE_HOST_UNIX)
    FIND_PROGRAM(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
    IF(CMAKE_UNAME)
--    EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_SYSTEM_NAME)
--    EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_SYSTEM_VERSION)
--    EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR
-+    EXEC_PROGRAM(uname ARGS -s 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_SYSTEM_NAME)
-+    EXEC_PROGRAM(uname ARGS -r 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_SYSTEM_VERSION)
-+    EXEC_PROGRAM(uname ARGS -p 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR
-       RETURN_VALUE val)
-     IF("${val}" GREATER 0)
--      EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR
-+      EXEC_PROGRAM(uname ARGS -m 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_SYSTEM_PROCESSOR
+-    EXEC_PROGRAM(uname ARGS -s OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
+-    EXEC_PROGRAM(uname ARGS -r OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
++    EXEC_PROGRAM(uname ARGS -s 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_NAME)
++    EXEC_PROGRAM(uname ARGS -r 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_VERSION)
+     IF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+-      EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
++      EXEC_PROGRAM(uname ARGS -m 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
          RETURN_VALUE val)
-     ENDIF("${val}" GREATER 0)
-     IF("${val}" GREATER 0)
+     ELSE(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")
+-      EXEC_PROGRAM(uname ARGS -p OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
++      EXEC_PROGRAM(uname ARGS -p 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
+         RETURN_VALUE val)
+       IF("${val}" GREATER 0)
+-        EXEC_PROGRAM(uname ARGS -m OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
++        EXEC_PROGRAM(uname ARGS -m 2>/dev/null | cat OUTPUT_VARIABLE CMAKE_HOST_SYSTEM_PROCESSOR
+           RETURN_VALUE val)
+       ENDIF("${val}" GREATER 0)
+     ENDIF(CMAKE_HOST_SYSTEM_NAME MATCHES "Linux")