CVS commit: pkgsrc/devel/cmake

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Jan 20 13:08:07 UTC 2023

Modified Files:
        pkgsrc/devel/cmake: configure-settings.mk distinfo version.mk

Log Message:
cmake: updated to 3.25.2

CMake 3.25.2
* CheckSymbolExists: Restore newline at end of test source
* Utilities/Release: Use explicit digest for Win7-compatible signature
* Help: Clarify SYSTEM property default for imported targets
* gitlab-ci: replace '$os' tags with '$os-x86_64' on 3.25 release branch
* gitlab-ci: drop unnecessary linux kernel version tag on 3.25 release branch
* ccmake: Restore compilation with AIX curses.h
* ASM_MASM: Populate MSVC debug information format abstraction table
* VS: Do not enable ASM_MASM debug information unless requested
* gitlab-ci: update macOS jobs to use Xcode 14.2
* Tests: Fix CTest.UpdateGIT under repo-local defaultBranch config
* try_run: Avoid crash in keyword-dispatched signature when cross-compiling
* Restore implicit include directory extraction for adaptive relative paths
* IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows
* Help: Restore cmake-buildsystem(7) header-only library example
* FetchContent: Don't pass SYSTEM through to sub-build
* Help: Clarify and update SYSTEM-related docs
* Code comments: Fix trivial typos
* Help: Add version information for SYSTEM option of add_subdirectory
* Help: string(JSON): avoid duplicate labels
* IntelLLVM: Avoid finding not-yet-supported icpx on Windows
* Help: Clarify compiler id distinction between Intel Classic and IntelLLVM
* CUDA: Add support for cuda_std_20 for nvcc 12.0+
* FindCUDAToolkit: Handle CUDA::nvToolsExt not existing
* zlib: Fix typo in mangling the crc32() function
* FindBoost: Add Boost 1.81 support


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/cmake/configure-settings.mk
cvs rdiff -u -r1.204 -r1.205 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.33 -r1.34 pkgsrc/devel/cmake/version.mk

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

Modified files:

Index: pkgsrc/devel/cmake/configure-settings.mk
diff -u pkgsrc/devel/cmake/configure-settings.mk:1.1 pkgsrc/devel/cmake/configure-settings.mk:1.2
--- pkgsrc/devel/cmake/configure-settings.mk:1.1        Thu Jan 12 19:32:37 2023
+++ pkgsrc/devel/cmake/configure-settings.mk    Fri Jan 20 13:08:07 2023
@@ -1,4 +1,4 @@
-# $NetBSD: configure-settings.mk,v 1.1 2023/01/12 19:32:37 markd Exp $
+# $NetBSD: configure-settings.mk,v 1.2 2023/01/20 13:08:07 adam Exp $
 #
 # This file handles packages that use CMake as their primary build
 # system. For more information about CMake, see http://www.cmake.org/.
@@ -22,9 +22,9 @@
 # CMAKE_PREFIX_PATH
 #      A list of directories to add the CMAKE_PREFIX_PATH cmake variable.
 #      If a package installs its contents in ${PREFIX}/package instead of
-#      ${PREFIX} and it installs cmake modules there 
-#      "CMAKE_PREFIX_PATH += ${PREFIX}/package" should be in its 
-#      buildlink3.mk so that packages that depend on it can find its 
+#      ${PREFIX} and it installs cmake modules there
+#      "CMAKE_PREFIX_PATH += ${PREFIX}/package" should be in its
+#      buildlink3.mk so that packages that depend on it can find its
 #      cmake modules if they use cmake to build.
 #
 # CMAKE_USE_GNU_INSTALL_DIRS
@@ -47,12 +47,12 @@ INSTALL_TARGET?=    install/strip
 
 CMAKE_USE_GNU_INSTALL_DIRS?=   yes
 
-CMAKE_INSTALL_PREFIX?= ${PREFIX}
-CMAKE_INSTALL_NAME_DIR?=${PREFIX}/lib
+CMAKE_INSTALL_PREFIX?=         ${PREFIX}
+CMAKE_INSTALL_NAME_DIR?=       ${PREFIX}/lib
 
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
-.if empty(CMAKE_PKGSRC_BUILD_FLAGS:M[nN][oO])
-CMAKE_CONFIGURE_ARGS+=    -DCMAKE_PKGSRC_BUILD_FLAGS:BOOL=TRUE
+.if ${CMAKE_PKGSRC_BUILD_FLAGS:U:tl} != no
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PKGSRC_BUILD_FLAGS:BOOL=TRUE
 .endif
 
 .if ${OPSYS} != "Darwin"
@@ -67,13 +67,13 @@ CMAKE_CONFIGURE_ARGS+=      -DCMAKE_SKIP_RPAT
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_NAME_DIR:PATH=${CMAKE_INSTALL_NAME_DIR}
 .endif
 
-.if defined(CMAKE_USE_GNU_INSTALL_DIRS) && empty(CMAKE_USE_GNU_INSTALL_DIRS:M[nN][oO])
+.if defined(CMAKE_USE_GNU_INSTALL_DIRS) && ${CMAKE_USE_GNU_INSTALL_DIRS:tl} != no
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LIBDIR:PATH=lib
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_MANDIR:PATH=${PKGMANDIR}
 .  if defined(INFO_FILES)
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_INFODIR:PATH=${PKGINFODIR}
 .  endif
-.  if defined(USE_PKGLOCALEDIR) && empty(USE_PKGLOCALEDIR:M[nN][oO])
+.  if defined(USE_PKGLOCALEDIR) && ${USE_PKGLOCALEDIR:U:tl} != no
 CMAKE_CONFIGURE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR:PATH=${PKGLOCALEDIR}/locale
 .  endif
 .endif
@@ -82,5 +82,5 @@ CMAKE_CONFIGURE_ARGS+=        -DCMAKE_APPLE_SIL
 .endif
 
 .if defined(CMAKE_PREFIX_PATH)
-CMAKE_CONFIGURE_ARGS+=-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH:ts;:Q}
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH:ts;:Q}
 .endif

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.204 pkgsrc/devel/cmake/distinfo:1.205
--- pkgsrc/devel/cmake/distinfo:1.204   Fri Dec  2 09:20:10 2022
+++ pkgsrc/devel/cmake/distinfo Fri Jan 20 13:08:07 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.204 2022/12/02 09:20:10 adam Exp $
+$NetBSD: distinfo,v 1.205 2023/01/20 13:08:07 adam Exp $
 
-BLAKE2s (cmake-3.25.1.tar.gz) = 711cf1d809b9295bfe110725ba740d78b3ef1bcc4033ef54559dddfad594fbc7
-SHA512 (cmake-3.25.1.tar.gz) = ec4203cac569e3c340bf6535d193d9ccff9c4e4d59a7a7ae5b9156172f647d9f9212bdc37b3c12cbd676b1351b9a64364c563aaa968a2f41e0f402410ed78d57
-Size (cmake-3.25.1.tar.gz) = 10561054 bytes
+BLAKE2s (cmake-3.25.2.tar.gz) = 9104e3ffca9dd7e5190a8718903aa53ce8a6d74d1d34e8b467e354048c16e1dd
+SHA512 (cmake-3.25.2.tar.gz) = 20146d06a1722c36249192944a58e4780aad334d2bc5ce2a3d8c4f24656630c5b71ca0ae7ed53587e3d46f488bd773452fa60c3fc7045fe54db2dbc6ffd86390
+Size (cmake-3.25.2.tar.gz) = 10561266 bytes
 SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4
 SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e091c53ac3f3a6cd811119d3231563df32e76bf9

Index: pkgsrc/devel/cmake/version.mk
diff -u pkgsrc/devel/cmake/version.mk:1.33 pkgsrc/devel/cmake/version.mk:1.34
--- pkgsrc/devel/cmake/version.mk:1.33  Fri Dec  2 09:20:10 2022
+++ pkgsrc/devel/cmake/version.mk       Fri Jan 20 13:08:07 2023
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.33 2022/12/02 09:20:10 adam Exp $
+# $NetBSD: version.mk,v 1.34 2023/01/20 13:08:07 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION= 3.25.1
+CMAKE_VERSION= 3.25.2
 CMAKE_API=     ${CMAKE_VERSION:R}