diff --git a/Mk/Uses/cmake.mk b/Mk/Uses/cmake.mk index f4150b0e5adf..d8a13e8f7e7a 100644 --- a/Mk/Uses/cmake.mk +++ b/Mk/Uses/cmake.mk @@ -1,184 +1,184 @@ # Provide support for CMake based projects # # Feature: cmake # Usage: USES=cmake or USES=cmake:ARGS # Valid ARGS: insource, run, noninja, testing # ARGS description: # insource do not perform an out-of-source build # noninja don't use ninja instead of make # Setting this should be an exception, and hints to an issue # inside the ports build system. # A few corner cases never use ninja, and are handled, to reduce # the usage of 'noninja'.: # 1) fortran ports # 2) ports that set BUILD_- or INSTALL_WRKSRC to # something different than CONFIGURE_WRKSRC # run add a runtime dependency on cmake # testing add the test target based on ctest # Additionally, CMAKE_TESTING_ON, CMAKE_TESTING_OFF, CMAKE_TESTING_ARGS, CMAKE_TESTING_TARGET # can be defined to override the default values. # _internal Not to be used by any other ports than the ones created from the release-tarball of cmake # # # Additional variables that affect cmake behaviour: # # User defined variables: # CMAKE_NOCOLOR - Disable colour build output # Default: not set, unless BATCH or PACKAGE_BUILDING is defined # # Variables for ports: # CMAKE_ON Appends -D:bool=ON to the CMAKE_ARGS, # CMAKE_OFF Appends -D:bool=OFF to the CMAKE_ARGS. # CMAKE_ARGS - Arguments passed to cmake # Default: see below # CMAKE_BUILD_TYPE - Type of build (cmake predefined build types). # Projects may have their own build profiles. # CMake supports the following types: Debug, # Release, RelWithDebInfo and MinSizeRel. # Debug and Release profiles respect system # CFLAGS, RelWithDebInfo and MinSizeRel will set # CFLAGS to "-O2 -g" and "-Os -DNDEBUG". # Default: Release, if WITH_DEBUG is not set, # Debug otherwise # CMAKE_SOURCE_PATH - Path to the source directory # Default: ${WRKSRC} # # MAINTAINER: kde@FreeBSD.org .if !defined(_INCLUDE_USES_CMAKE_MK) _INCLUDE_USES_CMAKE_MK= yes _valid_ARGS= insource run noninja testing _internal -_CMAKE_VERSION= 3.28.2 +_CMAKE_VERSION= 3.28.3 # Sanity check . for arg in ${cmake_ARGS} . if empty(_valid_ARGS:M${arg}) IGNORE= Incorrect 'USES+= cmake:${cmake_ARGS}' usage: argument [${arg}] is not recognized . endif . endfor # Check whehter other flags than only '_internal' are passed (this should be equivalent to PORT = devel/cmake-core . if ${cmake_ARGS} != _internal CMAKE_BIN= ${LOCALBASE}/bin/cmake BUILD_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core . if ${cmake_ARGS:Mrun} RUN_DEPENDS+= ${CMAKE_BIN}:devel/cmake-core . endif . if defined(WITH_DEBUG) CMAKE_BUILD_TYPE?= Debug . elif defined(WITH_DEBUGINFO) CMAKE_BUILD_TYPE?= RelWithDebInfo . else CMAKE_BUILD_TYPE?= Release . endif #defined(WITH_DEBUG) PLIST_SUB+= CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:tl}" . if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) && !defined(WITH_DEBUGINFO) INSTALL_TARGET?= install/strip . endif CMAKE_ARGS+= -DCMAKE_C_COMPILER:STRING="${CC}" \ -DCMAKE_CXX_COMPILER:STRING="${CXX}" \ -DCMAKE_C_FLAGS:STRING="${CFLAGS}" \ -DCMAKE_C_FLAGS_DEBUG:STRING="${CFLAGS}" \ -DCMAKE_C_FLAGS_RELEASE:STRING="${CFLAGS} -DNDEBUG" \ -DCMAKE_CXX_FLAGS:STRING="${CXXFLAGS}" \ -DCMAKE_CXX_FLAGS_DEBUG:STRING="${CXXFLAGS}" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="${CXXFLAGS} -DNDEBUG" \ -DCMAKE_EXE_LINKER_FLAGS:STRING="${LDFLAGS}" \ -DCMAKE_MODULE_LINKER_FLAGS:STRING="${LDFLAGS}" \ -DCMAKE_SHARED_LINKER_FLAGS:STRING="${LDFLAGS}" \ -DCMAKE_INSTALL_PREFIX:PATH="${CMAKE_INSTALL_PREFIX}" \ -DCMAKE_BUILD_TYPE:STRING="${CMAKE_BUILD_TYPE}" \ -DTHREADS_HAVE_PTHREAD_ARG:BOOL=YES \ -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=YES \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ -DFETCHCONTENT_FULLY_DISCONNECTED:BOOL=ON # Handle the option-like CMAKE_ON and CMAKE_OFF lists. . for _bool_kind in ON OFF . if defined(CMAKE_${_bool_kind}) CMAKE_ARGS+= ${CMAKE_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/} . endif . endfor CMAKE_INSTALL_PREFIX?= ${PREFIX} . if defined(BATCH) || defined(PACKAGE_BUILDING) CMAKE_NOCOLOR= yes . endif . if defined(CMAKE_NOCOLOR) CMAKE_ARGS+= -DCMAKE_COLOR_MAKEFILE:BOOL=OFF . endif _CMAKE_MSG= "===> Performing in-source build" CMAKE_SOURCE_PATH?= ${WRKSRC} . if empty(cmake_ARGS:Minsource) _CMAKE_MSG= "===> Performing out-of-source build" CONFIGURE_WRKSRC= ${WRKDIR}/.build BUILD_WRKSRC?= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC?= ${CONFIGURE_WRKSRC} TEST_WRKSRC?= ${CONFIGURE_WRKSRC} . endif # By default we use the ninja generator. # Except, if cmake:run is set (cmake not wanted as generator) # fortran is used, as the ninja-generator does not handle it. # or if CONFIGURE_WRKSRC does not match BUILD_WRKSRC or INSTALL_WRKSRC # as the build.ninja file won't be where ninja expects it. . if empty(cmake_ARGS:Mnoninja) && empty(cmake_ARGS:Mrun) && empty(USES:Mfortran) . if "${CONFIGURE_WRKSRC}" == "${BUILD_WRKSRC}" && "${CONFIGURE_WRKSRC}" == "${INSTALL_WRKSRC}" # USES=gmake sets MAKE_CMD and ninja.mk does too (it also messes with MAKEFILE and MAKE_CMD). . if ! empty(USES:Mgmake) BROKEN= USES=gmake is incompatible with cmake's ninja-generator (try cmake:noninja) . endif # USES=emacs appends EMACS= to MAKE_ARGS, which then get passed to ninja. # Since ninja doesn't support that kind of variable-setting on the command-line, # it errors out. . if ! empty(USES:Memacs) BROKEN= USES=emacs is incompatible with cmake's ninja-generator (try cmake:noninja) . endif . include "${USESDIR}/ninja.mk" . endif . endif . if !target(do-configure) do-configure: @${ECHO_MSG} ${_CMAKE_MSG} ${MKDIR} ${CONFIGURE_WRKSRC} @cd ${CONFIGURE_WRKSRC}; ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_SOURCE_PATH} . endif . if !target(do-test) && ${cmake_ARGS:Mtesting} CMAKE_TESTING_ON?= BUILD_TESTING CMAKE_TESTING_TARGET?= test # Handle the option-like CMAKE_TESTING_ON and CMAKE_TESTING_OFF lists. . for _bool_kind in ON OFF . if defined(CMAKE_TESTING_${_bool_kind}) CMAKE_TESTING_ARGS+= ${CMAKE_TESTING_${_bool_kind}:C/.*/-D&:BOOL=${_bool_kind}/} . endif . endfor do-test: @cd ${BUILD_WRKSRC} && \ ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_TESTING_ARGS} ${CMAKE_SOURCE_PATH} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET} && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${CMAKE_TESTING_TARGET} . endif . endif . if !empty(cmake_ARGS:M_internal) MASTER_SITES?= https://github.com/Kitware/CMake/releases/download/v${DISTVERSION}/ \ https://www.cmake.org/files/v${DISTVERSION}/ . endif .endif #!defined(_INCLUDE_USES_CMAKE_MK) diff --git a/devel/cmake-core/distinfo b/devel/cmake-core/distinfo index 0cb0e15d0571..02a4c8e9ce0e 100644 --- a/devel/cmake-core/distinfo +++ b/devel/cmake-core/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1706732211 -SHA256 (cmake-3.28.2.tar.gz) = 1466f872dc1c226f373cf8fba4230ed216a8f108bd54b477b5ccdfd9ea2d124a -SIZE (cmake-3.28.2.tar.gz) = 11067468 -SHA256 (61436858e431b137252b3d5e63ee579c7c575103.patch) = d18eb7ae3ccb364b7a38a8de73f392f8abd4a26b8d59462983038f570df3c146 -SIZE (61436858e431b137252b3d5e63ee579c7c575103.patch) = 1949 +TIMESTAMP = 1707600651 +SHA256 (cmake-3.28.3.tar.gz) = 72b7570e5c8593de6ac4ab433b73eab18c5fb328880460c86ce32608141ad5c1 +SIZE (cmake-3.28.3.tar.gz) = 11067653 diff --git a/devel/cmake-doc/Makefile b/devel/cmake-doc/Makefile index 0a8bfeb3690e..16fd12e5e4bf 100644 --- a/devel/cmake-doc/Makefile +++ b/devel/cmake-doc/Makefile @@ -1,34 +1,33 @@ PORTNAME= cmake DISTVERSION= ${_CMAKE_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -doc MAINTAINER= kde@FreeBSD.org COMMENT= HTML and Qt Creator helpfiles for CMake WWW= https://www.cmake.org LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} USES= cmake python:build qt:6 USE_LOCALE= en_US.UTF-8 USE_QT= sqldriver-sqlite:build tools:build CMAKE_ARGS= -DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \ -DQHELPGENERATOR_EXECUTABLE=${QT_TOOLDIR}/qhelpgenerator CMAKE_ON= SPHINX_HTML SPHINX_QTHELP CMAKE_OFF= SPHINX_MAN CMAKE_SOURCE_PATH= ${WRKSRC}/Utilities/Sphinx ALL_TARGET= documentation INSTALL_TARGET= install NO_ARCH= yes DISTINFO_FILE= ${.CURDIR}/../cmake-core/distinfo PLIST_SUB= CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}" .include diff --git a/devel/cmake-gui/Makefile b/devel/cmake-gui/Makefile index d80d834b5ff3..99aee236e9fe 100644 --- a/devel/cmake-gui/Makefile +++ b/devel/cmake-gui/Makefile @@ -1,68 +1,67 @@ PORTNAME= cmake DISTVERSION= ${_CMAKE_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -gui-${FLAVOR} MAINTAINER= kde@FreeBSD.org COMMENT= Qt-based GUI for CMake WWW= https://www.cmake.org LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash FLAVORS= qt5 qt6 FLAVOR?= qt6 qt5_CONFLICTS_INSTALL= cmake-gui-qt6 qt6_CONFLICTS_INSTALL= cmake-gui-qt5 USES= cmake:run,insource compiler:c++11-lang desktop-file-utils libarchive \ python:build shared-mime-info qt:${FLAVOR:S/qt//} _USE_QT_qt5= core gui widgets buildtools:build qmake:build _USE_QT_qt6= base USE_QT= ${_USE_QT_${FLAVOR}} CMAKE_ARGS= -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \ -DCMake_QT_MAJOR_VERSION=${FLAVOR:S/qt//} CMAKE_ON= BUILD_QtDialog \ CMAKE_USE_SYSTEM_CURL \ CMAKE_USE_SYSTEM_EXPAT \ CMAKE_USE_SYSTEM_FORM \ CMAKE_USE_SYSTEM_JSONCPP \ CMAKE_USE_SYSTEM_LIBARCHIVE \ CMAKE_USE_SYSTEM_LIBRHASH \ CMAKE_USE_SYSTEM_LIBUV \ SPHINX_MAN CMAKE_OFF= BUILD_CursesDialog \ CMake_SPHINX_DEPEND_ON_EXECUTABLES \ CMAKE_USE_SYSTEM_CPPDAP ALL_TARGET= cmake-gui documentation CXXFLAGS+= -D__BSD_VISIBLE INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialog DISTINFO_FILE= ${.CURDIR}/../cmake-core/distinfo 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}/share/man/man1 .include diff --git a/devel/cmake-man/Makefile b/devel/cmake-man/Makefile index 80773d21b2a9..fc3c8e0d0025 100644 --- a/devel/cmake-man/Makefile +++ b/devel/cmake-man/Makefile @@ -1,36 +1,35 @@ PORTNAME= cmake DISTVERSION= ${_CMAKE_VERSION} -PORTREVISION= 1 CATEGORIES= devel PKGNAMESUFFIX= -man MAINTAINER= kde@FreeBSD.org COMMENT= Manual pages for CMake WWW= https://www.cmake.org/ LICENSE= BSD3CLAUSE BUILD_DEPENDS= sphinx-build:textproc/py-sphinx@${PY_FLAVOR} USES= cmake python:build USE_LOCALE= en_US.UTF-8 CMAKE_ARGS= -DCMAKE_DOC_DIR:STRING="${DOCSDIR_REL}" \ -DCMAKE_MAN_DIR:STRING="share/man" CMAKE_ON= SPHINX_MAN CMAKE_OFF= SPHINX_HTML SPHINX_QTHELP CMAKE_SOURCE_PATH= ${WRKSRC}/Utilities/Sphinx ALL_TARGET= documentation INSTALL_TARGET= install NO_ARCH= yes DISTINFO_FILE= ${.CURDIR}/../cmake-core/distinfo PLIST_SUB= CMAKEVERSION="${DISTVERSION:S/.//g:C/-.*//}" post-install: # Installed by devel/cmake-gui @${RM} ${STAGEDIR}${PREFIX}/share/man/man1/cmake-gui.1 .include