Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1596211393102850"
MIME-Version: 1.0
Date: Fri, 31 Jul 2020 16:03:13 +0000
From: "Adam Ciarcinski" <adam@netbsd.org>
Subject: CVS commit: pkgsrc/devel/cmake
To: pkgsrc-changes@NetBSD.org
Reply-To: adam@netbsd.org
Message-Id: <20200731160313.6E91DFB28@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1596211393102850
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	adam
Date:		Fri Jul 31 16:03:13 UTC 2020

Modified Files:
	pkgsrc/devel/cmake: distinfo
Added Files:
	pkgsrc/devel/cmake/patches: patch-Modules_Platform_Darwin.cmake
Removed Files:
	pkgsrc/devel/cmake/patches: patch-Source_cmArchiveWrite.cxx

Log Message:
cmake: on Darwin, prefer pkgsrc over system provided libraries


To generate a diff of this commit:
cvs rdiff -u -r1.162 -r1.163 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/devel/cmake/patches/patch-Source_cmArchiveWrite.cxx

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1596211393102850
Content-Disposition: inline
Content-Length: 3984
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.162 pkgsrc/devel/cmake/distinfo:1.163
--- pkgsrc/devel/cmake/distinfo:1.162	Fri Jul 31 09:42:10 2020
+++ pkgsrc/devel/cmake/distinfo	Fri Jul 31 16:03:13 2020
@@ -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_FindGTK2.cmake) = 51
 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_Curses_CheckCu
 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

Added files:

Index: pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake
diff -u /dev/null pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake:1.1
--- /dev/null	Fri Jul 31 16:03:13 2020
+++ pkgsrc/devel/cmake/patches/patch-Modules_Platform_Darwin.cmake	Fri Jul 31 16:03:13 2020
@@ -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()


--_----------=_1596211393102850--