[pkgsrc/trunk]: pkgsrc/devel/cmake cmake: on Darwin, prefer pkgsrc over syste...

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/58ec44f889e0
branches:  trunk
changeset: 436306:58ec44f889e0
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Jul 31 16:03:13 2020 +0000

description:
cmake: on Darwin, prefer pkgsrc over system provided libraries

diffstat:

 devel/cmake/distinfo                                    |   4 +-
 devel/cmake/patches/patch-Modules_Platform_Darwin.cmake |  35 +++++++++++++++++
 devel/cmake/patches/patch-Source_cmArchiveWrite.cxx     |  20 ---------
 3 files changed, 37 insertions(+), 22 deletions(-)

diffs (88 lines):

diff -r a33704074fc9 -r 58ec44f889e0 devel/cmake/distinfo
--- a/devel/cmake/distinfo      Fri Jul 31 15:39:31 2020 +0000
+++ b/devel/cmake/distinfo      Fri Jul 31 16:03:13 2020 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.162 2020/07/31 09:42:10 adam Exp $
+$NetBSD: distinfo,v 1.163 2020/07/31 16:03:13 adam Exp $
 
 SHA1 (cmake-3.18.1.tar.gz) = 60c36386d0df016adc96c8bb3215d02de3777869
 RMD160 (cmake-3.18.1.tar.gz) = 3ed2d64fe8640f05522570cb9000e31f20477d7e
@@ -11,6 +11,7 @@
 SHA1 (patch-Modules_FindPythonInterp.cmake) = d1b39bdcd654f2a4fc63463cd20de656cce3cf8f
 SHA1 (patch-Modules_FindPythonLibs.cmake) = b5cedc6a2354beaf08e06d416c150154a7dc1f05
 SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
+SHA1 (patch-Modules_Platform_Darwin.cmake) = 11116f5b1d1e68a1ce9f76c854d3078e8e233b7a
 SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
 SHA1 (patch-Source_CMakeLists.txt) = 533667d43048b8bc2be17a766b5dc32f3101866e
 SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 37d95c6162cc1f4c0e47b537ac8204cb9fe75b8c
@@ -18,7 +19,6 @@
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
 SHA1 (patch-Source_CursesDialog_ccmake.cxx) = 7f6ca6fda5d0db615f04c18efa8ecdd6ef00cb93
 SHA1 (patch-Source_QtDialog_CMakeLists.txt) = c4007da363c5b7c925f1ff345901057f3fbdc4e1
-SHA1 (patch-Source_cmArchiveWrite.cxx) = 2d226c5394465b96f60e8e3e8d2e49852c721006
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
 SHA1 (patch-Utilities_std_cm_string__view) = 90bbb578c5628b661a25974d7dd9aa6f5063271f
 SHA1 (patch-bootstrap) = fc1b689bbe705cd888e2bef4debad1a26e5885bd
diff -r a33704074fc9 -r 58ec44f889e0 devel/cmake/patches/patch-Modules_Platform_Darwin.cmake
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake   Fri Jul 31 16:03:13 2020 +0000
@@ -0,0 +1,35 @@
+$NetBSD: patch-Modules_Platform_Darwin.cmake,v 1.1 2020/07/31 16:03:13 adam Exp $
+
+Prefer pkgsrc over system provided libraries.
+
+--- Modules/Platform/Darwin.cmake.orig 2020-07-30 16:34:59.000000000 +0000
++++ Modules/Platform/Darwin.cmake
+@@ -159,10 +159,10 @@ if(_CMAKE_OSX_SYSROOT_PATH)
+   endforeach()
+ 
+   if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/lib)
+-    list(INSERT CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr/lib)
++    list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${_CMAKE_OSX_SYSROOT_PATH}/usr/lib)
+   endif()
+   if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/lib)
+-    list(INSERT CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/lib)
++    list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/lib)
+   endif()
+ endif()
+ if (OSX_DEVELOPER_ROOT AND EXISTS "${OSX_DEVELOPER_ROOT}/Library/Frameworks")
+@@ -218,13 +218,13 @@ unset(_apps_paths)
+ include(Platform/UnixPaths)
+ if(_CMAKE_OSX_SYSROOT_PATH)
+   if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
+-    list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr)
++    list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr)
+     foreach(lang C CXX OBJC OBJCXX Swift)
+       list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/include)
+     endforeach()
+   endif()
+   if(EXISTS ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/include)
+-    list(INSERT CMAKE_SYSTEM_PREFIX_PATH 0 ${_CMAKE_OSX_SYSROOT_PATH}/usr/local)
++    list(APPEND CMAKE_SYSTEM_PREFIX_PATH ${_CMAKE_OSX_SYSROOT_PATH}/usr/local)
+     foreach(lang C CXX OBJC OBJCXX Swift)
+       list(APPEND _CMAKE_${lang}_IMPLICIT_INCLUDE_DIRECTORIES_INIT ${_CMAKE_OSX_SYSROOT_PATH}/usr/local/include)
+     endforeach()
diff -r a33704074fc9 -r 58ec44f889e0 devel/cmake/patches/patch-Source_cmArchiveWrite.cxx
--- a/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx       Fri Jul 31 15:39:31 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$NetBSD: patch-Source_cmArchiveWrite.cxx,v 1.4 2020/07/31 09:42:10 adam Exp $
-
-Libarchive from PkgSrc currenty does not support ZSTD.
-
---- Source/cmArchiveWrite.cxx.orig     2020-07-20 09:34:34.000000000 +0000
-+++ Source/cmArchiveWrite.cxx
-@@ -143,13 +143,6 @@ cmArchiveWrite::cmArchiveWrite(std::ostr
-         return;
-       }
-       break;
--    case CompressZstd:
--      if (archive_write_add_filter_zstd(this->Archive) != ARCHIVE_OK) {
--        this->Error = cmStrCat("archive_write_add_filter_zstd: ",
--                               cm_archive_error_string(this->Archive));
--        return;
--      }
--      break;
-   }
- #if !defined(_WIN32) || defined(__CYGWIN__)
-   if (archive_read_disk_set_standard_lookup(this->Disk) != ARCHIVE_OK) {