[153635] trunk/dports/devel/cmake
michaelld at macports.org
michaelld at macports.org
Thu Oct 6 16:18:53 CEST 2016
Revision: 153635
https://trac.macports.org/changeset/153635
Author: michaelld at macports.org
Date: 2016-10-06 07:18:53 -0700 (Thu, 06 Oct 2016)
Log Message:
-----------
cmake-devel: update to 20161004 (g280cf).
Modified Paths:
--------------
trunk/dports/devel/cmake/Portfile
trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff
trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff
Modified: trunk/dports/devel/cmake/Portfile
===================================================================
--- trunk/dports/devel/cmake/Portfile 2016-10-06 14:17:54 UTC (rev 153634)
+++ trunk/dports/devel/cmake/Portfile 2016-10-06 14:18:53 UTC (rev 153635)
@@ -54,12 +54,12 @@
# devel
- version 20160926
- set dist_branch 3.6
- set dist_date 20160926
- set dist_hash gcdaf3
- checksums rmd160 f16413d27c94a568d20e4a75140d37545c9b98f2 \
- sha256 d922c15c634e7827a7c563e64cd958ab96f53b310f132b36f3fb755a9999dd26
+ version 20161004
+ set dist_branch 3.7
+ set dist_date 20161004
+ set dist_hash g280cf
+ checksums rmd160 3189978ddca57c6d7a8f786aee1fe679aafe6b00 \
+ sha256 c4cb35dec5459497f31b41100332dfb70e5fe2c37c7e90aeaf59a554d870ea9a
master_sites http://www.cmake.org/files/dev/
distname ${name}-${dist_branch}.${dist_date}-${dist_hash}
Modified: trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff 2016-10-06 14:17:54 UTC (rev 153634)
+++ trunk/dports/devel/cmake/files/patch-CMakeFindFrameworks.cmake.devel.diff 2016-10-06 14:18:53 UTC (rev 153635)
@@ -1,6 +1,6 @@
--- Modules/CMakeFindFrameworks.cmake.orig
+++ Modules/CMakeFindFrameworks.cmake
-@@ -28,6 +28,7 @@
+@@ -18,6 +18,7 @@
if(APPLE)
foreach(dir
~/Library/Frameworks/${fwk}.framework
Modified: trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff 2016-10-06 14:17:54 UTC (rev 153634)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindFreetype.cmake.devel.diff 2016-10-06 14:18:53 UTC (rev 153635)
@@ -1,6 +1,6 @@
--- Modules/FindFreetype.cmake.orig
+++ Modules/FindFreetype.cmake
-@@ -56,10 +56,6 @@
+@@ -46,10 +46,6 @@
HINTS
ENV FREETYPE_DIR
PATHS
Modified: trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff 2016-10-06 14:17:54 UTC (rev 153634)
+++ trunk/dports/devel/cmake/files/patch-Modules-FindQt4.cmake.devel.diff 2016-10-06 14:18:53 UTC (rev 153635)
@@ -1,6 +1,6 @@
--- Modules/FindQt4.cmake.orig
+++ Modules/FindQt4.cmake
-@@ -743,9 +743,7 @@
+@@ -733,9 +733,7 @@
find_path(QT_IMPORTS_DIR NAMES Qt
HINTS ${qt_cross_paths} ${qt_imports_dir}
DOC "The location of the Qt imports"
Modified: trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2016-10-06 14:17:54 UTC (rev 153634)
+++ trunk/dports/devel/cmake/files/patch-qt4gui.devel.diff 2016-10-06 14:18:53 UTC (rev 153635)
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -15,83 +15,6 @@
+@@ -6,83 +6,6 @@
cmake_policy(SET CMP0020 NEW) # Drop when CMake >= 2.8.11 required
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
@@ -84,7 +84,7 @@
set(QT_MIN_VERSION "4.4.0")
find_package(Qt4 REQUIRED)
if(NOT QT4_FOUND)
-@@ -103,8 +26,6 @@
+@@ -94,8 +17,6 @@
set(CMake_QT_LIBRARIES ${QT_LIBRARIES})
@@ -93,7 +93,7 @@
set(SRCS
AddCacheEntry.cxx
AddCacheEntry.h
-@@ -149,7 +70,7 @@
+@@ -140,7 +61,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -102,7 +102,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -166,10 +87,10 @@
+@@ -157,10 +78,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -115,7 +115,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-@@ -215,18 +136,18 @@
+@@ -206,18 +127,18 @@
${COMPONENT})
endif()
@@ -139,7 +139,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -657,12 +657,6 @@
+@@ -649,12 +649,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
Modified: trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff
===================================================================
--- trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff 2016-10-06 14:17:54 UTC (rev 153634)
+++ trunk/dports/devel/cmake/files/patch-qt5gui.devel.diff 2016-10-06 14:18:53 UTC (rev 153635)
@@ -1,6 +1,6 @@
--- Source/QtDialog/CMakeLists.txt.orig
+++ Source/QtDialog/CMakeLists.txt
-@@ -16,7 +16,9 @@
+@@ -7,7 +7,9 @@
endif()
CMake_OPTIONAL_COMPONENT(cmake-gui)
find_package(Qt5Widgets QUIET)
@@ -11,7 +11,7 @@
include_directories(${Qt5Widgets_INCLUDE_DIRS})
add_definitions(${Qt5Widgets_DEFINITONS})
macro(qt4_wrap_ui)
-@@ -91,19 +93,6 @@
+@@ -82,19 +84,6 @@
get_filename_component(Qt_BIN_DIR "${Qt_BIN_DIR}" PATH)
endif()
endif()
@@ -31,7 +31,7 @@
set(SRCS
AddCacheEntry.cxx
-@@ -149,7 +138,7 @@
+@@ -140,7 +129,7 @@
if(WIN32)
set(SRCS ${SRCS} CMakeSetup.rc)
endif()
@@ -40,7 +40,7 @@
set(SRCS ${SRCS} CMakeSetup.icns)
set(MACOSX_BUNDLE_ICON_FILE CMakeSetup.icns)
set_source_files_properties(CMakeSetup.icns PROPERTIES
-@@ -166,10 +155,10 @@
+@@ -157,10 +146,10 @@
set(CMAKE_INCLUDE_CURRENT_DIR ON)
@@ -53,7 +53,7 @@
file(STRINGS "${CMake_SOURCE_DIR}/Copyright.txt" copyright_line
LIMIT_COUNT 1 REGEX "^Copyright 2000-20[0-9][0-9] Kitware")
-@@ -215,18 +204,18 @@
+@@ -206,18 +195,18 @@
${COMPONENT})
endif()
@@ -77,7 +77,7 @@
install(CODE "
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -657,12 +657,6 @@
+@@ -649,12 +649,6 @@
set(CMAKE_BUNDLE_VERSION
"${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}.${CMake_VERSION_PATCH}")
set(CMAKE_BUNDLE_LOCATION "${CMAKE_INSTALL_PREFIX}")
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macports.org/pipermail/macports-changes/attachments/20161006/57d61dee/attachment-0002.html>
More information about the macports-changes
mailing list