diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile index 18c7f64881b3..1f78ad5fb15a 100644 --- a/devel/cmake-doc/Makefile +++ b/devel/cmake-doc/Makefile @@ -1,33 +1,33 @@ PORTNAME= cmake -DISTVERSION= 3.22.1 +DISTVERSION= 3.22.2 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -doc MAINTAINER= kde@FreeBSD.org COMMENT= HTML and Qt Creator helpfiles for CMake LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo NO_ARCH= yes USES= cmake qt:5 USE_QT= help_build USE_LOCALE= en_US.UTF-8 CMAKE_OFF= SPHINX_MAN CMAKE_ON= SPHINX_HTML SPHINX_QTHELP CMAKE_ARGS= -DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \ -DQCOLLECTIONGENERATOR_EXECUTABLE=${QT_BINDIR}/qhelpgenerator CMAKE_SOURCE_PATH= ${WRKSRC}/Utilities/Sphinx ALL_TARGET= documentation INSTALL_TARGET= install PLIST_SUB= CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}" .include diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index 72f1b6866ef5..6771197152b6 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -1,51 +1,51 @@ PORTNAME= cmake -DISTVERSION= 3.22.1 +DISTVERSION= 3.22.2 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -gui MAINTAINER= kde@FreeBSD.org COMMENT= Qt-based GUI for CMake LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash USES= cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \ shared-mime-info qt:5 USE_QT= core gui widgets buildtools_build qmake_build CMAKE_OFF= BUILD_CursesDialog \ CMake_SPHINX_DEPEND_ON_EXECUTABLES CMAKE_ON= BUILD_QtDialog \ CMAKE_USE_SYSTEM_LIBRARIES \ SPHINX_MAN CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \ ALL_TARGET= cmake-gui documentation INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialog DISTINFO_FILE= ${.CURDIR}/../cmake/distinfo CXXFLAGS+= -D__BSD_VISIBLE 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' pre-install: ${LN} -sf ${CMAKE_BIN} ${WRKSRC}/bin post-install: ${INSTALL_MAN} ${WRKSRC}/Utilities/Sphinx/man/cmake-gui.1 \ ${STAGEDIR}${PREFIX}/man/man1 .include diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile index b340a88a5ed6..69095886dc8d 100644 --- a/devel/cmake/Makefile +++ b/devel/cmake/Makefile @@ -1,101 +1,101 @@ # Created by: Kyle Martin PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. -DISTVERSION= 3.22.1 +DISTVERSION= 3.22.2 CATEGORIES= devel MASTER_SITES= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \ https://www.cmake.org/files/v${PORTVERSION}/ MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform Makefile generator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash USES= compiler:c++11-lang cpe ncurses CPE_VENDOR= cmake_project HAS_CONFIGURE= yes CONFIGURE_ENV= MAKE=make CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ --docdir="/${DOCSDIR_REL}" \ --system-libs \ --parallel=${MAKE_JOBS_NUMBER} \ --init="${WRKSRC}/InitialCache.cmake" OPTIONS_DEFINE= DOCS MANPAGES CPACK OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes MANPAGES_USES= python:env MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_ON= --sphinx-man CPACK_DESC= Enable FreeBSD generator in CPack (experimental) CPACK_LIB_DEPENDS= libpkg.so:${PKG_ORIGIN} CPACK_USES_OFF= libarchive # When CPACK is on, uses base libarchive and won't pass stage-qa CXXFLAGS+= -D__BSD_VISIBLE .include .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) INSTALL_TARGET= install/strip .endif # 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. pre-configure: @${CP} "${FILESDIR}/InitialCache.cmake" "${WRKSRC}/InitialCache.cmake" pre-configure-CPACK-on: @${REINPLACE_CMD} \ -e 's/@@CPACK_OPTION_VALUE@@/ON/' \ -e 's/@@CPACK_OPTION_COMMENT@@//' \ "${WRKSRC}/InitialCache.cmake" pre-configure-CPACK-off: @${REINPLACE_CMD} \ -e 's/@@CPACK_OPTION_VALUE@@/OFF/' \ -e 's/@@CPACK_OPTION_COMMENT@@/# /' \ "${WRKSRC}/InitialCache.cmake" 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,/opt/kde4,${PREFIX},g' \ ${WRKSRC}/Modules/FindKDE4.cmake @${REINPLACE_CMD} -e 's,/usr/include,${LOCALBASE}/include,' \ ${WRKSRC}/Modules/FindDCMTK.cmake @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/Modules/FindFLEX.cmake @${FIND} ${WRKSRC} -name "*.bak" -delete -o -name "*.orig" -delete # 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 post-install: ${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp # The .NoDartCoverage is supposed to suppress testing in the # source directories, but gets accidentally installed. @${FIND} ${STAGEDIR}${PREFIX} -name ".NoDartCoverage" -delete .include diff --git a/devel/cmake/distinfo b/devel/cmake/distinfo index 6da2fdba1ed2..56ce88034903 100644 --- a/devel/cmake/distinfo +++ b/devel/cmake/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639168771 -SHA256 (cmake-3.22.1.tar.gz) = 0e998229549d7b3f368703d20e248e7ee1f853910d42704aa87918c213ea82c0 -SIZE (cmake-3.22.1.tar.gz) = 9778031 +TIMESTAMP = 1643176841 +SHA256 (cmake-3.22.2.tar.gz) = 3c1c478b9650b107d452c5bd545c72e2fad4e37c09b89a1984b9a2f46df6aced +SIZE (cmake-3.22.2.tar.gz) = 9779456 diff --git a/devel/cmake/files/patch-Modules_FindBoost.cmake b/devel/cmake/files/patch-Modules_FindBoost.cmake index b02e85249284..664b8749d839 100644 --- a/devel/cmake/files/patch-Modules_FindBoost.cmake +++ b/devel/cmake/files/patch-Modules_FindBoost.cmake @@ -1,35 +1,35 @@ ---- Modules/FindBoost.cmake.orig 2021-07-14 14:10:23 UTC +--- Modules/FindBoost.cmake.orig 2022-01-25 13:45:06 UTC +++ Modules/FindBoost.cmake @@ -135,6 +135,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``. @@ -558,6 +561,9 @@ function(_boost_set_legacy_variables_from_config) 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. -@@ -2132,10 +2138,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) +@@ -2162,10 +2168,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])\\.?([0-9])\$") +- 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}")