Index: head/devel/extra-cmake-modules/Makefile =================================================================== --- head/devel/extra-cmake-modules/Makefile (revision 421462) +++ head/devel/extra-cmake-modules/Makefile (revision 421463) @@ -1,54 +1,55 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= extra-cmake-modules PORTVERSION= 5.25.0 DISTVERSIONPREFIX= v +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@rawbw.com COMMENT= Extra modules and scripts for CMake LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/COPYING-CMAKE-SCRIPTS USE_GITHUB= yes GH_ACCOUNT= KDE USES= cmake DOCS_USE= QT5=help TEST_USE= QT5=buildtools_build,linguisttools_build,qmake_build NO_ARCH= yes ## options OPTIONS_DEFINE= DOCS HELP MANPAGES TEST OPTIONS_DEFAULT=HELP MANPAGES TEST # TEST=off fails: https://bugs.kde.org/show_bug.cgi?id=366110 OPTIONS_SUB= yes HELP_DESC= Generate QtHelp documentation for installed modules SPHINX_DEP= sphinx-build:textproc/py-sphinx DOCS_BUILD_DEPENDS= ${SPHINX_DEP} HELP_BUILD_DEPENDS= ${SPHINX_DEP} MANPAGES_BUILD_DEPENDS= ${SPHINX_DEP} DOCS_CMAKE_ON= -DBUILD_HTML_DOCS:BOOL=ON DOCS_CMAKE_OFF= -DBUILD_HTML_DOCS:BOOL=OFF HELP_CMAKE_ON= -DBUILD_QTHELP_DOCS:BOOL=ON HELP_CMAKE_OFF= -DBUILD_QTHELP_DOCS:BOOL=OFF MANPAGES_CMAKE_ON= -DBUILD_MAN_DOCS:BOOL=ON MANPAGES_CMAKE_OFF= -DBUILD_MAN_DOCS:BOOL=OFF TEST_CMAKE_ON= -DBUILD_TESTING:BOOL=ON TEST_CMAKE_OFF= -DBUILD_TESTING:BOOL=OFF CONFIGURE_ENV+= CMAKE_PROGRAM_PATH="${LOCALBASE}/bin:${LOCALBASE}/lib/qt5/bin" MANPAGES_PLIST_FILES= \ man/man7/ecm-developer.7.gz \ man/man7/ecm-find-modules.7.gz \ man/man7/ecm-kde-modules.7.gz \ man/man7/ecm-modules.7.gz \ man/man7/ecm-toolchains.7.gz \ man/man7/ecm.7.gz .include Index: head/devel/extra-cmake-modules/files/patch-kde-modules_KDECompilerSettings.cmake =================================================================== --- head/devel/extra-cmake-modules/files/patch-kde-modules_KDECompilerSettings.cmake (nonexistent) +++ head/devel/extra-cmake-modules/files/patch-kde-modules_KDECompilerSettings.cmake (revision 421463) @@ -0,0 +1,14 @@ +Make sure we only pass -std=c++0x if the compiler supports it (i.e. it is not base GCC). + +--- kde-modules/KDECompilerSettings.cmake.orig 2016-09-06 19:26:59 UTC ++++ kde-modules/KDECompilerSettings.cmake +@@ -181,7 +181,8 @@ if (CMAKE_C_COMPILER_ID STREQUAL "GNU" O + # compilers (in particular, MSVC 2010 does not support C99) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990") + endif() +-if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") ++if ((CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.2.4") OR ++ CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel" AND NOT WIN32) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") Property changes on: head/devel/extra-cmake-modules/files/patch-kde-modules_KDECompilerSettings.cmake ___________________________________________________________________ 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