CVS commit: pkgsrc/devel/cmake

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Oct  9 17:19:30 UTC 2023

Modified Files:
        pkgsrc/devel/cmake: build.mk distinfo version.mk

Log Message:
cmake: updated to 3.27.7

CMake 3.27.7
* Android: Require Clang 18 for -std=c++23
* Tests: Clarify RunCMake.CTestTimeout case name
* ctest: Restore support for --timeout values higher than default test timeout
* Help: Document CMP0124 behavior on already-set variables
* FindPostgreSQL: Add support for version 16


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/cmake/build.mk
cvs rdiff -u -r1.221 -r1.222 pkgsrc/devel/cmake/distinfo
cvs rdiff -u -r1.46 -r1.47 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/build.mk
diff -u pkgsrc/devel/cmake/build.mk:1.9 pkgsrc/devel/cmake/build.mk:1.10
--- pkgsrc/devel/cmake/build.mk:1.9     Mon Jul 17 06:43:59 2023
+++ pkgsrc/devel/cmake/build.mk Mon Oct  9 17:19:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: build.mk,v 1.9 2023/07/17 06:43:59 ryoon Exp $
+# $NetBSD: build.mk,v 1.10 2023/10/09 17:19:30 adam Exp $
 #
 # This Makefile fragment supports building using the CMake build tool.
 #
@@ -22,21 +22,21 @@
 # CMAKE_INSTALL_ARGS
 #      Arguments to pass to CMake during installation: Default: empty
 #
-# CONFIGURE_DIRS
-#      Directories relative to WRKSRC in which to run CMake. Usually
-#      only one, the toplevel.
+# CONFIGURE_DIR
+#      Directory relative to WRKSRC in which to run CMake. Usually
+#      the top-level one.
 #
 # BUILD_DIRS
-#      Directories relative to WRKSRC in which to build. Defaults
-#      to CONFIGURE_DIRS.
+#      Directories relative to WRKSRC/CMAKE_BUILD_DIR in which to build.
+#      Defaults to WRKSRC/CMAKE_BUILD_DIR.
 #
 # TEST_DIRS
-#      Directories relative to WRKSRC in which to run the tests. Defaults
-#      to CONFIGURE_DIRS.
+#      Directories relative to WRKSRC/CMAKE_BUILD_DIR in which to run the
+#      tests. Defaults to WRKSRC/CMAKE_BUILD_DIR.
 #
 # INSTALL_DIRS
-#      Directories relative to WRKSRC in which to run the 'install'
-#      step. Defaults to CONFIGURE_DIRS.
+#      Directories relative to WRKSRC/CMAKE_BUILD_DIR in which to run the
+#      'install' step. Defaults to WRKSRC/CMAKE_BUILD_DIR.
 
 CMAKE_REQD?=   0
 .for version in ${CMAKE_REQD}
@@ -64,62 +64,70 @@ _CMAKE_BUILD_SYSTEM?=       Unix Makefiles
 _CMAKE_BUILD_TOOL?=    ${MAKE_PROGRAM}
 .endif
 
-CONFIGURE_DIRS?=       .
-BUILD_DIRS?=           ${CONFIGURE_DIRS}
-TEST_DIRS?=            ${CONFIGURE_DIRS}
-INSTALL_DIRS?=         ${CONFIGURE_DIRS}
+CONFIGURE_DIR?=                .
+BUILD_DIRS?=           ${CONFIGURE_DIR}
+TEST_DIRS?=            ${CONFIGURE_DIR}
+INSTALL_DIRS?=         ${CONFIGURE_DIR}
 
 _CMAKE_CONFIGURE_SETTINGS=     yes
 
 .PHONY: cmake-configure cmake-build cmake-test cmake-install
 
+.if !target(do-configure)
 do-configure: cmake-configure
 cmake-configure:
-.for d in ${CONFIGURE_DIRS}
-       ${RUN} cd ${WRKSRC}/${d} && ${SETENV} ${CONFIGURE_ENV} cmake \
+       ${RUN} cd ${WRKSRC}/${CONFIGURE_DIR} && \
+               ${SETENV} ${CONFIGURE_ENV} cmake \
                --install-prefix ${PREFIX} \
                -B ${CMAKE_BUILD_DIR} \
                -G ${_CMAKE_BUILD_SYSTEM:Q} \
                ${CMAKE_CONFIGURE_ARGS} \
                ${WRKSRC}
-.endfor
+.endif
 
+.if !target(do-build)
 do-build: cmake-build
 cmake-build:
-.for d in ${BUILD_DIRS}
-       ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \
+.  for d in ${BUILD_DIRS}
+       ${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR}/${d} && \
                ${SETENV} ${MAKE_ENV} \
                ${_CMAKE_BUILD_TOOL} ${CMAKE_BUILD_ARGS} ${BUILD_TARGET}
-.endfor
+.  endfor
+.endif
 
+.if !target(do-test)
 do-test: cmake-test
 cmake-test:
-.for d in ${TEST_DIRS}
-       ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \
+.  for d in ${TEST_DIRS}
+       ${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR}/${d} && \
                ${SETENV} ${TEST_ENV} \
                ${_CMAKE_BUILD_TOOL} ${CMAKE_BUILD_ARGS} ${TEST_TARGET}
-.endfor
+.  endfor
+.endif
 
+.if !target(do-install)
 do-install: cmake-install
 cmake-install:
-.for d in ${INSTALL_DIRS}
-       ${RUN} cd ${WRKSRC}/${d}/${CMAKE_BUILD_DIR} && \
+.  for d in ${INSTALL_DIRS}
+       ${RUN} cd ${WRKSRC}/${CMAKE_BUILD_DIR}/${d} && \
                ${SETENV} ${INSTALL_ENV} \
                ${_CMAKE_BUILD_TOOL} ${CMAKE_INSTALL_ARGS} ${INSTALL_TARGET}
-.endfor
+.  endfor
+.endif
 
 _VARGROUPS+=           cmake
 _USER_VARS.cmake+=     CMAKE_GENERATOR
 _PKG_VARS.cmake+=      CMAKE_REQD
-_PKG_VARS.cmake+=      CMAKE_CONFIGURE_ARGS CONFIGURE_DIRS
-_PKG_VARS.cmake+=      CMAKE_BUILD_ARGS BUILD_DIRS
+_PKG_VARS.cmake+=      CMAKE_CONFIGURE_ARGS CONFIGURE_DIR
+_PKG_VARS.cmake+=      CMAKE_BUILD_ARGS BUILD_DIRS BUILD_TARGET
 _PKG_VARS.cmake+=      TEST_DIRS TEST_TARGET
 _PKG_VARS.cmake+=      CMAKE_INSTALL_ARGS INSTALL_DIRS INSTALL_TARGET
 _SYS_VARS.cmake+=      CMAKE_BUILD_DIR
 _USE_VARS.cmake+=      CMAKE_ARGS
 _USE_VARS.cmake+=      CONFIGURE_ENV MAKE_ENV TEST_ENV INSTALL_ENV
 _IGN_VARS.cmake+=      BUILDLINK_DIR WRKSRC PREFIX
-_IGN_VARS.cmake+=      SETENV TOOL_DEPENDS
+_IGN_VARS.cmake+=      BUILD_USES_CMAKE SETENV TOOL_DEPENDS
 _IGN_VARS.cmake+=      _CMAKE_BUILD_SYSTEM _CMAKE_BUILD_TOOL _MAKE_JOBS_N
+_IGN_VARS.cmake+=      _CMAKE_CONFIGURE_SETTINGS
 _LISTED_VARS.cmake+=   *_ARGS
 _SORTED_VARS.cmake+=   *_ENV

Index: pkgsrc/devel/cmake/distinfo
diff -u pkgsrc/devel/cmake/distinfo:1.221 pkgsrc/devel/cmake/distinfo:1.222
--- pkgsrc/devel/cmake/distinfo:1.221   Sat Sep 30 08:52:52 2023
+++ pkgsrc/devel/cmake/distinfo Mon Oct  9 17:19:30 2023
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.221 2023/09/30 08:52:52 nros Exp $
+$NetBSD: distinfo,v 1.222 2023/10/09 17:19:30 adam Exp $
 
-BLAKE2s (cmake-3.27.6.tar.gz) = 53cb0cea7c0815cb244726fa345f4f57396af5127f7dfa31edf5c41875d1913b
-SHA512 (cmake-3.27.6.tar.gz) = 268b5bd84800c37ce0e311cadf13c275a538d612844cc8687107549fe6341a6c3115560e3b9162836843016213d225f62db130bc251bf8aff50c69b9bd58e638
-Size (cmake-3.27.6.tar.gz) = 10982239 bytes
+BLAKE2s (cmake-3.27.7.tar.gz) = 456421df257cdefba27b664a58f7ae4e865d34d161909dc9afbc1aaf3d125863
+SHA512 (cmake-3.27.7.tar.gz) = 2e9b83dee8f8c012be4219ab74ebaa8b8438ea55d5204237a1c9feba94c732afe7baceddb9c681672903112b1e40f7b1a86b284cfceed15f46ce8f90143dbb86
+Size (cmake-3.27.7.tar.gz) = 10982558 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.46 pkgsrc/devel/cmake/version.mk:1.47
--- pkgsrc/devel/cmake/version.mk:1.46  Thu Sep 21 13:54:15 2023
+++ pkgsrc/devel/cmake/version.mk       Mon Oct  9 17:19:30 2023
@@ -1,6 +1,6 @@
-# $NetBSD: version.mk,v 1.46 2023/09/21 13:54:15 gdt Exp $
+# $NetBSD: version.mk,v 1.47 2023/10/09 17:19:30 adam Exp $
 # used by devel/cmake/Makefile.common
 # used by devel/cmake-fedora/Makefile
 
-CMAKE_VERSION= 3.27.6
+CMAKE_VERSION= 3.27.7
 CMAKE_API=     ${CMAKE_VERSION:R}