diff --git a/devel/cmake-core/Makefile b/devel/cmake-core/Makefile index f6dead9a0794..533042192c3b 100644 --- a/devel/cmake-core/Makefile +++ b/devel/cmake-core/Makefile @@ -1,97 +1,101 @@ PORTNAME= cmake DISTVERSION= ${_CMAKE_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -core +PATCH_SITES+= https://github.com/Kitware/CMake/commit/ +PATCHFILES+= 2bb8c6aec74bb658b9ef7b8b3c8db75f2fb6c2b5.diff:-p1 + MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform Makefile generator WWW= https://www.cmake.org/ LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt LIB_DEPENDS= libexpat.so:textproc/expat2 \ libidn2.so:dns/libidn2 \ libjsoncpp.so:devel/jsoncpp \ libpkg.so:${PKG_ORIGIN} \ librhash.so:security/rhash \ libuv.so:devel/libuv USES= cmake:_internal compiler:c++17-lang cpe localbase ncurses ssl CPE_VENDOR= cmake_project HAS_CONFIGURE= yes CONFIGURE_CMD= ${WRKSRC}/bootstrap CONFIGURE_LOG= Bootstrap.cmk/cmake_bootstrap.log CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ --docdir="/${DOCSDIR_REL}" \ --init="${BUILD_WRKSRC}/InitialCache.cmake" \ --parallel=${MAKE_JOBS_NUMBER} \ --system-bzip2 \ --system-expat \ --system-jsoncpp \ --system-liblzma \ --system-libarchive \ --system-librhash \ --system-libuv \ --system-zlib \ --system-zstd \ --no-system-cppdap \ --no-system-curl \ --no-system-nghttp2 \ --verbose .if defined(WITH_CCACHE_BUILD) CONFIGURE_ARGS+= --enable-ccache .endif CONFIGURE_ENV= MAKE=${MAKE} # Quick fix to enable build with non-base SSL (CFLAGS/LDFLAGS only) (PR: 274512) CFLAGS+= -I${OPENSSLINC} CXXFLAGS+= -D__BSD_VISIBLE LDFLAGS+= -L${OPENSSLLIB} SUB_FILES= InitialCache.cmake BUILD_WRKSRC= ${WRKDIR}/.build CONFIGURE_WRKSRC= ${BUILD_WRKSRC} INSTALL_WRKSRC= ${BUILD_WRKSRC} OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes post-patch: @(${FIND} ${WRKSRC}/Modules -name "*.cmake" -print0; \ ${FIND} ${WRKSRC}/Tests -name "CMakeLists.txt" -print0 ) | \ ${XARGS} -0 -n 100 ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \ s|/usr/X11R6|${LOCALBASE}|g' @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/Source/cmLocalGenerator.cxx \ ${WRKSRC}/Source/CPack/cmCPackGenerator.cxx \ ${WRKSRC}/bootstrap @${REINPLACE_CMD} -e 's|_compiler=\"ccache|_compiler="${CCACHE_BIN}|g' \ ${WRKSRC}/bootstrap @${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|' \ ${WRKSRC}/Modules/FindDCMTK.cmake @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Modules/FindFLEX.cmake @${REINPLACE_CMD} -e 's|/opt/kde4|${PREFIX}|g' \ ${WRKSRC}/Modules/FindKDE4.cmake # cmake-gui(1) is installed by devel/cmake-gui. Remove the man page's source to # prevent it from being built/installed by devel/cmake. @${RM} ${WRKSRC}/Help/manual/cmake-gui.1.rst pre-configure: @${MKDIR} ${BUILD_WRKSRC} # Before running configure, substitute in the values of options # for the build. CMake's configure doesn't accept --with-foo # or similar options: it expects them to be set in CMake-style # syntax in the initial cache. @${CP} ${WRKDIR}/InitialCache.cmake ${BUILD_WRKSRC} @${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete post-install: ${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp .include diff --git a/devel/cmake-core/distinfo b/devel/cmake-core/distinfo index 38d638c4dcd0..e549f05c67f0 100644 --- a/devel/cmake-core/distinfo +++ b/devel/cmake-core/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1746076226 +TIMESTAMP = 1753273999 SHA256 (cmake-3.31.7.tar.gz) = a6d2eb1ebeb99130dfe63ef5a340c3fdb11431cce3d7ca148524c125924cea68 SIZE (cmake-3.31.7.tar.gz) = 11711975 +SHA256 (2bb8c6aec74bb658b9ef7b8b3c8db75f2fb6c2b5.diff) = 7c9b2bbb3c95aff4649c884ba31114ac0a177d512ef6a0684e30ff275383a676 +SIZE (2bb8c6aec74bb658b9ef7b8b3c8db75f2fb6c2b5.diff) = 2912 diff --git a/devel/cmake-core/files/patch-Modules_FindBoost.cmake b/devel/cmake-core/files/patch-Modules_FindBoost.cmake index ffff3ae66b4c..548cc7f4268b 100644 --- a/devel/cmake-core/files/patch-Modules_FindBoost.cmake +++ b/devel/cmake-core/files/patch-Modules_FindBoost.cmake @@ -1,35 +1,44 @@ --- Modules/FindBoost.cmake.orig 2024-11-06 13:41:37 UTC +++ Modules/FindBoost.cmake @@ -140,6 +140,9 @@ This module reads hints about search locations from va ``BOOST_LIBRARYDIR`` Preferred library directory e.g. ``/lib``. +``BOOST_PYTHON_SUFFIX`` + Preferred Python version. + ``Boost_NO_SYSTEM_PATHS`` Set to ``ON`` to disable searching in locations not specified by these hint variables. Default is ``OFF``. @@ -574,6 +577,9 @@ endfunction() endif() endfunction() +# https://gitlab.kitware.com/cmake/cmake/issues/18865 +set(Boost_NO_BOOST_CMAKE ON CACHE BOOL "Disable the search for boost-cmake") + #------------------------------------------------------------------------------- # Before we go searching, check whether a boost cmake package is available, unless # the user specifically asked NOT to search for one. +@@ -2170,7 +2177,7 @@ if(Boost_VERSION_STRING AND Boost_FIND_COMPONENTS) + # On versions < 1.35, remove the System library from the considered list + # since it wasn't added until 1.35. + if(Boost_VERSION_STRING AND Boost_FIND_COMPONENTS) +- if(Boost_VERSION_STRING VERSION_LESS 1.35.0) ++ if(Boost_VERSION_STRING VERSION_LESS 1.35.0 OR Boost_VERSION_STRING VERSION_GREATER_EQUAL 1.71.0) + list(REMOVE_ITEM Boost_FIND_COMPONENTS system) + endif() + endif() @@ -2196,10 +2202,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) # Handle Python version suffixes unset(COMPONENT_PYTHON_VERSION_MAJOR) unset(COMPONENT_PYTHON_VERSION_MINOR) - if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$") + if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\$") set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") - elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9]+)\$") + elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9]+)\$") set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}")