Skip to content

Commit b82a360

Browse files
committed
cmake: finish package
Due to devel/ hardcodes some files were in the wrong location
1 parent c41e23a commit b82a360

6 files changed

+25
-25
lines changed

cmake/Makefile.common

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ MAINTAINER= [email protected]
1212
HOMEPAGE= https://www.cmake.org/
1313
LICENSE= modified-bsd
1414

15-
DISTINFO_FILE= ${.CURDIR}/../../devel/cmake/distinfo
16-
PATCHDIR= ${.CURDIR}/../../devel/cmake/patches
15+
DISTINFO_FILE= ${.CURDIR}/../../wip/cmake/distinfo
16+
PATCHDIR= ${.CURDIR}/../../wip/cmake/patches
1717

1818
USE_CXX_FEATURES= c++11
1919
USE_LANGUAGES= c c++

cmake/buildlink3.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ BUILDLINK_TREE+= cmake
66
CMAKE_BUILDLINK3_MK:=
77

88
BUILDLINK_API_DEPENDS.cmake+= cmake>=2.8.5nb1
9-
BUILDLINK_PKGSRCDIR.cmake?= ../../devel/cmake
9+
BUILDLINK_PKGSRCDIR.cmake?= ../../wip/cmake
1010
BUILDLINK_DEPMETHOD.cmake?= build
1111
BUILDLINK_FILES.cmake+= share/cmake-*/include/*
1212
.endif # CMAKE_BUILDLINK3_MK

cmake/distinfo

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
$NetBSD: distinfo,v 1.252 2025/06/30 13:14:28 adam Exp $
22

3-
BLAKE2s (cmake-3.31.8.tar.gz) = e94a260ebd6450a2d2a8e0947323f73a0d5c9ea8cdfae353aad13c1fa37faba3
4-
SHA512 (cmake-3.31.8.tar.gz) = 07dbb5af1d449760ef92a921e43c0a0a091989ac51ce3f8b7607bf617b8b56e47c675486d3c620c04f1105b7dfa3852b926915e0888ff46ea473cd01e572f461
5-
Size (cmake-3.31.8.tar.gz) = 11713806 bytes
3+
BLAKE2s (cmake-4.1.0.tar.gz) = e519a976ffacd3524615a9e171193b861bbe30fd1d0958e3d5707567c5d573d1
4+
SHA512 (cmake-4.1.0.tar.gz) = 644b6b13539ba0e7f35a7496e4240b1d3361606163f35b69006e47d03ffd9759d35c62a73826253ed168af4196df29983ec10c0f561ea74d7ed6ffee0c2cd8e4
5+
Size (cmake-4.1.0.tar.gz) = 12042798 bytes
66
SHA1 (patch-Auxiliary_CMakeLists.txt) = 7a26ef79be53b9d0370029e83f203440aa0be2a4
77
SHA1 (patch-CMakeLists.txt) = 0fb79458828a021a96e350bc4cf12875914f868b
88
SHA1 (patch-Modules_Compiler_GNU.cmake) = e06fc41fd7a49ca9f8edaabb95d4ab1cde784112
@@ -15,11 +15,11 @@ SHA1 (patch-Modules_FindX11.cmake) = 124a2d51155cb4455e8b829dc74598cbd50a4e1c
1515
SHA1 (patch-Modules_FortranCInterface_CMakeLists.txt) = f5477f5c94ebab82caea6db702b449032ba3dc75
1616
SHA1 (patch-Modules_Platform_Darwin.cmake) = 7629f034111ff64b144ff41316299d5edcfe081a
1717
SHA1 (patch-Modules_Platform_UnixPaths.cmake) = 911271546d3ac52be0e8000857bdb236ac50ec1c
18-
SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 0575cf1a01c4462fc7271d6d28529d46df291748
18+
SHA1 (patch-Source_Checks_Curses_CMakeLists.txt) = 1a505da231fd265260ec32d11ba9f79815c263c9
1919
SHA1 (patch-Source_Checks_Curses_CheckCurses.c) = 530ee1300595e64c97630d27792cc2dca3b9049a
2020
SHA1 (patch-Source_Checks_cm__cxx17__check.cpp) = d5e2708df6fcda078b1b5ea59264c663d2633ced
21-
SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = 7046fb8a0d2aadb81e027d8e2f1a4bccf2bd79cf
22-
SHA1 (patch-Source_QtDialog_CMakeLists.txt) = 1cefaa7ee6cd09e84d699ea54844ae3811d890f7
21+
SHA1 (patch-Source_Modules_CMakeBuildUtilities.cmake) = e4f2ad39f0899074c2b66d97ef12d03c48e82950
22+
SHA1 (patch-Source_QtDialog_CMakeLists.txt) = ca57d666f0a30d87aa1db49f82c62c41b05d87f9
2323
SHA1 (patch-Source_kwsys_ProcessUNIX.c) = e333da03c3ac31be6a992809062a60a9cccc62c0
2424
SHA1 (patch-Tests_CMakeLists.txt) = 555e0be38ef92530c7315a87db65dd3004d7744c
2525
SHA1 (patch-Utilities_KWIML_CMakeLists.txt) = e4bdf9fc58757e87bf7e3e3e195839eededbc796

cmake/patches/patch-Source_Checks_Curses_CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ $NetBSD: patch-Source_Checks_Curses_CMakeLists.txt,v 1.6 2024/11/10 19:58:31 ada
22

33
Don't insist on ncurses.
44

5-
--- Source/Checks/Curses/CMakeLists.txt.orig 2024-11-06 13:41:37.000000000 +0000
5+
--- Source/Checks/Curses/CMakeLists.txt.orig 2025-08-05 14:55:57.000000000 +0000
66
+++ Source/Checks/Curses/CMakeLists.txt
77
@@ -1,7 +1,6 @@
8-
cmake_minimum_required(VERSION 3.13...3.29 FATAL_ERROR)
8+
cmake_minimum_required(VERSION 3.13...3.31 FATAL_ERROR)
99
project(CheckCurses C)
1010

1111
-set(CURSES_NEED_NCURSES TRUE)
1212
find_package(Curses)
13-
if(NOT CURSES_FOUND)
13+
if(NOT Curses_FOUND)
1414
return()

cmake/patches/patch-Source_Modules_CMakeBuildUtilities.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ $NetBSD: patch-Source_Modules_CMakeBuildUtilities.cmake,v 1.1 2022/11/22 19:14:0
22

33
Don't insist on ncurses.
44

5-
--- Source/Modules/CMakeBuildUtilities.cmake.orig 2022-11-22 18:51:08.946372477 +0000
5+
--- Source/Modules/CMakeBuildUtilities.cmake.orig 2025-08-05 14:55:57.000000000 +0000
66
+++ Source/Modules/CMakeBuildUtilities.cmake
7-
@@ -352,7 +352,6 @@ if(NOT DEFINED BUILD_CursesDialog)
7+
@@ -354,7 +354,6 @@ if(NOT DEFINED BUILD_CursesDialog)
88
endif()
99
if(BUILD_CursesDialog)
1010
if(UNIX)
1111
- set(CURSES_NEED_NCURSES TRUE)
1212
find_package(Curses)
13-
if(NOT CURSES_FOUND)
13+
if(NOT Curses_FOUND)
1414
message(WARNING

cmake/patches/patch-Source_QtDialog_CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@ $NetBSD: patch-Source_QtDialog_CMakeLists.txt,v 1.5 2022/11/22 19:14:03 adam Exp
22

33
Do not make app bundle on Darwin.
44

5-
--- Source/QtDialog/CMakeLists.txt.orig 2022-11-16 14:42:03.000000000 +0000
5+
--- Source/QtDialog/CMakeLists.txt.orig 2025-08-05 14:55:57.000000000 +0000
66
+++ Source/QtDialog/CMakeLists.txt
7-
@@ -256,7 +256,7 @@ target_link_libraries(
7+
@@ -263,7 +263,7 @@ target_link_libraries(
88
CMakeGUILib
99
)
1010

1111
-add_executable(cmake-gui WIN32 MACOSX_BUNDLE CMakeGUIExec.cxx)
1212
+add_executable(cmake-gui WIN32 CMakeGUIExec.cxx)
13+
set_property(TARGET cmake-gui PROPERTY CMake_QT_MAJOR_VERSION "${CMake_QT_MAJOR_VERSION}")
1314
target_link_libraries(cmake-gui
1415
PRIVATE
15-
CMakeGUIMainLib
16-
@@ -269,7 +269,7 @@ target_link_libraries(cmake-gui
16+
@@ -277,7 +277,7 @@ target_link_libraries(cmake-gui
1717
if(WIN32)
1818
target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.rc)
1919
endif()
@@ -22,16 +22,16 @@ Do not make app bundle on Darwin.
2222
target_sources(CMakeGUIMainLib INTERFACE CMakeSetup.icns)
2323
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
2424
set_source_files_properties(CMakeSetup.icns PROPERTIES
25-
@@ -299,7 +299,7 @@ Checks: '-*,llvm-twine-local'
25+
@@ -307,7 +307,7 @@ Checks: '-*,llvm-twine-local'
2626
...
2727
")
2828

2929
-if(APPLE)
3030
+if(FALSE)
31-
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
32-
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
33-
34-
@@ -324,7 +324,7 @@ install(TARGETS cmake-gui
31+
set_target_properties(cmake-gui PROPERTIES
32+
OUTPUT_NAME CMake
33+
MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.in"
34+
@@ -329,7 +329,7 @@ install(TARGETS cmake-gui
3535
RUNTIME DESTINATION bin ${COMPONENT}
3636
BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" ${COMPONENT})
3737

@@ -40,7 +40,7 @@ Do not make app bundle on Darwin.
4040
foreach(size IN ITEMS 32 128)
4141
install(
4242
FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeSetup${size}.png"
43-
@@ -343,14 +343,14 @@ if(UNIX AND NOT APPLE)
43+
@@ -348,14 +348,14 @@ if(UNIX AND NOT APPLE)
4444
${COMPONENT})
4545
endif()
4646

0 commit comments

Comments
 (0)