Date: Thu, 14 Sep 2017 21:02:52 +0000 (UTC) From: Adriaan de Groot <adridg@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r449853 - in head: . astro/libosmpbf/files audio/sayonara/files databases/kdb/files devel devel/cmake devel/cmake-doc devel/cmake-gui devel/cmake-gui/files devel/cmake-modules devel/cma... Message-ID: <201709142102.v8EL2q5R011625@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adridg Date: Thu Sep 14 21:02:51 2017 New Revision: 449853 URL: https://svnweb.freebsd.org/changeset/ports/449853 Log: Update CMake to 3.9, merge devel/cmake-modules into devel/cmake Thanks to antoine@ for the exp-run. Approved by: rakuco (mentor) Reviewed by: tcberner (mentor) Reviewed by: mat PR: 222000 (exp-run) Differential Revision: https://reviews.freebsd.org/D12299 Added: head/audio/sayonara/files/patch-CMakeLists.txt (contents, props changed) head/audio/sayonara/files/patch-src_3rdParty_SomaFM_ui_GUI__SomaFM.h (contents, props changed) head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudArtistSearch.h (contents, props changed) head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudLibrary.h (contents, props changed) head/audio/sayonara/files/patch-uifiles.patch (contents, props changed) head/databases/kdb/files/ head/databases/kdb/files/patch-src_CMakeLists.txt (contents, props changed) head/devel/cmake/files/patch-Modules_Platform_FreeBSD-CXX.cmake (contents, props changed) head/finance/kmymoney-kde4/files/patch-kmymoney_dialogs_settings_CMakeLists.txt (contents, props changed) head/security/openconnect-gui/files/patch-CMake_Includes_git__revision__main.cmake (contents, props changed) head/x11/kdelibs4/files/patch-git_57eaf65 (contents, props changed) Deleted: head/devel/cmake-gui/files/ head/devel/cmake-modules/ head/devel/cmake/files/patch-CMakeLists.txt Modified: head/MOVED head/UPDATING head/astro/libosmpbf/files/patch-src_CMakeLists.txt head/astro/libosmpbf/files/patch-tools_CMakeLists.txt head/devel/Makefile head/devel/cmake-doc/Makefile head/devel/cmake-doc/pkg-plist head/devel/cmake-gui/Makefile head/devel/cmake-gui/pkg-plist head/devel/cmake/Makefile head/devel/cmake/distinfo head/devel/cmake/files/patch-Modules_FindImageMagick.cmake head/devel/cmake/files/patch-Modules_FindQt4.cmake head/devel/cmake/files/patch-Modules_FindSDL.cmake head/devel/cmake/files/patch-Modules_FindwxWidgets.cmake head/devel/cmake/files/patch-Modules_FindwxWindows.cmake head/devel/cmake/pkg-plist head/emulators/ppsspp/files/patch-system-libpng16 head/graphics/nomacs/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Thu Sep 14 20:22:17 2017 (r449852) +++ head/MOVED Thu Sep 14 21:02:51 2017 (r449853) @@ -9544,3 +9544,4 @@ devel/py33-setuptools||2017-09-03|Removed, please upda x11-toolkits/py33-tkinter||2017-09-03|Removed, please update to Python 3.6 devel/py3-enum34||2017-09-03|Removed, Python 3.3 only security/clambc||2017-09-14|Has expired: Practically unmaintained, featuring issues elsewhere solved 6 years ago +devel/cmake-modules||2017-09-14|Merged with devel/cmake Modified: head/UPDATING ============================================================================== --- head/UPDATING Thu Sep 14 20:22:17 2017 (r449852) +++ head/UPDATING Thu Sep 14 21:02:51 2017 (r449853) @@ -5,6 +5,17 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20170914: + AFFECTS: users of CMake + AUTHOR: adridg@freebsd.org + + The ports devel/cmake and devel/cmake-modules have been merged into + devel/cmake. The benefit of being able to update the modules without + the binary is outweighed by the issues caused by having the binary + out-of-sync with the modules. + + All ports have been updated to depend only on CMake. + 20170904 AFFECTS: users of net-mgmt/seafile-server AUTHOR: ultima@FreeBSD.org Modified: head/astro/libosmpbf/files/patch-src_CMakeLists.txt ============================================================================== --- head/astro/libosmpbf/files/patch-src_CMakeLists.txt Thu Sep 14 20:22:17 2017 (r449852) +++ head/astro/libosmpbf/files/patch-src_CMakeLists.txt Thu Sep 14 21:02:51 2017 (r449853) @@ -1,3 +1,5 @@ +Don't use special compiler flags. +Add upstream patch to make dependencies explicit; needed for ninja builds. --- src/CMakeLists.txt.orig 2014-03-15 15:11:32 UTC +++ src/CMakeLists.txt @@ -3,7 +3,6 @@ PROTOBUF_GENERATE_CPP(CPPS HS fileformat @@ -8,3 +10,19 @@ endif() add_library(osmpbf STATIC ${CPPS}) +@@ -10,8 +10,13 @@ add_library(osmpbf STATIC ${CPPS}) + + set_target_properties(osmpbf PROPERTIES LINKER_LANGUAGE CXX LANGUAGE CXX) + +-ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/fileformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf) +-ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf) ++ADD_CUSTOM_COMMAND(TARGET osmpbf POST_BUILD ++ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/fileformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf ++ COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_SOURCE_DIR}/include/osmpbf ++ BYPRODUCTS ++ ${CMAKE_SOURCE_DIR}/include/osmpbf/fileformat.pb.h ++ ${CMAKE_SOURCE_DIR}/include/osmpbf/osmformat.pb.h ++) + + SET(INCLUDE_INSTALL "include/osmpbf") + SET(files ${CMAKE_SOURCE_DIR}/include/osmpbf/osmpbf.h ${CMAKE_BINARY_DIR}/src/osmformat.pb.h ${CMAKE_BINARY_DIR}/src/fileformat.pb.h) Modified: head/astro/libosmpbf/files/patch-tools_CMakeLists.txt ============================================================================== --- head/astro/libosmpbf/files/patch-tools_CMakeLists.txt Thu Sep 14 20:22:17 2017 (r449852) +++ head/astro/libosmpbf/files/patch-tools_CMakeLists.txt Thu Sep 14 21:02:51 2017 (r449853) @@ -1,3 +1,5 @@ +Don't use special compiler flags. +Add upstream patch to make dependencies explicit; needed for ninja builds. --- tools/CMakeLists.txt.orig 2014-03-15 15:11:32 UTC +++ tools/CMakeLists.txt @@ -4,7 +4,6 @@ PROJECT(${PROJECT}) @@ -8,3 +10,12 @@ endif() SET(CPP_SRC osmpbf-outline.cpp) +@@ -10,6 +10,8 @@ endif() + SET(CPP_SRC osmpbf-outline.cpp) + SET(HPP_SRC "") + SET(C_SRC "") ++set_source_files_properties(${CPP_SRC} ++ OBJECT_DEPENDS "${CMAKE_SOURCE_DIR}/include/osmpbf/fileformat.pb.h;${CMAKE_SOURCE_DIR}/include/osmpbf/osmformat.pb.h") + include_directories("${CMAKE_SOURCE_DIR}/include") + + add_executable(${PROJECT} ${HPP_SRC} ${CPP_SRC} ${C_SRC}) Added: head/audio/sayonara/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sayonara/files/patch-CMakeLists.txt Thu Sep 14 21:02:51 2017 (r449853) @@ -0,0 +1,28 @@ +CMake 3.9 compatibility. Upstreamed in a different form for +sayonara 0.9.4, which is fully patched for CMake 3.9 and FreeBSD + +--- CMakeLists.txt.orig 2016-10-30 11:53:25 UTC ++++ CMakeLists.txt +@@ -1,6 +1,11 @@ + CMAKE_MINIMUM_REQUIRED(VERSION 2.7) + PROJECT("Sayonara Player") + ++IF(POLICY CMP0071) ++ CMAKE_POLICY(SET CMP0071 OLD) ++ SET(CMAKE_POLICY_DEFAULT_CMP0071 OLD) # Don't reset in subdirs ++ENDIF() ++ + set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}") + INCLUDE(cotire) + SET(VAR_SAYONARA_VERSION "0.9.2") +@@ -15,6 +20,10 @@ ADD_DEFINITIONS( -DSAYONARA_INSTALL_SHAR + MESSAGE("Build Sayonara ${VAR_SAYONARA_VERSION}") + MESSAGE("Will install to ${CMAKE_INSTALL_PREFIX}") + ++# CMake 3.9 searches full UI-file paths ++SET(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/src/GUI/Preferences/Fonts) ++INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/GUI/Playlist/ ${CMAKE_BINARY_DIR}/src/GUI/Preferences .) ++ + ADD_SUBDIRECTORY(src) + ADD_SUBDIRECTORY(resources) + Added: head/audio/sayonara/files/patch-src_3rdParty_SomaFM_ui_GUI__SomaFM.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sayonara/files/patch-src_3rdParty_SomaFM_ui_GUI__SomaFM.h Thu Sep 14 21:02:51 2017 (r449853) @@ -0,0 +1,11 @@ +--- src/3rdParty/SomaFM/ui/GUI_SomaFM.h.orig 2017-09-01 21:11:21 UTC ++++ src/3rdParty/SomaFM/ui/GUI_SomaFM.h +@@ -29,7 +29,7 @@ + #include "SomaFMLibrary.h" + #include "SomaFMStation.h" + +-#include "3rdParty/SomaFM/ui_GUI_SomaFM.h" ++#include "3rdParty/SomaFM/ui/ui_GUI_SomaFM.h" + #include "Components/Covers/CoverLocation.h" + #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h" + Added: head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudArtistSearch.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudArtistSearch.h Thu Sep 14 21:02:51 2017 (r449853) @@ -0,0 +1,11 @@ +--- src/3rdParty/Soundcloud/ui/GUI_SoundcloudArtistSearch.h.orig 2017-09-01 21:08:31 UTC ++++ src/3rdParty/Soundcloud/ui/GUI_SoundcloudArtistSearch.h +@@ -25,7 +25,7 @@ + + #include <QDialog> + #include "GUI/Helper/SayonaraWidget/SayonaraDialog.h" +-#include "3rdParty/Soundcloud/ui_GUI_SoundcloudArtistSearch.h" ++#include "3rdParty/Soundcloud/ui/ui_GUI_SoundcloudArtistSearch.h" + #include "3rdParty/Soundcloud/src/SoundcloudLibrary.h" + #include "3rdParty/Soundcloud/src/SoundcloudDataFetcher.h" + Added: head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudLibrary.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sayonara/files/patch-src_3rdParty_Soundcloud_ui_GUI__SoundcloudLibrary.h Thu Sep 14 21:02:51 2017 (r449853) @@ -0,0 +1,11 @@ +--- src/3rdParty/Soundcloud/ui/GUI_SoundcloudLibrary.h.orig 2017-09-01 21:10:28 UTC ++++ src/3rdParty/Soundcloud/ui/GUI_SoundcloudLibrary.h +@@ -23,7 +23,7 @@ + #ifndef GUI_SOUNDCLOUDLIBRARY_H + #define GUI_SOUNDCLOUDLIBRARY_H + +-#include "3rdParty/Soundcloud/ui_GUI_SoundcloudLibrary.h" ++#include "3rdParty/Soundcloud/ui/ui_GUI_SoundcloudLibrary.h" + + #include "GUI/Library/GUI_AbstractLibrary.h" + Added: head/audio/sayonara/files/patch-uifiles.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sayonara/files/patch-uifiles.patch Thu Sep 14 21:02:51 2017 (r449853) @@ -0,0 +1,181 @@ +Many files #include generated UI-files with the path where they are +generated by CMake 3.8; this breaks autouic in CMake 3.9, which looks +at the actual source path and generates the files in a different +location. All upstreamed in different forms for the forthcoming 0.9.4. + +--- src/GUI/Library/ImportFolderDialog/GUI_ImportFolder.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Library/ImportFolderDialog/GUI_ImportFolder.h +@@ -21,7 +21,7 @@ + #ifndef GUIIMPORTFOLDER_H_ + #define GUIIMPORTFOLDER_H_ + +-#include "GUI/Library/ui_GUI_ImportFolder.h" ++#include "ui_GUI_ImportFolder.h" + #include "GUI/Helper/SayonaraWidget/SayonaraDialog.h" + #include "Components/Library/Importer/LibraryImporter.h" + +--- src/GUI/Library/InfoBox/GUI_LibraryInfoBox.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Library/InfoBox/GUI_LibraryInfoBox.h +@@ -25,7 +25,7 @@ + #ifndef GUILIBRARYINFOBOX_H_ + #define GUILIBRARYINFOBOX_H_ + +-#include "GUI/Library/ui_GUI_LibraryInfoBox.h" ++#include "ui_GUI_LibraryInfoBox.h" + #include "GUI/Helper/SayonaraWidget/SayonaraDialog.h" + + +--- src/GUI/Playlist/BottomBar/GUI_PlaylistBottomBar.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Playlist/BottomBar/GUI_PlaylistBottomBar.h +@@ -24,7 +24,7 @@ + #define PLAYLISTBOTTOMBAR_H + + #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h" +-#include "GUI/Playlist/ui_GUI_PlaylistBottomBar.h" ++#include "ui_GUI_PlaylistBottomBar.h" + + #include "Helper/Shutdown/Shutdown.h" + #include "Helper/Playlist/PlaylistMode.h" +--- src/GUI/Preferences/Broadcast/GUI_BroadcastSetup.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/Broadcast/GUI_BroadcastSetup.h +@@ -23,7 +23,7 @@ + #ifndef GUI_BROADCASTSETUP_H + #define GUI_BROADCASTSETUP_H + +-#include "GUI/Preferences/ui_GUI_BroadcastSetup.h" ++#include "ui_GUI_BroadcastSetup.h" + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" + + class GUI_BroadcastSetup : +--- src/GUI/Preferences/Fonts/GUI_FontConfig.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/Fonts/GUI_FontConfig.h +@@ -24,7 +24,7 @@ + #define GUI_FONTCONFIG_H + + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" +-#include "GUI/Preferences/ui_GUI_FontConfig.h" ++#include "ui_GUI_FontConfig.h" + + #include <QFontDatabase> + #include <QFont> +--- src/GUI/Preferences/Language/GUI_LanguageChooser.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/Language/GUI_LanguageChooser.h +@@ -26,7 +26,7 @@ + #include <QMap> + #include <QShowEvent> + +-#include "GUI/Preferences/ui_GUI_LanguageChooser.h" ++#include "ui_GUI_LanguageChooser.h" + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" + + +--- src/GUI/Preferences/LastFM/GUI_LastFM.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/LastFM/GUI_LastFM.h +@@ -29,7 +29,7 @@ + #ifndef GUI_LASTFM_H_ + #define GUI_LASTFM_H_ + +-#include "GUI/Preferences/ui_GUI_LastFM.h" ++#include "ui_GUI_LastFM.h" + + #include "Components/StreamPlugins/LastFM/LastFM.h" + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" +--- src/GUI/Preferences/LibraryPreferences/GUI_LibraryPreferences.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/LibraryPreferences/GUI_LibraryPreferences.h +@@ -22,7 +22,7 @@ + #define GUI_LIBRARYPREFERENCES_H + + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" +-#include "GUI/Preferences/ui_GUI_LibraryPreferences.h" ++#include "ui_GUI_LibraryPreferences.h" + + + class GUI_LibraryPreferences : +--- src/GUI/Preferences/Notifications/GUI_Notifications.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/Notifications/GUI_Notifications.h +@@ -25,7 +25,7 @@ + + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" + #include "Interfaces/Notification/NotificationHandler.h" +-#include "GUI/Preferences/ui_GUI_Notifications.h" ++#include "ui_GUI_Notifications.h" + + + class GUI_Notifications : +--- src/GUI/Preferences/PlayerPreferences/GUI_PlayerPreferences.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/PlayerPreferences/GUI_PlayerPreferences.h +@@ -24,7 +24,7 @@ + #define GUI_PLAYERPREFERENCES_H + + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" +-#include "GUI/Preferences/ui_GUI_PlayerPreferences.h" ++#include "ui_GUI_PlayerPreferences.h" + + + class GUI_PlayerPreferences : +--- src/GUI/Preferences/PlaylistPreferences/GUI_PlaylistPreferences.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/PlaylistPreferences/GUI_PlaylistPreferences.h +@@ -28,7 +28,7 @@ + + + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" +-#include "GUI/Preferences/ui_GUI_PlaylistPreferences.h" ++#include "ui_GUI_PlaylistPreferences.h" + + + class GUI_PlaylistPreferences : +--- src/GUI/Preferences/PreferenceDialog/GUI_PreferenceDialog.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/PreferenceDialog/GUI_PreferenceDialog.h +@@ -25,7 +25,7 @@ + + #include <QDialog> + #include <QList> +-#include "GUI/Preferences/ui_GUI_PreferenceDialog.h" ++#include "ui_GUI_PreferenceDialog.h" + #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h" + #include "Interfaces/PreferenceDialog/PreferenceDialogInterface.h" + +--- src/GUI/Preferences/RemoteControl/GUI_RemoteControl.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/RemoteControl/GUI_RemoteControl.h +@@ -25,7 +25,7 @@ + #ifndef GUISOCKETSETUP_H_ + #define GUISOCKETSETUP_H_ + +-#include "GUI/Preferences/ui_GUI_RemoteControl.h" ++#include "ui_GUI_RemoteControl.h" + + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" + +--- src/GUI/Preferences/Shortcuts/GUI_ShortcutEntry.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/Shortcuts/GUI_ShortcutEntry.h +@@ -24,7 +24,7 @@ + + #include "GUI/Helper/SayonaraWidget/SayonaraWidget.h" + #include "GUI/Helper/Shortcuts/ShortcutHandler.h" +-#include "GUI/Preferences/ui_GUI_ShortcutEntry.h" ++#include "ui_GUI_ShortcutEntry.h" + + + /** +--- src/GUI/Preferences/Shortcuts/GUI_Shortcuts.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/Shortcuts/GUI_Shortcuts.h +@@ -24,7 +24,7 @@ + #define GUI_SHORTCUTS_H + + +-#include "GUI/Preferences/ui_GUI_Shortcuts.h" ++#include "ui_GUI_Shortcuts.h" + #include "GUI/Helper/Shortcuts/ShortcutHandler.h" + + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" +--- src/GUI/Preferences/StreamRecorder/GUI_StreamRecorder.h.orig 2016-10-30 11:53:25 UTC ++++ src/GUI/Preferences/StreamRecorder/GUI_StreamRecorder.h +@@ -25,7 +25,7 @@ + #ifndef GUI_STREAMRECORDER_H_ + #define GUI_STREAMRECORDER_H_ + +-#include "GUI/Preferences/ui_GUI_StreamRecorder.h" ++#include "ui_GUI_StreamRecorder.h" + #include "Interfaces/PreferenceDialog/PreferenceWidgetInterface.h" + + class GUI_StreamRecorder : Added: head/databases/kdb/files/patch-src_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/kdb/files/patch-src_CMakeLists.txt Thu Sep 14 21:02:51 2017 (r449853) @@ -0,0 +1,31 @@ +This has been submitted upstream; the # TODO (GEN) is a comment used +elsewhere upstream to mark things commented-out for generated files. + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index c63ab1f2..73d15fce 100644 +--- src/CMakeLists.txt ++++ src/CMakeLists.txt +@@ -56,18 +56,18 @@ endif() + # Mark files as generated, set compile flags + set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.cpp + PROPERTIES +- GENERATED TRUE ++ #TODO(GEN) GENERATED TRUE + # YYERROR_VERBOSE=1 needed to get a token table for tokenName() even for release builds + COMPILE_FLAGS "-DYYERROR_VERBOSE=1 ${EXTRA_PARSER_COMPILE_FLAGS} " + ) +-set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE) +-set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE) +-set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE) ++# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/sqlparser.h PROPERTIES GENERATED TRUE) ++# TODO(GEN) set_source_files_properties(${PARSER_SOURCE_DIR}/generated/KDbToken.h PROPERTIES GENERATED TRUE) ++# TODO(GEN) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/KDbConnectionData_sdc.cpp PROPERTIES GENERATED TRUE) + + set_source_files_properties( + ${PARSER_SOURCE_DIR}/generated/sqlscanner.cpp + PROPERTIES +- GENERATED TRUE ++ #TODO(GEN) GENERATED TRUE + COMPILE_FLAGS "${EXTRA_SCANNER_COMPILE_FLAGS} " + ) + Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/Makefile Thu Sep 14 21:02:51 2017 (r449853) @@ -323,7 +323,6 @@ SUBDIR += cmake-doc SUBDIR += cmake-fedora SUBDIR += cmake-gui - SUBDIR += cmake-modules SUBDIR += cmake-modules-webos SUBDIR += cmph SUBDIR += cmunge Modified: head/devel/cmake-doc/Makefile ============================================================================== --- head/devel/cmake-doc/Makefile Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/cmake-doc/Makefile Thu Sep 14 21:02:51 2017 (r449853) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 3.8.2 +DISTVERSION= 3.9.2 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -doc Modified: head/devel/cmake-doc/pkg-plist ============================================================================== --- head/devel/cmake-doc/pkg-plist Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/cmake-doc/pkg-plist Thu Sep 14 21:02:51 2017 (r449853) @@ -183,6 +183,7 @@ %%DOCSDIR%%/html/_sources/module/CMakePushCheckState.txt %%DOCSDIR%%/html/_sources/module/CMakeVerifyManifest.txt %%DOCSDIR%%/html/_sources/module/CPack.txt +%%DOCSDIR%%/html/_sources/module/CPackArchive.txt %%DOCSDIR%%/html/_sources/module/CPackBundle.txt %%DOCSDIR%%/html/_sources/module/CPackComponent.txt %%DOCSDIR%%/html/_sources/module/CPackCygwin.txt @@ -195,6 +196,7 @@ %%DOCSDIR%%/html/_sources/module/CPackProductBuild.txt %%DOCSDIR%%/html/_sources/module/CPackRPM.txt %%DOCSDIR%%/html/_sources/module/CPackWIX.txt +%%DOCSDIR%%/html/_sources/module/CSharpUtilities.txt %%DOCSDIR%%/html/_sources/module/CTest.txt %%DOCSDIR%%/html/_sources/module/CTestCoverageCollectGCOV.txt %%DOCSDIR%%/html/_sources/module/CTestScriptMode.txt @@ -210,6 +212,7 @@ %%DOCSDIR%%/html/_sources/module/CheckFortranFunctionExists.txt %%DOCSDIR%%/html/_sources/module/CheckFortranSourceCompiles.txt %%DOCSDIR%%/html/_sources/module/CheckFunctionExists.txt +%%DOCSDIR%%/html/_sources/module/CheckIPOSupported.txt %%DOCSDIR%%/html/_sources/module/CheckIncludeFile.txt %%DOCSDIR%%/html/_sources/module/CheckIncludeFileCXX.txt %%DOCSDIR%%/html/_sources/module/CheckIncludeFiles.txt @@ -220,7 +223,6 @@ %%DOCSDIR%%/html/_sources/module/CheckSymbolExists.txt %%DOCSDIR%%/html/_sources/module/CheckTypeSize.txt %%DOCSDIR%%/html/_sources/module/CheckVariableExists.txt -%%DOCSDIR%%/html/_sources/module/CSharpUtilities.txt %%DOCSDIR%%/html/_sources/module/Dart.txt %%DOCSDIR%%/html/_sources/module/DeployQt4.txt %%DOCSDIR%%/html/_sources/module/Documentation.txt @@ -379,6 +381,7 @@ %%DOCSDIR%%/html/_sources/module/GNUInstallDirs.txt %%DOCSDIR%%/html/_sources/module/GenerateExportHeader.txt %%DOCSDIR%%/html/_sources/module/GetPrerequisites.txt +%%DOCSDIR%%/html/_sources/module/GoogleTest.txt %%DOCSDIR%%/html/_sources/module/InstallRequiredSystemLibraries.txt %%DOCSDIR%%/html/_sources/module/MacroAddFileDependencies.txt %%DOCSDIR%%/html/_sources/module/ProcessorCount.txt @@ -468,6 +471,8 @@ %%DOCSDIR%%/html/_sources/policy/CMP0065.txt %%DOCSDIR%%/html/_sources/policy/CMP0066.txt %%DOCSDIR%%/html/_sources/policy/CMP0067.txt +%%DOCSDIR%%/html/_sources/policy/CMP0068.txt +%%DOCSDIR%%/html/_sources/policy/CMP0069.txt %%DOCSDIR%%/html/_sources/prop_cache/ADVANCED.txt %%DOCSDIR%%/html/_sources/prop_cache/HELPSTRING.txt %%DOCSDIR%%/html/_sources/prop_cache/MODIFIED.txt @@ -505,8 +510,11 @@ %%DOCSDIR%%/html/_sources/prop_dir/VS_GLOBAL_SECTION_PRE_section.txt %%DOCSDIR%%/html/_sources/prop_dir/VS_STARTUP_PROJECT.txt %%DOCSDIR%%/html/_sources/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.txt +%%DOCSDIR%%/html/_sources/prop_gbl/AUTOGEN_SOURCE_GROUP.txt %%DOCSDIR%%/html/_sources/prop_gbl/AUTOGEN_TARGETS_FOLDER.txt +%%DOCSDIR%%/html/_sources/prop_gbl/AUTOMOC_SOURCE_GROUP.txt %%DOCSDIR%%/html/_sources/prop_gbl/AUTOMOC_TARGETS_FOLDER.txt +%%DOCSDIR%%/html/_sources/prop_gbl/AUTORCC_SOURCE_GROUP.txt %%DOCSDIR%%/html/_sources/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.txt %%DOCSDIR%%/html/_sources/prop_gbl/CMAKE_C_KNOWN_FEATURES.txt %%DOCSDIR%%/html/_sources/prop_gbl/DEBUG_CONFIGURATIONS.txt @@ -516,7 +524,9 @@ %%DOCSDIR%%/html/_sources/prop_gbl/ENABLED_LANGUAGES.txt %%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.txt %%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.txt +%%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.txt %%DOCSDIR%%/html/_sources/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.txt +%%DOCSDIR%%/html/_sources/prop_gbl/GENERATOR_IS_MULTI_CONFIG.txt %%DOCSDIR%%/html/_sources/prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE.txt %%DOCSDIR%%/html/_sources/prop_gbl/GLOBAL_DEPENDS_NO_CYCLES.txt %%DOCSDIR%%/html/_sources/prop_gbl/IN_TRY_COMPILE.txt @@ -582,6 +592,7 @@ %%DOCSDIR%%/html/_sources/prop_test/ATTACHED_FILES_ON_FAIL.txt %%DOCSDIR%%/html/_sources/prop_test/COST.txt %%DOCSDIR%%/html/_sources/prop_test/DEPENDS.txt +%%DOCSDIR%%/html/_sources/prop_test/DISABLED.txt %%DOCSDIR%%/html/_sources/prop_test/ENVIRONMENT.txt %%DOCSDIR%%/html/_sources/prop_test/FAIL_REGULAR_EXPRESSION.txt %%DOCSDIR%%/html/_sources/prop_test/FIXTURES_CLEANUP.txt @@ -621,15 +632,19 @@ %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.txt %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME.txt %%DOCSDIR%%/html/_sources/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.txt +%%DOCSDIR%%/html/_sources/prop_tgt/AUTOGEN_BUILD_DIR.txt %%DOCSDIR%%/html/_sources/prop_tgt/AUTOGEN_TARGET_DEPENDS.txt %%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC.txt +%%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC_DEPEND_FILTERS.txt %%DOCSDIR%%/html/_sources/prop_tgt/AUTOMOC_MOC_OPTIONS.txt %%DOCSDIR%%/html/_sources/prop_tgt/AUTORCC.txt %%DOCSDIR%%/html/_sources/prop_tgt/AUTORCC_OPTIONS.txt %%DOCSDIR%%/html/_sources/prop_tgt/AUTOUIC.txt %%DOCSDIR%%/html/_sources/prop_tgt/AUTOUIC_OPTIONS.txt +%%DOCSDIR%%/html/_sources/prop_tgt/AUTOUIC_SEARCH_PATHS.txt %%DOCSDIR%%/html/_sources/prop_tgt/BINARY_DIR.txt %%DOCSDIR%%/html/_sources/prop_tgt/BUILD_RPATH.txt +%%DOCSDIR%%/html/_sources/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.txt %%DOCSDIR%%/html/_sources/prop_tgt/BUILD_WITH_INSTALL_RPATH.txt %%DOCSDIR%%/html/_sources/prop_tgt/BUNDLE.txt %%DOCSDIR%%/html/_sources/prop_tgt/BUNDLE_EXTENSION.txt @@ -650,6 +665,8 @@ %%DOCSDIR%%/html/_sources/prop_tgt/CONFIG_POSTFIX.txt %%DOCSDIR%%/html/_sources/prop_tgt/CROSSCOMPILING_EMULATOR.txt %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_EXTENSIONS.txt +%%DOCSDIR%%/html/_sources/prop_tgt/CUDA_PTX_COMPILATION.txt +%%DOCSDIR%%/html/_sources/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.txt %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_SEPARABLE_COMPILATION.txt %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_STANDARD.txt %%DOCSDIR%%/html/_sources/prop_tgt/CUDA_STANDARD_REQUIRED.txt @@ -695,6 +712,8 @@ %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_LOCATION_CONFIG.txt %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_NO_SONAME.txt %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_NO_SONAME_CONFIG.txt +%%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_OBJECTS.txt +%%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_OBJECTS_CONFIG.txt %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_SONAME.txt %%DOCSDIR%%/html/_sources/prop_tgt/IMPORTED_SONAME_CONFIG.txt %%DOCSDIR%%/html/_sources/prop_tgt/IMPORT_PREFIX.txt @@ -824,6 +843,7 @@ %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.6.txt %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.7.txt %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.8.txt +%%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/3.9.txt %%DOCSDIR%%/html/_sources/%%CMAKE_BUILD_TYPE%%/index.txt %%DOCSDIR%%/html/_sources/variable/ANDROID.txt %%DOCSDIR%%/html/_sources/variable/APPLE.txt @@ -845,6 +865,7 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_ANDROID_PROCESS_MAX.txt @@ -861,17 +882,20 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_ARGC.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_ARGV0.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_MOC_OPTIONS.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOMOC_RELAXED_MODE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTORCC.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTORCC_OPTIONS.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOUIC.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOUIC_OPTIONS.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_AUTOUIC_SEARCH_PATHS.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_BACKWARDS_COMPATIBILITY.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_BINARY_DIR.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_RPATH.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_TOOL.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_TYPE.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_BUILD_WITH_INSTALL_RPATH.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_CACHEFILE_DIR.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_CACHE_MAJOR_VERSION.txt @@ -934,6 +958,7 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_APPBUNDLE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_FRAMEWORK.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_LIBRARY_PREFIXES.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_LIBRARY_SUFFIXES.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_FIND_NO_INSTALL_PREFIX.txt @@ -983,6 +1008,8 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_RPATH.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_INTERNAL_PLATFORM_ABI.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_IOS_INSTALL_COMBINED.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_JOB_POOL_COMPILE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_JOB_POOL_LINK.txt @@ -995,10 +1022,12 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_CLANG_TIDY.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_ABI.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_AR.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_ID.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_LAUNCHER.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_LOADED.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_RANLIB.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_TARGET.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILER_VERSION.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_LANG_COMPILE_OBJECT.txt @@ -1060,6 +1089,7 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_MAKE_PROGRAM.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_MATCH_COUNT.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_MATCH_n.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_MFC_FLAG.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_MINIMUM_REQUIRED_VERSION.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_MINOR_VERSION.txt @@ -1085,6 +1115,7 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_POSITION_INDEPENDENT_CODE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_PREFIX_PATH.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_PROGRAM_PATH.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_DESCRIPTION.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_NAME.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_RANLIB.txt @@ -1117,6 +1148,8 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT_COMPILE.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_SYSROOT_LINK.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSTEM.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.txt @@ -1148,6 +1181,7 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_NsightTegra_VERSION.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_NAME.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_WARN_DEPRECATED.txt @@ -1155,6 +1189,7 @@ %%DOCSDIR%%/html/_sources/variable/CMAKE_WIN32_EXECUTABLE.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.txt +%%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_GENERATE_SCHEME.txt %%DOCSDIR%%/html/_sources/variable/CMAKE_XCODE_PLATFORM_TOOLSET.txt %%DOCSDIR%%/html/_sources/variable/CPACK_ABSOLUTE_DESTINATION_FILES.txt %%DOCSDIR%%/html/_sources/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.txt @@ -1258,6 +1293,7 @@ %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_VERSION_PATCH.txt %%DOCSDIR%%/html/_sources/variable/PROJECT-NAME_VERSION_TWEAK.txt %%DOCSDIR%%/html/_sources/variable/PROJECT_BINARY_DIR.txt +%%DOCSDIR%%/html/_sources/variable/PROJECT_DESCRIPTION.txt %%DOCSDIR%%/html/_sources/variable/PROJECT_NAME.txt %%DOCSDIR%%/html/_sources/variable/PROJECT_SOURCE_DIR.txt %%DOCSDIR%%/html/_sources/variable/PROJECT_VERSION.txt @@ -1483,6 +1519,7 @@ %%DOCSDIR%%/html/module/CMakePushCheckState.html %%DOCSDIR%%/html/module/CMakeVerifyManifest.html %%DOCSDIR%%/html/module/CPack.html +%%DOCSDIR%%/html/module/CPackArchive.html %%DOCSDIR%%/html/module/CPackBundle.html %%DOCSDIR%%/html/module/CPackComponent.html %%DOCSDIR%%/html/module/CPackCygwin.html @@ -1495,6 +1532,7 @@ %%DOCSDIR%%/html/module/CPackProductBuild.html %%DOCSDIR%%/html/module/CPackRPM.html %%DOCSDIR%%/html/module/CPackWIX.html +%%DOCSDIR%%/html/module/CSharpUtilities.html %%DOCSDIR%%/html/module/CTest.html %%DOCSDIR%%/html/module/CTestCoverageCollectGCOV.html %%DOCSDIR%%/html/module/CTestScriptMode.html @@ -1510,6 +1548,7 @@ %%DOCSDIR%%/html/module/CheckFortranFunctionExists.html %%DOCSDIR%%/html/module/CheckFortranSourceCompiles.html %%DOCSDIR%%/html/module/CheckFunctionExists.html +%%DOCSDIR%%/html/module/CheckIPOSupported.html %%DOCSDIR%%/html/module/CheckIncludeFile.html %%DOCSDIR%%/html/module/CheckIncludeFileCXX.html %%DOCSDIR%%/html/module/CheckIncludeFiles.html @@ -1520,7 +1559,6 @@ %%DOCSDIR%%/html/module/CheckSymbolExists.html %%DOCSDIR%%/html/module/CheckTypeSize.html %%DOCSDIR%%/html/module/CheckVariableExists.html -%%DOCSDIR%%/html/module/CSharpUtilities.html %%DOCSDIR%%/html/module/Dart.html %%DOCSDIR%%/html/module/DeployQt4.html %%DOCSDIR%%/html/module/Documentation.html @@ -1679,6 +1717,7 @@ %%DOCSDIR%%/html/module/GNUInstallDirs.html %%DOCSDIR%%/html/module/GenerateExportHeader.html %%DOCSDIR%%/html/module/GetPrerequisites.html +%%DOCSDIR%%/html/module/GoogleTest.html %%DOCSDIR%%/html/module/InstallRequiredSystemLibraries.html %%DOCSDIR%%/html/module/MacroAddFileDependencies.html %%DOCSDIR%%/html/module/ProcessorCount.html @@ -1769,6 +1808,8 @@ %%DOCSDIR%%/html/policy/CMP0065.html %%DOCSDIR%%/html/policy/CMP0066.html %%DOCSDIR%%/html/policy/CMP0067.html +%%DOCSDIR%%/html/policy/CMP0068.html +%%DOCSDIR%%/html/policy/CMP0069.html %%DOCSDIR%%/html/prop_cache/ADVANCED.html %%DOCSDIR%%/html/prop_cache/HELPSTRING.html %%DOCSDIR%%/html/prop_cache/MODIFIED.html @@ -1806,8 +1847,11 @@ %%DOCSDIR%%/html/prop_dir/VS_GLOBAL_SECTION_PRE_section.html %%DOCSDIR%%/html/prop_dir/VS_STARTUP_PROJECT.html %%DOCSDIR%%/html/prop_gbl/ALLOW_DUPLICATE_CUSTOM_TARGETS.html +%%DOCSDIR%%/html/prop_gbl/AUTOGEN_SOURCE_GROUP.html %%DOCSDIR%%/html/prop_gbl/AUTOGEN_TARGETS_FOLDER.html +%%DOCSDIR%%/html/prop_gbl/AUTOMOC_SOURCE_GROUP.html %%DOCSDIR%%/html/prop_gbl/AUTOMOC_TARGETS_FOLDER.html +%%DOCSDIR%%/html/prop_gbl/AUTORCC_SOURCE_GROUP.html %%DOCSDIR%%/html/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html %%DOCSDIR%%/html/prop_gbl/CMAKE_C_KNOWN_FEATURES.html %%DOCSDIR%%/html/prop_gbl/DEBUG_CONFIGURATIONS.html @@ -1817,7 +1861,9 @@ %%DOCSDIR%%/html/prop_gbl/ENABLED_LANGUAGES.html %%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_LIB32_PATHS.html %%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_LIB64_PATHS.html +%%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_LIBX32_PATHS.html %%DOCSDIR%%/html/prop_gbl/FIND_LIBRARY_USE_OPENBSD_VERSIONING.html +%%DOCSDIR%%/html/prop_gbl/GENERATOR_IS_MULTI_CONFIG.html %%DOCSDIR%%/html/prop_gbl/GLOBAL_DEPENDS_DEBUG_MODE.html %%DOCSDIR%%/html/prop_gbl/GLOBAL_DEPENDS_NO_CYCLES.html %%DOCSDIR%%/html/prop_gbl/IN_TRY_COMPILE.html @@ -1883,6 +1929,7 @@ %%DOCSDIR%%/html/prop_test/ATTACHED_FILES_ON_FAIL.html %%DOCSDIR%%/html/prop_test/COST.html %%DOCSDIR%%/html/prop_test/DEPENDS.html +%%DOCSDIR%%/html/prop_test/DISABLED.html %%DOCSDIR%%/html/prop_test/ENVIRONMENT.html %%DOCSDIR%%/html/prop_test/FAIL_REGULAR_EXPRESSION.html %%DOCSDIR%%/html/prop_test/FIXTURES_CLEANUP.html @@ -1922,15 +1969,19 @@ %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_DIRECTORY_CONFIG.html %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_NAME.html %%DOCSDIR%%/html/prop_tgt/ARCHIVE_OUTPUT_NAME_CONFIG.html +%%DOCSDIR%%/html/prop_tgt/AUTOGEN_BUILD_DIR.html %%DOCSDIR%%/html/prop_tgt/AUTOGEN_TARGET_DEPENDS.html %%DOCSDIR%%/html/prop_tgt/AUTOMOC.html +%%DOCSDIR%%/html/prop_tgt/AUTOMOC_DEPEND_FILTERS.html %%DOCSDIR%%/html/prop_tgt/AUTOMOC_MOC_OPTIONS.html %%DOCSDIR%%/html/prop_tgt/AUTORCC.html %%DOCSDIR%%/html/prop_tgt/AUTORCC_OPTIONS.html %%DOCSDIR%%/html/prop_tgt/AUTOUIC.html %%DOCSDIR%%/html/prop_tgt/AUTOUIC_OPTIONS.html +%%DOCSDIR%%/html/prop_tgt/AUTOUIC_SEARCH_PATHS.html %%DOCSDIR%%/html/prop_tgt/BINARY_DIR.html %%DOCSDIR%%/html/prop_tgt/BUILD_RPATH.html +%%DOCSDIR%%/html/prop_tgt/BUILD_WITH_INSTALL_NAME_DIR.html %%DOCSDIR%%/html/prop_tgt/BUILD_WITH_INSTALL_RPATH.html %%DOCSDIR%%/html/prop_tgt/BUNDLE.html %%DOCSDIR%%/html/prop_tgt/BUNDLE_EXTENSION.html @@ -1951,6 +2002,8 @@ %%DOCSDIR%%/html/prop_tgt/CONFIG_POSTFIX.html %%DOCSDIR%%/html/prop_tgt/CROSSCOMPILING_EMULATOR.html %%DOCSDIR%%/html/prop_tgt/CUDA_EXTENSIONS.html +%%DOCSDIR%%/html/prop_tgt/CUDA_PTX_COMPILATION.html +%%DOCSDIR%%/html/prop_tgt/CUDA_RESOLVE_DEVICE_SYMBOLS.html %%DOCSDIR%%/html/prop_tgt/CUDA_SEPARABLE_COMPILATION.html %%DOCSDIR%%/html/prop_tgt/CUDA_STANDARD.html %%DOCSDIR%%/html/prop_tgt/CUDA_STANDARD_REQUIRED.html @@ -1996,6 +2049,8 @@ %%DOCSDIR%%/html/prop_tgt/IMPORTED_LOCATION_CONFIG.html %%DOCSDIR%%/html/prop_tgt/IMPORTED_NO_SONAME.html %%DOCSDIR%%/html/prop_tgt/IMPORTED_NO_SONAME_CONFIG.html +%%DOCSDIR%%/html/prop_tgt/IMPORTED_OBJECTS.html +%%DOCSDIR%%/html/prop_tgt/IMPORTED_OBJECTS_CONFIG.html %%DOCSDIR%%/html/prop_tgt/IMPORTED_SONAME.html %%DOCSDIR%%/html/prop_tgt/IMPORTED_SONAME_CONFIG.html %%DOCSDIR%%/html/prop_tgt/IMPORT_PREFIX.html @@ -2125,6 +2180,7 @@ %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.6.html %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.7.html %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.8.html +%%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/3.9.html %%DOCSDIR%%/html/%%CMAKE_BUILD_TYPE%%/index.html %%DOCSDIR%%/html/search.html %%DOCSDIR%%/html/searchindex.js @@ -2148,6 +2204,7 @@ %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NATIVE_LIB_DEPENDENCIES.html %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NATIVE_LIB_DIRECTORIES.html %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK.html +%%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK_DEPRECATED_HEADERS.html %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_HOST_TAG.html %%DOCSDIR%%/html/variable/CMAKE_ANDROID_NDK_TOOLCHAIN_VERSION.html %%DOCSDIR%%/html/variable/CMAKE_ANDROID_PROCESS_MAX.html @@ -2164,17 +2221,20 @@ %%DOCSDIR%%/html/variable/CMAKE_ARGC.html %%DOCSDIR%%/html/variable/CMAKE_ARGV0.html %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC.html +%%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_DEPEND_FILTERS.html %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_MOC_OPTIONS.html %%DOCSDIR%%/html/variable/CMAKE_AUTOMOC_RELAXED_MODE.html %%DOCSDIR%%/html/variable/CMAKE_AUTORCC.html %%DOCSDIR%%/html/variable/CMAKE_AUTORCC_OPTIONS.html %%DOCSDIR%%/html/variable/CMAKE_AUTOUIC.html %%DOCSDIR%%/html/variable/CMAKE_AUTOUIC_OPTIONS.html +%%DOCSDIR%%/html/variable/CMAKE_AUTOUIC_SEARCH_PATHS.html %%DOCSDIR%%/html/variable/CMAKE_BACKWARDS_COMPATIBILITY.html %%DOCSDIR%%/html/variable/CMAKE_BINARY_DIR.html %%DOCSDIR%%/html/variable/CMAKE_BUILD_RPATH.html %%DOCSDIR%%/html/variable/CMAKE_BUILD_TOOL.html %%DOCSDIR%%/html/variable/CMAKE_BUILD_TYPE.html +%%DOCSDIR%%/html/variable/CMAKE_BUILD_WITH_INSTALL_NAME_DIR.html %%DOCSDIR%%/html/variable/CMAKE_BUILD_WITH_INSTALL_RPATH.html %%DOCSDIR%%/html/variable/CMAKE_CACHEFILE_DIR.html %%DOCSDIR%%/html/variable/CMAKE_CACHE_MAJOR_VERSION.html @@ -2237,6 +2297,7 @@ %%DOCSDIR%%/html/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.html %%DOCSDIR%%/html/variable/CMAKE_FIND_APPBUNDLE.html %%DOCSDIR%%/html/variable/CMAKE_FIND_FRAMEWORK.html +%%DOCSDIR%%/html/variable/CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX.html %%DOCSDIR%%/html/variable/CMAKE_FIND_LIBRARY_PREFIXES.html %%DOCSDIR%%/html/variable/CMAKE_FIND_LIBRARY_SUFFIXES.html %%DOCSDIR%%/html/variable/CMAKE_FIND_NO_INSTALL_PREFIX.html @@ -2286,6 +2347,8 @@ %%DOCSDIR%%/html/variable/CMAKE_INSTALL_RPATH.html %%DOCSDIR%%/html/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.html %%DOCSDIR%%/html/variable/CMAKE_INTERNAL_PLATFORM_ABI.html +%%DOCSDIR%%/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION.html +%%DOCSDIR%%/html/variable/CMAKE_INTERPROCEDURAL_OPTIMIZATION_CONFIG.html %%DOCSDIR%%/html/variable/CMAKE_IOS_INSTALL_COMBINED.html %%DOCSDIR%%/html/variable/CMAKE_JOB_POOL_COMPILE.html %%DOCSDIR%%/html/variable/CMAKE_JOB_POOL_LINK.html @@ -2298,10 +2361,12 @@ %%DOCSDIR%%/html/variable/CMAKE_LANG_CLANG_TIDY.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_ABI.html +%%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_AR.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_EXTERNAL_TOOLCHAIN.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_ID.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_LAUNCHER.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_LOADED.html +%%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_RANLIB.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_TARGET.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILER_VERSION.html %%DOCSDIR%%/html/variable/CMAKE_LANG_COMPILE_OBJECT.html @@ -2363,6 +2428,7 @@ %%DOCSDIR%%/html/variable/CMAKE_MAKE_PROGRAM.html %%DOCSDIR%%/html/variable/CMAKE_MAP_IMPORTED_CONFIG_CONFIG.html %%DOCSDIR%%/html/variable/CMAKE_MATCH_COUNT.html +%%DOCSDIR%%/html/variable/CMAKE_MATCH_n.html %%DOCSDIR%%/html/variable/CMAKE_MFC_FLAG.html %%DOCSDIR%%/html/variable/CMAKE_MINIMUM_REQUIRED_VERSION.html %%DOCSDIR%%/html/variable/CMAKE_MINOR_VERSION.html @@ -2388,6 +2454,7 @@ %%DOCSDIR%%/html/variable/CMAKE_POSITION_INDEPENDENT_CODE.html %%DOCSDIR%%/html/variable/CMAKE_PREFIX_PATH.html %%DOCSDIR%%/html/variable/CMAKE_PROGRAM_PATH.html +%%DOCSDIR%%/html/variable/CMAKE_PROJECT_DESCRIPTION.html %%DOCSDIR%%/html/variable/CMAKE_PROJECT_NAME.html %%DOCSDIR%%/html/variable/CMAKE_PROJECT_PROJECT-NAME_INCLUDE.html %%DOCSDIR%%/html/variable/CMAKE_RANLIB.html @@ -2420,6 +2487,8 @@ %%DOCSDIR%%/html/variable/CMAKE_SUBLIME_TEXT_2_ENV_SETTINGS.html %%DOCSDIR%%/html/variable/CMAKE_SUBLIME_TEXT_2_EXCLUDE_BUILD_TREE.html %%DOCSDIR%%/html/variable/CMAKE_SYSROOT.html +%%DOCSDIR%%/html/variable/CMAKE_SYSROOT_COMPILE.html +%%DOCSDIR%%/html/variable/CMAKE_SYSROOT_LINK.html %%DOCSDIR%%/html/variable/CMAKE_SYSTEM.html %%DOCSDIR%%/html/variable/CMAKE_SYSTEM_APPBUNDLE_PATH.html %%DOCSDIR%%/html/variable/CMAKE_SYSTEM_FRAMEWORK_PATH.html @@ -2451,6 +2520,7 @@ %%DOCSDIR%%/html/variable/CMAKE_VS_NsightTegra_VERSION.html %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_NAME.html %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET.html +%%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET_CUDA.html %%DOCSDIR%%/html/variable/CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE.html %%DOCSDIR%%/html/variable/CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION.html %%DOCSDIR%%/html/variable/CMAKE_WARN_DEPRECATED.html @@ -2458,6 +2528,7 @@ %%DOCSDIR%%/html/variable/CMAKE_WIN32_EXECUTABLE.html %%DOCSDIR%%/html/variable/CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS.html %%DOCSDIR%%/html/variable/CMAKE_XCODE_ATTRIBUTE_an-attribute.html +%%DOCSDIR%%/html/variable/CMAKE_XCODE_GENERATE_SCHEME.html %%DOCSDIR%%/html/variable/CMAKE_XCODE_PLATFORM_TOOLSET.html %%DOCSDIR%%/html/variable/CPACK_ABSOLUTE_DESTINATION_FILES.html %%DOCSDIR%%/html/variable/CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY.html @@ -2561,6 +2632,7 @@ %%DOCSDIR%%/html/variable/PROJECT-NAME_VERSION_PATCH.html %%DOCSDIR%%/html/variable/PROJECT-NAME_VERSION_TWEAK.html %%DOCSDIR%%/html/variable/PROJECT_BINARY_DIR.html +%%DOCSDIR%%/html/variable/PROJECT_DESCRIPTION.html %%DOCSDIR%%/html/variable/PROJECT_NAME.html %%DOCSDIR%%/html/variable/PROJECT_SOURCE_DIR.html %%DOCSDIR%%/html/variable/PROJECT_VERSION.html Modified: head/devel/cmake-gui/Makefile ============================================================================== --- head/devel/cmake-gui/Makefile Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/cmake-gui/Makefile Thu Sep 14 21:02:51 2017 (r449853) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= cmake -PORTVERSION= 3.8.2 +DISTVERSION= 3.9.2 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ PKGNAMESUFFIX= -gui @@ -27,7 +27,8 @@ CMAKE_ARGS= -DBUILD_QtDialog:bool=on \ -DSPHINX_MAN:BOOL=ON \ -DCMAKE_USE_SYSTEM_LIBRARIES:BOOL=ON \ -DCMAKE_DATA_DIR:STRING="/${DATADIR_REL}" \ - -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" + -DCMAKE_DOC_DIR:STRING="/${DOCSDIR_REL}" \ + -DCMake_SPHINX_DEPEND_ON_EXECUTABLES:BOOL=OFF ALL_TARGET= cmake-gui documentation INSTALL_WRKSRC= ${WRKSRC}/Source/QtDialog Modified: head/devel/cmake-gui/pkg-plist ============================================================================== --- head/devel/cmake-gui/pkg-plist Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/cmake-gui/pkg-plist Thu Sep 14 21:02:51 2017 (r449853) @@ -1,6 +1,6 @@ bin/cmake-gui man/man1/cmake-gui.1.gz -share/applications/CMake.desktop +share/applications/cmake-gui.desktop share/icons/hicolor/128x128/apps/CMakeSetup.png share/icons/hicolor/32x32/apps/CMakeSetup.png share/mime/packages/cmakecache.xml Modified: head/devel/cmake/Makefile ============================================================================== --- head/devel/cmake/Makefile Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/cmake/Makefile Thu Sep 14 21:02:51 2017 (r449853) @@ -2,13 +2,12 @@ # $FreeBSD$ PORTNAME= cmake -DISTVERSION= 3.8.2 -PORTREVISION?= 0 +DISTVERSION= 3.9.2 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ MAINTAINER= kde@FreeBSD.org -COMMENT?= Cross-platform Makefile generator +COMMENT= Cross-platform Makefile generator LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/Copyright.txt @@ -21,11 +20,10 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \ --parallel=${MAKE_JOBS_NUMBER} \ --init="${PATCHDIR}/InitialCache.cmake" -.if !defined(CMAKE_MODULES) OPTIONS_DEFINE= DOCS MANPAGES OPTIONS_DEFAULT=MANPAGES OPTIONS_SUB= yes -USES+= execinfo libarchive ncurses +USES= execinfo libarchive ncurses HAS_CONFIGURE= yes LIB_DEPENDS= libcurl.so:ftp/curl \ @@ -33,12 +31,12 @@ LIB_DEPENDS= libcurl.so:ftp/curl \ libjsoncpp.so:devel/jsoncpp \ libuv.so:devel/libuv \ librhash.so:security/rhash -RUN_DEPENDS= ${LOCALBASE}/share/cmake/Modules/CMake.cmake:devel/cmake-modules MANPAGES_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx MANPAGES_CONFIGURE_ON= --sphinx-man -.endif +CONFLICTS_INSTALL= cmake-modules-* + .include <bsd.port.pre.mk> .if defined(STRIP) && ${STRIP} != "" && !defined(WITH_DEBUG) @@ -64,9 +62,10 @@ post-patch: # prevent it from being built/installed by devel/cmake. ${RM} ${WRKSRC}/Help/manual/cmake-gui.1.rst -.if !defined(CMAKE_MODULES) post-install: ${INSTALL_DATA} ${WRKSRC}/Auxiliary/cmake-mode.el ${STAGEDIR}${PREFIX}/share/emacs/site-lisp -.endif + # The .NoDartCoverage is supposed to suppress testing in the + # source directories, but gets accidentally installed. + @${FIND} ${STAGEDIR}${PREFIX} -name ".NoDartCoverage" -delete .include <bsd.port.post.mk> Modified: head/devel/cmake/distinfo ============================================================================== --- head/devel/cmake/distinfo Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/cmake/distinfo Thu Sep 14 21:02:51 2017 (r449853) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496307017 -SHA256 (cmake-3.8.2.tar.gz) = da3072794eb4c09f2d782fcee043847b99bb4cf8d4573978d9b2024214d6e92d -SIZE (cmake-3.8.2.tar.gz) = 7504706 +TIMESTAMP = 1504850116 +SHA256 (cmake-3.9.2.tar.gz) = 954a5801a456ee48e76f01107c9a4961677dd0f3e115275bbd18410dc22ba3c1 +SIZE (cmake-3.9.2.tar.gz) = 7703777 Modified: head/devel/cmake/files/patch-Modules_FindImageMagick.cmake ============================================================================== --- head/devel/cmake/files/patch-Modules_FindImageMagick.cmake Thu Sep 14 20:22:17 2017 (r449852) +++ head/devel/cmake/files/patch-Modules_FindImageMagick.cmake Thu Sep 14 21:02:51 2017 (r449853) @@ -1,23 +1,38 @@ ---- Modules/FindImageMagick.cmake.orig 2015-01-18 20:59:07.643587544 +0100 -+++ Modules/FindImageMagick.cmake 2015-01-18 21:00:52.175617819 +0100 -@@ -207,17 +207,17 @@ - ) +Insert an additional search item when finding ImageMagick, originally +from kwm (see below), adjusted for new organization of search paths. + +Author: kwm <kwm@FreeBSD.org> +Date: Sun Jan 18 21:12:42 2015 +0000 + + Update ImageMagick to 6.9.0.4. + + - Normalize the ImageMagick library name so it stays the same regardless of + what the 16-bit and HDRI option are set to [1]. Teach cmake to look for + the new name. Bump ports that link to the libraries due to this. + +--- Modules/FindImageMagick.cmake.orig 2017-07-27 18:33:53.634381000 +0200 ++++ Modules/FindImageMagick.cmake 2017-07-27 18:36:31.110708000 +0200 +@@ -196,6 +196,7 @@ if(component STREQUAL "Magick++") FIND_IMAGEMAGICK_API(Magick++ Magick++.h -- Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI -+ Magick++ CORE_RL_Magick++_ Magick++-6 Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY) + Magick++ CORE_RL_Magick++_ ++ Magick++-6 + Magick++-Q8 Magick++-Q16 Magick++-Q16HDRI Magick++-Q8HDRI + Magick++-6.Q16 Magick++-6.Q8 Magick++-6.Q16HDRI Magick++-6.Q8HDRI + Magick++-7.Q16 Magick++-7.Q8 Magick++-7.Q16HDRI Magick++-7.Q8HDRI +@@ -204,6 +205,7 @@ elseif(component STREQUAL "MagickWand") - FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h -- Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI -+ Wand MagickWand CORE_RL_wand_ MagickWand-6 MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI - ) - list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY) + FIND_IMAGEMAGICK_API(MagickWand "wand/MagickWand.h;MagickWand/MagickWand.h" + Wand MagickWand CORE_RL_wand_ ++ MagickWand-6 + MagickWand-Q16 MagickWand-Q8 MagickWand-Q16HDRI MagickWand-Q8HDRI + MagickWand-6.Q16 MagickWand-6.Q8 MagickWand-6.Q16HDRI MagickWand-6.Q8HDRI *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709142102.v8EL2q5R011625>