Index: head/devel/cmake/Makefile =================================================================== --- head/devel/cmake/Makefile (revision 450300) +++ head/devel/cmake/Makefile (revision 450301) @@ -1,71 +1,72 @@ # Created by: Kyle Martin # $FreeBSD$ PORTNAME= cmake DISTVERSION= 3.9.2 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ MAINTAINER= kde@FreeBSD.org COMMENT= Cross-platform Makefile generator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt CONFIGURE_ENV= MAKE=make CONFIGURE_ARGS= --prefix=${PREFIX} \ --datadir="/${DATADIR_REL}" \ --docdir="/${DOCSDIR_REL}" \ --system-libs \ --parallel=${MAKE_JOBS_NUMBER} \ --init="${PATCHDIR}/InitialCache.cmake" OPTIONS_DEFINE= DOCS MANPAGES OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes USES= execinfo libarchive ncurses HAS_CONFIGURE= yes LIB_DEPENDS= libcurl.so:ftp/curl \ libexpat.so:textproc/expat2 \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_ON= --sphinx-man CONFLICTS_INSTALL= cmake-modules-* .include .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) INSTALL_TARGET= install/strip .endif 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 @${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-git_ee1f8903 =================================================================== --- head/devel/cmake/files/patch-git_ee1f8903 (nonexistent) +++ head/devel/cmake/files/patch-git_ee1f8903 (revision 450301) @@ -0,0 +1,72 @@ +From ee1f8903322b443b263ec9638ab4851e7e5edf21 Mon Sep 17 00:00:00 2001 +From: Roger Leigh +Date: Wed, 6 Sep 2017 21:11:47 +0100 +Subject: [PATCH] FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake + 3.9 + +Backport the changes from commit fa114e7d70 (FindBoost: Add Boost 1.65 +dependencies, 2017-08-22) and commit dbba53a5aa (FindBoost: Add version +1.65.1, 2017-09-06) to CMake 3.9. + +Fixes: #17289 + +--- Modules/FindBoost.cmake.orig 2017-09-07 16:10:58 UTC ++++ Modules/FindBoost.cmake +@@ -550,7 +550,10 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + # The addition of a new release should only require it to be run + # against the new release. + set(_Boost_IMPORTED_TARGETS TRUE) +- if(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500) ++ if(Boost_VERSION VERSION_LESS 103300) ++ message(WARNING "Imported targets and dependency information not available for Boost version ${Boost_VERSION} (all versions older than 1.33)") ++ set(_Boost_IMPORTED_TARGETS FALSE) ++ elseif(NOT Boost_VERSION VERSION_LESS 103300 AND Boost_VERSION VERSION_LESS 103500) + set(_Boost_IOSTREAMS_DEPENDENCIES regex thread) + set(_Boost_REGEX_DEPENDENCIES thread) + set(_Boost_WAVE_DEPENDENCIES filesystem thread) +@@ -764,8 +767,27 @@ function(_Boost_COMPONENT_DEPENDENCIES component _ret) + set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) + set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) + else() +- message(WARNING "Imported targets not available for Boost version ${Boost_VERSION}") +- set(_Boost_IMPORTED_TARGETS FALSE) ++ if(NOT Boost_VERSION VERSION_LESS 106500) ++ set(_Boost_CHRONO_DEPENDENCIES system) ++ set(_Boost_CONTEXT_DEPENDENCIES thread chrono system date_time) ++ set(_Boost_COROUTINE_DEPENDENCIES context system) ++ set(_Boost_FIBER_DEPENDENCIES context thread chrono system date_time) ++ set(_Boost_FILESYSTEM_DEPENDENCIES system) ++ set(_Boost_IOSTREAMS_DEPENDENCIES regex) ++ set(_Boost_LOG_DEPENDENCIES date_time log_setup system filesystem thread regex chrono atomic) ++ set(_Boost_MATH_DEPENDENCIES math_c99 math_c99f math_c99l math_tr1 math_tr1f math_tr1l atomic) ++ set(_Boost_MPI_DEPENDENCIES serialization) ++ set(_Boost_MPI_PYTHON_DEPENDENCIES python mpi serialization) ++ set(_Boost_NUMPY_DEPENDENCIES python) ++ set(_Boost_RANDOM_DEPENDENCIES system) ++ set(_Boost_THREAD_DEPENDENCIES chrono system date_time atomic) ++ set(_Boost_WAVE_DEPENDENCIES filesystem system serialization thread chrono date_time atomic) ++ set(_Boost_WSERIALIZATION_DEPENDENCIES serialization) ++ endif() ++ if(NOT Boost_VERSION VERSION_LESS 106600) ++ message(WARNING "New Boost version may have incorrect or missing dependencies and imported targets") ++ set(_Boost_IMPORTED_TARGETS FALSE) ++ endif() + endif() + + string(TOUPPER ${component} uppercomponent) +@@ -815,6 +837,7 @@ function(_Boost_COMPONENT_HEADERS component _hdrs) + set(_Boost_MATH_TR1L_HEADERS "boost/math/tr1.hpp") + set(_Boost_MPI_HEADERS "boost/mpi.hpp") + set(_Boost_MPI_PYTHON_HEADERS "boost/mpi/python/config.hpp") ++ set(_Boost_NUMPY_HEADERS "boost/python/numpy.hpp") + set(_Boost_PRG_EXEC_MONITOR_HEADERS "boost/test/prg_exec_monitor.hpp") + set(_Boost_PROGRAM_OPTIONS_HEADERS "boost/program_options.hpp") + set(_Boost_PYTHON_HEADERS "boost/python.hpp") +@@ -998,6 +1021,7 @@ else() + # _Boost_COMPONENT_HEADERS. See the instructions at the top of + # _Boost_COMPONENT_DEPENDENCIES. + set(_Boost_KNOWN_VERSIONS ${Boost_ADDITIONAL_VERSIONS} ++ "1.65.1" "1.65.0" "1.65" + "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" + "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57" "1.56.0" "1.56" "1.55.0" "1.55" + "1.54.0" "1.54" "1.53.0" "1.53" "1.52.0" "1.52" "1.51.0" "1.51" Property changes on: head/devel/cmake/files/patch-git_ee1f8903 ___________________________________________________________________ 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