CVS commit: pkgsrc/cad/occt

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Fri Aug 15 10:25:08 UTC 2025

Modified Files:
        pkgsrc/cad/occt: distinfo
        pkgsrc/cad/occt/patches: patch-CMakeLists.txt

Log Message:
cad/occt: Hack around cmake version checks

cmake 4 objects to the min version in this project's CMakeFile, so
just increase it.  Resolves building for now, pending a future update
to the current upstream release.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/cad/occt/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/cad/occt/patches/patch-CMakeLists.txt

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

Modified files:

Index: pkgsrc/cad/occt/distinfo
diff -u pkgsrc/cad/occt/distinfo:1.6 pkgsrc/cad/occt/distinfo:1.7
--- pkgsrc/cad/occt/distinfo:1.6        Sun Jan 19 13:42:28 2025
+++ pkgsrc/cad/occt/distinfo    Fri Aug 15 10:25:07 2025
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2025/01/19 13:42:28 mef Exp $
+$NetBSD: distinfo,v 1.7 2025/08/15 10:25:07 gdt Exp $
 
 BLAKE2s (opencascade-7.8.0.tgz) = 4ce03bb4bdb8781c85ea17e727f83b323eaf4bb33f9a646bdacb337d034dfbd9
 SHA512 (opencascade-7.8.0.tgz) = bf119c2963a69dfad58ddef064e3f2df15f6e8fa660db56b4c94a7d69f83eb238ed3ff06b9431b1e758829cd0e3ae6d4757fb68368b8531099499f6dd6c0cb17
 Size (opencascade-7.8.0.tgz) = 48431454 bytes
-SHA1 (patch-CMakeLists.txt) = d6f533f8a54881b060e05ed816cb6e9bbfe0c5a8
+SHA1 (patch-CMakeLists.txt) = 50942ab046a3aca71cb2cc2ac8a35db20eed08f6
 SHA1 (patch-adm_cmake_occt__macros.cmake) = 9f17527238443cc770d2def9ad8211f410fae7f4
 SHA1 (patch-adm_cmake_occt_csf.cmake) = df33048718a1ff1f490d1a566dc99573713d3677
 SHA1 (patch-src_MeshVS_MeshVS__MeshPrsBuilder.cxx) = ba177be057941b7077a4525348d0563cb1378213

Index: pkgsrc/cad/occt/patches/patch-CMakeLists.txt
diff -u pkgsrc/cad/occt/patches/patch-CMakeLists.txt:1.2 pkgsrc/cad/occt/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/cad/occt/patches/patch-CMakeLists.txt:1.2    Sun Feb 12 16:03:28 2023
+++ pkgsrc/cad/occt/patches/patch-CMakeLists.txt        Fri Aug 15 10:25:07 2025
@@ -1,11 +1,17 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2023/02/12 16:03:28 tnn Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2025/08/15 10:25:07 gdt Exp $
 
 Don't install world writable files.
 Fix DESTDIR issues.
 
---- CMakeLists.txt.orig        2022-11-11 22:19:44.000000000 +0000
+--- CMakeLists.txt.orig        2023-12-26 08:37:59.000000000 +0000
 +++ CMakeLists.txt
-@@ -1002,10 +1002,10 @@ if (${DRAWEXE_INDEX} GREATER -1)
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.1 FATAL_ERROR)
++cmake_minimum_required (VERSION 3.22 FATAL_ERROR)
+ 
+ set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/adm/cmake")
+ 
+@@ -1012,10 +1012,10 @@ if (${DRAWEXE_INDEX} GREATER -1)
    # copy draw script to install script folder
    if (BUILD_PATCH AND EXISTS "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}")
      install (FILES "${BUILD_PATCH}/adm/templates/draw.${SCRIPT_EXT}" DESTINATION  "${INSTALL_DIR_SCRIPT}"
@@ -18,7 +24,7 @@ Fix DESTDIR issues.
    endif()
  
    # copy draw script to CMake binary folder
-@@ -1021,7 +1021,8 @@ else()
+@@ -1031,7 +1031,8 @@ else()
  endif()
  
   # change custom.bat/sh
@@ -28,7 +34,7 @@ Fix DESTDIR issues.
    file (READ "${INSTALL_DIR}/${INSTALL_DIR_SCRIPT}/custom.${SCRIPT_EXT}" CUSTOM_CONTENT)
  
    set (CUSTOM_CONTENT "${CUSTOM_CONTENT} ${ADDITIONAL_CUSTOM_CONTENT}")
-@@ -1265,7 +1266,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF
+@@ -1275,7 +1276,7 @@ foreach (OCCT_CONFIGURATION ${CMAKE_CONF
  endforeach()
  # install OpenCASCADE config file with compile definitions and C/C++ flags ONLY for current configuration
  install (CODE "string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWER)")