CMake-3.9.1

Here's the update to CMake-3.9.1

Still needing a bulk build, so I can fix eventual failures in
dependant ports...

Ciao!
David

Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.161
diff -u -p -u -p -r1.161 Makefile
--- Makefile 26 Jul 2017 22:45:17 -0000 1.161
+++ Makefile 21 Aug 2017 17:57:58 -0000
@@ -4,10 +4,9 @@ DPB_PROPERTIES =parallel

COMMENT = portable build system

-VER = 3.7.2
+VER = 3.9.1
DISTNAME = cmake-${VER}
CATEGORIES = devel
-REVISION = 4

HOMEPAGE = https://www.cmake.org/

@@ -19,7 +18,7 @@ MASTER_SITES = ${HOMEPAGE}files/v${VER:R
PERMIT_PACKAGE_CDROM = Yes

WANTLIB += archive c curl expat form jsoncpp m ncurses pthread
-WANTLIB += ${COMPILER_LIBCXX} z
+WANTLIB += rhash ${COMPILER_LIBCXX} z

# XXX: Ninja is broken on m88k
.if ${MACHINE_ARCH} != "m88k"
@@ -30,7 +29,8 @@ BUILD_DEPENDS += textproc/py-sphinx>=1.4

LIB_DEPENDS = archivers/libarchive \
devel/jsoncpp \
- net/curl
+ net/curl \
+ security/rhash

CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.47
diff -u -p -u -p -r1.47 distinfo
--- distinfo 16 Jan 2017 08:51:50 -0000 1.47
+++ distinfo 21 Aug 2017 17:57:58 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.7.2.tar.gz) = 3BJGxObRaOpNbgQs+6V3wazWX+6iflb1/zffkgwwyuA=
-SIZE (cmake-3.7.2.tar.gz) = 7361593
+SHA256 (cmake-3.9.1.tar.gz) = 12jug9IX+Ru1l7PKKsZj2nqGA8l+HxpRhLwB4K0rErs=
+SIZE (cmake-3.9.1.tar.gz) = 7702497
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 28 Nov 2016 09:15:13 -0000 1.22
+++ patches/patch-CMakeLists_txt 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-CMakeLists_txt,v 1.22 2016/11/28 09:15:13 dcoppa Exp $
---- CMakeLists.txt.orig Fri Nov 11 15:37:13 2016
-+++ CMakeLists.txt Sat Nov 26 15:18:08 2016
-@@ -274,6 +274,15 @@ macro (CMAKE_BUILD_UTILITIES)
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -305,6 +305,15 @@ macro (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
endif()

@@ -17,7 +18,17 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
#---------------------------------------------------------------------
# Setup third-party libraries.
# Everything in the tree should be able to include files from the
-@@ -453,7 +462,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -342,7 +351,8 @@ macro (CMAKE_BUILD_UTILITIES)
+ message(FATAL_ERROR
+ "CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
+ endif()
+- set(CMAKE_LIBRHASH_LIBRARIES LibRHash::LibRHash)
++ set(CMAKE_LIBRHASH_INCLUDES ${LibRHash_INCLUDE_DIRS})
++ set(CMAKE_LIBRHASH_LIBRARIES ${LibRHash_LIBRARIES})
+ else()
+ set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
+ add_subdirectory(Utilities/cmlibrhash)
+@@ -512,7 +522,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
endif()
@@ -27,7 +38,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
else()
set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
add_subdirectory(Utilities/cmjsoncpp)
-@@ -463,7 +473,7 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -522,7 +533,7 @@ macro (CMAKE_BUILD_UTILITIES)
#---------------------------------------------------------------------
# Build libuv library.
if(NOT DEFINED CMAKE_USE_LIBUV)
@@ -36,7 +47,7 @@ $OpenBSD: patch-CMakeLists_txt,v 1.22 20
if(APPLE)
include(CheckCSourceCompiles)
check_c_source_compiles("
-@@ -499,7 +509,8 @@ int main(void) { return 0; }
+@@ -552,7 +563,8 @@ int main(void) { return 0; }
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBUV is ON but a libuv is not found!")
endif()
Index: patches/patch-Modules_CMakeCInformation_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCInformation_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake 28 Nov 2016 09:15:13 -0000 1.5
+++ patches/patch-Modules_CMakeCInformation_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/CMakeCInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeCInformation.cmake Fri Nov 25 22:31:44 2016
-@@ -163,7 +163,7 @@ include(CMakeCommonLanguageInclude)
+Index: Modules/CMakeCInformation.cmake
+--- Modules/CMakeCInformation.cmake.orig
++++ Modules/CMakeCInformation.cmake
+@@ -165,7 +165,7 @@ include(CMakeCommonLanguageInclude)
# create a C shared library
if(NOT CMAKE_C_CREATE_SHARED_LIBRARY)
set(CMAKE_C_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_Compiler_GNU_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_Compiler_GNU_cmake
--- patches/patch-Modules_Compiler_GNU_cmake 28 Nov 2016 09:15:13 -0000 1.11
+++ patches/patch-Modules_Compiler_GNU_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_Compiler_GNU_cmake,v 1.11 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/Compiler/GNU.cmake.orig Sat Nov 26 12:31:32 2016
-+++ Modules/Compiler/GNU.cmake Sat Nov 26 12:32:18 2016
-@@ -37,9 +37,9 @@ macro(__compiler_gnu lang)
+Index: Modules/Compiler/GNU.cmake
+--- Modules/Compiler/GNU.cmake.orig
++++ Modules/Compiler/GNU.cmake
+@@ -39,9 +39,9 @@ macro(__compiler_gnu lang)
# Initial configuration flags.
string(APPEND CMAKE_${lang}_FLAGS_INIT " ")
string(APPEND CMAKE_${lang}_FLAGS_DEBUG_INIT " -g")
Index: patches/patch-Modules_FindBoost_cmake
===================================================================
RCS file: patches/patch-Modules_FindBoost_cmake
diff -N patches/patch-Modules_FindBoost_cmake
--- patches/patch-Modules_FindBoost_cmake 16 Jan 2017 08:51:50 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,35 +0,0 @@
-$OpenBSD: patch-Modules_FindBoost_cmake,v 1.13 2017/01/16 08:51:50 dcoppa Exp $
---- Modules/FindBoost.cmake.orig Fri Jan 13 15:05:41 2017
-+++ Modules/FindBoost.cmake Mon Jan 16 09:12:56 2017
-@@ -884,6 +884,22 @@ function(_Boost_MISSING_DEPENDENCIES componentvar extr
- set(${extravar} ${_boost_extra_components} PARENT_SCOPE)
- endfunction()
-
-+function(_Boost_consider_adding_pthread _outvar)
-+ # On Unix platforms (excluding Cygwin) add pthread to Boost_LIBRARIES
-+ # if the user is searching for the boost-thread component.
-+ if(UNIX AND NOT CYGWIN)
-+ list(FIND Boost_FIND_COMPONENTS thread _using_boost_thread)
-+ if(_using_boost_thread GREATER -1)
-+ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
-+ set(THREADS_PREFER_PTHREAD_FLAG TRUE)
-+ find_package(Threads)
-+ if(Threads_FOUND)
-+ set(${_outvar} ${ARGN} Threads::Threads PARENT_SCOPE)
-+ endif()
-+ endif()
-+ endif()
-+endfunction()
-+
- #
- # Update library search directory hint variable with paths used by prebuilt boost binaries.
- #
-@@ -1807,6 +1823,8 @@ if(Boost_FOUND)
- list(APPEND Boost_LIBRARIES ${Boost_${UPPERCOMPONENT}_LIBRARY})
- endif()
- endforeach()
-+ # Add pthread library if thread component was found
-+ _Boost_consider_adding_pthread(Boost_LIBRARIES ${Boost_LIBRARIES})
- else()
- if(Boost_FIND_REQUIRED)
- message(SEND_ERROR "Unable to find the requested Boost libraries.\n${Boost_ERROR_REASON}")
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 21 Apr 2017 18:37:43 -0000 1.20
+++ patches/patch-Modules_FindJNI_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Modules_FindJNI_cmake,v 1.20 2017/04/21 18:37:43 kurt Exp $
---- Modules/FindJNI.cmake.orig Fri Jan 13 09:05:41 2017
-+++ Modules/FindJNI.cmake Fri Apr 21 09:54:40 2017
+Index: Modules/FindJNI.cmake
+--- Modules/FindJNI.cmake.orig
++++ Modules/FindJNI.cmake
@@ -25,6 +25,8 @@
# JAVA_INCLUDE_PATH2 = the include path to jni_md.h
# JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
@@ -23,7 +24,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
endif()

# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -107,57 +111,63 @@ if(_JAVA_HOME_EXPLICIT)
+@@ -107,60 +111,66 @@ if(_JAVA_HOME_EXPLICIT)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()

@@ -82,6 +83,9 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
- /usr/lib/jvm/default-java/jre/lib/{libarch}
- /usr/lib/jvm/default-java/jre/lib
- /usr/lib/jvm/default-java/lib
+- # Arch Linux specific paths for default JVM
+- /usr/lib/jvm/default/jre/lib/{libarch}
+- /usr/lib/jvm/default/lib/{libarch}
- # Ubuntu specific paths for default JVM
- /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
- /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
@@ -120,6 +124,9 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
+ /usr/lib/jvm/default-java/jre/lib/{libarch}
+ /usr/lib/jvm/default-java/jre/lib
+ /usr/lib/jvm/default-java/lib
++ # Arch Linux specific paths for default JVM
++ /usr/lib/jvm/default/jre/lib/{libarch}
++ /usr/lib/jvm/default/lib/{libarch}
+ # Ubuntu specific paths for default JVM
+ /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
+ /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
@@ -135,7 +142,7 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v

set(JAVA_JVM_LIBRARY_DIRECTORIES)
foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -171,41 +181,48 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+@@ -174,43 +184,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
)
endforeach()

@@ -168,6 +175,8 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
- /opt/sun-jdk-1.5.0.04/include
- # Debian specific path for default JVM
- /usr/lib/jvm/default-java/include
+- # Arch specific path for default JVM
+- /usr/lib/jvm/default/include
- # OpenBSD specific path for default JVM
- /usr/local/jdk-1.7.0/include
- /usr/local/jdk-1.6.0/include
@@ -209,6 +218,8 @@ $OpenBSD: patch-Modules_FindJNI_cmake,v
+ /opt/sun-jdk-1.5.0.04/include
+ # Debian specific path for default JVM
+ /usr/lib/jvm/default-java/include
++ # Arch specific path for default JVM
++ /usr/lib/jvm/default/include
+ # OpenBSD specific path for default JVM
+ ${LOCALBASE}/jdk-1.8.0/include
+ # SuSE specific paths for default JVM
Index: patches/patch-Modules_FindJava_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 patch-Modules_FindJava_cmake
--- patches/patch-Modules_FindJava_cmake 21 Apr 2017 18:37:43 -0000 1.20
+++ patches/patch-Modules_FindJava_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Modules_FindJava_cmake,v 1.20 2017/04/21 18:37:43 kurt Exp $
---- Modules/FindJava.cmake.orig Fri Jan 13 09:05:41 2017
-+++ Modules/FindJava.cmake Fri Apr 21 09:52:03 2017
+Index: Modules/FindJava.cmake
+--- Modules/FindJava.cmake.orig
++++ Modules/FindJava.cmake
@@ -72,6 +72,8 @@

include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
@@ -10,7 +11,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v
# The HINTS option should only be used for values computed from the system.
set(_JAVA_HINTS)
if(_JAVA_HOME)
-@@ -89,19 +91,22 @@ list(APPEND _JAVA_HINTS
+@@ -97,19 +99,22 @@ list(APPEND _JAVA_HINTS
)
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
@@ -46,7 +47,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v
find_program(Java_JAVA_EXECUTABLE
NAMES java
HINTS ${_JAVA_HINTS}
-@@ -131,7 +136,7 @@ if(Java_JAVA_EXECUTABLE)
+@@ -139,7 +144,7 @@ if(Java_JAVA_EXECUTABLE)
# 2. OpenJDK 1.6
# 3. GCJ 1.5
# 4. Kaffe 1.4.2
@@ -55,7 +56,7 @@ $OpenBSD: patch-Modules_FindJava_cmake,v
if(var MATCHES "java version \"([0-9]+\\.[0-9]+\\.[0-9_.]+.*)\"")
# This is most likely Sun / OpenJDK, or maybe GCJ-java compat layer
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
-@@ -139,7 +144,7 @@ if(Java_JAVA_EXECUTABLE)
+@@ -150,7 +155,7 @@ if(Java_JAVA_EXECUTABLE)
# Kaffe style
set(Java_VERSION_STRING "${CMAKE_MATCH_1}")
elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"")
Index: patches/patch-Modules_FindKDE3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindKDE3_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Modules_FindKDE3_cmake
--- patches/patch-Modules_FindKDE3_cmake 28 Nov 2016 09:15:13 -0000 1.3
+++ patches/patch-Modules_FindKDE3_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.3 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindKDE3.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindKDE3.cmake Fri Nov 25 22:31:44 2016
-@@ -292,12 +292,6 @@ if(KDE3_FOUND)
+Index: Modules/FindKDE3.cmake
+--- Modules/FindKDE3.cmake.orig
++++ Modules/FindKDE3.cmake
+@@ -294,12 +294,6 @@ if(KDE3_FOUND)
set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
endif ()

Index: patches/patch-Modules_FindLibXml2_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindLibXml2_cmake,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Modules_FindLibXml2_cmake
--- patches/patch-Modules_FindLibXml2_cmake 10 Jul 2017 23:05:54 -0000 1.3
+++ patches/patch-Modules_FindLibXml2_cmake 21 Aug 2017 17:57:58 -0000
@@ -27,15 +27,13 @@ Index: Modules/FindLibXml2.cmake
HINTS
${PC_LIBXML_LIBDIR}
${PC_LIBXML_LIBRARY_DIRS}
-@@ -52,11 +54,14 @@ elseif(LIBXML2_INCLUDE_DIR AND EXISTS "${LIBXML2_INCLU
+@@ -52,9 +54,12 @@ elseif(LIBXML2_INCLUDE_DIR AND EXISTS "${LIBXML2_INCLU
unset(libxml2_version_str)
endif()

+set(LIBXML2_INCLUDE_DIRS ${LIBXML2_INCLUDE_DIR} ${PC_LIBXML_INCLUDE_DIRS})
+set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY})
+
- # handle the QUIETLY and REQUIRED arguments and set LIBXML2_FOUND to TRUE if
- # all listed variables are TRUE
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibXml2
- REQUIRED_VARS LIBXML2_LIBRARIES LIBXML2_INCLUDE_DIR
Index: patches/patch-Modules_FindLua_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindLua_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_FindLua_cmake
--- patches/patch-Modules_FindLua_cmake 28 Nov 2016 09:15:13 -0000 1.5
+++ patches/patch-Modules_FindLua_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Modules_FindLua_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindLua.cmake.orig Sat Nov 26 12:39:29 2016
-+++ Modules/FindLua.cmake Sat Nov 26 12:53:09 2016
+Index: Modules/FindLua.cmake
+--- Modules/FindLua.cmake.orig
++++ Modules/FindLua.cmake
@@ -40,9 +40,16 @@ unset(_lua_include_subdirs)
unset(_lua_library_names)
unset(_lua_append_versions)
@@ -12,73 +13,21 @@ $OpenBSD: patch-Modules_FindLua_cmake,v
function(_lua_set_version_vars)
- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+ if(MODLUA_VERSION)
-+ set(LUA_VERSIONS5 ${MODLUA_VERSION})
++ set(LUA_VERSIONS5 ${MODLUA_VERSION})
+ else()
-+ set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
++ set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+ endif()

if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1)
-@@ -122,33 +129,37 @@ endfunction(_lua_check_header_version)
+@@ -114,6 +121,10 @@ function(_lua_check_header_version _hdr_file)
+ endfunction(_lua_check_header_version)

_lua_set_version_vars()
-
--if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-- _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
--endif ()
++
+if(MODLUA_INCL_DIR)
+ set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
-+else(MODLUA_INCL_DIR)
-+ if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
-+ _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
-+ endif ()
-
--if (NOT LUA_VERSION_STRING)
-- foreach (subdir IN LISTS _lua_include_subdirs)
-- unset(LUA_INCLUDE_PREFIX CACHE)
-- find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
-- HINTS
-- ENV LUA_DIR
-- PATHS
-- ~/Library/Frameworks
-- /Library/Frameworks
-- /sw # Fink
-- /opt/local # DarwinPorts
-- /opt/csw # Blastwave
-- /opt
-- )
-- if (LUA_INCLUDE_PREFIX)
-- _lua_check_header_version("${LUA_INCLUDE_PREFIX}/${subdir}/lua.h")
-- if (LUA_VERSION_STRING)
-- set(LUA_INCLUDE_DIR "${LUA_INCLUDE_PREFIX}/${subdir}")
-- break()
-+ if (NOT LUA_VERSION_STRING)
-+ foreach (subdir IN LISTS _lua_include_subdirs)
-+ unset(LUA_INCLUDE_PREFIX CACHE)
-+ find_path(LUA_INCLUDE_PREFIX ${subdir}/lua.h
-+ HINTS
-+ ENV LUA_DIR
-+ PATHS
-+ ~/Library/Frameworks
-+ /Library/Frameworks
-+ /sw # Fink
-+ /opt/local # DarwinPorts
-+ /opt/csw # Blastwave
-+ /opt
-+ )
-+ if (LUA_INCLUDE_PREFIX)
-+ _lua_check_header_version("${LUA_INCLUDE_PREFIX}/${subdir}/lua.h")
-+ if (LUA_VERSION_STRING)
-+ set(LUA_INCLUDE_DIR "${LUA_INCLUDE_PREFIX}/${subdir}")
-+ break()
-+ endif ()
- endif ()
-- endif ()
-- endforeach ()
--endif ()
-+ endforeach ()
-+ endif ()
-+endif(MODLUA_INCL_DIR)
- unset(_lua_include_subdirs)
- unset(_lua_append_versions)
++endif()

+ if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
+ _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
Index: patches/patch-Modules_FindMPEG2_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG2_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_FindMPEG2_cmake
--- patches/patch-Modules_FindMPEG2_cmake 28 Nov 2016 09:15:13 -0000 1.7
+++ patches/patch-Modules_FindMPEG2_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.7 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindMPEG2.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindMPEG2.cmake Fri Nov 25 22:31:44 2016
-@@ -23,27 +23,21 @@
+Index: Modules/FindMPEG2.cmake
+--- Modules/FindMPEG2.cmake.orig
++++ Modules/FindMPEG2.cmake
+@@ -23,24 +23,19 @@
# MPEG2_vo_LIBRARY, where to find the vo library.

find_path(MPEG2_INCLUDE_DIR
@@ -20,9 +21,6 @@ $OpenBSD: patch-Modules_FindMPEG2_cmake,
- /usr/local/livid/mpeg2dec/libvo/.libs
-)
-
--
- # handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
- # all listed variables are TRUE
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)

@@ -33,7 +31,7 @@ $OpenBSD: patch-Modules_FindMPEG2_cmake,

#some native mpeg2 installations will depend
#on libSDL, if found, add it in.
-@@ -53,4 +47,4 @@ if(MPEG2_FOUND)
+@@ -50,4 +45,4 @@ if(MPEG2_FOUND)
endif()
endif()

Index: patches/patch-Modules_FindMPEG_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG_cmake,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 patch-Modules_FindMPEG_cmake
--- patches/patch-Modules_FindMPEG_cmake 28 Nov 2016 09:15:13 -0000 1.8
+++ patches/patch-Modules_FindMPEG_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.8 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindMPEG.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindMPEG.cmake Fri Nov 25 22:31:44 2016
-@@ -22,25 +22,21 @@
+Index: Modules/FindMPEG.cmake
+--- Modules/FindMPEG.cmake.orig
++++ Modules/FindMPEG.cmake
+@@ -22,23 +22,19 @@
# MPEG_mpeg2_LIBRARY, where to find the MPEG library.
# MPEG_vo_LIBRARY, where to find the vo library.

@@ -20,8 +21,6 @@ $OpenBSD: patch-Modules_FindMPEG_cmake,v
- /usr/local/livid/mpeg2dec/libvo/.libs
-)
-
- # handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
- # all listed variables are TRUE
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
Index: patches/patch-Modules_FindPythonLibs_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 patch-Modules_FindPythonLibs_cmake
--- patches/patch-Modules_FindPythonLibs_cmake 28 Nov 2016 09:15:13 -0000 1.14
+++ patches/patch-Modules_FindPythonLibs_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.14 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindPythonLibs.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindPythonLibs.cmake Fri Nov 25 22:31:44 2016
+Index: Modules/FindPythonLibs.cmake
+--- Modules/FindPythonLibs.cmake.orig
++++ Modules/FindPythonLibs.cmake
@@ -72,6 +72,9 @@ endif()
# To avoid picking up the system Python.h pre-maturely.
set(CMAKE_FIND_FRAMEWORK LAST)
@@ -32,7 +33,7 @@ $OpenBSD: patch-Modules_FindPythonLibs_c

unset(_PYTHON_FIND_OTHER_VERSIONS)
unset(_PYTHON1_VERSIONS)
-@@ -184,20 +191,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+@@ -191,20 +198,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
endforeach()
endif()

Index: patches/patch-Modules_FindXMLRPC_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindXMLRPC_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindXMLRPC_cmake
--- patches/patch-Modules_FindXMLRPC_cmake 28 Nov 2016 09:15:13 -0000 1.6
+++ patches/patch-Modules_FindXMLRPC_cmake 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindXMLRPC_cmake,v 1.6 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindXMLRPC.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindXMLRPC.cmake Fri Nov 25 22:31:45 2016
-@@ -112,6 +112,8 @@ if(XMLRPC_FOUND)
+Index: Modules/FindXMLRPC.cmake
+--- Modules/FindXMLRPC.cmake.orig
++++ Modules/FindXMLRPC.cmake
+@@ -112,6 +112,8 @@ if(XMLRPC_C_FOUND)
endif()
endforeach()

Index: patches/patch-Source_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_CMakeLists_txt,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Source_CMakeLists_txt
--- patches/patch-Source_CMakeLists_txt 28 Nov 2016 09:15:13 -0000 1.9
+++ patches/patch-Source_CMakeLists_txt 21 Aug 2017 17:57:58 -0000
@@ -1,10 +1,12 @@
$OpenBSD: patch-Source_CMakeLists_txt,v 1.9 2016/11/28 09:15:13 dcoppa Exp $
---- Source/CMakeLists.txt.orig Fri Nov 11 15:37:13 2016
-+++ Source/CMakeLists.txt Sat Nov 26 12:24:01 2016
-@@ -80,6 +80,8 @@ include_directories(
- "${CMake_SOURCE_DIR}/Source"
+Index: Source/CMakeLists.txt
+--- Source/CMakeLists.txt.orig
++++ Source/CMakeLists.txt
+@@ -81,6 +81,9 @@ include_directories(
+ "${CMake_SOURCE_DIR}/Source/LexerParser"
${CMAKE_ZLIB_INCLUDES}
${CMAKE_EXPAT_INCLUDES}
++ ${CMAKE_LIBRHASH_INCLUDES}
+ ${CMAKE_JSONCPP_INCLUDES}
+ ${CMAKE_LIBUV_INCLUDES}
${CMAKE_TAR_INCLUDES}
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 patch-Source_cmComputeLinkInformation_cxx
--- patches/patch-Source_cmComputeLinkInformation_cxx 28 Nov 2016 09:15:13 -0000 1.18
+++ patches/patch-Source_cmComputeLinkInformation_cxx 21 Aug 2017 17:57:58 -0000
@@ -1,22 +1,34 @@
$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.18 2016/11/28 09:15:13 dcoppa Exp $
---- Source/cmComputeLinkInformation.cxx.orig Fri Nov 11 15:37:14 2016
-+++ Source/cmComputeLinkInformation.cxx Fri Nov 25 22:31:45 2016
-@@ -445,6 +445,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked()
+Index: Source/cmComputeLinkInformation.cxx
+--- Source/cmComputeLinkInformation.cxx.orig
++++ Source/cmComputeLinkInformation.cxx
+@@ -366,8 +366,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
+ this->Target->GetLinkDirectories());
+
+ // Set up the implicit link directories.
+- this->LoadImplicitLinkInfo();
++ this->LoadImplicitLinkInfoOpenBSD();
+ this->OrderLinkerSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
++ this->LoadImplicitLinkInfo();
+ this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
+ if (this->OrderDependentRPath) {
+ this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs);
+@@ -446,6 +447,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked()

bool cmComputeLinkInformation::Compute()
{
+ bool use_wxneeded = false;
+
// Skip targets that do not link.
- if (!(this->Target->GetType() == cmState::EXECUTABLE ||
- this->Target->GetType() == cmState::SHARED_LIBRARY ||
-@@ -473,10 +475,17 @@ bool cmComputeLinkInformation::Compute()
+ if (!(this->Target->GetType() == cmStateEnums::EXECUTABLE ||
+ this->Target->GetType() == cmStateEnums::SHARED_LIBRARY ||
+@@ -474,10 +477,17 @@ bool cmComputeLinkInformation::Compute()
if (lei->IsSharedDep) {
this->AddSharedDepItem(lei->Item, lei->Target);
} else {
+ std::string litem_tolower = lei->Item;
+ transform(litem_tolower.begin(), litem_tolower.end(), litem_tolower.begin(), ::tolower);
-+ if (litem_tolower.find("webkit") != std::string::npos)
++ if (litem_tolower.find("webkit") != std::string::npos || litem_tolower.find("webengine") != std::string::npos)
+ use_wxneeded = true;
this->AddItem(lei->Item, lei->Target);
}
@@ -28,7 +40,7 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
// Restore the target link type so the correct system runtime
// libraries are found.
const char* lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC");
-@@ -627,10 +636,16 @@ void cmComputeLinkInformation::AddItem(std::string con
+@@ -644,10 +654,16 @@ void cmComputeLinkInformation::AddItem(std::string con
// This is a directory.
this->AddDirectoryItem(item);
} else {
@@ -48,7 +60,7 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
}
} else {
// This is a library or option specified by the user.
-@@ -973,11 +988,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
+@@ -993,11 +1009,18 @@ void cmComputeLinkInformation::AddTargetItem(std::stri
this->SharedLibrariesLinked.insert(target);
}

@@ -58,7 +70,7 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
- this->AddSharedLibNoSOName(item);
- return;
+ if (this->OpenBSD) {
-+ if (target->GetType() == cmState::SHARED_LIBRARY) {
++ if (target->GetType() == cmStateEnums::SHARED_LIBRARY) {
+ this->AddSharedLibNoSOName(item);
+ return;
+ }
@@ -72,3 +84,61 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
}

// If this platform wants a flag before the full path, add it.
+@@ -1557,6 +1580,57 @@ void cmComputeLinkInformation::LoadImplicitLinkInfo()
+ if (const char* implicitDirs =
+ this->Makefile->GetDefinition(implicitDirVar)) {
+ cmSystemTools::ExpandListArgument(implicitDirs, implicitDirVec);
++ }
++
++ // Store implicit link directories.
++ this->ImplicitLinkDirs.insert(implicitDirVec.begin(), implicitDirVec.end());
++
++ // Get language-specific implicit libraries.
++ std::vector<std::string> implicitLibVec;
++ std::string implicitLibVar = "CMAKE_";
++ implicitLibVar += this->LinkLanguage;
++ implicitLibVar += "_IMPLICIT_LINK_LIBRARIES";
++ if (const char* implicitLibs =
++ this->Makefile->GetDefinition(implicitLibVar)) {
++ cmSystemTools::ExpandListArgument(implicitLibs, implicitLibVec);
++ }
++
++ // Store implicit link libraries.
++ for (std::vector<std::string>::const_iterator i = implicitLibVec.begin();
++ i != implicitLibVec.end(); ++i) {
++ // Items starting in '-' but not '-l' are flags, not libraries,
++ // and should not be filtered by this implicit list.
++ std::string const& item = *i;
++ if (item[0] != '-' || item[1] == 'l') {
++ this->ImplicitLinkLibs.insert(item);
++ }
++ }
++
++ // Get platform specific rpath link directories
++ if (const char* rpathDirs =
++ (this->Makefile->GetDefinition("CMAKE_PLATFORM_RUNTIME_PATH"))) {
++ cmSystemTools::ExpandListArgument(rpathDirs, this->RuntimeLinkDirs);
++ }
++}
++
++void cmComputeLinkInformation::LoadImplicitLinkInfoOpenBSD()
++{
++ std::vector<std::string> implicitDirVec;
++
++ // Get platform-wide implicit directories.
++ if (const char* implicitLinks = (this->Makefile->GetDefinition(
++ "CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES"))) {
++ cmSystemTools::ExpandListArgument(implicitLinks, implicitDirVec);
++ }
++
++ // Append library architecture to all implicit platform directories
++ // and add them to the set
++ if (const char* libraryArch =
++ this->Makefile->GetDefinition("CMAKE_LIBRARY_ARCHITECTURE")) {
++ for (std::vector<std::string>::const_iterator i = implicitDirVec.begin();
++ i != implicitDirVec.end(); ++i) {
++ this->ImplicitLinkDirs.insert(*i + "/" + libraryArch);
++ }
+ }
+
+ // Store implicit link directories.
Index: patches/patch-Source_cmComputeLinkInformation_h
===================================================================
RCS file: patches/patch-Source_cmComputeLinkInformation_h
diff -N patches/patch-Source_cmComputeLinkInformation_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_cmComputeLinkInformation_h 21 Aug 2017 17:57:58 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: Source/cmComputeLinkInformation.h
+--- Source/cmComputeLinkInformation.h.orig
++++ Source/cmComputeLinkInformation.h
+@@ -162,6 +162,7 @@ class cmComputeLinkInformation (private)
+
+ // Implicit link libraries and directories for linker language.
+ void LoadImplicitLinkInfo();
++ void LoadImplicitLinkInfoOpenBSD();
+ void AddImplicitLinkInfo();
+ void AddImplicitLinkInfo(std::string const& lang);
+ std::set<std::string> ImplicitLinkDirs;
Index: patches/patch-Source_cmGeneratorTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx 28 Nov 2016 09:15:13 -0000 1.6
+++ patches/patch-Source_cmGeneratorTarget_cxx 21 Aug 2017 17:57:58 -0000
@@ -1,14 +1,15 @@
$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.6 2016/11/28 09:15:13 dcoppa Exp $
---- Source/cmGeneratorTarget.cxx.orig Fri Nov 11 15:37:14 2016
-+++ Source/cmGeneratorTarget.cxx Fri Nov 25 22:31:45 2016
-@@ -1094,11 +1094,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
+Index: Source/cmGeneratorTarget.cxx
+--- Source/cmGeneratorTarget.cxx.orig
++++ Source/cmGeneratorTarget.cxx
+@@ -1222,11 +1222,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(

bool cmGeneratorTarget::HasSOName(const std::string& config) const
{
+#if !defined(__OpenBSD__)
// soname is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
- return ((this->GetType() == cmState::SHARED_LIBRARY) &&
+ return ((this->GetType() == cmStateEnums::SHARED_LIBRARY) &&
!this->GetPropertyAsBool("NO_SONAME") &&
this->Makefile->GetSONameFlag(this->GetLinkerLanguage(config)));
+#else
@@ -17,13 +18,13 @@ $OpenBSD: patch-Source_cmGeneratorTarget
}

bool cmGeneratorTarget::NeedRelinkBeforeInstall(
-@@ -2810,9 +2814,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3040,9 +3044,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
+#if defined(__OpenBSD__)
-+ if (this->GetType() != cmState::SHARED_LIBRARY &&
-+ this->GetType() != cmState::MODULE_LIBRARY)
++ if (this->GetType() != cmStateEnums::SHARED_LIBRARY &&
++ this->GetType() != cmStateEnums::MODULE_LIBRARY)
+#else
if (!this->HasSOName(config) ||
this->Makefile->IsOn("CMAKE_PLATFORM_NO_VERSIONED_SONAME") ||
@@ -34,15 +35,15 @@ $OpenBSD: patch-Source_cmGeneratorTarget
// Versioning is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
version = CM_NULLPTR;
-@@ -2837,6 +2847,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3068,6 +3078,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// The library name.
name = prefix + base + suffix;

+#if defined(__OpenBSD__)
+ // Override shared library version using LIBxxx_VERSION
+ // environment variable. Needed for OpenBSD ports system.
-+ if (this->GetType() == cmState::SHARED_LIBRARY ||
-+ this->GetType() == cmState::MODULE_LIBRARY) {
++ if (this->GetType() == cmStateEnums::SHARED_LIBRARY ||
++ this->GetType() == cmStateEnums::MODULE_LIBRARY) {
+ std::string env_name = "LIB" + base + "_VERSION";
+ char *env_vers_cstr = getenv(env_name.c_str());
+
@@ -69,7 +70,7 @@ $OpenBSD: patch-Source_cmGeneratorTarget
if (this->IsFrameworkOnApple()) {
realName = prefix;
if (!this->Makefile->PlatformIsAppleIos()) {
-@@ -2848,7 +2886,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3079,7 +3117,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
soName = realName;
} else {
// The library's soname.
@@ -81,7 +82,7 @@ $OpenBSD: patch-Source_cmGeneratorTarget

// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix, name, version);
-@@ -3943,7 +3985,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
+@@ -4223,7 +4265,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
vName = this->Makefile->IsOn("APPLE") ? (prefix + base) : name;
if (version) {
vName += ".";
Index: patches/patch-Source_cmGlobalGenerator_cxx
===================================================================
RCS file: patches/patch-Source_cmGlobalGenerator_cxx
diff -N patches/patch-Source_cmGlobalGenerator_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_cmGlobalGenerator_cxx 21 Aug 2017 17:57:58 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: Source/cmGlobalGenerator.cxx
+--- Source/cmGlobalGenerator.cxx.orig
++++ Source/cmGlobalGenerator.cxx
+@@ -2265,6 +2265,9 @@ void cmGlobalGenerator::AddGlobalTarget_Test(
+ cmCustomCommandLine singleLine;
+ singleLine.push_back(cmSystemTools::GetCTestCommand());
+ singleLine.push_back("--force-new-ctest-process");
++ // Skip tests requiring internet access
++ singleLine.push_back("--exclude-regex");
++ singleLine.push_back("\"CMake.FileDownload|CTestTestUpload\"");
+ if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
+ singleLine.push_back("-C");
+ singleLine.push_back(cmakeCfgIntDir);
Index: patches/patch-Source_cmInstallCommand_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmInstallCommand_cxx,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Source_cmInstallCommand_cxx
--- patches/patch-Source_cmInstallCommand_cxx 8 Aug 2016 07:44:48 -0000 1.11
+++ patches/patch-Source_cmInstallCommand_cxx 21 Aug 2017 17:57:58 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.11 2016/08/08 07:44:48 dcoppa Exp $
---- Source/cmInstallCommand.cxx.orig Thu Aug 4 12:10:48 2016
-+++ Source/cmInstallCommand.cxx Thu Aug 4 12:17:08 2016
-@@ -295,6 +295,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+Index: Source/cmInstallCommand.cxx
+--- Source/cmInstallCommand.cxx.orig
++++ Source/cmInstallCommand.cxx
+@@ -318,6 +318,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
}

// Select the mode for installing symlinks to versioned shared libraries.
@@ -11,7 +12,7 @@ $OpenBSD: patch-Source_cmInstallCommand_
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
-@@ -302,6 +305,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -325,6 +328,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
} else if (libraryArgs.GetNamelinkSkip()) {
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
Index: patches/patch-Source_cmTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 patch-Source_cmTarget_cxx
--- patches/patch-Source_cmTarget_cxx 28 Nov 2016 09:15:13 -0000 1.30
+++ patches/patch-Source_cmTarget_cxx 21 Aug 2017 17:57:58 -0000
@@ -1,12 +1,13 @@
$OpenBSD: patch-Source_cmTarget_cxx,v 1.30 2016/11/28 09:15:13 dcoppa Exp $
---- Source/cmTarget.cxx.orig Fri Nov 11 15:37:14 2016
-+++ Source/cmTarget.cxx Fri Nov 25 22:31:45 2016
-@@ -104,7 +104,7 @@ cmTarget::cmTarget(std::string const& name, cmState::T
- this->SetPropertyDefault("ANDROID_ANT_ADDITIONAL_OPTIONS", CM_NULLPTR);
+Index: Source/cmTarget.cxx
+--- Source/cmTarget.cxx.orig
++++ Source/cmTarget.cxx
+@@ -230,7 +230,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
+ this->SetPropertyDefault("BUILD_RPATH", CM_NULLPTR);
this->SetPropertyDefault("INSTALL_NAME_DIR", CM_NULLPTR);
this->SetPropertyDefault("INSTALL_RPATH", "");
- this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "OFF");
+ this->SetPropertyDefault("INSTALL_RPATH_USE_LINK_PATH", "ON");
+ this->SetPropertyDefault("INTERPROCEDURAL_OPTIMIZATION", CM_NULLPTR);
this->SetPropertyDefault("SKIP_BUILD_RPATH", "OFF");
this->SetPropertyDefault("BUILD_WITH_INSTALL_RPATH", "OFF");
- this->SetPropertyDefault("ARCHIVE_OUTPUT_DIRECTORY", CM_NULLPTR);
Index: patches/patch-Source_cmake_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmake_cxx,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 patch-Source_cmake_cxx
--- patches/patch-Source_cmake_cxx 28 Nov 2016 09:15:13 -0000 1.13
+++ patches/patch-Source_cmake_cxx 21 Aug 2017 17:57:58 -0000
@@ -3,9 +3,10 @@ $OpenBSD: patch-Source_cmake_cxx,v 1.13
Revert 4e3c7725d0d724d7a8a0e8305d15713e01b20503: we want to build
CMake using Ninja

---- Source/cmake.cxx.orig Fri Nov 25 23:00:29 2016
-+++ Source/cmake.cxx Fri Nov 25 23:02:52 2016
-@@ -72,9 +72,7 @@
+Index: Source/cmake.cxx
+--- Source/cmake.cxx.orig
++++ Source/cmake.cxx
+@@ -77,9 +77,7 @@
#include "cmGlobalWatcomWMakeGenerator.h"