On Tue, Oct 11, 2011 at 07:15:19AM -0600, David Coppa wrote: > Hi again, > > this one fixes another bug (into FindJNI.cmake) found by Vadim.
Is this tested with jdk-1.7.0? Because the current cmake port has a bug in its regex as well. > > ciao, > David > > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/cmake/Makefile,v > retrieving revision 1.45 > diff -u -p -r1.45 Makefile > --- Makefile 8 Oct 2011 18:55:36 -0000 1.45 > +++ Makefile 11 Oct 2011 12:35:46 -0000 > @@ -5,7 +5,7 @@ VMEM_WARNING = Yes > HOMEPAGE = http://www.cmake.org/ > CATEGORIES = devel > COMMENT = portable build system > -DISTNAME = cmake-2.8.5 > +DISTNAME = cmake-2.8.6 > MASTER_SITES = ${HOMEPAGE}files/v2.8/ > > MAINTAINER = David Coppa <dco...@openbsd.org> > @@ -44,9 +44,9 @@ pre-configure: > ${WRKSRC}/Modules/FindQt.cmake \ > ${WRKSRC}/Modules/FindQt3.cmake \ > ${WRKSRC}/Modules/FindSDL.cmake \ > - ${WRKSRC}/Modules/FindwxWindows.cmake > + ${WRKSRC}/Modules/FindwxWindows.cmake \ > + ${WRKSRC}/Modules/UseJava.cmake > > -# Remove spurious post-build files > post-install: > @rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig} > @rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/Compiler/*.orig > Index: distinfo > =================================================================== > RCS file: /cvs/ports/devel/cmake/distinfo,v > retrieving revision 1.12 > diff -u -p -r1.12 distinfo > --- distinfo 20 Sep 2011 11:32:36 -0000 1.12 > +++ distinfo 11 Oct 2011 12:35:46 -0000 > @@ -1,5 +1,5 @@ > -MD5 (cmake-2.8.5.tar.gz) = PF0yzsD0wtxF9MLoT0ogxQ== > -RMD160 (cmake-2.8.5.tar.gz) = 5HZ9wOo+U9o6sUzGr11C3RkO2nY= > -SHA1 (cmake-2.8.5.tar.gz) = jdTDHLzPGil4KaR2oO950WFMo2g= > -SHA256 (cmake-2.8.5.tar.gz) = Xhi/918BZWxk9VNBKokFUn4bhe+vMWPG+4HqWqztC5E= > -SIZE (cmake-2.8.5.tar.gz) = 5517977 > +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 > Index: files/MacroPushRequiredVars.cmake > =================================================================== > RCS file: files/MacroPushRequiredVars.cmake > diff -N files/MacroPushRequiredVars.cmake > --- files/MacroPushRequiredVars.cmake 31 May 2010 06:29:27 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,47 +0,0 @@ > -# this module defines two macros: > -# MACRO_PUSH_REQUIRED_VARS() > -# and > -# MACRO_POP_REQUIRED_VARS() > -# use these if you call cmake macros which use > -# any of the CMAKE_REQUIRED_XXX variables > -# > -# Usage: > -# MACRO_PUSH_REQUIRED_VARS() > -# SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} > -DSOME_MORE_DEF) > -# CHECK_FUNCTION_EXISTS(...) > -# MACRO_POP_REQUIRED_VARS() > - > -# Copyright (c) 2006, Alexander Neundorf, <neund...@kde.org> > -# > -# Redistribution and use is allowed according to the terms of the BSD > license. > -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. > - > -MACRO(MACRO_PUSH_REQUIRED_VARS) > - > - IF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER) > - SET(_PUSH_REQUIRED_VARS_COUNTER 0) > - ENDIF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER) > - > - MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}+1") > - > - SET(_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_INCLUDES}) > - SET(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_DEFINITIONS}) > - SET(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_LIBRARIES}) > - SET(_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_FLAGS}) > -ENDMACRO(MACRO_PUSH_REQUIRED_VARS) > - > -MACRO(MACRO_POP_REQUIRED_VARS) > - > -# don't pop more than we pushed > - IF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0") > - > - SET(CMAKE_REQUIRED_INCLUDES > ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - SET(CMAKE_REQUIRED_DEFINITIONS > ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - SET(CMAKE_REQUIRED_LIBRARIES > ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - SET(CMAKE_REQUIRED_FLAGS > ${_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - > - MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER > "${_PUSH_REQUIRED_VARS_COUNTER}-1") > - ENDIF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0") > - > -ENDMACRO(MACRO_POP_REQUIRED_VARS) > - > Index: patches/patch-CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v > retrieving revision 1.7 > diff -u -p -r1.7 patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 20 Sep 2011 11:32:36 -0000 1.7 > +++ patches/patch-CMakeLists_txt 11 Oct 2011 12:35:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-CMakeLists_txt,v 1.7 2011/09/20 11:32:36 dcoppa Exp $ > ---- CMakeLists.txt.orig Fri Jul 8 14:21:43 2011 > -+++ CMakeLists.txt Fri Sep 9 09:49:49 2011 > -@@ -250,6 +250,15 @@ MACRO (CMAKE_BUILD_UTILITIES) > +--- 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) > # (a macro defined in this file) > CMAKE_HANDLE_SYSTEM_LIBRARIES() > > @@ -17,7 +17,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201 > #--------------------------------------------------------------------- > # Build zlib library for Curl, CMake, and CTest. > SET(CMAKE_ZLIB_HEADER "cm_zlib.h") > -@@ -388,26 +397,7 @@ MACRO (CMAKE_BUILD_UTILITIES) > +@@ -390,26 +399,7 @@ MACRO (CMAKE_BUILD_UTILITIES) > ELSE (UNIX) > SET(BUILD_CursesDialog 0) > ENDIF (UNIX) > Index: patches/patch-Modules_Compiler_GNU-Fortran_cmake > =================================================================== > RCS file: > /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-Modules_Compiler_GNU-Fortran_cmake > --- patches/patch-Modules_Compiler_GNU-Fortran_cmake 26 Oct 2010 18:31:18 > -0000 1.1 > +++ patches/patch-Modules_Compiler_GNU-Fortran_cmake 11 Oct 2011 12:35:46 > -0000 > @@ -1,9 +1,9 @@ > $OpenBSD: patch-Modules_Compiler_GNU-Fortran_cmake,v 1.1 2010/10/26 18:31:18 > dcoppa Exp $ > ---- Modules/Compiler/GNU-Fortran.cmake.orig Mon Jun 28 17:15:57 2010 > -+++ Modules/Compiler/GNU-Fortran.cmake Tue Oct 26 15:21:23 2010 > -@@ -1,10 +1,6 @@ > - include(Compiler/GNU) > - __compiler_gnu(Fortran) > +--- Modules/Compiler/GNU-Fortran.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/Compiler/GNU-Fortran.cmake Fri Oct 7 09:15:14 2011 > +@@ -4,10 +4,6 @@ __compiler_gnu(Fortran) > + set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-ffixed-form") > + set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form") > > -# No -DNDEBUG for Fortran. > -SET(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os") > Index: patches/patch-Modules_FindJNI_cmake > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Modules_FindJNI_cmake > --- patches/patch-Modules_FindJNI_cmake 20 Sep 2011 11:32:36 -0000 > 1.3 > +++ patches/patch-Modules_FindJNI_cmake 11 Oct 2011 12:35:46 -0000 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-Modules_FindJNI_cmake,v 1.3 2011/09/20 11:32:36 dcoppa Exp $ > ---- Modules/FindJNI.cmake.orig Fri Jul 8 14:21:44 2011 > -+++ Modules/FindJNI.cmake Fri Sep 9 10:02:12 2011 > +--- Modules/FindJNI.cmake.orig Tue Oct 4 20:09:24 2011 > ++++ Modules/FindJNI.cmake Mon Oct 10 22:13:31 2011 > @@ -26,6 +26,8 @@ > # (To distribute this file outside of CMake, substitute the full > # License text for the above reference.) > @@ -10,8 +10,16 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set > ${_var} > MACRO(java_append_library_directories _var) > # Determine java arch-specific library subdir > -@@ -96,31 +98,53 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES > - > +@@ -88,40 +90,59 @@ ENDMACRO(java_append_library_directories) > + GET_FILENAME_COMPONENT(java_install_version > + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit;CurrentVersion]" NAME) > + > +-SET(JAVA_AWT_LIBRARY_DIRECTORIES > +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.4;JavaHome]/lib" > +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.3;JavaHome]/lib" > +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\${java_install_version};JavaHome]/lib" > +- ) > +- > FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME) > > -JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > @@ -42,24 +50,27 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > +IF(MODJAVA_VER) > + IF(MODJAVA_VER MATCHES "^1\\.5.*") > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > -+ ${JAVA_AWT_LIBRARY_DIRECTORIES} > + /usr/local/jdk-1.5.0/jre/lib/{libarch} > + /usr/local/jre-1.5.0/lib/{libarch} > + ) > + ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*") > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > -+ ${JAVA_AWT_LIBRARY_DIRECTORIES} > + /usr/local/jdk-1.6.0/jre/lib/{libarch} > + /usr/local/jre-1.6.0/lib/{libarch} > + ) > + ELSE(MODJAVA_VER MATCHES "^1\\.5.*") > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > -+ ${JAVA_AWT_LIBRARY_DIRECTORIES} > + /usr/local/jdk-1.7.0/jre/lib/{libarch} > + /usr/local/jre-1.7.0/lib/{libarch} > + ) > + ENDIF(MODJAVA_VER MATCHES "^1\\.5.*") > +ELSE(MODJAVA_VER) > ++ SET(JAVA_AWT_LIBRARY_DIRECTORIES > ++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.4;JavaHome]/lib" > ++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.3;JavaHome]/lib" > ++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\${java_install_version};JavaHome]/lib" > ++ ) > + > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > + ${_JAVA_HOME}/jre/lib/{libarch} > + ${_JAVA_HOME}/jre/lib > @@ -86,10 +97,11 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > + /usr/lib/jvm/default-java/lib > + ) > +ENDIF(MODJAVA_VER) > - > ++ > SET(JAVA_JVM_LIBRARY_DIRECTORIES) > FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) > -@@ -132,29 +156,47 @@ FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) > + SET(JAVA_JVM_LIBRARY_DIRECTORIES > +@@ -132,29 +153,47 @@ FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) > ) > ENDFOREACH(dir) > > @@ -159,7 +171,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}") > GET_FILENAME_COMPONENT(jpath "${JAVA_PROG}" PATH) > FOREACH(JAVA_INC_PATH ../include ../java/include ../share/java/include) > -@@ -227,6 +269,7 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h > +@@ -227,6 +266,7 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h > ${JAVA_INCLUDE_PATH}/win32 > ${JAVA_INCLUDE_PATH}/linux > ${JAVA_INCLUDE_PATH}/freebsd > Index: patches/patch-Modules_FindJava_cmake > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-Modules_FindJava_cmake > --- patches/patch-Modules_FindJava_cmake 20 Sep 2011 11:32:36 -0000 > 1.4 > +++ patches/patch-Modules_FindJava_cmake 11 Oct 2011 12:35:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-Modules_FindJava_cmake,v 1.4 2011/09/20 11:32:36 dcoppa Exp $ > ---- Modules/FindJava.cmake.orig Fri Jul 8 14:21:44 2011 > -+++ Modules/FindJava.cmake Fri Sep 9 09:53:48 2011 > -@@ -54,6 +54,8 @@ > +--- Modules/FindJava.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/FindJava.cmake Fri Oct 7 09:15:16 2011 > +@@ -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 > # 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" > -@@ -66,19 +68,29 @@ SET(_JAVA_HINTS > +@@ -68,19 +70,29 @@ SET(_JAVA_HINTS > "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.3;JavaHome]/bin" > $ENV{JAVA_HOME}/bin > ) > @@ -53,7 +53,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v > FIND_PROGRAM(Java_JAVA_EXECUTABLE > NAMES java > HINTS ${_JAVA_HINTS} > -@@ -105,6 +117,7 @@ IF(Java_JAVA_EXECUTABLE) > +@@ -107,6 +119,7 @@ IF(Java_JAVA_EXECUTABLE) > # 2. OpenJDK 1.6 > # 3. GCJ 1.5 > # 4. Kaffe 1.4.2 > @@ -61,7 +61,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v > 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-]*\".*" > -@@ -112,6 +125,10 @@ IF(Java_JAVA_EXECUTABLE) > +@@ -114,6 +127,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_]+).*" > Index: patches/patch-Modules_FindPythonInterp_cmake > =================================================================== > RCS file: > /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Modules_FindPythonInterp_cmake > --- patches/patch-Modules_FindPythonInterp_cmake 13 Mar 2011 18:23:02 > -0000 1.3 > +++ patches/patch-Modules_FindPythonInterp_cmake 11 Oct 2011 12:35:46 > -0000 > @@ -1,9 +1,9 @@ > $OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.3 2011/03/13 18:23:02 > dcoppa Exp $ > ---- Modules/FindPythonInterp.cmake.orig Tue Feb 15 18:47:27 2011 > -+++ Modules/FindPythonInterp.cmake Mon Mar 7 11:29:02 2011 > -@@ -20,11 +20,17 @@ > - # (To distribute this file outside of CMake, substitute the full > - # License text for the above reference.) > +--- Modules/FindPythonInterp.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/FindPythonInterp.cmake Fri Oct 7 09:15:16 2011 > +@@ -29,11 +29,17 @@ > + # Search for the current active python version first > + find_program(PYTHON_EXECUTABLE NAMES python) > > +SET(MODPY_VERSION $ENV{MODPY_VERSION}) > + > @@ -20,5 +20,5 @@ $OpenBSD: patch-Modules_FindPythonInterp > + 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) > +ENDIF(MODPY_VERSION) > > - # Run first with the Python version in the executable > - foreach(_CURRENT_VERSION ${_Python_VERSIONS}) > + # Search for newest python version if python executable isn't found > + if(NOT PYTHON_EXECUTABLE) > Index: patches/patch-Modules_FindQt4_cmake > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v > retrieving revision 1.11 > diff -u -p -r1.11 patch-Modules_FindQt4_cmake > --- patches/patch-Modules_FindQt4_cmake 20 Sep 2011 11:32:36 -0000 > 1.11 > +++ patches/patch-Modules_FindQt4_cmake 11 Oct 2011 12:35:46 -0000 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-Modules_FindQt4_cmake,v 1.11 2011/09/20 11:32:36 dcoppa Exp $ > ---- Modules/FindQt4.cmake.orig Fri Jul 8 14:21:44 2011 > -+++ Modules/FindQt4.cmake Fri Sep 9 09:52:18 2011 > +--- Modules/FindQt4.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/FindQt4.cmake Fri Oct 7 09:15:17 2011 > @@ -473,13 +473,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE > # check for qmake > # Debian uses qmake-qt4 > @@ -29,7 +29,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v > > # double check that it was a Qt4 qmake, if not, re-find with different names > IF (QT_QMAKE_EXECUTABLE) > -@@ -920,6 +927,12 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > +@@ -921,6 +928,12 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > _QT4_ADJUST_LIB_VARS(QAxContainer) > ENDIF(Q_WS_WIN) > > @@ -42,7 +42,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v > > ####################################### > # > -@@ -944,13 +957,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > +@@ -945,13 +958,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > ENDIF(QT_QMAKE_CHANGED) > > FIND_PROGRAM(QT_MOC_EXECUTABLE > Index: patches/patch-Modules_FindRuby_cmake > =================================================================== > RCS file: patches/patch-Modules_FindRuby_cmake > diff -N patches/patch-Modules_FindRuby_cmake > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Modules_FindRuby_cmake 11 Oct 2011 12:35:46 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- Modules/FindRuby.cmake.orig Sun Oct 9 18:41:47 2011 > ++++ Modules/FindRuby.cmake Sun Oct 9 18:42:49 2011 > +@@ -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 "" ) > Index: patches/patch-Modules_UseJava_cmake > =================================================================== > RCS file: patches/patch-Modules_UseJava_cmake > diff -N patches/patch-Modules_UseJava_cmake > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Modules_UseJava_cmake 11 Oct 2011 12:35:46 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- Modules/UseJava.cmake.orig Fri Oct 7 11:27:56 2011 > ++++ Modules/UseJava.cmake Fri Oct 7 11:28:32 2011 > +@@ -445,7 +445,7 @@ function (find_jar VARIABLE) > + set(_jar_versions) > + set(_jar_paths > + /usr/share/java/ > +- /usr/local/share/java/ > ++ ${LOCALBASE}/share/java/ > + ${Java_JAR_PATHS}) > + set(_jar_doc "NOTSET") > + > Index: patches/patch-Source_cmTarget_cxx > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v > retrieving revision 1.9 > diff -u -p -r1.9 patch-Source_cmTarget_cxx > --- patches/patch-Source_cmTarget_cxx 20 Sep 2011 11:32:36 -0000 1.9 > +++ patches/patch-Source_cmTarget_cxx 11 Oct 2011 12:35:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-Source_cmTarget_cxx,v 1.9 2011/09/20 11:32:36 dcoppa Exp $ > ---- Source/cmTarget.cxx.orig Fri Jul 8 14:21:47 2011 > -+++ Source/cmTarget.cxx Fri Sep 9 09:49:49 2011 > -@@ -3276,6 +3276,36 @@ void cmTarget::GetLibraryNames(std::string& name, > +--- 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); > > @@ -38,7 +38,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1. > // The library name. > name = prefix+base+suffix; > > -@@ -3310,8 +3340,27 @@ void cmTarget::GetLibraryNames(std::string& name, > +@@ -3354,8 +3384,27 @@ void cmTarget::GetLibraryNames(std::string& name, > if(version) > { > realName += "."; > Index: patches/patch-Source_kwsys_SystemTools_cxx > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx,v > retrieving revision 1.9 > diff -u -p -r1.9 patch-Source_kwsys_SystemTools_cxx > --- patches/patch-Source_kwsys_SystemTools_cxx 16 Apr 2011 15:18:13 > -0000 1.9 > +++ patches/patch-Source_kwsys_SystemTools_cxx 11 Oct 2011 12:35:46 > -0000 > @@ -2,9 +2,9 @@ $OpenBSD: patch-Source_kwsys_SystemTools > > Don't spam systrace by attempting to create dirs which already exist. > > ---- Source/kwsys/SystemTools.cxx.orig Sat Apr 16 12:20:19 2011 > -+++ Source/kwsys/SystemTools.cxx Sat Apr 16 12:31:43 2011 > -@@ -226,11 +226,13 @@ inline void Realpath(const char *path, kwsys_stl::stri > +--- 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 > } > #else > #include <sys/types.h> > Index: patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in > =================================================================== > RCS file: > /cvs/ports/devel/cmake/patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in > --- patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in 20 Sep 2011 > 11:32:36 -0000 1.3 > +++ patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in 11 Oct 2011 > 12:35:46 -0000 > @@ -1,14 +1,13 @@ > $OpenBSD: patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v 1.3 2011/09/20 > 11:32:36 dcoppa Exp $ > ---- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Fri Jul 8 14:21:50 2011 > -+++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Fri Sep 9 10:49:42 2011 > -@@ -22,6 +22,10 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege > +--- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Tue Oct 4 18:09:25 2011 > ++++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Fri Oct 7 11:25:43 2011 > +@@ -22,6 +22,9 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege > # Modules that do not require our notice. > set(notice_exceptions > FindCUDA.cmake # MIT License, distributed here from upstream project > + FindIconv.cmake > + FindLCMS.cmake > + FindLibintl.cmake > -+ MacroPushRequiredVars.cmake > ) > > # Load the list of modules to check. > Index: patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt > =================================================================== > RCS file: patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt > diff -N patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt 11 Oct > 2011 12:35:46 -0000 > @@ -0,0 +1,11 @@ > +$OpenBSD$ > +--- 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.*") > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/cmake/pkg/PLIST,v > retrieving revision 1.14 > diff -u -p -r1.14 PLIST > --- pkg/PLIST 20 Sep 2011 11:32:36 -0000 1.14 > +++ pkg/PLIST 11 Oct 2011 12:35:46 -0000 > @@ -13,9 +13,14 @@ > @man man/man1/cmakevars.1 > @man man/man1/cpack.1 > @man man/man1/ctest.1 > +share/aclocal/ > +share/aclocal/cmake.m4 > share/cmake/ > share/cmake/Modules/ > share/cmake/Modules/AddFileDependencies.cmake > +share/cmake/Modules/AutomocInfo.cmake.in > +share/cmake/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in > +share/cmake/Modules/BasicConfigVersion-SameMajorVersion.cmake.in > share/cmake/Modules/BundleUtilities.cmake > share/cmake/Modules/CMake.cmake > share/cmake/Modules/CMakeASM-ATTInformation.cmake > @@ -54,11 +59,13 @@ share/cmake/Modules/CMakeDetermineRCComp > share/cmake/Modules/CMakeDetermineSystem.cmake > share/cmake/Modules/CMakeDetermineVSServicePack.cmake > share/cmake/Modules/CMakeExportBuildSettings.cmake > +share/cmake/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake > share/cmake/Modules/CMakeFindBinUtils.cmake > share/cmake/Modules/CMakeFindCodeBlocks.cmake > share/cmake/Modules/CMakeFindEclipseCDT4.cmake > share/cmake/Modules/CMakeFindFrameworks.cmake > share/cmake/Modules/CMakeFindKDevelop3.cmake > +share/cmake/Modules/CMakeFindPackageMode.cmake > share/cmake/Modules/CMakeFindWMake.cmake > share/cmake/Modules/CMakeFindXCode.cmake > share/cmake/Modules/CMakeForceCompiler.cmake > @@ -78,6 +85,7 @@ share/cmake/Modules/CMakeParseArguments. > share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake > share/cmake/Modules/CMakePlatformId.h.in > share/cmake/Modules/CMakePrintSystemInformation.cmake > +share/cmake/Modules/CMakePushCheckState.cmake > share/cmake/Modules/CMakeRCCompiler.cmake.in > share/cmake/Modules/CMakeRCInformation.cmake > share/cmake/Modules/CMakeSystem.cmake.in > @@ -95,8 +103,10 @@ share/cmake/Modules/CMakeTestGNU.c > share/cmake/Modules/CMakeTestJavaCompiler.cmake > share/cmake/Modules/CMakeTestNMakeCLVersion.c > share/cmake/Modules/CMakeTestRCCompiler.cmake > +share/cmake/Modules/CMakeTestWatcomVersion.c > share/cmake/Modules/CMakeUnixFindMake.cmake > share/cmake/Modules/CMakeVS10FindMake.cmake > +share/cmake/Modules/CMakeVS11FindMake.cmake > share/cmake/Modules/CMakeVS6BackwardCompatibility.cmake > share/cmake/Modules/CMakeVS6FindMake.cmake > share/cmake/Modules/CMakeVS71FindMake.cmake > @@ -133,6 +143,7 @@ share/cmake/Modules/CheckCSourceRuns.cma > share/cmake/Modules/CheckCXXCompilerFlag.cmake > share/cmake/Modules/CheckCXXSourceCompiles.cmake > share/cmake/Modules/CheckCXXSourceRuns.cmake > +share/cmake/Modules/CheckCXXSymbolExists.cmake > share/cmake/Modules/CheckForPthreads.c > share/cmake/Modules/CheckFortranFunctionExists.cmake > share/cmake/Modules/CheckFunctionExists.c > @@ -371,14 +382,18 @@ share/cmake/Modules/FortranCInterface/my > share/cmake/Modules/FortranCInterface/mysub.f > share/cmake/Modules/FortranCInterface/symbol.c.in > share/cmake/Modules/GNUInstallDirs.cmake > +share/cmake/Modules/GenerateExportHeader.cmake > share/cmake/Modules/GetPrerequisites.cmake > share/cmake/Modules/ITKCompatibility.cmake > share/cmake/Modules/InstallRequiredSystemLibraries.cmake > +share/cmake/Modules/IntelVSImplicitPath/ > +share/cmake/Modules/IntelVSImplicitPath/CMakeLists.txt > +share/cmake/Modules/IntelVSImplicitPath/detect.cmake > +share/cmake/Modules/IntelVSImplicitPath/hello.f > share/cmake/Modules/KDE3Macros.cmake > share/cmake/Modules/MacOSXBundleInfo.plist.in > share/cmake/Modules/MacOSXFrameworkInfo.plist.in > share/cmake/Modules/MacroAddFileDependencies.cmake > -share/cmake/Modules/MacroPushRequiredVars.cmake > share/cmake/Modules/NSIS.InstallOptions.ini.in > share/cmake/Modules/NSIS.template.in > share/cmake/Modules/Platform/ > @@ -388,6 +403,7 @@ share/cmake/Modules/Platform/AIX-GNU-For > share/cmake/Modules/Platform/AIX-GNU.cmake > share/cmake/Modules/Platform/AIX-VisualAge-C.cmake > share/cmake/Modules/Platform/AIX-VisualAge-CXX.cmake > +share/cmake/Modules/Platform/AIX-VisualAge-Fortran.cmake > share/cmake/Modules/Platform/AIX-XL-ASM.cmake > share/cmake/Modules/Platform/AIX-XL-C.cmake > share/cmake/Modules/Platform/AIX-XL-CXX.cmake > @@ -551,6 +567,9 @@ share/cmake/Modules/TestForSSTREAM.cxx > share/cmake/Modules/TestForSTDNamespace.cmake > share/cmake/Modules/TestForSTDNamespace.cxx > share/cmake/Modules/UseEcos.cmake > +share/cmake/Modules/UseJava.cmake > +share/cmake/Modules/UseJavaClassFilelist.cmake > +share/cmake/Modules/UseJavaSymlinks.cmake > share/cmake/Modules/UsePkgConfig.cmake > share/cmake/Modules/UseQt4.cmake > share/cmake/Modules/UseSWIG.cmake > @@ -560,7 +579,9 @@ share/cmake/Modules/UseVTKConfig40.cmake > share/cmake/Modules/Use_wxWindows.cmake > share/cmake/Modules/UsewxWidgets.cmake > share/cmake/Modules/VTKCompatibility.cmake > +share/cmake/Modules/WriteBasicConfigVersionFile.cmake > share/cmake/Modules/ecos_clean.cmake > +share/cmake/Modules/exportheader.cmake.in > share/cmake/Modules/kde3init_dummy.cpp.in > share/cmake/Modules/kde3uic.cmake > share/cmake/Modules/readme.txt > Index: Makefile > =================================================================== > RCS file: /cvs/ports/devel/cmake/Makefile,v > retrieving revision 1.45 > diff -u -p -r1.45 Makefile > --- Makefile 8 Oct 2011 18:55:36 -0000 1.45 > +++ Makefile 11 Oct 2011 12:35:46 -0000 > @@ -5,7 +5,7 @@ VMEM_WARNING = Yes > HOMEPAGE = http://www.cmake.org/ > CATEGORIES = devel > COMMENT = portable build system > -DISTNAME = cmake-2.8.5 > +DISTNAME = cmake-2.8.6 > MASTER_SITES = ${HOMEPAGE}files/v2.8/ > > MAINTAINER = David Coppa <dco...@openbsd.org> > @@ -44,9 +44,9 @@ pre-configure: > ${WRKSRC}/Modules/FindQt.cmake \ > ${WRKSRC}/Modules/FindQt3.cmake \ > ${WRKSRC}/Modules/FindSDL.cmake \ > - ${WRKSRC}/Modules/FindwxWindows.cmake > + ${WRKSRC}/Modules/FindwxWindows.cmake \ > + ${WRKSRC}/Modules/UseJava.cmake > > -# Remove spurious post-build files > post-install: > @rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/*.{beforesubst,orig} > @rm ${WRKINST}/${LOCALBASE}/share/cmake/Modules/Compiler/*.orig > Index: distinfo > =================================================================== > RCS file: /cvs/ports/devel/cmake/distinfo,v > retrieving revision 1.12 > diff -u -p -r1.12 distinfo > --- distinfo 20 Sep 2011 11:32:36 -0000 1.12 > +++ distinfo 11 Oct 2011 12:35:46 -0000 > @@ -1,5 +1,5 @@ > -MD5 (cmake-2.8.5.tar.gz) = PF0yzsD0wtxF9MLoT0ogxQ== > -RMD160 (cmake-2.8.5.tar.gz) = 5HZ9wOo+U9o6sUzGr11C3RkO2nY= > -SHA1 (cmake-2.8.5.tar.gz) = jdTDHLzPGil4KaR2oO950WFMo2g= > -SHA256 (cmake-2.8.5.tar.gz) = Xhi/918BZWxk9VNBKokFUn4bhe+vMWPG+4HqWqztC5E= > -SIZE (cmake-2.8.5.tar.gz) = 5517977 > +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 > Index: files/MacroPushRequiredVars.cmake > =================================================================== > RCS file: files/MacroPushRequiredVars.cmake > diff -N files/MacroPushRequiredVars.cmake > --- files/MacroPushRequiredVars.cmake 31 May 2010 06:29:27 -0000 1.1 > +++ /dev/null 1 Jan 1970 00:00:00 -0000 > @@ -1,47 +0,0 @@ > -# this module defines two macros: > -# MACRO_PUSH_REQUIRED_VARS() > -# and > -# MACRO_POP_REQUIRED_VARS() > -# use these if you call cmake macros which use > -# any of the CMAKE_REQUIRED_XXX variables > -# > -# Usage: > -# MACRO_PUSH_REQUIRED_VARS() > -# SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} > -DSOME_MORE_DEF) > -# CHECK_FUNCTION_EXISTS(...) > -# MACRO_POP_REQUIRED_VARS() > - > -# Copyright (c) 2006, Alexander Neundorf, <neund...@kde.org> > -# > -# Redistribution and use is allowed according to the terms of the BSD > license. > -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. > - > -MACRO(MACRO_PUSH_REQUIRED_VARS) > - > - IF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER) > - SET(_PUSH_REQUIRED_VARS_COUNTER 0) > - ENDIF(NOT DEFINED _PUSH_REQUIRED_VARS_COUNTER) > - > - MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER "${_PUSH_REQUIRED_VARS_COUNTER}+1") > - > - SET(_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_INCLUDES}) > - SET(_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_DEFINITIONS}) > - SET(_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_LIBRARIES}) > - SET(_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER} > ${CMAKE_REQUIRED_FLAGS}) > -ENDMACRO(MACRO_PUSH_REQUIRED_VARS) > - > -MACRO(MACRO_POP_REQUIRED_VARS) > - > -# don't pop more than we pushed > - IF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0") > - > - SET(CMAKE_REQUIRED_INCLUDES > ${_CMAKE_REQUIRED_INCLUDES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - SET(CMAKE_REQUIRED_DEFINITIONS > ${_CMAKE_REQUIRED_DEFINITIONS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - SET(CMAKE_REQUIRED_LIBRARIES > ${_CMAKE_REQUIRED_LIBRARIES_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - SET(CMAKE_REQUIRED_FLAGS > ${_CMAKE_REQUIRED_FLAGS_SAVE_${_PUSH_REQUIRED_VARS_COUNTER}}) > - > - MATH(EXPR _PUSH_REQUIRED_VARS_COUNTER > "${_PUSH_REQUIRED_VARS_COUNTER}-1") > - ENDIF("${_PUSH_REQUIRED_VARS_COUNTER}" GREATER "0") > - > -ENDMACRO(MACRO_POP_REQUIRED_VARS) > - > Index: patches/patch-CMakeLists_txt > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v > retrieving revision 1.7 > diff -u -p -r1.7 patch-CMakeLists_txt > --- patches/patch-CMakeLists_txt 20 Sep 2011 11:32:36 -0000 1.7 > +++ patches/patch-CMakeLists_txt 11 Oct 2011 12:35:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-CMakeLists_txt,v 1.7 2011/09/20 11:32:36 dcoppa Exp $ > ---- CMakeLists.txt.orig Fri Jul 8 14:21:43 2011 > -+++ CMakeLists.txt Fri Sep 9 09:49:49 2011 > -@@ -250,6 +250,15 @@ MACRO (CMAKE_BUILD_UTILITIES) > +--- 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) > # (a macro defined in this file) > CMAKE_HANDLE_SYSTEM_LIBRARIES() > > @@ -17,7 +17,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.7 201 > #--------------------------------------------------------------------- > # Build zlib library for Curl, CMake, and CTest. > SET(CMAKE_ZLIB_HEADER "cm_zlib.h") > -@@ -388,26 +397,7 @@ MACRO (CMAKE_BUILD_UTILITIES) > +@@ -390,26 +399,7 @@ MACRO (CMAKE_BUILD_UTILITIES) > ELSE (UNIX) > SET(BUILD_CursesDialog 0) > ENDIF (UNIX) > Index: patches/patch-Modules_Compiler_GNU-Fortran_cmake > =================================================================== > RCS file: > /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU-Fortran_cmake,v > retrieving revision 1.1 > diff -u -p -r1.1 patch-Modules_Compiler_GNU-Fortran_cmake > --- patches/patch-Modules_Compiler_GNU-Fortran_cmake 26 Oct 2010 18:31:18 > -0000 1.1 > +++ patches/patch-Modules_Compiler_GNU-Fortran_cmake 11 Oct 2011 12:35:46 > -0000 > @@ -1,9 +1,9 @@ > $OpenBSD: patch-Modules_Compiler_GNU-Fortran_cmake,v 1.1 2010/10/26 18:31:18 > dcoppa Exp $ > ---- Modules/Compiler/GNU-Fortran.cmake.orig Mon Jun 28 17:15:57 2010 > -+++ Modules/Compiler/GNU-Fortran.cmake Tue Oct 26 15:21:23 2010 > -@@ -1,10 +1,6 @@ > - include(Compiler/GNU) > - __compiler_gnu(Fortran) > +--- Modules/Compiler/GNU-Fortran.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/Compiler/GNU-Fortran.cmake Fri Oct 7 09:15:14 2011 > +@@ -4,10 +4,6 @@ __compiler_gnu(Fortran) > + set(CMAKE_Fortran_FORMAT_FIXED_FLAG "-ffixed-form") > + set(CMAKE_Fortran_FORMAT_FREE_FLAG "-ffree-form") > > -# No -DNDEBUG for Fortran. > -SET(CMAKE_Fortran_FLAGS_MINSIZEREL_INIT "-Os") > Index: patches/patch-Modules_FindJNI_cmake > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Modules_FindJNI_cmake > --- patches/patch-Modules_FindJNI_cmake 20 Sep 2011 11:32:36 -0000 > 1.3 > +++ patches/patch-Modules_FindJNI_cmake 11 Oct 2011 12:35:46 -0000 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-Modules_FindJNI_cmake,v 1.3 2011/09/20 11:32:36 dcoppa Exp $ > ---- Modules/FindJNI.cmake.orig Fri Jul 8 14:21:44 2011 > -+++ Modules/FindJNI.cmake Fri Sep 9 10:02:12 2011 > +--- Modules/FindJNI.cmake.orig Tue Oct 4 20:09:24 2011 > ++++ Modules/FindJNI.cmake Mon Oct 10 22:13:31 2011 > @@ -26,6 +26,8 @@ > # (To distribute this file outside of CMake, substitute the full > # License text for the above reference.) > @@ -10,8 +10,16 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set > ${_var} > MACRO(java_append_library_directories _var) > # Determine java arch-specific library subdir > -@@ -96,31 +98,53 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES > - > +@@ -88,40 +90,59 @@ ENDMACRO(java_append_library_directories) > + GET_FILENAME_COMPONENT(java_install_version > + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit;CurrentVersion]" NAME) > + > +-SET(JAVA_AWT_LIBRARY_DIRECTORIES > +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.4;JavaHome]/lib" > +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.3;JavaHome]/lib" > +- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\${java_install_version};JavaHome]/lib" > +- ) > +- > FILE(TO_CMAKE_PATH "$ENV{JAVA_HOME}" _JAVA_HOME) > > -JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > @@ -42,24 +50,27 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > +IF(MODJAVA_VER) > + IF(MODJAVA_VER MATCHES "^1\\.5.*") > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > -+ ${JAVA_AWT_LIBRARY_DIRECTORIES} > + /usr/local/jdk-1.5.0/jre/lib/{libarch} > + /usr/local/jre-1.5.0/lib/{libarch} > + ) > + ELSEIF(MODJAVA_VER MATCHES "^1\\.6.*") > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > -+ ${JAVA_AWT_LIBRARY_DIRECTORIES} > + /usr/local/jdk-1.6.0/jre/lib/{libarch} > + /usr/local/jre-1.6.0/lib/{libarch} > + ) > + ELSE(MODJAVA_VER MATCHES "^1\\.5.*") > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > -+ ${JAVA_AWT_LIBRARY_DIRECTORIES} > + /usr/local/jdk-1.7.0/jre/lib/{libarch} > + /usr/local/jre-1.7.0/lib/{libarch} > + ) > + ENDIF(MODJAVA_VER MATCHES "^1\\.5.*") > +ELSE(MODJAVA_VER) > ++ SET(JAVA_AWT_LIBRARY_DIRECTORIES > ++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.4;JavaHome]/lib" > ++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.3;JavaHome]/lib" > ++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\${java_install_version};JavaHome]/lib" > ++ ) > + > + JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES > + ${_JAVA_HOME}/jre/lib/{libarch} > + ${_JAVA_HOME}/jre/lib > @@ -86,10 +97,11 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > + /usr/lib/jvm/default-java/lib > + ) > +ENDIF(MODJAVA_VER) > - > ++ > SET(JAVA_JVM_LIBRARY_DIRECTORIES) > FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) > -@@ -132,29 +156,47 @@ FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) > + SET(JAVA_JVM_LIBRARY_DIRECTORIES > +@@ -132,29 +153,47 @@ FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES}) > ) > ENDFOREACH(dir) > > @@ -159,7 +171,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v > FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}") > GET_FILENAME_COMPONENT(jpath "${JAVA_PROG}" PATH) > FOREACH(JAVA_INC_PATH ../include ../java/include ../share/java/include) > -@@ -227,6 +269,7 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h > +@@ -227,6 +266,7 @@ FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h > ${JAVA_INCLUDE_PATH}/win32 > ${JAVA_INCLUDE_PATH}/linux > ${JAVA_INCLUDE_PATH}/freebsd > Index: patches/patch-Modules_FindJava_cmake > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v > retrieving revision 1.4 > diff -u -p -r1.4 patch-Modules_FindJava_cmake > --- patches/patch-Modules_FindJava_cmake 20 Sep 2011 11:32:36 -0000 > 1.4 > +++ patches/patch-Modules_FindJava_cmake 11 Oct 2011 12:35:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-Modules_FindJava_cmake,v 1.4 2011/09/20 11:32:36 dcoppa Exp $ > ---- Modules/FindJava.cmake.orig Fri Jul 8 14:21:44 2011 > -+++ Modules/FindJava.cmake Fri Sep 9 09:53:48 2011 > -@@ -54,6 +54,8 @@ > +--- Modules/FindJava.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/FindJava.cmake Fri Oct 7 09:15:16 2011 > +@@ -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 > # 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" > -@@ -66,19 +68,29 @@ SET(_JAVA_HINTS > +@@ -68,19 +70,29 @@ SET(_JAVA_HINTS > "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development > Kit\\1.3;JavaHome]/bin" > $ENV{JAVA_HOME}/bin > ) > @@ -53,7 +53,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v > FIND_PROGRAM(Java_JAVA_EXECUTABLE > NAMES java > HINTS ${_JAVA_HINTS} > -@@ -105,6 +117,7 @@ IF(Java_JAVA_EXECUTABLE) > +@@ -107,6 +119,7 @@ IF(Java_JAVA_EXECUTABLE) > # 2. OpenJDK 1.6 > # 3. GCJ 1.5 > # 4. Kaffe 1.4.2 > @@ -61,7 +61,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v > 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-]*\".*" > -@@ -112,6 +125,10 @@ IF(Java_JAVA_EXECUTABLE) > +@@ -114,6 +127,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_]+).*" > Index: patches/patch-Modules_FindPythonInterp_cmake > =================================================================== > RCS file: > /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Modules_FindPythonInterp_cmake > --- patches/patch-Modules_FindPythonInterp_cmake 13 Mar 2011 18:23:02 > -0000 1.3 > +++ patches/patch-Modules_FindPythonInterp_cmake 11 Oct 2011 12:35:46 > -0000 > @@ -1,9 +1,9 @@ > $OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.3 2011/03/13 18:23:02 > dcoppa Exp $ > ---- Modules/FindPythonInterp.cmake.orig Tue Feb 15 18:47:27 2011 > -+++ Modules/FindPythonInterp.cmake Mon Mar 7 11:29:02 2011 > -@@ -20,11 +20,17 @@ > - # (To distribute this file outside of CMake, substitute the full > - # License text for the above reference.) > +--- Modules/FindPythonInterp.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/FindPythonInterp.cmake Fri Oct 7 09:15:16 2011 > +@@ -29,11 +29,17 @@ > + # Search for the current active python version first > + find_program(PYTHON_EXECUTABLE NAMES python) > > +SET(MODPY_VERSION $ENV{MODPY_VERSION}) > + > @@ -20,5 +20,5 @@ $OpenBSD: patch-Modules_FindPythonInterp > + 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) > +ENDIF(MODPY_VERSION) > > - # Run first with the Python version in the executable > - foreach(_CURRENT_VERSION ${_Python_VERSIONS}) > + # Search for newest python version if python executable isn't found > + if(NOT PYTHON_EXECUTABLE) > Index: patches/patch-Modules_FindQt4_cmake > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v > retrieving revision 1.11 > diff -u -p -r1.11 patch-Modules_FindQt4_cmake > --- patches/patch-Modules_FindQt4_cmake 20 Sep 2011 11:32:36 -0000 > 1.11 > +++ patches/patch-Modules_FindQt4_cmake 11 Oct 2011 12:35:46 -0000 > @@ -1,6 +1,6 @@ > $OpenBSD: patch-Modules_FindQt4_cmake,v 1.11 2011/09/20 11:32:36 dcoppa Exp $ > ---- Modules/FindQt4.cmake.orig Fri Jul 8 14:21:44 2011 > -+++ Modules/FindQt4.cmake Fri Sep 9 09:52:18 2011 > +--- Modules/FindQt4.cmake.orig Tue Oct 4 18:09:24 2011 > ++++ Modules/FindQt4.cmake Fri Oct 7 09:15:17 2011 > @@ -473,13 +473,20 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRE > # check for qmake > # Debian uses qmake-qt4 > @@ -29,7 +29,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v > > # double check that it was a Qt4 qmake, if not, re-find with different names > IF (QT_QMAKE_EXECUTABLE) > -@@ -920,6 +927,12 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > +@@ -921,6 +928,12 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > _QT4_ADJUST_LIB_VARS(QAxContainer) > ENDIF(Q_WS_WIN) > > @@ -42,7 +42,7 @@ $OpenBSD: patch-Modules_FindQt4_cmake,v > > ####################################### > # > -@@ -944,13 +957,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > +@@ -945,13 +958,13 @@ IF (QT_QMAKE_EXECUTABLE AND QTVERSION) > ENDIF(QT_QMAKE_CHANGED) > > FIND_PROGRAM(QT_MOC_EXECUTABLE > Index: patches/patch-Modules_FindRuby_cmake > =================================================================== > RCS file: patches/patch-Modules_FindRuby_cmake > diff -N patches/patch-Modules_FindRuby_cmake > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Modules_FindRuby_cmake 11 Oct 2011 12:35:46 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- Modules/FindRuby.cmake.orig Sun Oct 9 18:41:47 2011 > ++++ Modules/FindRuby.cmake Sun Oct 9 18:42:49 2011 > +@@ -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 "" ) > Index: patches/patch-Modules_UseJava_cmake > =================================================================== > RCS file: patches/patch-Modules_UseJava_cmake > diff -N patches/patch-Modules_UseJava_cmake > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Modules_UseJava_cmake 11 Oct 2011 12:35:46 -0000 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- Modules/UseJava.cmake.orig Fri Oct 7 11:27:56 2011 > ++++ Modules/UseJava.cmake Fri Oct 7 11:28:32 2011 > +@@ -445,7 +445,7 @@ function (find_jar VARIABLE) > + set(_jar_versions) > + set(_jar_paths > + /usr/share/java/ > +- /usr/local/share/java/ > ++ ${LOCALBASE}/share/java/ > + ${Java_JAR_PATHS}) > + set(_jar_doc "NOTSET") > + > Index: patches/patch-Source_cmTarget_cxx > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v > retrieving revision 1.9 > diff -u -p -r1.9 patch-Source_cmTarget_cxx > --- patches/patch-Source_cmTarget_cxx 20 Sep 2011 11:32:36 -0000 1.9 > +++ patches/patch-Source_cmTarget_cxx 11 Oct 2011 12:35:46 -0000 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-Source_cmTarget_cxx,v 1.9 2011/09/20 11:32:36 dcoppa Exp $ > ---- Source/cmTarget.cxx.orig Fri Jul 8 14:21:47 2011 > -+++ Source/cmTarget.cxx Fri Sep 9 09:49:49 2011 > -@@ -3276,6 +3276,36 @@ void cmTarget::GetLibraryNames(std::string& name, > +--- 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); > > @@ -38,7 +38,7 @@ $OpenBSD: patch-Source_cmTarget_cxx,v 1. > // The library name. > name = prefix+base+suffix; > > -@@ -3310,8 +3340,27 @@ void cmTarget::GetLibraryNames(std::string& name, > +@@ -3354,8 +3384,27 @@ void cmTarget::GetLibraryNames(std::string& name, > if(version) > { > realName += "."; > Index: patches/patch-Source_kwsys_SystemTools_cxx > =================================================================== > RCS file: /cvs/ports/devel/cmake/patches/patch-Source_kwsys_SystemTools_cxx,v > retrieving revision 1.9 > diff -u -p -r1.9 patch-Source_kwsys_SystemTools_cxx > --- patches/patch-Source_kwsys_SystemTools_cxx 16 Apr 2011 15:18:13 > -0000 1.9 > +++ patches/patch-Source_kwsys_SystemTools_cxx 11 Oct 2011 12:35:46 > -0000 > @@ -2,9 +2,9 @@ $OpenBSD: patch-Source_kwsys_SystemTools > > Don't spam systrace by attempting to create dirs which already exist. > > ---- Source/kwsys/SystemTools.cxx.orig Sat Apr 16 12:20:19 2011 > -+++ Source/kwsys/SystemTools.cxx Sat Apr 16 12:31:43 2011 > -@@ -226,11 +226,13 @@ inline void Realpath(const char *path, kwsys_stl::stri > +--- 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 > } > #else > #include <sys/types.h> > Index: patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in > =================================================================== > RCS file: > /cvs/ports/devel/cmake/patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v > retrieving revision 1.3 > diff -u -p -r1.3 patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in > --- patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in 20 Sep 2011 > 11:32:36 -0000 1.3 > +++ patches/patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in 11 Oct 2011 > 12:35:46 -0000 > @@ -1,14 +1,13 @@ > $OpenBSD: patch-Tests_CMakeTests_ModuleNoticesTest_cmake_in,v 1.3 2011/09/20 > 11:32:36 dcoppa Exp $ > ---- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Fri Jul 8 14:21:50 2011 > -+++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Fri Sep 9 10:49:42 2011 > -@@ -22,6 +22,10 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege > +--- Tests/CMakeTests/ModuleNoticesTest.cmake.in.orig Tue Oct 4 18:09:25 2011 > ++++ Tests/CMakeTests/ModuleNoticesTest.cmake.in Fri Oct 7 11:25:43 2011 > +@@ -22,6 +22,9 @@ string(REPLACE "\r\r" "\r" notice_regex "${notice_rege > # Modules that do not require our notice. > set(notice_exceptions > FindCUDA.cmake # MIT License, distributed here from upstream project > + FindIconv.cmake > + FindLCMS.cmake > + FindLibintl.cmake > -+ MacroPushRequiredVars.cmake > ) > > # Load the list of modules to check. > Index: patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt > =================================================================== > RCS file: patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt > diff -N patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt > --- /dev/null 1 Jan 1970 00:00:00 -0000 > +++ patches/patch-Tests_FindPackageModeMakefileTest_CMakeLists_txt 11 Oct > 2011 12:35:46 -0000 > @@ -0,0 +1,11 @@ > +$OpenBSD$ > +--- 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.*") > Index: pkg/PLIST > =================================================================== > RCS file: /cvs/ports/devel/cmake/pkg/PLIST,v > retrieving revision 1.14 > diff -u -p -r1.14 PLIST > --- pkg/PLIST 20 Sep 2011 11:32:36 -0000 1.14 > +++ pkg/PLIST 11 Oct 2011 12:35:46 -0000 > @@ -13,9 +13,14 @@ > @man man/man1/cmakevars.1 > @man man/man1/cpack.1 > @man man/man1/ctest.1 > +share/aclocal/ > +share/aclocal/cmake.m4 > share/cmake/ > share/cmake/Modules/ > share/cmake/Modules/AddFileDependencies.cmake > +share/cmake/Modules/AutomocInfo.cmake.in > +share/cmake/Modules/BasicConfigVersion-AnyNewerVersion.cmake.in > +share/cmake/Modules/BasicConfigVersion-SameMajorVersion.cmake.in > share/cmake/Modules/BundleUtilities.cmake > share/cmake/Modules/CMake.cmake > share/cmake/Modules/CMakeASM-ATTInformation.cmake > @@ -54,11 +59,13 @@ share/cmake/Modules/CMakeDetermineRCComp > share/cmake/Modules/CMakeDetermineSystem.cmake > share/cmake/Modules/CMakeDetermineVSServicePack.cmake > share/cmake/Modules/CMakeExportBuildSettings.cmake > +share/cmake/Modules/CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake > share/cmake/Modules/CMakeFindBinUtils.cmake > share/cmake/Modules/CMakeFindCodeBlocks.cmake > share/cmake/Modules/CMakeFindEclipseCDT4.cmake > share/cmake/Modules/CMakeFindFrameworks.cmake > share/cmake/Modules/CMakeFindKDevelop3.cmake > +share/cmake/Modules/CMakeFindPackageMode.cmake > share/cmake/Modules/CMakeFindWMake.cmake > share/cmake/Modules/CMakeFindXCode.cmake > share/cmake/Modules/CMakeForceCompiler.cmake > @@ -78,6 +85,7 @@ share/cmake/Modules/CMakeParseArguments. > share/cmake/Modules/CMakeParseImplicitLinkInfo.cmake > share/cmake/Modules/CMakePlatformId.h.in > share/cmake/Modules/CMakePrintSystemInformation.cmake > +share/cmake/Modules/CMakePushCheckState.cmake > share/cmake/Modules/CMakeRCCompiler.cmake.in > share/cmake/Modules/CMakeRCInformation.cmake > share/cmake/Modules/CMakeSystem.cmake.in > @@ -95,8 +103,10 @@ share/cmake/Modules/CMakeTestGNU.c > share/cmake/Modules/CMakeTestJavaCompiler.cmake > share/cmake/Modules/CMakeTestNMakeCLVersion.c > share/cmake/Modules/CMakeTestRCCompiler.cmake > +share/cmake/Modules/CMakeTestWatcomVersion.c > share/cmake/Modules/CMakeUnixFindMake.cmake > share/cmake/Modules/CMakeVS10FindMake.cmake > +share/cmake/Modules/CMakeVS11FindMake.cmake > share/cmake/Modules/CMakeVS6BackwardCompatibility.cmake > share/cmake/Modules/CMakeVS6FindMake.cmake > share/cmake/Modules/CMakeVS71FindMake.cmake > @@ -133,6 +143,7 @@ share/cmake/Modules/CheckCSourceRuns.cma > share/cmake/Modules/CheckCXXCompilerFlag.cmake > share/cmake/Modules/CheckCXXSourceCompiles.cmake > share/cmake/Modules/CheckCXXSourceRuns.cmake > +share/cmake/Modules/CheckCXXSymbolExists.cmake > share/cmake/Modules/CheckForPthreads.c > share/cmake/Modules/CheckFortranFunctionExists.cmake > share/cmake/Modules/CheckFunctionExists.c > @@ -371,14 +382,18 @@ share/cmake/Modules/FortranCInterface/my > share/cmake/Modules/FortranCInterface/mysub.f > share/cmake/Modules/FortranCInterface/symbol.c.in > share/cmake/Modules/GNUInstallDirs.cmake > +share/cmake/Modules/GenerateExportHeader.cmake > share/cmake/Modules/GetPrerequisites.cmake > share/cmake/Modules/ITKCompatibility.cmake > share/cmake/Modules/InstallRequiredSystemLibraries.cmake > +share/cmake/Modules/IntelVSImplicitPath/ > +share/cmake/Modules/IntelVSImplicitPath/CMakeLists.txt > +share/cmake/Modules/IntelVSImplicitPath/detect.cmake > +share/cmake/Modules/IntelVSImplicitPath/hello.f > share/cmake/Modules/KDE3Macros.cmake > share/cmake/Modules/MacOSXBundleInfo.plist.in > share/cmake/Modules/MacOSXFrameworkInfo.plist.in > share/cmake/Modules/MacroAddFileDependencies.cmake > -share/cmake/Modules/MacroPushRequiredVars.cmake > share/cmake/Modules/NSIS.InstallOptions.ini.in > share/cmake/Modules/NSIS.template.in > share/cmake/Modules/Platform/ > @@ -388,6 +403,7 @@ share/cmake/Modules/Platform/AIX-GNU-For > share/cmake/Modules/Platform/AIX-GNU.cmake > share/cmake/Modules/Platform/AIX-VisualAge-C.cmake > share/cmake/Modules/Platform/AIX-VisualAge-CXX.cmake > +share/cmake/Modules/Platform/AIX-VisualAge-Fortran.cmake > share/cmake/Modules/Platform/AIX-XL-ASM.cmake > share/cmake/Modules/Platform/AIX-XL-C.cmake > share/cmake/Modules/Platform/AIX-XL-CXX.cmake > @@ -551,6 +567,9 @@ share/cmake/Modules/TestForSSTREAM.cxx > share/cmake/Modules/TestForSTDNamespace.cmake > share/cmake/Modules/TestForSTDNamespace.cxx > share/cmake/Modules/UseEcos.cmake > +share/cmake/Modules/UseJava.cmake > +share/cmake/Modules/UseJavaClassFilelist.cmake > +share/cmake/Modules/UseJavaSymlinks.cmake > share/cmake/Modules/UsePkgConfig.cmake > share/cmake/Modules/UseQt4.cmake > share/cmake/Modules/UseSWIG.cmake > @@ -560,7 +579,9 @@ share/cmake/Modules/UseVTKConfig40.cmake > share/cmake/Modules/Use_wxWindows.cmake > share/cmake/Modules/UsewxWidgets.cmake > share/cmake/Modules/VTKCompatibility.cmake > +share/cmake/Modules/WriteBasicConfigVersionFile.cmake > share/cmake/Modules/ecos_clean.cmake > +share/cmake/Modules/exportheader.cmake.in > share/cmake/Modules/kde3init_dummy.cpp.in > share/cmake/Modules/kde3uic.cmake > share/cmake/Modules/readme.txt
