diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index 0e82b81e18c..a80a8822c76 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.56 2012/06/14 09:32:00 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.57 2012/06/15 10:26:56 dcoppa Exp $ VMEM_WARNING = Yes BROKEN-arm = build fails since move to gcc4 @@ -7,7 +7,7 @@ HOMEPAGE = http://www.cmake.org/ CATEGORIES = devel COMMENT = portable build system DISTNAME = cmake-2.8.8 -REVISION = 3 +REVISION = 4 MASTER_SITES = ${HOMEPAGE}files/v2.8/ MAINTAINER = David Coppa diff --git a/devel/cmake/files/FindIconv.cmake b/devel/cmake/files/FindIconv.cmake index ce40ab26823..028df5c1ae5 100644 --- a/devel/cmake/files/FindIconv.cmake +++ b/devel/cmake/files/FindIconv.cmake @@ -55,3 +55,4 @@ MARK_AS_ADVANCED( ICONV_LIBRARIES ICONV_SECOND_ARGUMENT_IS_CONST ) + diff --git a/devel/cmake/files/FindLibLZMA.cmake b/devel/cmake/files/FindLibLZMA.cmake new file mode 100644 index 00000000000..d58d2eef8c4 --- /dev/null +++ b/devel/cmake/files/FindLibLZMA.cmake @@ -0,0 +1,69 @@ +# - 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 +# Copyright 2009 Alexander Neundorf +# Copyright 2009 Helio Chissini de Castro +# Copyright 2012 Mario Bensi +# +# 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 ) diff --git a/devel/cmake/files/FindLibintl.cmake b/devel/cmake/files/FindLibintl.cmake index 52ae647938a..aa4016f800a 100644 --- a/devel/cmake/files/FindLibintl.cmake +++ b/devel/cmake/files/FindLibintl.cmake @@ -44,3 +44,4 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(Libintl DEFAULT_MSG LIBINTL_INCLUDE_DIR LIBINTL_LIB_FOUND) mark_as_advanced(LIBINTL_INCLUDE_DIR LIBINTL_LIBRARIES LIBINTL_LIBC_HAS_DGETTEXT LIBINTL_LIB_FOUND) + diff --git a/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake b/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake index 83cd77cd9b8..db30e4f9ff5 100644 --- a/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake +++ b/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake @@ -1,6 +1,12 @@ -$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.4 2012/05/07 07:06:20 dcoppa Exp $ ---- Modules/FindPythonLibs.cmake.orig Mon Apr 30 11:57:25 2012 -+++ Modules/FindPythonLibs.cmake Mon Apr 30 12:04:05 2012 +$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 +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) # Search for the python framework on Apple. CMAKE_FIND_FRAMEWORKS(Python) @@ -11,7 +17,29 @@ $OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.4 2012/05/07 07:06:20 dcoppa Ex 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) -@@ -58,10 +61,14 @@ ENDIF(PythonLibs_FIND_VERSION) +@@ -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) # Set up the versions we know about, in the order we will search. Always add # the user supplied additional versions to the front. @@ -30,7 +58,7 @@ $OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.4 2012/05/07 07:06:20 dcoppa Ex UNSET(_PYTHON_FIND_OTHER_VERSIONS) UNSET(_PYTHON1_VERSIONS) -@@ -113,15 +120,19 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) +@@ -113,15 +126,19 @@ FOREACH(_CURRENT_VERSION ${_Python_VERSIONS}) ENDFOREACH(dir) ENDIF(Python_FRAMEWORKS AND NOT PYTHON_INCLUDE_DIR) diff --git a/devel/cmake/patches/patch-Modules_UseJava_cmake b/devel/cmake/patches/patch-Modules_UseJava_cmake index c7839296691..a2b54c4d985 100644 --- a/devel/cmake/patches/patch-Modules_UseJava_cmake +++ b/devel/cmake/patches/patch-Modules_UseJava_cmake @@ -1,6 +1,12 @@ -$OpenBSD: patch-Modules_UseJava_cmake,v 1.2 2012/05/07 07:06:20 dcoppa Exp $ +$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 +Date: Fri, 8 Jun 2012 17:22:43 +0200 +Subject: [PATCH] UseJava: fix find_jar() called with multiple files (#13281) + --- Modules/UseJava.cmake.orig Wed Apr 18 20:10:54 2012 -+++ Modules/UseJava.cmake Mon Apr 30 11:07:26 2012 ++++ Modules/UseJava.cmake Fri Jun 15 11:38:50 2012 @@ -465,7 +465,7 @@ function (find_jar VARIABLE) set(_jar_versions) set(_jar_paths @@ -10,3 +16,15 @@ $OpenBSD: patch-Modules_UseJava_cmake,v 1.2 2012/05/07 07:06:20 dcoppa Exp $ ${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}) diff --git a/devel/cmake/patches/patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt b/devel/cmake/patches/patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt index 4e265e014d1..a8dd02d215c 100644 --- a/devel/cmake/patches/patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt +++ b/devel/cmake/patches/patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt @@ -1,16 +1,19 @@ -$OpenBSD: patch-Tests_CMakeOnly_AllFindModules_CMakeLists_txt,v 1.1 2012/05/07 13:58:18 dcoppa Exp $ +$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 Mon May 7 13:45:28 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 LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB) ++ JASPER LIBLZMA LIBXML2 LIBXSLT PERL PKG_CONFIG PostgreSQL TIFF ZLIB) check_version_string(${VTEST} ${VTEST}_VERSION_STRING) endforeach(VTEST) diff --git a/devel/cmake/pkg/PLIST b/devel/cmake/pkg/PLIST index f7b7bbc9357..373d46bf3fc 100644 --- a/devel/cmake/pkg/PLIST +++ b/devel/cmake/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.17 2012/05/07 07:06:20 dcoppa Exp $ +@comment $OpenBSD: PLIST,v 1.18 2012/06/15 10:26:56 dcoppa Exp $ @bin bin/ccmake @bin bin/cmake @bin bin/cpack @@ -293,6 +293,7 @@ share/cmake/Modules/FindLAPACK.cmake share/cmake/Modules/FindLATEX.cmake share/cmake/Modules/FindLCMS.cmake share/cmake/Modules/FindLibArchive.cmake +share/cmake/Modules/FindLibLZMA.cmake share/cmake/Modules/FindLibXml2.cmake share/cmake/Modules/FindLibXslt.cmake share/cmake/Modules/FindLibintl.cmake