cmake: finish package

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: cmake: finish package
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sun, 10 Aug 2025 20:50:35 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Sun Aug 10 22:50:18 2025 +0200
Changeset:	b82a3605f48c1b752c3bc64da2cc77938f360e75

Modified Files:
	cmake/Makefile.common
	cmake/buildlink3.mk
	cmake/distinfo
	cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt
	cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake
	cmake/patches/patch-Source_QtDialog_CMakeLists.txt

Log Message:
cmake: finish package

Due to devel/ hardcodes some files were in the wrong location

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b82a3605f48c1b752c3bc64da2cc77938f360e75

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

diffstat:
 cmake/Makefile.common                                |  4 ++--
 cmake/buildlink3.mk                                  |  2 +-
 cmake/distinfo                                       | 12 ++++++------
 .../patch-Source_Checks_Curses_CMakeLists.txt        |  6 +++---
 .../patch-Source_Modules_CMakeBuildUtilities.cmake   |  6 +++---
 cmake/patches/patch-Source_QtDialog_CMakeLists.txt   | 20 ++++++++++----------
 6 files changed, 25 insertions(+), 25 deletions(-)

diffs:
diff --git a/cmake/Makefile.common b/cmake/Makefile.common
index e87ee9a73e..765448e82f 100644
--- a/cmake/Makefile.common
+++ b/cmake/Makefile.common
@@ -12,8 +12,8 @@ MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://www.cmake.org/
 LICENSE=	modified-bsd
 
-DISTINFO_FILE=	${.CURDIR}/../../devel/cmake/distinfo
-PATCHDIR=	${.CURDIR}/../../devel/cmake/patches
+DISTINFO_FILE=	${.CURDIR}/../../wip/cmake/distinfo
+PATCHDIR=	${.CURDIR}/../../wip/cmake/patches
 
 USE_CXX_FEATURES=	c++11
 USE_LANGUAGES=		c c++
diff --git a/cmake/buildlink3.mk b/cmake/buildlink3.mk
index 5d2225de51..893a4c668a 100644
--- a/cmake/buildlink3.mk
+++ b/cmake/buildlink3.mk
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	cmake
 CMAKE_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.cmake+=	cmake>=2.8.5nb1
-BUILDLINK_PKGSRCDIR.cmake?=	../../devel/cmake
+BUILDLINK_PKGSRCDIR.cmake?=	../../wip/cmake
 BUILDLINK_DEPMETHOD.cmake?=	build
 BUILDLINK_FILES.cmake+=		share/cmake-*/include/*
 .endif # CMAKE_BUILDLINK3_MK
diff --git a/cmake/distinfo b/cmake/distinfo
index dfbc83ccb9..222c449d72 100644
--- a/cmake/distinfo
+++ b/cmake/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.252 2025/06/30 13:14:28 adam Exp $
 
-BLAKE2s (cmake-3.31.8.tar.gz) = e94a260ebd6450a2d2a8e0947323f73a0d5c9ea8cdfae353aad13c1fa37faba3
-SHA512 (cmake-3.31.8.tar.gz) = 07dbb5af1d449760ef92a921e43c0a0a091989ac51ce3f8b7607bf617b8b56e47c675486d3c620c04f1105b7dfa3852b926915e0888ff46ea473cd01e572f461
-Size (cmake-3.31.8.tar.gz) = 11713806 bytes
+BLAKE2s (cmake-4.1.0.tar.gz) = e519a976ffacd3524615a9e171193b861bbe30fd1d0958e3d5707567c5d573d1
+SHA512 (cmake-4.1.0.tar.gz) = 644b6b13539ba0e7f35a7496e4240b1d3361606163f35b69006e47d03ffd9759d35c62a73826253ed168af4196df29983ec10c0f561ea74d7ed6ffee0c2cd8e4
+Size (cmake-4.1.0.tar.gz) = 12042798 bytes
 SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4
 SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b
 SHA1 (patch-Modules_Compiler_GNU.cmake) = e06fc41fd7a49ca9f8edaabb95d4ab1cde784112
@@ -15,11 +15,11 @@ SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
 SHA1 (patch-Modules_FortranCInterface_CMakeLists.txt) = f5477f5c94ebab82caea6db702b449032ba3dc75
 SHA1 (patch-Modules_Platform_Darwin.cmake) = 7629f034111ff64b144ff41316299d5edcfe081a
 SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
-SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 0575cf1a01c4462fc7271d6d28529d46df291748
+SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 1a505da231fd265260ec32d11ba9f79815c263c9
 SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = 530ee1300595e64c97630d27792cc2dca3b9049a
 SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
-SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = 7046fb8a0d2aadb81e027d8e2f1a4bccf2bd79cf
-SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 1cefaa7ee6cd09e84d699ea54844ae3811d890f7
+SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = e4f2ad39f0899074c2b66d97ef12d03c48e82950
+SHA1 (patch-Source_QtDialog_CMakeLists.txt) = ca57d666f0a30d87aa1db49f82c62c41b05d87f9
 SHA1 (patch-Source_kwsys_ProcessUNIX.c) = e333da03c3ac31be6a992809062a60a9cccc62c0
 SHA1 (patch-Tests_CMakeLists.txt) = 555e0be38ef92530c7315a87db65dd3004d7744c
 SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796
diff --git a/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt b/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt
index 3a247a8f73..14666d380c 100644
--- a/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt
+++ b/cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt
@@ -2,13 +2,13 @@ $NetBSD: patch-Source_Checks_Curses_CMakeLists.txt,v 1.6 2024/11/10 19:58:31 ada
 
 Don't insist on ncurses.
 
---- Source/Checks/Curses/CMakeLists.txt.orig	2024-11-06 13:41:37.000000000 +0000
+--- Source/Checks/Curses/CMakeLists.txt.orig	2025-08-05 14:55:57.000000000 +0000
 +++ Source/Checks/Curses/CMakeLists.txt
 @@ -1,7 +1,6 @@
- cmake_minimum_required(VERSION 3.13...3.29 FATAL_ERROR)
+ cmake_minimum_required(VERSION 3.13...3.31 FATAL_ERROR)
  project(CheckCurses C)
  
 -set(CURSES_NEED_NCURSES TRUE)
  find_package(Curses)
- if(NOT CURSES_FOUND)
+ if(NOT Curses_FOUND)
    return()
diff --git a/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake b/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake
index 7d29ec57ce..42e34dd891 100644
--- a/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake
+++ b/cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake
@@ -2,13 +2,13 @@ $NetBSD: patch-Source_Modules_CMakeBuildUtilities.cmake,v 1.1 2022/11/22 19:14:0
 
 Don't insist on ncurses.
 
---- Source/Modules/CMakeBuildUtilities.cmake.orig	2022-11-22 18:51:08.946372477 +0000
+--- Source/Modules/CMakeBuildUtilities.cmake.orig	2025-08-05 14:55:57.000000000 +0000
 +++ Source/Modules/CMakeBuildUtilities.cmake
-@@ -352,7 +352,6 @@ if(NOT DEFINED BUILD_CursesDialog)
+@@ -354,7 +354,6 @@ if(NOT DEFINED BUILD_CursesDialog)
  endif()
  if(BUILD_CursesDialog)
    if(UNIX)
 -    set(CURSES_NEED_NCURSES TRUE)
      find_package(Curses)
-     if(NOT CURSES_FOUND)
+     if(NOT Curses_FOUND)
        message(WARNING
diff --git a/cmake/patches/patch-Source_QtDialog_CMakeLists.txt b/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
index aac5338edf..68e13f7686 100644
--- a/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
+++ b/cmake/patches/patch-Source_QtDialog_CMakeLists.txt
@@ -2,18 +2,18 @@ $NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.5 2022/11/22 19:14:03 adam Exp
 
 Do not make app bundle on Darwin.
 
---- Source/QtDialog/CMakeLists.txt.orig	2022-11-16 14:42:03.000000000 +0000
+--- Source/QtDialog/CMakeLists.txt.orig	2025-08-05 14:55:57.000000000 +0000
 +++ Source/QtDialog/CMakeLists.txt
-@@ -256,7 +256,7 @@ target_link_libraries(
+@@ -263,7 +263,7 @@ target_link_libraries(
      CMakeGUILib
    )
  
 -add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx)
 +add_executable(cmake-gui WIN32 CMakeGUIExec.cxx)
+ set_property(TARGET cmake-gui PROPERTY CMake_QT_MAJOR_VERSION "${CMake_QT_MAJOR_VERSION}")
  target_link_libraries(cmake-gui
    PRIVATE
-     CMakeGUIMainLib
-@@ -269,7 +269,7 @@ target_link_libraries(cmake-gui
+@@ -277,7 +277,7 @@ target_link_libraries(cmake-gui
  if(WIN32)
    target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.rc)
  endif()
@@ -22,16 +22,16 @@ Do not make app bundle on Darwin.
    target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns)
    set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
    set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -299,7 +299,7 @@ Checks: '-*,llvm-twine-local'
+@@ -307,7 +307,7 @@ Checks: '-*,llvm-twine-local'
  ...
  ")
  
 -if(APPLE)
 +if(FALSE)
-   file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
-     LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
- 
-@@ -324,7 +324,7 @@ install(TARGETS cmake-gui
+   set_target_properties(cmake-gui PROPERTIES
+     OUTPUT_NAME CMake
+     MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
+@@ -329,7 +329,7 @@ install(TARGETS cmake-gui
    RUNTIME DESTINATION bin ${COMPONENT}
    BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" ${COMPONENT})
  
@@ -40,7 +40,7 @@ Do not make app bundle on Darwin.
    foreach(size IN ITEMS 32 128)
      install(
        FILES       "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
-@@ -343,14 +343,14 @@ if(UNIX AND NOT APPLE)
+@@ -348,14 +348,14 @@ if(UNIX AND NOT APPLE)
      ${COMPONENT})
  endif()
Prev by Date: Add cargo-c: MSRV 1.87.0
Next by Date: rust189: add a package for rust 1.89.0.
Previous by Thread: Add cargo-c: MSRV 1.87.0
Next by Thread: rust189: add a package for rust 1.89.0.
Indexes:
Home | Main Index | Thread Index | Old Index