Index: head/devel/cmake/Makefile =================================================================== --- head/devel/cmake/Makefile (revision 564850) +++ head/devel/cmake/Makefile (revision 564851) @@ -1,103 +1,104 @@ # Created by: Kyle Martin # $FreeBSD$ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= 3.19.4 +PORTREVISION= 1 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 ncurses 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 CONFLICTS_INSTALL= cmake-modules-* 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 Index: head/devel/cmake/files/patch-cmake-issue-21408 =================================================================== --- head/devel/cmake/files/patch-cmake-issue-21408 (nonexistent) +++ head/devel/cmake/files/patch-cmake-issue-21408 (revision 564851) @@ -0,0 +1,59 @@ +- Backport https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5483/diffs?commit_id=15e77fbd40e324fd0be394a73ed94800bb47ad2e that is schedueled for 3.20 + +diff --git Modules/FortranCInterface.cmake Modules/FortranCInterface.cmake +index 547346ba90782d765cac860f755641cfb55b6dcf..733c7232c737e1c9a721124fc8a5465eaf872d91 100644 +--- Modules/FortranCInterface.cmake ++++ Modules/FortranCInterface.cmake +@@ -343,6 +343,13 @@ function(FortranCInterface_VERIFY) + set(_desc "Verifying Fortran/${lang} Compiler Compatibility") + message(CHECK_START "${_desc}") + ++ cmake_policy(GET CMP0056 _FortranCInterface_CMP0056) ++ if(_FortranCInterface_CMP0056 STREQUAL "NEW") ++ set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}") ++ else() ++ set(_FortranCInterface_EXE_LINKER_FLAGS "") ++ endif() ++ + # Build a sample project which reports symbols. + set(CMAKE_TRY_COMPILE_CONFIGURATION Release) + try_compile(FortranCInterface_VERIFY_${lang}_COMPILED +@@ -358,6 +365,7 @@ function(FortranCInterface_VERIFY) + "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}" + "-DCMAKE_CXX_FLAGS_RELEASE:STRING=${CMAKE_CXX_FLAGS_RELEASE}" + "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}" ++ ${_FortranCInterface_EXE_LINKER_FLAGS} + OUTPUT_VARIABLE _output) + file(WRITE "${FortranCInterface_BINARY_DIR}/Verify${lang}/output.txt" "${_output}") + +diff --git Modules/FortranCInterface/Detect.cmake Modules/FortranCInterface/Detect.cmake +index c75067b32e4b7eeba1edf7d6bc6acc3798032dd7..998faf1eccf92f654f78ea66f2a34a8b05b5f991 100644 +--- Modules/FortranCInterface/Detect.cmake ++++ Modules/FortranCInterface/Detect.cmake +@@ -26,6 +26,14 @@ unset(FortranCInterface_VERIFIED_CXX CACHE) + + set(_result) + ++cmake_policy(GET CMP0056 _FortranCInterface_CMP0056) ++if(_FortranCInterface_CMP0056 STREQUAL "NEW") ++ set(_FortranCInterface_EXE_LINKER_FLAGS "-DCMAKE_EXE_LINKER_FLAGS:STRING=${CMAKE_EXE_LINKER_FLAGS}") ++else() ++ set(_FortranCInterface_EXE_LINKER_FLAGS "") ++endif() ++unset(_FortranCInterface_CMP0056) ++ + # Build a sample project which reports symbols. + set(CMAKE_TRY_COMPILE_CONFIGURATION Release) + try_compile(FortranCInterface_COMPILED +@@ -38,9 +46,11 @@ try_compile(FortranCInterface_COMPILED + "-DCMAKE_Fortran_FLAGS:STRING=${CMAKE_Fortran_FLAGS}" + "-DCMAKE_C_FLAGS_RELEASE:STRING=${CMAKE_C_FLAGS_RELEASE}" + "-DCMAKE_Fortran_FLAGS_RELEASE:STRING=${CMAKE_Fortran_FLAGS_RELEASE}" ++ ${_FortranCInterface_EXE_LINKER_FLAGS} + OUTPUT_VARIABLE FortranCInterface_OUTPUT) + set(FortranCInterface_COMPILED ${FortranCInterface_COMPILED}) + unset(FortranCInterface_COMPILED CACHE) ++unset(_FortranCInterface_EXE_LINKER_FLAGS) + + # Locate the sample project executable. + set(FortranCInterface_EXE) Property changes on: head/devel/cmake/files/patch-cmake-issue-21408 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property