Hi All.
Please find below diff to update cmake to the latest stable version. The
last time it failed on i386 so it would be great if someone could build
it on i386 and report to me/ports@. Please ignore the wrong CVS tags,
the diff based on an old diff from sthen@.
Rafael Sadowski
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/cmake/Makefile,v
retrieving revision 1.171
diff -u -p -u -p -r1.171 Makefile
--- Makefile 13 Jul 2018 03:00:16 -0000 1.171
+++ Makefile 20 Oct 2018 11:34:30 -0000
@@ -1,12 +1,11 @@
-# $OpenBSD: Makefile,v 1.171 2018/07/13 03:00:16 jsg Exp $
+# $OpenBSD: Makefile,v 1.169 2018/06/12 05:12:01 rsadowski Exp $
DPB_PROPERTIES =parallel
COMMENT = portable build system
-VER = 3.10.2
+VER = 3.12.2
EPOCH = 0
-REVISION = 0
DISTNAME = cmake-${VER}
CATEGORIES = devel
@@ -41,6 +40,7 @@ CONFIGURE_STYLE = simple
CONFIGURE_ARGS = --prefix=${PREFIX} \
--datadir=share/cmake \
--docdir=share/doc/cmake \
+ --system-librhash \
--mandir=man \
--no-qt-gui \
--parallel=${MAKE_JOBS} \
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/cmake/distinfo,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 distinfo
--- distinfo 14 Jun 2018 17:04:45 -0000 1.53
+++ distinfo 20 Oct 2018 11:34:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.10.2.tar.gz) = gND6rUq1beB6ohp/xpLIjEzmFW1CsFecaWIASnCjIYs=
-SIZE (cmake-3.10.2.tar.gz) = 7824452
+SHA256 (cmake-3.12.2.tar.gz) = D5dIV5nlGnBwzBFJTz4CNJsPw6JMwSsILnN79noFgaQ=
+SIZE (cmake-3.12.2.tar.gz) = 8388114
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-CMakeLists_txt,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 14 Jun 2018 17:04:45 -0000 1.26
+++ patches/patch-CMakeLists_txt 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.26 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-CMakeLists_txt,v 1.25 2018/06/12 05:12:01 rsadowski Exp $
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -317,6 +317,15 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -337,6 +337,15 @@ macro (CMAKE_BUILD_UTILITIES)
CMAKE_SET_TARGET_FOLDER(${KWSYS_NAMESPACE}TestSharedForward "${kwsys_folder}")
endif()
@@ -18,7 +18,7 @@ Index: CMakeLists.txt
#---------------------------------------------------------------------
# Setup third-party libraries.
# Everything in the tree should be able to include files from the
-@@ -350,7 +359,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -370,7 +379,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_LIBRHASH is ON but LibRHash is not found!")
endif()
@@ -28,7 +28,7 @@ Index: CMakeLists.txt
else()
set(CMAKE_LIBRHASH_LIBRARIES cmlibrhash)
add_subdirectory(Utilities/cmlibrhash)
-@@ -516,7 +526,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -536,7 +546,8 @@ macro (CMAKE_BUILD_UTILITIES)
message(FATAL_ERROR
"CMAKE_USE_SYSTEM_JSONCPP is ON but a JsonCpp is not found!")
endif()
@@ -38,7 +38,7 @@ Index: CMakeLists.txt
else()
set(CMAKE_JSONCPP_LIBRARIES cmjsoncpp)
add_subdirectory(Utilities/cmjsoncpp)
-@@ -531,7 +542,8 @@ macro (CMAKE_BUILD_UTILITIES)
+@@ -551,7 +562,8 @@ macro (CMAKE_BUILD_UTILITIES)
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.8
diff -u -p -u -p -r1.8 patch-Modules_CMakeCInformation_cmake
--- patches/patch-Modules_CMakeCInformation_cmake 14 Jun 2018 17:04:45 -0000 1.8
+++ patches/patch-Modules_CMakeCInformation_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.8 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_CMakeCInformation_cmake,v 1.7 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/CMakeCInformation.cmake
--- Modules/CMakeCInformation.cmake.orig
+++ Modules/CMakeCInformation.cmake
-@@ -165,7 +165,7 @@ include(CMakeCommonLanguageInclude)
+@@ -142,7 +142,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_CMakeCXXInformation_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeCXXInformation_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_CMakeCXXInformation_cmake
--- patches/patch-Modules_CMakeCXXInformation_cmake 14 Jun 2018 17:04:45 -0000 1.7
+++ patches/patch-Modules_CMakeCXXInformation_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,6 +1,7 @@
-$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeCXXInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeCXXInformation.cmake Fri Nov 25 22:31:44 2016
+$OpenBSD: patch-Modules_CMakeCXXInformation_cmake,v 1.6 2018/06/12 05:12:01 rsadowski Exp $
+Index: Modules/CMakeCXXInformation.cmake
+--- Modules/CMakeCXXInformation.cmake.orig
++++ Modules/CMakeCXXInformation.cmake
@@ -134,10 +134,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_CXX_FLAG)
set(CMAKE_EXE_EXPORTS_CXX_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
endif()
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_CMakeCXXInformat
if(NOT CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG)
set(CMAKE_EXECUTABLE_RUNTIME_CXX_FLAG ${CMAKE_SHARED_LIBRARY_RUNTIME_CXX_FLAG})
endif()
-@@ -253,7 +249,7 @@ include(CMakeCommonLanguageInclude)
+@@ -232,7 +228,7 @@ include(CMakeCommonLanguageInclude)
# create a shared C++ library
if(NOT CMAKE_CXX_CREATE_SHARED_LIBRARY)
set(CMAKE_CXX_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_CMakeFortranInformation_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_CMakeFortranInformation_cmake,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 patch-Modules_CMakeFortranInformation_cmake
--- patches/patch-Modules_CMakeFortranInformation_cmake 14 Jun 2018 17:04:45 -0000 1.7
+++ patches/patch-Modules_CMakeFortranInformation_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,7 +1,8 @@
-$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.7 2018/06/14 17:04:45 sthen Exp $
---- Modules/CMakeFortranInformation.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/CMakeFortranInformation.cmake Fri Nov 25 22:31:44 2016
-@@ -115,10 +115,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
+$OpenBSD: patch-Modules_CMakeFortranInformation_cmake,v 1.6 2018/06/12 05:12:01 rsadowski Exp $
+Index: Modules/CMakeFortranInformation.cmake
+--- Modules/CMakeFortranInformation.cmake.orig
++++ Modules/CMakeFortranInformation.cmake
+@@ -110,10 +110,6 @@ if(NOT DEFINED CMAKE_EXE_EXPORTS_Fortran_FLAG)
set(CMAKE_EXE_EXPORTS_Fortran_FLAG ${CMAKE_EXE_EXPORTS_C_FLAG})
endif()
@@ -12,7 +13,7 @@ $OpenBSD: patch-Modules_CMakeFortranInfo
# for most systems a module is the same as a shared library
# so unless the variable CMAKE_MODULE_EXISTS is set just
# copy the values from the LIBRARY variables
-@@ -182,7 +178,7 @@ include(CMakeCommonLanguageInclude)
+@@ -168,7 +164,7 @@ include(CMakeCommonLanguageInclude)
# create a Fortran shared library
if(NOT CMAKE_Fortran_CREATE_SHARED_LIBRARY)
set(CMAKE_Fortran_CREATE_SHARED_LIBRARY
Index: patches/patch-Modules_FindJNI_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJNI_cmake,v
retrieving revision 1.23
diff -u -p -u -p -r1.23 patch-Modules_FindJNI_cmake
--- patches/patch-Modules_FindJNI_cmake 14 Jun 2018 17:04:45 -0000 1.23
+++ patches/patch-Modules_FindJNI_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Modules_FindJNI_cmake,v 1.23 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindJNI_cmake,v 1.22 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindJNI.cmake
--- Modules/FindJNI.cmake.orig
+++ Modules/FindJNI.cmake
@@ -8,10 +8,10 @@ Index: Modules/FindJNI.cmake
+set(MODJAVA_VER $ENV{MODJAVA_VER})
+
- # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
+ # Expand {libarch} occurrences to java_libarch subdirectory(-ies) and set ${_var}
macro(java_append_library_directories _var)
# Determine java arch-specific library subdir
-@@ -70,8 +72,10 @@ macro(java_append_library_directories _var)
+@@ -73,8 +75,10 @@ macro(java_append_library_directories _var)
# Append default list architectures if CMAKE_SYSTEM_PROCESSOR was empty or
# system is non-Linux (where the code above has not been well tested)
@@ -24,13 +24,13 @@ Index: Modules/FindJNI.cmake
endif()
# Sometimes ${CMAKE_SYSTEM_PROCESSOR} is added to the list to prefer
-@@ -107,60 +111,66 @@ if(_JAVA_HOME_EXPLICIT)
+@@ -110,17 +114,67 @@ if(_JAVA_HOME_EXPLICIT)
set(CMAKE_FIND_FRAMEWORK NEVER)
endif()
-set(JAVA_AWT_LIBRARY_DIRECTORIES)
-if(_JAVA_HOME)
-+if(MODJAVA_VER)
++if (MODJAVA_VER)
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
- ${_JAVA_HOME}/jre/lib/{libarch}
@@ -41,9 +41,6 @@ Index: Modules/FindJNI.cmake
+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
)
--endif()
--get_filename_component(java_install_version
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+else(MODJAVA_VER)
+ set(JAVA_AWT_LIBRARY_DIRECTORIES)
+ if(_JAVA_HOME)
@@ -54,95 +51,55 @@ Index: Modules/FindJNI.cmake
+ ${_JAVA_HOME}/lib
+ ${_JAVA_HOME}
+ )
-+ endif()
-+ get_filename_component(java_install_version
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
-
--list(APPEND 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
-- /usr/lib
-- /usr/local/lib
-- /usr/lib/jvm/java/lib
-- /usr/lib/java/jre/lib/{libarch}
-- /usr/lib/jvm/jre/lib/{libarch}
-- /usr/local/lib/java/jre/lib/{libarch}
-- /usr/local/share/java/jre/lib/{libarch}
-- /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-- /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-- /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-- /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-- /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-- /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
-- /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-- /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
-- # Debian specific paths for default JVM
-- /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
-- /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-- # OpenBSD specific paths for default JVM
-- /usr/local/jdk-1.7.0/jre/lib/{libarch}
-- /usr/local/jre-1.7.0/lib/{libarch}
-- /usr/local/jdk-1.6.0/jre/lib/{libarch}
-- /usr/local/jre-1.6.0/lib/{libarch}
-- # SuSE specific paths for default JVM
-- /usr/lib64/jvm/java/jre/lib/{libarch}
-- /usr/lib64/jvm/jre/lib/{libarch}
-- )
-+ list(APPEND 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
-+ /usr/lib
-+ /usr/local/lib
-+ /usr/lib/jvm/java/lib
-+ /usr/lib/java/jre/lib/{libarch}
-+ /usr/lib/jvm/jre/lib/{libarch}
-+ /usr/local/lib/java/jre/lib/{libarch}
-+ /usr/local/share/java/jre/lib/{libarch}
-+ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
-+ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
-+ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
-+ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
-+ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
-+ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
-+ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
-+ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
-+ # Debian specific paths for default JVM
-+ /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
-+ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
-+ # OpenBSD specific paths for default JVM
-+ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
-+ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
-+ # SuSE specific paths for default JVM
-+ /usr/lib64/jvm/java/jre/lib/{libarch}
-+ /usr/lib64/jvm/jre/lib/{libarch}
-+ )
+ endif()
++list(APPEND 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
++ /usr/lib
++ /usr/local/lib
++ /usr/lib/jvm/java/lib
++ /usr/lib/java/jre/lib/{libarch}
++ /usr/lib/jvm/jre/lib/{libarch}
++ /usr/local/lib/java/jre/lib/{libarch}
++ /usr/local/share/java/jre/lib/{libarch}
++ /usr/lib/j2sdk1.4-sun/jre/lib/{libarch}
++ /usr/lib/j2sdk1.5-sun/jre/lib/{libarch}
++ /opt/sun-jdk-1.5.0.04/jre/lib/{libarch}
++ /usr/lib/jvm/java-6-sun/jre/lib/{libarch}
++ /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
++ /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed ac
++ /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
++ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
++ # Debian specific paths for default JVM
++ /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
++ /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch} # Ubuntu 15.10
++ # OpenBSD specific paths for default JVM
++ ${LOCALBASE}/jdk-1.8.0/jre/lib/{libarch}
++ ${LOCALBASE}/jre-1.8.0/lib/{libarch}
++ # SuSE specific paths for default JVM
++ /usr/lib64/jvm/java/jre/lib/{libarch}
++ /usr/lib64/jvm/jre/lib/{libarch}
++ )
+endif(MODJAVA_VER)
- set(JAVA_JVM_LIBRARY_DIRECTORIES)
- foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
-@@ -174,43 +184,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
++get_filename_component(java_install_version
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
++
+ if (WIN32)
+ set (_JNI_HINTS)
+ execute_process(COMMAND REG QUERY HKLM\\SOFTWARE\\JavaSoft\\JDK /f "." /k
+@@ -212,52 +266,50 @@ foreach(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
)
endforeach()
@@ -150,15 +107,27 @@ Index: Modules/FindJNI.cmake
-if(_JAVA_HOME)
- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
-endif()
--list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
--)
+-if (WIN32)
+- foreach (_JNI_HINT IN LISTS _JNI_HINTS)
+- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES "${_JNI_HINT}/include")
+- endforeach()
+- list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.9;JavaHome]/include"
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.8;JavaHome]/include"
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.7;JavaHome]/include"
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.6;JavaHome]/include"
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/include"
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
++if(MODJAVA_VER)
++ set(JAVA_AWT_INCLUDE_DIRECTORIES)
++ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
++ ${LOCALBASE}/jdk-1.8.0/include
+ )
+-endif()
-
-JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-- /usr/include
-- /usr/local/include
- /usr/lib/java/include
- /usr/local/lib/java/include
- /usr/lib/jvm/java/include
@@ -182,23 +151,18 @@ Index: Modules/FindJNI.cmake
- /usr/local/jdk-1.6.0/include
- # SuSE specific paths for default JVM
- /usr/lib64/jvm/java/include
-+if(MODJAVA_VER)
-+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
-+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
-+ ${LOCALBASE}/jdk-1.8.0/include
-+ )
+else(MODJAVA_VER)
+ set(JAVA_AWT_INCLUDE_DIRECTORIES)
+ if(_JAVA_HOME)
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES ${_JAVA_HOME}/include)
+ endif()
+ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
-+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_versio
++ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_versio
)
-+
+
+ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
+ /usr/include
+ /usr/local/include
@@ -207,7 +171,7 @@ Index: Modules/FindJNI.cmake
+ /usr/lib/jvm/java/include
+ /usr/lib/jvm/java-6-sun/include
+ /usr/lib/jvm/java-1.5.0-sun/include
-+ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex
++ /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to
+ /usr/lib/jvm/java-6-openjdk/include
+ /usr/lib/jvm/java-8-openjdk-{libarch}/include # ubuntu 15.10
+ /usr/lib/jvm/java-7-openjdk-{libarch}/include # ubuntu 15.10
@@ -226,6 +190,6 @@ Index: Modules/FindJNI.cmake
+ /usr/lib64/jvm/java/include
+ )
+endif(MODJAVA_VER)
-
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)
Index: patches/patch-Modules_FindJava_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindJava_cmake,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 patch-Modules_FindJava_cmake
--- patches/patch-Modules_FindJava_cmake 14 Jun 2018 17:04:45 -0000 1.24
+++ patches/patch-Modules_FindJava_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Modules_FindJava_cmake,v 1.24 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindJava_cmake,v 1.23 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindJava.cmake
--- Modules/FindJava.cmake.orig
+++ Modules/FindJava.cmake
@@ -11,8 +11,8 @@ Index: Modules/FindJava.cmake
# The HINTS option should only be used for values computed from the system.
set(_JAVA_HINTS)
if(_JAVA_HOME)
-@@ -97,19 +99,22 @@ list(APPEND _JAVA_HINTS
- )
+@@ -127,19 +129,22 @@ endif()
+
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
-set(_JAVA_PATHS
Index: patches/patch-Modules_FindKDE3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindKDE3_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindKDE3_cmake
--- patches/patch-Modules_FindKDE3_cmake 14 Jun 2018 17:04:45 -0000 1.6
+++ patches/patch-Modules_FindKDE3_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.6 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindKDE3_cmake,v 1.5 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindKDE3.cmake
--- Modules/FindKDE3.cmake.orig
+++ Modules/FindKDE3.cmake
-@@ -294,12 +294,6 @@ if(KDE3_FOUND)
+@@ -293,12 +293,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_FindLua_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindLua_cmake,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Modules_FindLua_cmake
--- patches/patch-Modules_FindLua_cmake 26 Aug 2017 17:53:35 -0000 1.6
+++ patches/patch-Modules_FindLua_cmake 20 Oct 2018 11:34:30 -0000
@@ -2,32 +2,31 @@ $OpenBSD: patch-Modules_FindLua_cmake,v
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)
+@@ -50,9 +50,16 @@ set(_lua_additional_paths
+ /opt/csw # Blastwave
+ /opt)
+set(MODLUA_VERSION $ENV{MODLUA_VERSION})
+set(MODLUA_INCL_DIR $ENV{MODLUA_INCL_DIR})
+
# this is a function only to have all the variables inside go away automatically
- function(_lua_set_version_vars)
+ function(_lua_get_versions)
- 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)
-@@ -114,6 +121,10 @@ function(_lua_check_header_version _hdr_file)
- endfunction(_lua_check_header_version)
+@@ -149,6 +156,9 @@ endfunction(_lua_get_header_version)
- _lua_set_version_vars()
-+
-+if(MODLUA_INCL_DIR)
-+ set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
-+endif()
+ function(_lua_find_header)
+ _lua_set_version_vars()
++ if(MODLUA_INCL_DIR)
++ set(LUA_INCLUDE_DIR "${MODLUA_INCL_DIR}")
++ endif()
- if (LUA_INCLUDE_DIR AND EXISTS "${LUA_INCLUDE_DIR}/lua.h")
- _lua_check_header_version("${LUA_INCLUDE_DIR}/lua.h")
+ # Initialize as local variable
+ set(CMAKE_IGNORE_PATH ${CMAKE_IGNORE_PATH})
Index: patches/patch-Modules_FindMPEG2_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindMPEG2_cmake,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Modules_FindMPEG2_cmake
--- patches/patch-Modules_FindMPEG2_cmake 14 Jun 2018 17:04:45 -0000 1.10
+++ patches/patch-Modules_FindMPEG2_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,37 +1,8 @@
-$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.10 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindMPEG2_cmake,v 1.9 2018/06/12 05:12:01 rsadowski Exp $
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
-- NAMES mpeg2.h mpeg2dec/mpeg2.h
-- PATHS /usr/local/livid
-+ NAMES mpeg2dec/mpeg2.h
-+ PATHS ${LOCALBASE}/include
- )
-
- find_library(MPEG2_mpeg2_LIBRARY mpeg2
-- /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+ ${LOCALBASE}/lib
- )
-
--find_library( MPEG2_vo_LIBRARY vo
-- /usr/local/livid/mpeg2dec/libvo/.libs
--)
--
- include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
-
- if(MPEG2_FOUND)
-- set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
-- ${MPEG2_vo_LIBRARY})
-+ set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY})
-
- #some native mpeg2 installations will depend
- #on libSDL, if found, add it in.
-@@ -50,4 +45,4 @@ if(MPEG2_FOUND)
+@@ -46,4 +46,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.11
diff -u -p -u -p -r1.11 patch-Modules_FindMPEG_cmake
--- patches/patch-Modules_FindMPEG_cmake 14 Jun 2018 17:04:45 -0000 1.11
+++ patches/patch-Modules_FindMPEG_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,33 +1,18 @@
-$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.10 2018/06/12 05:12:01 rsadowski Exp $
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.
+@@ -27,8 +27,6 @@ find_path(MPEG_INCLUDE_DIR
--find_path(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
-- /usr/local/livid
-+find_path(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
-+ ${LOCALBASE}/include
- )
+ find_library(MPEG_mpeg2_LIBRARY mpeg2)
- find_library(MPEG_mpeg2_LIBRARY mpeg2
-- /usr/local/livid/mpeg2dec/libmpeg2/.libs
-+ ${LOCALBASE}/lib
- )
-
--find_library( MPEG_vo_LIBRARY vo
-- /usr/local/livid/mpeg2dec/libvo/.libs
--)
+-find_library(MPEG_vo_LIBRARY vo)
-
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)
+ FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR)
- if(MPEG_FOUND)
-- set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
-+ set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
+@@ -39,4 +37,4 @@ if(MPEG_FOUND)
+ endif()
endif()
-mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
Index: patches/patch-Modules_FindPythonInterp_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonInterp_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_FindPythonInterp_cmake
--- patches/patch-Modules_FindPythonInterp_cmake 28 Nov 2016 09:15:13 -0000 1.11
+++ patches/patch-Modules_FindPythonInterp_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-Modules_FindPythonInterp_cmake,v 1.11 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindPythonInterp.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindPythonInterp.cmake Fri Nov 25 22:31:44 2016
-@@ -36,6 +36,8 @@
+Index: Modules/FindPythonInterp.cmake
+--- Modules/FindPythonInterp.cmake.orig
++++ Modules/FindPythonInterp.cmake
+@@ -40,6 +40,8 @@
# get the currently active Python version by default with a consistent version
# of PYTHON_LIBRARIES.
@@ -10,7 +11,7 @@ $OpenBSD: patch-Modules_FindPythonInterp
unset(_Python_NAMES)
set(_PYTHON1_VERSIONS 1.6 1.5)
-@@ -68,19 +70,23 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
+@@ -72,19 +74,23 @@ find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
# Set up the versions we know about, in the order we will search. Always add
# the user supplied additional versions to the front.
Index: patches/patch-Modules_FindPythonLibs_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindPythonLibs_cmake,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 patch-Modules_FindPythonLibs_cmake
--- patches/patch-Modules_FindPythonLibs_cmake 14 Jun 2018 17:04:45 -0000 1.17
+++ patches/patch-Modules_FindPythonLibs_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.17 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindPythonLibs_cmake,v 1.16 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindPythonLibs.cmake
--- Modules/FindPythonLibs.cmake.orig
+++ Modules/FindPythonLibs.cmake
-@@ -72,6 +72,9 @@ endif()
+@@ -76,6 +76,9 @@ endif()
# To avoid picking up the system Python.h pre-maturely.
set(CMAKE_FIND_FRAMEWORK LAST)
@@ -11,8 +11,8 @@ Index: Modules/FindPythonLibs.cmake
+
set(_PYTHON1_VERSIONS 1.6 1.5)
set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
- set(_PYTHON3_VERSIONS 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
-@@ -106,11 +109,15 @@ endif()
+ set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+@@ -110,11 +113,15 @@ endif()
# If FindPythonInterp has already found the major and minor version,
# insert that version between the user supplied versions and the stock
# version list.
@@ -33,7 +33,7 @@ Index: Modules/FindPythonLibs.cmake
unset(_PYTHON_FIND_OTHER_VERSIONS)
unset(_PYTHON1_VERSIONS)
-@@ -191,20 +198,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
+@@ -194,20 +201,24 @@ foreach(_CURRENT_VERSION ${_Python_VERSIONS})
endforeach()
endif()
Index: patches/patch-Modules_FindQt3_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt3_cmake,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 patch-Modules_FindQt3_cmake
--- patches/patch-Modules_FindQt3_cmake 14 Jun 2018 17:04:45 -0000 1.11
+++ patches/patch-Modules_FindQt3_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,7 +1,8 @@
-$OpenBSD: patch-Modules_FindQt3_cmake,v 1.11 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindQt3.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindQt3.cmake Fri Nov 25 22:31:45 2016
-@@ -151,7 +151,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
+$OpenBSD: patch-Modules_FindQt3_cmake,v 1.10 2018/06/12 05:12:01 rsadowski Exp $
+Index: Modules/FindQt3.cmake
+--- Modules/FindQt3.cmake.orig
++++ Modules/FindQt3.cmake
+@@ -139,7 +139,7 @@ find_library(QT_QASSISTANTCLIENT_LIBRARY
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_MOC_EXECUTABLE
@@ -10,7 +11,7 @@ $OpenBSD: patch-Modules_FindQt3_cmake,v
HINTS
ENV QTDIR
PATHS
-@@ -176,7 +176,7 @@ endif()
+@@ -159,7 +159,7 @@ endif()
# Qt 3 should prefer QTDIR over the PATH
find_program(QT_UIC_EXECUTABLE
Index: patches/patch-Modules_FindQt4_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindQt4_cmake,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 patch-Modules_FindQt4_cmake
--- patches/patch-Modules_FindQt4_cmake 14 Jun 2018 17:04:45 -0000 1.30
+++ patches/patch-Modules_FindQt4_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Modules_FindQt4_cmake,v 1.30 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Modules_FindQt4_cmake,v 1.29 2018/06/12 05:12:01 rsadowski Exp $
Index: Modules/FindQt4.cmake
--- Modules/FindQt4.cmake.orig
+++ Modules/FindQt4.cmake
-@@ -516,7 +516,12 @@ endfunction()
+@@ -517,7 +517,12 @@ endfunction()
set(QT4_INSTALLED_VERSION_TOO_OLD FALSE)
@@ -16,7 +16,7 @@ Index: Modules/FindQt4.cmake
_qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
if (QT_QMAKE_EXECUTABLE AND
-@@ -696,6 +701,8 @@ if (QT_QMAKE_EXECUTABLE AND
+@@ -693,6 +698,8 @@ if (QT_QMAKE_EXECUTABLE AND
# Set QT_INCLUDES
set( QT_INCLUDES ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR})
@@ -25,7 +25,7 @@ Index: Modules/FindQt4.cmake
# ask qmake for the documentation directory
-@@ -1139,17 +1146,17 @@ if (QT_QMAKE_EXECUTABLE AND
+@@ -1132,17 +1139,17 @@ if (QT_QMAKE_EXECUTABLE AND
endif()
endmacro()
Index: patches/patch-Modules_FindRuby_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindRuby_cmake,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-Modules_FindRuby_cmake
--- patches/patch-Modules_FindRuby_cmake 14 Jun 2018 17:04:45 -0000 1.16
+++ patches/patch-Modules_FindRuby_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,12 +1,13 @@
-$OpenBSD: patch-Modules_FindRuby_cmake,v 1.16 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindRuby.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindRuby.cmake Fri Nov 25 22:31:45 2016
-@@ -42,35 +42,53 @@
+$OpenBSD: patch-Modules_FindRuby_cmake,v 1.15 2018/06/12 05:12:01 rsadowski Exp $
+Index: Modules/FindRuby.cmake
+--- Modules/FindRuby.cmake.orig
++++ Modules/FindRuby.cmake
+@@ -41,10 +41,18 @@
+
# uncomment the following line to get debug output for this file
# set(_RUBY_DEBUG_OUTPUT TRUE)
-
+set(MODRUBY_REV $ENV{MODRUBY_REV})
-+
+
+if(MODRUBY_REV AND MODRUBY_REV MATCHES "^[0-9]+\\.[0-9]$")
+ string(REPLACE "." "" MODRUBY_REV_NO_DOTS ${MODRUBY_REV})
+ string(REPLACE "." ";" MODRUBY_REV_LIST ${MODRUBY_REV})
@@ -21,41 +22,24 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v
# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
- set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
- # we can't construct that if only major version is given
- set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
-- ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
- ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
-+ ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
- ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
- else()
-- set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+ if(MODRUBY_REV_NO_DOTS)
-+ set(Ruby_FIND_VERSION_SHORT_NODOT "${MODRUBY_REV_NO_DOTS}")
-+ else(MODRUBY_REV_NO_DOTS)
-+ set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+ endif(MODRUBY_REV_NO_DOTS)
+@@ -59,12 +67,9 @@ else()
endif()
if(NOT Ruby_FIND_VERSION_EXACT)
+- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
+- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
+- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
-+ if(MODRUBY_REV AND MODRUBY_REV_NO_DOTS)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby${MODRUBY_REV_NO_DOTS} ruby${MODRUBY_REV})
-+ endif()
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby22 ruby2.2)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby21 ruby2.1)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby20 ruby2.0)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby19 ruby1.9)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby25 ruby2.4)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby24 ruby2.4)
++ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby23 ruby2.3)
# if we want a version below 1.9, also look for ruby 1.8
if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
-- list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
-+ list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby18 ruby1.8)
- endif()
--
-- list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
+@@ -74,6 +79,9 @@ if(NOT Ruby_FIND_VERSION_EXACT)
+ list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
endif()
+list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
@@ -64,35 +48,25 @@ $OpenBSD: patch-Modules_FindRuby_cmake,v
find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-@@ -155,6 +173,10 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
- set(RUBY_VERSION_MAJOR 1)
- set(RUBY_VERSION_MINOR 8)
- set(RUBY_VERSION_PATCH 0)
-+ if(${RUBY_EXECUTABLE} MATCHES "ruby${MODRUBY_REV_NO_DOTS}")
-+ set(RUBY_VERSION_MAJOR ${MODRUBY_REV_MAJOR})
-+ set(RUBY_VERSION_MINOR ${MODRUBY_REV_MINOR})
-+ endif()
- # check whether we found 1.9.x
- if(${RUBY_EXECUTABLE} MATCHES "ruby1.?9")
- set(RUBY_VERSION_MAJOR 1)
-@@ -170,6 +192,11 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
+@@ -188,6 +196,11 @@ if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
set(RUBY_VERSION_MAJOR 2)
- set(RUBY_VERSION_MINOR 1)
+ set(RUBY_VERSION_MINOR 4)
endif()
-+ # check whether we found 2.2.x
-+ if(${RUBY_EXECUTABLE} MATCHES "ruby2.?2")
++ # check whether we found 2.5.x
++ if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
+ set(RUBY_VERSION_MAJOR 2)
-+ set(RUBY_VERSION_MINOR 2)
++ set(RUBY_VERSION_MINOR 4)
+ endif()
endif()
if(RUBY_VERSION_MAJOR)
-@@ -203,7 +230,7 @@ endif()
+@@ -221,7 +234,8 @@ endif()
# Determine the list of possible names for the ruby library
-set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
+set(_RUBY_POSSIBLE_LIB_NAMES ruby${_RUBY_VERSION_SHORT_NODOT} ruby${_RUBY_VERSION_SHORT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION} ruby ruby-static)
++
if(WIN32)
set( _RUBY_MSVC_RUNTIME "" )
Index: patches/patch-Modules_FindTCL_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTCL_cmake,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 patch-Modules_FindTCL_cmake
--- patches/patch-Modules_FindTCL_cmake 14 Jun 2018 17:04:45 -0000 1.15
+++ patches/patch-Modules_FindTCL_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,6 +1,7 @@
-$OpenBSD: patch-Modules_FindTCL_cmake,v 1.15 2018/06/14 17:04:45 sthen Exp $
---- Modules/FindTCL.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindTCL.cmake Fri Nov 25 22:31:45 2016
+$OpenBSD: patch-Modules_FindTCL_cmake,v 1.14 2018/06/12 05:12:01 rsadowski Exp $
+Index: Modules/FindTCL.cmake
+--- Modules/FindTCL.cmake.orig
++++ Modules/FindTCL.cmake
@@ -48,19 +48,36 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindFrameworks.
include(${CMAKE_CURRENT_LIST_DIR}/FindTclsh.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/FindWish.cmake)
@@ -42,7 +43,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -75,19 +92,37 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
+@@ -75,15 +92,37 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
string(REGEX REPLACE
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
@@ -53,11 +54,7 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
- "${TK_LIBRARY_PATH}"
- "${TCL_TCLSH_PATH_PARENT}/lib"
- "${TK_WISH_PATH_PARENT}/lib"
-- /usr/local/lib/tcl/tcl8.5
-- /usr/local/lib/tcl/tk8.5
-- /usr/local/lib/tcl/tcl8.4
-- /usr/local/lib/tcl/tk8.4
-- )
+-)
+set(TCLTK_OPENBSD_LIB_PATHS)
+if(MODTCL_LIBDIR)
@@ -89,82 +86,10 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
+ )
+endif()
+
- if(WIN32)
- get_filename_component(
- ActiveTcl_CurrentVersion
-@@ -107,31 +142,47 @@ if(WIN32)
- )
- endif()
-
--find_library(TCL_LIBRARY
-- NAMES
-- tcl
-- tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
-- tcl86 tcl8.6
-- tcl85 tcl8.5
-- tcl84 tcl8.4
-- tcl83 tcl8.3
-- tcl82 tcl8.2
-- tcl80 tcl8.0
-- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-- )
-+if(MODTCL_LIB)
-+ find_library(TCL_LIBRARY
-+ NAMES
-+ ${MODTCL_LIB}
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+else(MODTCL_LIB)
-+ find_library(TCL_LIBRARY
-+ NAMES
-+ tcl
-+ tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
-+ tcl86 tcl8.6
-+ tcl85 tcl8.5
-+ tcl84 tcl8.4
-+ tcl83 tcl8.3
-+ tcl82 tcl8.2
-+ tcl80 tcl8.0
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+endif(MODTCL_LIB)
-
--find_library(TK_LIBRARY
-- NAMES
-- tk
-- tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
-- tk86 tk8.6
-- tk85 tk8.5
-- tk84 tk8.4
-- tk83 tk8.3
-- tk82 tk8.2
-- tk80 tk8.0
-- PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-- )
-+if(MODTK_LIB)
-+ find_library(TK_LIBRARY
-+ NAMES
-+ ${MODTK_LIB}
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+else(MODTK_LIB)
-+ find_library(TK_LIBRARY
-+ NAMES
-+ tk
-+ tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
-+ tk86 tk8.6
-+ tk85 tk8.5
-+ tk84 tk8.4
-+ tk83 tk8.3
-+ tk82 tk8.2
-+ tk80 tk8.0
-+ PATHS ${TCLTK_POSSIBLE_LIB_PATHS}
-+ )
-+endif(MODTK_LIB)
-
- CMAKE_FIND_FRAMEWORKS(Tcl)
- CMAKE_FIND_FRAMEWORKS(Tk)
-@@ -155,30 +206,46 @@ if(Tk_FRAMEWORKS)
+ set(TCLTK_POSSIBLE_LIB_PATH_SUFFIXES
+ lib/tcl/tcl8.7
+ lib/tcl/tk8.7
+@@ -166,16 +205,6 @@ if(Tk_FRAMEWORKS)
endif()
endif()
@@ -177,21 +102,14 @@ $OpenBSD: patch-Modules_FindTCL_cmake,v
- ${TK_FRAMEWORK_INCLUDES}
- "${TCL_TCLSH_PATH_PARENT}/include"
- "${TK_WISH_PATH_PARENT}/include"
-- /usr/include/tcl${TK_LIBRARY_VERSION}
-- /usr/include/tcl${TCL_LIBRARY_VERSION}
-- /usr/include/tcl8.6
-- /usr/include/tcl8.5
-- /usr/include/tcl8.4
-- /usr/include/tcl8.3
-- /usr/include/tcl8.2
-- /usr/include/tcl8.0
-- /usr/local/include/tcl8.6
-- /usr/local/include/tk8.6
-- /usr/local/include/tcl8.5
-- /usr/local/include/tk8.5
-- /usr/local/include/tcl8.4
-- /usr/local/include/tk8.4
- )
+
+ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+ include/tcl${TK_LIBRARY_VERSION}
+@@ -192,6 +221,46 @@ set(TCLTK_POSSIBLE_INCLUDE_PATH_SUFFIXES
+ include/tcl8.2
+ include/tcl8.0
+ )
+set(TCLTK_OPENBSD_INCLUDE_PATHS)
+
+if(MODTCL_INCDIR)
Index: patches/patch-Modules_FindTclsh_cmake
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Modules_FindTclsh_cmake,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 patch-Modules_FindTclsh_cmake
--- patches/patch-Modules_FindTclsh_cmake 28 Nov 2016 09:15:13 -0000 1.5
+++ patches/patch-Modules_FindTclsh_cmake 20 Oct 2018 11:34:30 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-Modules_FindTclsh_cmake,v 1.5 2016/11/28 09:15:13 dcoppa Exp $
---- Modules/FindTclsh.cmake.orig Fri Nov 11 15:37:13 2016
-+++ Modules/FindTclsh.cmake Fri Nov 25 22:31:45 2016
+Index: Modules/FindTclsh.cmake
+--- Modules/FindTclsh.cmake.orig
++++ Modules/FindTclsh.cmake
@@ -19,14 +19,21 @@
# In cygwin, look for the cygwin version first. Don't look for it later
# to avoid finding the cygwin version on a Win32 build.
@@ -25,36 +26,3 @@ $OpenBSD: patch-Modules_FindTclsh_cmake,
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
-@@ -65,16 +72,22 @@ if(WIN32)
- )
- endif()
-
--set(TCL_TCLSH_NAMES
-- tclsh
-- tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
-- tclsh86 tclsh8.6
-- tclsh85 tclsh8.5
-- tclsh84 tclsh8.4
-- tclsh83 tclsh8.3
-- tclsh82 tclsh8.2
-- tclsh80 tclsh8.0
-- )
-+if(MODTCL_VERSION)
-+ set(TCL_TCLSH_NAMES
-+ tclsh${MODTCL_VERSION}
-+ )
-+else(MODTCL_VERSION)
-+ set(TCL_TCLSH_NAMES
-+ tclsh
-+ tclsh${TCL_LIBRARY_VERSION} tclsh${TK_LIBRARY_VERSION} tclsh${TK_WISH_VERSION}
-+ tclsh86 tclsh8.6
-+ tclsh85 tclsh8.5
-+ tclsh84 tclsh8.4
-+ tclsh83 tclsh8.3
-+ tclsh82 tclsh8.2
-+ tclsh80 tclsh8.0
-+ )
-+endif(MODTCL_VERSION)
-
- find_program(TCL_TCLSH
- NAMES ${TCL_TCLSH_NAMES}
Index: patches/patch-Source_CMakeLists_txt
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_CMakeLists_txt,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-Source_CMakeLists_txt
--- patches/patch-Source_CMakeLists_txt 14 Jun 2018 17:04:45 -0000 1.12
+++ patches/patch-Source_CMakeLists_txt 20 Oct 2018 11:34:30 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_CMakeLists_txt,v 1.12 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_CMakeLists_txt,v 1.11 2018/06/12 05:12:01 rsadowski Exp $
Index: Source/CMakeLists.txt
--- Source/CMakeLists.txt.orig
+++ Source/CMakeLists.txt
@@ -12,7 +12,7 @@ Index: Source/CMakeLists.txt
${CMAKE_TAR_INCLUDES}
${CMAKE_COMPRESS_INCLUDES}
${CMake_HAIKU_INCLUDE_DIRS}
-@@ -273,7 +276,6 @@ set(SRCS
+@@ -279,7 +282,6 @@ set(SRCS
cmRulePlaceholderExpander.cxx
cmRulePlaceholderExpander.h
cmLocalUnixMakefileGenerator3.cxx
Index: patches/patch-Source_cmComputeLinkInformation_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_cxx,v
retrieving revision 1.22
diff -u -p -u -p -r1.22 patch-Source_cmComputeLinkInformation_cxx
--- patches/patch-Source_cmComputeLinkInformation_cxx 14 Jun 2018 17:04:45 -0000 1.22
+++ patches/patch-Source_cmComputeLinkInformation_cxx 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.22 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmComputeLinkInformation_cxx,v 1.21 2018/06/12 05:12:01 rsadowski Exp $
Index: Source/cmComputeLinkInformation.cxx
--- Source/cmComputeLinkInformation.cxx.orig
+++ Source/cmComputeLinkInformation.cxx
-@@ -366,8 +366,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
+@@ -363,8 +363,9 @@ cmComputeLinkInformation::cmComputeLinkInformation(
this->Target->GetLinkDirectories());
// Set up the implicit link directories.
@@ -13,7 +13,7 @@ Index: Source/cmComputeLinkInformation.c
this->OrderRuntimeSearchPath->SetImplicitDirectories(this->ImplicitLinkDirs);
if (this->OrderDependentRPath) {
this->OrderDependentRPath->SetImplicitDirectories(this->ImplicitLinkDirs);
-@@ -446,6 +447,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked()
+@@ -445,6 +446,8 @@ cmComputeLinkInformation::GetSharedLibrariesLinked() c
bool cmComputeLinkInformation::Compute()
{
@@ -22,7 +22,7 @@ Index: Source/cmComputeLinkInformation.c
// Skip targets that do not link.
if (!(this->Target->GetType() == cmStateEnums::EXECUTABLE ||
this->Target->GetType() == cmStateEnums::SHARED_LIBRARY ||
-@@ -472,10 +475,17 @@ bool cmComputeLinkInformation::Compute()
+@@ -471,10 +474,17 @@ bool cmComputeLinkInformation::Compute()
if (linkEntry.IsSharedDep) {
this->AddSharedDepItem(linkEntry.Item, linkEntry.Target);
} else {
@@ -40,7 +40,7 @@ Index: Source/cmComputeLinkInformation.c
// Restore the target link type so the correct system runtime
// libraries are found.
const char* lss = this->Target->GetProperty("LINK_SEARCH_END_STATIC");
-@@ -637,10 +647,16 @@ void cmComputeLinkInformation::AddItem(std::string con
+@@ -639,10 +649,16 @@ void cmComputeLinkInformation::AddItem(std::string con
// This is a directory.
this->AddDirectoryItem(item);
} else {
Index: patches/patch-Source_cmComputeLinkInformation_h
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmComputeLinkInformation_h,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Source_cmComputeLinkInformation_h
--- patches/patch-Source_cmComputeLinkInformation_h 26 Aug 2017 17:53:35 -0000 1.3
+++ patches/patch-Source_cmComputeLinkInformation_h 20 Oct 2018 11:34:30 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Source_cmComputeLinkInfo
Index: Source/cmComputeLinkInformation.h
--- Source/cmComputeLinkInformation.h.orig
+++ Source/cmComputeLinkInformation.h
-@@ -162,6 +162,7 @@ class cmComputeLinkInformation (private)
+@@ -163,6 +163,7 @@ class cmComputeLinkInformation (private)
// Implicit link libraries and directories for linker language.
void LoadImplicitLinkInfo();
Index: patches/patch-Source_cmGeneratorTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmGeneratorTarget_cxx,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-Source_cmGeneratorTarget_cxx
--- patches/patch-Source_cmGeneratorTarget_cxx 14 Jun 2018 17:04:45 -0000 1.10
+++ patches/patch-Source_cmGeneratorTarget_cxx 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.10 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmGeneratorTarget_cxx,v 1.9 2018/06/12 05:12:01 rsadowski Exp $
Index: Source/cmGeneratorTarget.cxx
--- Source/cmGeneratorTarget.cxx.orig
+++ Source/cmGeneratorTarget.cxx
-@@ -1195,11 +1195,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
+@@ -1224,11 +1224,15 @@ std::string cmGeneratorTarget::GetCompilePDBPath(
bool cmGeneratorTarget::HasSOName(const std::string& config) const
{
@@ -18,7 +18,7 @@ Index: Source/cmGeneratorTarget.cxx
}
bool cmGeneratorTarget::NeedRelinkBeforeInstall(
-@@ -2974,9 +2978,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3026,9 +3030,15 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// Check for library version properties.
const char* version = this->GetProperty("VERSION");
const char* soversion = this->GetProperty("SOVERSION");
@@ -35,7 +35,7 @@ Index: Source/cmGeneratorTarget.cxx
// Versioning is supported only for shared libraries and modules,
// and then only when the platform supports an soname flag.
version = nullptr;
-@@ -3002,6 +3012,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+@@ -3054,6 +3064,34 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
// The library name.
name = prefix + base + suffix;
@@ -69,8 +69,8 @@ Index: Source/cmGeneratorTarget.cxx
+
if (this->IsFrameworkOnApple()) {
realName = prefix;
- if (!this->Makefile->PlatformIsAppleIos()) {
-@@ -3013,7 +3051,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
+ if (!this->Makefile->PlatformIsAppleEmbedded()) {
+@@ -3065,7 +3103,11 @@ void cmGeneratorTarget::GetLibraryNames(std::string& n
soName = realName;
} else {
// The library's soname.
@@ -82,7 +82,7 @@ Index: Source/cmGeneratorTarget.cxx
// The library's real name on disk.
this->ComputeVersionedName(realName, prefix, base, suffix, name, version);
-@@ -4142,7 +4184,21 @@ void cmGeneratorTarget::ComputeVersionedName(std::stri
+@@ -4195,7 +4237,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: /cvs/ports/devel/cmake/patches/patch-Source_cmGlobalGenerator_cxx,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 patch-Source_cmGlobalGenerator_cxx
--- patches/patch-Source_cmGlobalGenerator_cxx 14 Jun 2018 17:04:45 -0000 1.9
+++ patches/patch-Source_cmGlobalGenerator_cxx 20 Oct 2018 11:34:30 -0000
@@ -1,15 +1,15 @@
-$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.9 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmGlobalGenerator_cxx,v 1.8 2018/06/12 05:12:01 rsadowski Exp $
Index: Source/cmGlobalGenerator.cxx
--- Source/cmGlobalGenerator.cxx.orig
+++ Source/cmGlobalGenerator.cxx
-@@ -2227,6 +2227,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|RunCMake.ctest_submit\"");
- if (cmakeCfgIntDir && *cmakeCfgIntDir && cmakeCfgIntDir[0] != '.') {
- singleLine.push_back("-C");
- singleLine.push_back(cmakeCfgIntDir);
+@@ -2398,6 +2398,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|RunCMake.ctest_submit\"");
+ 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.14
diff -u -p -u -p -r1.14 patch-Source_cmInstallCommand_cxx
--- patches/patch-Source_cmInstallCommand_cxx 14 Jun 2018 17:04:45 -0000 1.14
+++ patches/patch-Source_cmInstallCommand_cxx 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.14 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmInstallCommand_cxx,v 1.13 2018/06/12 05:12:01 rsadowski Exp $
Index: Source/cmInstallCommand.cxx
--- Source/cmInstallCommand.cxx.orig
+++ Source/cmInstallCommand.cxx
-@@ -318,6 +318,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -335,6 +335,9 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
}
// Select the mode for installing symlinks to versioned shared libraries.
@@ -12,7 +12,7 @@ Index: Source/cmInstallCommand.cxx
cmInstallTargetGenerator::NamelinkModeType namelinkMode =
cmInstallTargetGenerator::NamelinkModeNone;
if (libraryArgs.GetNamelinkOnly()) {
-@@ -325,6 +328,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
+@@ -342,6 +345,10 @@ bool cmInstallCommand::HandleTargetsMode(std::vector<s
} else if (libraryArgs.GetNamelinkSkip()) {
namelinkMode = cmInstallTargetGenerator::NamelinkModeSkip;
}
Index: patches/patch-Source_cmSystemTools_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmSystemTools_cxx,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-Source_cmSystemTools_cxx
--- patches/patch-Source_cmSystemTools_cxx 14 Jun 2018 17:04:45 -0000 1.12
+++ patches/patch-Source_cmSystemTools_cxx 20 Oct 2018 11:34:30 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.12 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmSystemTools_cxx,v 1.11 2018/06/12 05:12:01 rsadowski Exp $
Get rid of cmLocaleRAII.
@@ -29,15 +29,7 @@ the invalid use of the interface.
Index: Source/cmSystemTools.cxx
--- Source/cmSystemTools.cxx.orig
+++ Source/cmSystemTools.cxx
-@@ -8,7 +8,6 @@
-
- #if defined(CMAKE_BUILD_WITH_CMAKE)
- #include "cmArchiveWrite.h"
--#include "cmLocale.h"
- #include "cm_libarchive.h"
- #ifndef __LA_INT64_T
- #define __LA_INT64_T la_int64_t
-@@ -1671,8 +1670,6 @@ long copy_data(struct archive* ar, struct archive* aw)
+@@ -1744,8 +1744,6 @@ bool copy_data(struct archive* ar, struct archive* aw)
bool extract_tar(const char* outFileName, bool verbose, bool extract)
{
Index: patches/patch-Source_cmTarget_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
retrieving revision 1.34
diff -u -p -u -p -r1.34 patch-Source_cmTarget_cxx
--- patches/patch-Source_cmTarget_cxx 14 Jun 2018 17:04:45 -0000 1.34
+++ patches/patch-Source_cmTarget_cxx 20 Oct 2018 11:34:30 -0000
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Source_cmTarget_cxx,v 1.34 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmTarget_cxx,v 1.33 2018/06/12 05:12:01 rsadowski Exp $
Index: Source/cmTarget.cxx
--- Source/cmTarget.cxx.orig
+++ Source/cmTarget.cxx
-@@ -227,7 +227,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
+@@ -218,7 +218,7 @@ cmTarget::cmTarget(std::string const& name, cmStateEnu
this->SetPropertyDefault("BUILD_RPATH", nullptr);
this->SetPropertyDefault("INSTALL_NAME_DIR", nullptr);
this->SetPropertyDefault("INSTALL_RPATH", "");
Index: patches/patch-Source_cmake_cxx
===================================================================
RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmake_cxx,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 patch-Source_cmake_cxx
--- patches/patch-Source_cmake_cxx 14 Jun 2018 17:04:45 -0000 1.17
+++ patches/patch-Source_cmake_cxx 20 Oct 2018 11:34:30 -0000
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Source_cmake_cxx,v 1.17 2018/06/14 17:04:45 sthen Exp $
+$OpenBSD: patch-Source_cmake_cxx,v 1.16 2018/06/12 05:12:01 rsadowski Exp $
Revert 4e3c7725d0d724d7a8a0e8305d15713e01b20503: we want to build
CMake using Ninja
@@ -6,17 +6,17 @@ CMake using Ninja
Index: Source/cmake.cxx
--- Source/cmake.cxx.orig
+++ Source/cmake.cxx
-@@ -76,9 +76,7 @@
- #include "cmGlobalWatcomWMakeGenerator.h"
+@@ -68,9 +68,7 @@
+ # include "cmGlobalWatcomWMakeGenerator.h"
No comments:
Post a Comment