CVS commit: pkgsrc/devel/cmake39

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Oct  8 17:20:32 UTC 2025

Modified Files:
        pkgsrc/devel/cmake39: Makefile
Added Files:
        pkgsrc/devel/cmake39/patches: patch-Source_cmSystemTools.cxx

Log Message:
cmake39: when cmake invokes itself, use the suffixed executable
names (except during bootstrap)


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/cmake39/Makefile
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cmake39/patches/patch-Source_cmSystemTools.cxx

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

Modified files:

Index: pkgsrc/devel/cmake39/Makefile
diff -u pkgsrc/devel/cmake39/Makefile:1.2 pkgsrc/devel/cmake39/Makefile:1.3
--- pkgsrc/devel/cmake39/Makefile:1.2   Sun Oct  5 19:25:49 2025
+++ pkgsrc/devel/cmake39/Makefile       Wed Oct  8 17:20:32 2025
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2025/10/05 19:25:49 js Exp $
+# $NetBSD: Makefile,v 1.3 2025/10/08 17:20:32 nia Exp $
 
-PKGREVISION= 1
+PKGREVISION= 2
 .include "Makefile.version"
 
 DISTNAME=      cmake-${CMAKE_VERSION}

Added files:

Index: pkgsrc/devel/cmake39/patches/patch-Source_cmSystemTools.cxx
diff -u /dev/null pkgsrc/devel/cmake39/patches/patch-Source_cmSystemTools.cxx:1.1
--- /dev/null   Wed Oct  8 17:20:32 2025
+++ pkgsrc/devel/cmake39/patches/patch-Source_cmSystemTools.cxx Wed Oct  8 17:20:32 2025
@@ -0,0 +1,56 @@
+$NetBSD: patch-Source_cmSystemTools.cxx,v 1.1 2025/10/08 17:20:32 nia Exp $
+
+Handle the 39 suffix to the commands.
+
+--- Source/cmSystemTools.cxx.orig      2017-11-10 12:28:58.000000000 +0000
++++ Source/cmSystemTools.cxx
+@@ -2033,7 +2033,7 @@ void cmSystemTools::FindCMakeResources(c
+     // Look for ..<CMAKE_BIN_DIR> (install tree) and then fall back to
+     // ../../../bin (build tree).
+     exe_dir = cmSystemTools::GetFilenamePath(exe_dir);
+-    if (cmSystemTools::FileExists(exe_dir + CMAKE_BIN_DIR "/cmake")) {
++    if (cmSystemTools::FileExists(exe_dir + CMAKE_BIN_DIR "/cmake39")) {
+       exe_dir += CMAKE_BIN_DIR;
+     } else {
+       exe_dir = cmSystemTools::GetFilenamePath(exe_dir);
+@@ -2053,7 +2053,10 @@ void cmSystemTools::FindCMakeResources(c
+ #endif
+   exe_dir = cmSystemTools::GetActualCaseForPath(exe_dir);
+   cmSystemToolsCMakeCommand = exe_dir;
+-  cmSystemToolsCMakeCommand += "/cmake";
++  cmSystemToolsCMakeCommand += "/cmake39";
++  if (!cmSystemTools::FileExists(cmSystemToolsCMakeCommand.c_str())) {
++    cmSystemToolsCMakeCommand = exe_dir + "/cmake";
++  }
+   cmSystemToolsCMakeCommand += cmSystemTools::GetExecutableExtension();
+ #ifndef CMAKE_BUILD_WITH_CMAKE
+   // The bootstrap cmake does not provide the other tools,
+@@ -2061,10 +2064,10 @@ void cmSystemTools::FindCMakeResources(c
+   exe_dir = CMAKE_BOOTSTRAP_BINARY_DIR "/bin";
+ #endif
+   cmSystemToolsCTestCommand = exe_dir;
+-  cmSystemToolsCTestCommand += "/ctest";
++  cmSystemToolsCTestCommand += "/ctest39";
+   cmSystemToolsCTestCommand += cmSystemTools::GetExecutableExtension();
+   cmSystemToolsCPackCommand = exe_dir;
+-  cmSystemToolsCPackCommand += "/cpack";
++  cmSystemToolsCPackCommand += "/cpack39";
+   cmSystemToolsCPackCommand += cmSystemTools::GetExecutableExtension();
+   cmSystemToolsCMakeGUICommand = exe_dir;
+   cmSystemToolsCMakeGUICommand += "/cmake-gui";
+@@ -2073,13 +2076,13 @@ void cmSystemTools::FindCMakeResources(c
+     cmSystemToolsCMakeGUICommand = "";
+   }
+   cmSystemToolsCMakeCursesCommand = exe_dir;
+-  cmSystemToolsCMakeCursesCommand += "/ccmake";
++  cmSystemToolsCMakeCursesCommand += "/ccmake39";
+   cmSystemToolsCMakeCursesCommand += cmSystemTools::GetExecutableExtension();
+   if (!cmSystemTools::FileExists(cmSystemToolsCMakeCursesCommand.c_str())) {
+     cmSystemToolsCMakeCursesCommand = "";
+   }
+   cmSystemToolsCMClDepsCommand = exe_dir;
+-  cmSystemToolsCMClDepsCommand += "/cmcldeps";
++  cmSystemToolsCMClDepsCommand += "/cmcldeps39";
+   cmSystemToolsCMClDepsCommand += cmSystemTools::GetExecutableExtension();
+   if (!cmSystemTools::FileExists(cmSystemToolsCMClDepsCommand.c_str())) {
+     cmSystemToolsCMClDepsCommand = "";