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

Update to cmake-2.8.9.

Browse Source 
"There was no cmake fallout in the bulk on amd64" jasper@
Also tested by Brad with a handful of CMake using ports
This commit is contained in:
dcoppa 2012-08-31 12:28:31 +00:00
parent 94ec942f9f
commit d475b0a293
24 changed files with 96 additions and 320 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.63 2012/08/20 08:07:34 dcoppa Exp $
# $OpenBSD: Makefile,v 1.64 2012/08/31 12:28:31 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.8
REVISION = 10
DISTNAME = cmake-2.8.9
MASTER_SITES = ${HOMEPAGE}files/v2.8/
MAINTAINER = David Coppa <dcoppa@openbsd.org>

7
devel/cmake/distinfo
View File

@ -1,5 +1,2 @@
MD5 (cmake-2.8.8.tar.gz) = unSyLHiKDIVHl2uIDNArFw==
RMD160 (cmake-2.8.8.tar.gz) = 22CZn9TRs+Lig2jUUDWgWO1+djk=
SHA1 (cmake-2.8.8.tar.gz) = p038PgoNf4V6xd2gO7mevwdnbaE=
SHA256 (cmake-2.8.8.tar.gz) = K1mJeGTWIg/yCqjqxkysiZTgBImKHA+JnIy017dXC0Y=
SIZE (cmake-2.8.8.tar.gz) = 5691656
SHA256 (cmake-2.8.9.tar.gz) = 3D3Mc5m+hjZHGXX5VQhs34AHOYYsJAhYqY6JcZ5F5vk=
SIZE (cmake-2.8.9.tar.gz) = 5658837

69
devel/cmake/files/FindLibLZMA.cmake
View File

@ -1,69 +0,0 @@
# - Find LibLZMA
# Find LibLZMA headers and library
#
# LIBLZMA_FOUND - True if liblzma is found.
# LIBLZMA_INCLUDE_DIRS - Directory where liblzma headers are located.
# LIBLZMA_LIBRARIES - Lzma libraries to link against.
# LIBLZMA_HAS_AUTO_DECODER - True if lzma_auto_decoder() is found (required).
# LIBLZMA_HAS_EASY_ENCODER - True if lzma_easy_encoder() is found (required).
# LIBLZMA_HAS_LZMA_PRESET - True if lzma_lzma_preset() is found (required).
# LIBLZMA_VERSION_MAJOR - The major version of lzma
# LIBLZMA_VERSION_MINOR - The minor version of lzma
# LIBLZMA_VERSION_PATCH - The patch version of lzma
# LIBLZMA_VERSION_STRING - version number as a string (ex: "5.0.3")
#=============================================================================
# Copyright 2008 Per Oyvind Karlsen <peroyvind@mandriva.org>
# Copyright 2009 Alexander Neundorf <neundorf@kde.org>
# Copyright 2009 Helio Chissini de Castro <helio@kde.org>
# Copyright 2012 Mario Bensi <mbensi@ipsquad.net>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
FIND_PATH(LIBLZMA_INCLUDE_DIR lzma.h )
FIND_LIBRARY(LIBLZMA_LIBRARY lzma)
IF(LIBLZMA_INCLUDE_DIR AND EXISTS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h")
FILE(READ "${LIBLZMA_INCLUDE_DIR}/lzma/version.h" LIBLZMA_HEADER_CONTENTS)
STRING(REGEX REPLACE ".*#define LZMA_VERSION_MAJOR ([0-9]+).*" "\\1" LIBLZMA_VERSION_MAJOR "${LIBLZMA_HEADER_CONTENTS}")
STRING(REGEX REPLACE ".*#define LZMA_VERSION_MINOR ([0-9]+).*" "\\1" LIBLZMA_VERSION_MINOR "${LIBLZMA_HEADER_CONTENTS}")
STRING(REGEX REPLACE ".*#define LZMA_VERSION_PATCH ([0-9]+).*" "\\1" LIBLZMA_VERSION_PATCH "${LIBLZMA_HEADER_CONTENTS}")
SET(LIBLZMA_VERSION_STRING "${LIBLZMA_VERSION_MAJOR}.${LIBLZMA_VERSION_MINOR}.${LIBLZMA_VERSION_PATCH}")
ENDIF(LIBLZMA_INCLUDE_DIR AND EXISTS "${LIBLZMA_INCLUDE_DIR}/lzma/version.h")
# We're using new code known now as XZ, even library still been called LZMA
# it can be found in http://tukaani.org/xz/
# Avoid using old codebase
IF (LIBLZMA_LIBRARY)
INCLUDE(CheckLibraryExists)
CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_auto_decoder "" LIBLZMA_HAS_AUTO_DECODER)
CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_easy_encoder "" LIBLZMA_HAS_EASY_ENCODER)
CHECK_LIBRARY_EXISTS(${LIBLZMA_LIBRARY} lzma_lzma_preset "" LIBLZMA_HAS_LZMA_PRESET)
ENDIF (LIBLZMA_LIBRARY)
INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibLZMA REQUIRED_VARS LIBLZMA_INCLUDE_DIR
LIBLZMA_LIBRARY
LIBLZMA_HAS_AUTO_DECODER
LIBLZMA_HAS_EASY_ENCODER
LIBLZMA_HAS_LZMA_PRESET
VERSION_VAR LIBLZMA_VERSION_STRING
)
IF (LIBLZMA_FOUND)
SET(LIBLZMA_LIBRARIES ${LIBLZMA_LIBRARY})
SET(LIBLZMA_INCLUDE_DIRS ${LIBLZMA_INCLUDE_DIR})
ENDIF (LIBLZMA_FOUND)
MARK_AS_ADVANCED( LIBLZMA_INCLUDE_DIR LIBLZMA_LIBRARY )

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

@ -1,6 +1,6 @@
$OpenBSD: patch-CMakeLists_txt,v 1.10 2012/05/07 07:06:20 dcoppa Exp $
--- CMakeLists.txt.orig Wed Apr 18 20:10:54 2012
+++ CMakeLists.txt Mon Apr 30 11:07:24 2012
$OpenBSD: patch-CMakeLists_txt,v 1.11 2012/08/31 12:28:31 dcoppa Exp $
--- CMakeLists.txt.orig Thu Aug 9 20:15:18 2012
+++ CMakeLists.txt Thu Aug 23 11:25:46 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.10 2012/05/07 07:06:20 dcoppa Exp $
#---------------------------------------------------------------------
# Build zlib library for Curl, CMake, and CTest.
SET(CMAKE_ZLIB_HEADER "cm_zlib.h")
@@ -397,26 +406,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
@@ -396,26 +405,7 @@ MACRO (CMAKE_BUILD_UTILITIES)
ELSE (UNIX)
SET(BUILD_CursesDialog 0)
ENDIF (UNIX)

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

@ -1,16 +0,0 @@
$OpenBSD: patch-Modules_CMakeDetermineCCompiler_cmake,v 1.1 2012/07/03 07:48:54 dcoppa Exp $
Fix typo: "_CXX_" -> "_C_"
(upstream git commit b9ccaf5f7977b7444a50a7b1dbb1902422f7ab27)
--- Modules/CMakeDetermineCCompiler.cmake.orig Tue Jul 3 08:49:51 2012
+++ Modules/CMakeDetermineCCompiler.cmake Tue Jul 3 08:50:29 2012
@@ -32,7 +32,7 @@
# _CMAKE_TOOLCHAIN_PREFIX
IF(NOT CMAKE_C_COMPILER)
- SET(CMAKE_CXX_COMPILER_INIT NOTFOUND)
+ SET(CMAKE_C_COMPILER_INIT NOTFOUND)
# prefer the environment variable CC
IF($ENV{CC} MATCHES ".+")

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
--- Modules/Compiler/GNU.cmake.orig Wed Apr 18 20:10:54 2012
+++ Modules/Compiler/GNU.cmake Mon Apr 30 11:07:25 2012
@@ -39,8 +39,8 @@ macro(__compiler_gnu lang)
$OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.4 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/Compiler/GNU.cmake.orig Thu Aug 9 20:15:19 2012
+++ Modules/Compiler/GNU.cmake Thu Aug 23 11:25:47 2012
@@ -43,8 +43,8 @@ macro(__compiler_gnu lang)
# Initial configuration flags.
set(CMAKE_${lang}_FLAGS_INIT "")
set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-g")

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_FindBoost_cmake,v 1.4 2012/05/07 07:06:20 dcoppa Exp $
--- Modules/FindBoost.cmake.orig Wed Apr 18 20:10:54 2012
+++ Modules/FindBoost.cmake Mon Apr 30 11:07:25 2012
@@ -73,7 +73,9 @@
$OpenBSD: patch-Modules_FindBoost_cmake,v 1.5 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/FindBoost.cmake.orig Thu Aug 9 20:15:19 2012
+++ Modules/FindBoost.cmake Thu Aug 23 11:25:47 2012
@@ -74,7 +74,9 @@
# omit the 3rd version number from include paths if it is 0 although not all
# binary Boost releases do so.
#

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-Modules_FindJava_cmake,v 1.7 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/FindJava.cmake.orig Thu Aug 23 11:31:02 2012
+++ Modules/FindJava.cmake Thu Aug 23 11:33:50 2012
@@ -56,6 +56,8 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
@ -63,9 +63,9 @@ $OpenBSD: patch-Modules_FindJava_cmake,v 1.6 2012/01/07 22:14:51 dcoppa Exp $
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
+ # 5. OpenJDK 1.7.x on OpenBSD
IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+[oem-]*\".*")
IF(var MATCHES "java version \"[0-9]+\\.[0-9]+\\.[0-9_.]+.*\".*")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+)[oem-]*\".*"
STRING( REGEX REPLACE ".* version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\".*"
@@ -114,6 +132,10 @@ IF(Java_JAVA_EXECUTABLE)
ELSEIF(var MATCHES "java full version \"kaffe-[0-9]+\\.[0-9]+\\.[0-9_]+\".*")
# Kaffe style

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_FindLua51_cmake,v 1.1 2012/07/12 16:26:13 dcoppa Exp $
--- Modules/FindLua51.cmake.orig Thu Jul 12 18:17:15 2012
+++ Modules/FindLua51.cmake Thu Jul 12 18:23:12 2012
$OpenBSD: patch-Modules_FindLua51_cmake,v 1.2 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/FindLua51.cmake.orig Thu Aug 9 20:15:19 2012
+++ Modules/FindLua51.cmake Thu Aug 23 11:25:47 2012
@@ -28,7 +28,7 @@
FIND_PATH(LUA_INCLUDE_DIR lua.h
HINTS
@ -10,7 +10,7 @@ $OpenBSD: patch-Modules_FindLua51_cmake,v 1.1 2012/07/12 16:26:13 dcoppa Exp $
PATHS
~/Library/Frameworks
/Library/Frameworks
@@ -41,7 +41,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
@@ -39,7 +39,7 @@ FIND_PATH(LUA_INCLUDE_DIR lua.h
)
FIND_LIBRARY(LUA_LIBRARY

32
devel/cmake/patches/patch-Modules_FindPkgConfig_cmake
View File

@ -1,32 +0,0 @@
$OpenBSD: patch-Modules_FindPkgConfig_cmake,v 1.2 2012/05/07 13:58:18 dcoppa Exp $
FindPkgConfig.cmake: fix documented output variable not set
(upstream git commit 3ea850a5023060b84dcc0e6f0098c32c28b15807)
--- Modules/FindPkgConfig.cmake.orig Thu May 3 09:28:55 2012
+++ Modules/FindPkgConfig.cmake Thu May 3 09:30:09 2012
@@ -13,11 +13,10 @@
# When the 'QUIET' argument is set, no status messages will be printed.
#
# It sets the following variables:
-# PKG_CONFIG_FOUND ... true if pkg-config works on the system
+# PKG_CONFIG_FOUND ... if pkg-config executable was found
# PKG_CONFIG_EXECUTABLE ... pathname of the pkg-config program
# PKG_CONFIG_VERSION_STRING ... the version of the pkg-config program found
# (since CMake 2.8.8)
-# PKG_CONFIG_FOUND ... if pkg-config executable was found
#
# For the following variables two sets of values exist; first one is the
# common one and has the given PREFIX. The second set contains flags
@@ -103,6 +102,11 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleSta
find_package_handle_standard_args(PkgConfig
REQUIRED_VARS PKG_CONFIG_EXECUTABLE
VERSION_VAR PKG_CONFIG_VERSION_STRING)
+
+# This is needed because the module name is "PkgConfig" but the name of
+# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
+# handled by FPHSA.
+set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
# Unsets the given variables
macro(_pkgconfig_unset var)

50
devel/cmake/patches/patch-Modules_FindPythonLibs_cmake
View File

@ -1,13 +1,7 @@
$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.5 2012/06/15 10:26:56 dcoppa Exp $
From 9d145b0998f21ae6d0571c5b6a7ab0168722df7c Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Tue, 5 Jun 2012 20:02:58 +0200
Subject: [PATCH] FindPythonLibs: honor EXACT version specification (#13216)
--- Modules/FindPythonLibs.cmake.orig Fri Jun 15 11:41:23 2012
+++ Modules/FindPythonLibs.cmake Fri Jun 15 11:41:31 2012
@@ -31,6 +31,9 @@ INCLUDE(CMakeFindFrameworks)
$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.6 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/FindPythonLibs.cmake.orig Thu Aug 23 11:39:18 2012
+++ Modules/FindPythonLibs.cmake Thu Aug 23 11:42:40 2012
@@ -36,6 +36,9 @@ INCLUDE(CMakeFindFrameworks)
# Search for the python framework on Apple.
CMAKE_FIND_FRAMEWORKS(Python)
@ -17,29 +11,7 @@ Subject: [PATCH] FindPythonLibs: honor EXACT version specification (#13216)
SET(_PYTHON1_VERSIONS 1.6 1.5)
SET(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
SET(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
@@ -40,13 +43,19 @@ IF(PythonLibs_FIND_VERSION)
STRING(REGEX REPLACE "^([0-9]+\\.[0-9]+).*" "\\1" _PYTHON_FIND_MAJ_MIN "${PythonLibs_FIND_VERSION}")
STRING(REGEX REPLACE "^([0-9]+).*" "\\1" _PYTHON_FIND_MAJ "${_PYTHON_FIND_MAJ_MIN}")
UNSET(_PYTHON_FIND_OTHER_VERSIONS)
- IF(NOT PythonLibs_FIND_VERSION_EXACT)
+ IF(PythonLibs_FIND_VERSION_EXACT)
+ IF(_PYTHON_FIND_MAJ_MIN STREQUAL PythonLibs_FIND_VERSION)
+ SET(_PYTHON_FIND_OTHER_VERSIONS "${PythonLibs_FIND_VERSION}")
+ ELSE(_PYTHON_FIND_MAJ_MIN STREQUAL PythonLibs_FIND_VERSION)
+ SET(_PYTHON_FIND_OTHER_VERSIONS "${PythonLibs_FIND_VERSION}" "${_PYTHON_FIND_MAJ_MIN}")
+ ENDIF(_PYTHON_FIND_MAJ_MIN STREQUAL PythonLibs_FIND_VERSION)
+ ELSE(PythonLibs_FIND_VERSION_EXACT)
FOREACH(_PYTHON_V ${_PYTHON${_PYTHON_FIND_MAJ}_VERSIONS})
IF(NOT _PYTHON_V VERSION_LESS _PYTHON_FIND_MAJ_MIN)
LIST(APPEND _PYTHON_FIND_OTHER_VERSIONS ${_PYTHON_V})
ENDIF()
ENDFOREACH()
- ENDIF(NOT PythonLibs_FIND_VERSION_EXACT)
+ ENDIF(PythonLibs_FIND_VERSION_EXACT)
UNSET(_PYTHON_FIND_MAJ_MIN)
UNSET(_PYTHON_FIND_MAJ)
ELSE(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$")
@@ -58,10 +67,14 @@ ENDIF(PythonLibs_FIND_VERSION)
@@ -69,10 +72,14 @@ ENDIF(PythonLibs_FIND_VERSION)
# Set up the versions we know about, in the order we will search. Always add
# the user supplied additional versions to the front.
@ -58,7 +30,7 @@ Subject: [PATCH] FindPythonLibs: honor EXACT version specification (#13216)
UNSET(_PYTHON_FIND_OTHER_VERSIONS)
UNSET(_PYTHON1_VERSIONS)
@@ -113,15 +126,19 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
@@ -129,18 +136,22 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS})
ENDFOREACH(dir)
ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR)
@ -69,6 +41,9 @@ Subject: [PATCH] FindPythonLibs: honor EXACT version specification (#13216)
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
- [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
- PATH_SUFFIXES
- python${_CURRENT_VERSION}mu
- python${_CURRENT_VERSION}m
- python${_CURRENT_VERSION}u
- python${_CURRENT_VERSION}
- )
+ IF(MODPY_VERSION AND MODPY_INCDIR)
@ -81,9 +56,12 @@ Subject: [PATCH] FindPythonLibs: honor EXACT version specification (#13216)
+ [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+ [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/include
+ PATH_SUFFIXES
+ python${_CURRENT_VERSION}mu
+ python${_CURRENT_VERSION}m
+ python${_CURRENT_VERSION}u
+ python${_CURRENT_VERSION}
+ )
+ ENDIF(MODPY_VERSION AND MODPY_INCDIR)
# For backward compatibility, set PYTHON_INCLUDE_PATH, but make it internal.
SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}" CACHE INTERNAL
# For backward compatibility, set PYTHON_INCLUDE_PATH.
SET(PYTHON_INCLUDE_PATH "${PYTHON_INCLUDE_DIR}")

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.14 2012/08/20 08:07:34 dcoppa Exp $
--- Modules/FindQt4.cmake.orig Wed Apr 18 14:10:54 2012
+++ Modules/FindQt4.cmake Sat Aug 18 08:43:30 2012
@@ -473,13 +473,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE
$OpenBSD: patch-Modules_FindQt4_cmake,v 1.15 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/FindQt4.cmake.orig Thu Aug 9 20:15:19 2012
+++ Modules/FindQt4.cmake Thu Aug 23 11:25:47 2012
@@ -486,13 +486,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE
# check for qmake
# Debian uses qmake-qt4
# macports' Qt uses qmake-mac
@ -29,7 +29,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v 1.14 2012/08/20 08:07:34 dcoppa Exp $
# double check that it was a Qt4 qmake, if not, re-find with different names
IF (QT_QMAKE_EXECUTABLE)
@@ -946,13 +953,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
@@ -959,13 +966,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION)
ENDIF(QT_QMAKE_CHANGED)
FIND_PROGRAM(QT_MOC_EXECUTABLE

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_FindTCL_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
--- Modules/FindTCL.cmake.orig Mon Apr 30 11:24:38 2012
+++ Modules/FindTCL.cmake Mon Apr 30 11:35:24 2012
$OpenBSD: patch-Modules_FindTCL_cmake,v 1.4 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/FindTCL.cmake.orig Thu Aug 23 11:47:12 2012
+++ Modules/FindTCL.cmake Thu Aug 23 12:02:49 2012
@@ -48,19 +48,36 @@ INCLUDE(CMakeFindFrameworks)
INCLUDE(FindTclsh)
INCLUDE(FindWish)
@ -48,7 +48,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -75,17 +92,37 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI
@@ -75,15 +92,35 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI
STRING(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
@ -59,8 +59,6 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
- "${TK_LIBRARY_PATH}"
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
- )
+IF(MODTCL_LIBDIR)
+ SET(TCLTK_OPENBSD_LIB_PATHS
@ -88,15 +86,13 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
+ "${TK_LIBRARY_PATH}"
+ "${TCL_TCLSH_PATH_PARENT}/lib"
+ "${TK_WISH_PATH_PARENT}/lib"
+ /usr/lib
+ /usr/local/lib
+ )
+ENDIF(TCLTK_OPENBSD_LIB_PATHS)
+
IF(WIN32)
GET_FILENAME_COMPONENT(
ActiveTcl_CurrentVersion
@@ -105,31 +142,47 @@ IF(WIN32)
@@ -103,31 +140,47 @@ IF(WIN32)
)
ENDIF(WIN32)
@ -168,7 +164,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
CMAKE_FIND_FRAMEWORKS(Tcl)
CMAKE_FIND_FRAMEWORKS(Tk)
@@ -153,26 +206,46 @@ IF(Tk_FRAMEWORKS)
@@ -151,24 +204,44 @@ IF(Tk_FRAMEWORKS)
ENDIF(NOT TK_INCLUDE_PATH)
ENDIF(Tk_FRAMEWORKS)
@ -181,8 +177,6 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
- ${TK_FRAMEWORK_INCLUDES}
- "${TCL_TCLSH_PATH_PARENT}/include"
- "${TK_WISH_PATH_PARENT}/include"
- /usr/include
- /usr/local/include
- /usr/include/tcl${TK_LIBRARY_VERSION}
- /usr/include/tcl${TCL_LIBRARY_VERSION}
- /usr/include/tcl8.6
@ -220,8 +214,6 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v 1.3 2012/05/07 07:06:20 dcoppa Exp $
+ ${TK_FRAMEWORK_INCLUDES}
+ "${TCL_TCLSH_PATH_PARENT}/include"
+ "${TK_WISH_PATH_PARENT}/include"
+ /usr/include
+ /usr/local/include
+ /usr/include/tcl${TK_LIBRARY_VERSION}
+ /usr/include/tcl${TCL_LIBRARY_VERSION}
+ /usr/include/tcl8.6

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

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_FindTclStub_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
--- Modules/FindTclStub.cmake.orig Tue May 11 14:30:20 2010
+++ Modules/FindTclStub.cmake Tue May 11 14:38:47 2010
$OpenBSD: patch-Modules_FindTclStub_cmake,v 1.2 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/FindTclStub.cmake.orig Thu Aug 23 12:09:46 2012
+++ Modules/FindTclStub.cmake Thu Aug 23 12:09:59 2012
@@ -38,13 +38,21 @@ INCLUDE(FindTCL)
GET_FILENAME_COMPONENT(TCL_TCLSH_PATH "${TCL_TCLSH}" PATH)
@ -27,7 +27,7 @@ $OpenBSD: patch-Modules_FindTclStub_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
GET_FILENAME_COMPONENT(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
@@ -59,16 +67,22 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI
@@ -59,14 +67,20 @@ GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LI
STRING(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
@ -38,8 +38,6 @@ $OpenBSD: patch-Modules_FindTclStub_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
- "${TK_LIBRARY_PATH}"
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
- /usr/lib
- /usr/local/lib
-)
+IF(TCLTK_OPENBSD_LIB_PATHS)
+ SET(TCLTK_POSSIBLE_LIB_PATHS
@ -53,8 +51,6 @@ $OpenBSD: patch-Modules_FindTclStub_cmake,v 1.1 2010/05/28 20:21:48 dcoppa Exp $
+ "${TK_LIBRARY_PATH}"
+ "${TCL_TCLSH_PATH_PARENT}/lib"
+ "${TK_WISH_PATH_PARENT}/lib"
+ /usr/lib
+ /usr/local/lib
+ )
+ENDIF(TCLTK_OPENBSD_LIB_PATHS)

25
devel/cmake/patches/patch-Modules_FindwxWidgets_cmake
View File

@ -1,25 +0,0 @@
$OpenBSD: patch-Modules_FindwxWidgets_cmake,v 1.2 2012/05/15 08:36:28 dcoppa Exp $
From 16ee19731e13abcd7d36d18822f61b7679322631 Mon Sep 17 00:00:00 2001
From: Anthony J. Bentley <anthonyjbentley@gmail.com>
Date: Mon, 14 May 2012 15:42:00 -0400
Subject: [PATCH] FindwxWidgets: Do not use -isystem on OpenBSD (#13219)
Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM on OpenBSD in addition to Apple to
prevent UsewxWidgets.cmake from using the include_directories SYSTEM
option.
--- Modules/FindwxWidgets.cmake.orig Wed Apr 18 20:10:54 2012
+++ Modules/FindwxWidgets.cmake Tue May 15 10:27:15 2012
@@ -167,9 +167,9 @@ SET(wxWidgets_CXX_FLAGS "")
# http://www.cmake.org/pipermail/cmake/2008-April/021115.html
# http://www.cmake.org/pipermail/cmake/2008-April/021146.html
#
-IF(APPLE)
+IF(APPLE OR CMAKE_CXX_PLATFORM_ID MATCHES "OpenBSD")
SET(wxWidgets_INCLUDE_DIRS_NO_SYSTEM 1)
-ENDIF(APPLE)
+ENDIF()
# DEPRECATED: This is a patch to support the DEPRECATED use of
# wxWidgets_USE_LIBS.

13
devel/cmake/patches/patch-Modules_Platform_OpenBSD_cmake
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.5 2010/11/15 11:39:09 dcoppa Exp $
--- Modules/Platform/OpenBSD.cmake.orig Wed Nov 3 20:58:27 2010
+++ Modules/Platform/OpenBSD.cmake Fri Nov 12 10:04:21 2010
$OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.6 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/Platform/OpenBSD.cmake.orig Thu Aug 9 20:15:19 2012
+++ Modules/Platform/OpenBSD.cmake Fri Aug 31 14:20:36 2012
@@ -1,5 +1,24 @@
INCLUDE(Platform/NetBSD)
@ -26,8 +26,13 @@ $OpenBSD: patch-Modules_Platform_OpenBSD_cmake,v 1.5 2010/11/15 11:39:09 dcoppa
# On OpenBSD, the compile time linker does not share it's configuration with
# the runtime linker. This will extract the library search paths from the
# system's ld.so.hints file which will allow CMake to set the appropriate
@@ -16,3 +35,4 @@ IF(NOT CMAKE_PLATFORM_RUNTIME_PATH)
@@ -16,3 +35,9 @@ IF(NOT CMAKE_PLATFORM_RUNTIME_PATH)
ENDIF()
SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_OPENBSD_VERSIONING 1)
+
+# OpenBSD policy requires that shared libraries be installed without
+# executable permission.
+SET(CMAKE_INSTALL_SO_NO_EXE 1)
+SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
+ "Install .so files without execute permission.")

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

@ -1,10 +1,4 @@
$OpenBSD: patch-Modules_UseJava_cmake,v 1.3 2012/06/15 10:26:56 dcoppa Exp $
From 5593d5718ec90f6a2e37ca4e2fdf3fc4537380ff Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike@sf-mail.de>
Date: Fri, 8 Jun 2012 17:22:43 +0200
Subject: [PATCH] UseJava: fix find_jar() called with multiple files (#13281)
$OpenBSD: patch-Modules_UseJava_cmake,v 1.4 2012/08/31 12:28:31 dcoppa Exp $
--- Modules/UseJava.cmake.orig Wed Apr 18 20:10:54 2012
+++ Modules/UseJava.cmake Fri Jun 15 11:38:50 2012
@@ -465,7 +465,7 @@ function (find_jar VARIABLE)
@ -16,15 +10,3 @@ Subject: [PATCH] UseJava: fix find_jar() called with multiple files (#13281)
${Java_JAR_PATHS})
set(_jar_doc "NOTSET")
@@ -533,9 +533,9 @@ function (find_jar VARIABLE)
endif (${_state} STREQUAL "name")
endforeach (arg ${ARGN})
- if (${_jar_names} STREQUAL "")
+ if (NOT _jar_names)
message(FATAL_ERROR "find_jar: No name to search for given")
- endif (${_jar_names} STREQUAL "")
+ endif (NOT _jar_names)
foreach (jar_name ${_jar_names})
foreach (version ${_jar_versions})

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

@ -1,20 +0,0 @@
$OpenBSD: patch-Source_cmCoreTryCompile_cxx,v 1.1 2012/05/07 13:58:18 dcoppa Exp $
try_compile: Cleanup temporary directories
Since commit 4fbdce2b (try_compile: Use random executable file name,
2012-02-13) a different <target>.dir is used for each try-compile.
Cleanup the directories as well as their content to avoid accumulating
leftover temporary directories.
(upstream git commit 953257ca611526c9a161a22e5148802be1c67649)
--- Source/cmCoreTryCompile.cxx.orig Mon May 7 13:34:33 2012
+++ Source/cmCoreTryCompile.cxx Mon May 7 13:35:05 2012
@@ -404,6 +404,7 @@ void cmCoreTryCompile::CleanupFiles(const char* binDir
if(cmSystemTools::FileIsDirectory(fullPath.c_str()))
{
this->CleanupFiles(fullPath.c_str());
+ cmSystemTools::RemoveADirectory(fullPath.c_str());
}
else
{

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.2 2010/07/28 20:34:22 dcoppa Exp $
--- Source/cmInstallCommand.cxx.orig Mon Jun 28 17:15:59 2010
+++ Source/cmInstallCommand.cxx Wed Jul 28 21:12:05 2010
@@ -324,6 +324,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.3 2012/08/31 12:28:31 dcoppa Exp $
--- Source/cmInstallCommand.cxx.orig Thu Aug 9 20:15:19 2012
+++ Source/cmInstallCommand.cxx Thu Aug 23 11:25:48 2012
@@ -331,6 +331,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
// Select the mode for installing symlinks to versioned shared libraries.
cmInstallTargetGenerator::NamelinkModeType
@ -11,7 +11,7 @@ $OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.2 2010/07/28 20:34:22 dcoppa Exp
namelinkMode = cmInstallTargetGenerator::NamelinkModeNone;
if(libraryArgs.GetNamelinkOnly())
{
@@ -333,7 +336,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
@@ -340,7 +343,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
{
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}

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

@ -1,7 +1,7 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.12 2012/05/07 07:06:20 dcoppa Exp $
--- Source/cmTarget.cxx.orig Wed Apr 18 20:10:54 2012
+++ Source/cmTarget.cxx Mon Apr 30 11:07:26 2012
@@ -3371,9 +3371,43 @@ void cmTarget::GetLibraryNames(std::string& name,
$OpenBSD: patch-Source_cmTarget_cxx,v 1.13 2012/08/31 12:28:31 dcoppa Exp $
--- Source/cmTarget.cxx.orig Thu Aug 9 20:15:19 2012
+++ Source/cmTarget.cxx Thu Aug 23 11:25:48 2012
@@ -3380,9 +3380,43 @@ void cmTarget::GetLibraryNames(std::string& name,
// The library name.
name = prefix+base+suffix;
@ -45,7 +45,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1.12 2012/05/07 07:06:20 dcoppa Exp $
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix,
@@ -3406,7 +3440,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
@@ -3415,7 +3449,23 @@ void cmTarget::ComputeVersionedName(std::string& vName
if(version)
{
vName += ".";

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

@ -1,10 +1,10 @@
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.10 2011/10/14 17:22:10 dcoppa Exp $
$OpenBSD: patch-Source_kwsys_SystemTools_cxx,v 1.11 2012/08/31 12:28:31 dcoppa Exp $
Don't spam systrace by attempting to create dirs which already exist.
--- Source/kwsys/SystemTools.cxx.orig Tue Oct 4 18:09:25 2011
+++ Source/kwsys/SystemTools.cxx Fri Oct 7 09:15:20 2011
@@ -227,11 +227,13 @@ inline void Realpath(const char *path, kwsys_stl::stri
--- Source/kwsys/SystemTools.cxx.orig Thu Aug 9 20:15:19 2012
+++ Source/kwsys/SystemTools.cxx Thu Aug 23 11:25:48 2012
@@ -233,11 +233,13 @@ inline void Realpath(const char *path, kwsys_stl::stri
}
#else
#include <sys/types.h>

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

@ -1,10 +1,10 @@
$OpenBSD: patch-Tests_CMakeLists_txt,v 1.1 2012/05/07 13:58:18 dcoppa Exp $
$OpenBSD: patch-Tests_CMakeLists_txt,v 1.2 2012/08/31 12:28:31 dcoppa Exp $
Remove troublesome "Qt4Deploy" and "CTest.UpdateCVS" tests
(from gentoo's package/dev-util/cmake/files/)
--- Tests/CMakeLists.txt.orig Wed Apr 18 20:10:54 2012
+++ Tests/CMakeLists.txt Mon May 7 13:45:40 2012
--- Tests/CMakeLists.txt.orig Thu Aug 9 20:15:19 2012
+++ Tests/CMakeLists.txt Thu Aug 23 11:25:48 2012
@@ -273,23 +273,6 @@ IF(BUILD_TESTING)
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/BundleUtilities")
@ -29,7 +29,7 @@ Remove troublesome "Qt4Deploy" and "CTest.UpdateCVS" tests
endif()
endif()
@@ -1547,30 +1530,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CM
@@ -1581,30 +1564,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CM
)
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/${CTestUpdateSVN_DIR}")
ENDIF(Subversion_FOUND)

24
devel/cmake/patches/patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt
View File

@ -1,24 +0,0 @@
$OpenBSD: patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt,v 1.2 2012/06/15 10:26:56 dcoppa Exp $
Add FindLibLZMA Module
(upstream git commit ee26019bd433020b8aad3c3a70bcb537e03b04ba)
FindPkgConfig.cmake: fix documented output variable not set
(upstream git commit 3ea850a5023060b84dcc0e6f0098c32c28b15807)
--- Tests/CMakeOnly/AllFindModules/CMakeLists.txt.orig Wed Apr 18 20:10:54 2012
+++ Tests/CMakeOnly/AllFindModules/CMakeLists.txt Fri Jun 15 11:47:17 2012
@@ -71,7 +71,7 @@ endmacro(check_version_string)
# reported.
foreach(VTEST ALSA ARMADILLO BZIP2 CUPS CURL EXPAT FREETYPE GETTEXT GIT HSPELL
- JASPER LIBXML2 LIBXSLT PERL PostgreSQL TIFF ZLIB)
+ JASPER LIBLZMA LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB)
check_version_string(${VTEST} ${VTEST}_VERSION_STRING)
endforeach(VTEST)
@@ -82,4 +82,3 @@ endforeach(VTEST)
check_version_string(PYTHONINTERP PYTHON_VERSION_STRING)
check_version_string(SUBVERSION Subversion_VERSION_SVN)
-check_version_string(PKGCONFIG PKG_CONFIG_VERSION_STRING)

15
devel/cmake/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.20 2012/07/12 15:36:20 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.21 2012/08/31 12:28:31 dcoppa Exp $
@bin bin/ccmake
@bin bin/cmake
@bin bin/cpack
@ -46,6 +46,7 @@ share/cmake/Modules/CMakeCXXCompiler.cmake.in
share/cmake/Modules/CMakeCXXCompilerABI.cpp
share/cmake/Modules/CMakeCXXCompilerId.cpp.in
share/cmake/Modules/CMakeCXXInformation.cmake
share/cmake/Modules/CMakeClDeps.cmake
share/cmake/Modules/CMakeCommonLanguageInclude.cmake
share/cmake/Modules/CMakeCompilerABI.h
share/cmake/Modules/CMakeConfigurableFile.in
@ -416,6 +417,7 @@ share/cmake/Modules/MacroAddFileDependencies.cmake
share/cmake/Modules/NSIS.InstallOptions.ini.in
share/cmake/Modules/NSIS.template.in
share/cmake/Modules/Platform/
share/cmake/Modules/Platform/AIX-GNU-ASM.cmake
share/cmake/Modules/Platform/AIX-GNU-C.cmake
share/cmake/Modules/Platform/AIX-GNU-CXX.cmake
share/cmake/Modules/Platform/AIX-GNU-Fortran.cmake
@ -633,6 +635,17 @@ share/cmake/Templates/UtilityHeader.dsptemplate
share/cmake/Templates/cygwin-package.sh.in
share/cmake/Templates/staticLibFooter.dsptemplate
share/cmake/Templates/staticLibHeader.dsptemplate
share/cmake/completions/
share/cmake/completions/cmake
share/cmake/completions/cpack
share/cmake/completions/ctest
share/cmake/editors/
share/cmake/editors/emacs/
share/cmake/editors/emacs/cmake-mode.el
share/cmake/editors/vim/
share/cmake/editors/vim/cmake-help.vim
share/cmake/editors/vim/cmake-indent.vim
share/cmake/editors/vim/cmake-syntax.vim
share/cmake/include/
share/cmake/include/cmCPluginAPI.h
share/doc/cmake/