svn commit: r411409 - in head: devel/cmake devel/cmake-gui devel/cmake-modules devel/cmake/files science/orthanc science/orthanc/files

Raphael Kubo da Costa rakuco at FreeBSD.org
Sat Mar 19 14:41:40 UTC 2016 

Author: rakuco
Date: Sat Mar 19 14:41:38 2016
New Revision: 411409
URL: https://svnweb.freebsd.org/changeset/ports/411409

Log:
  Update CMake to 3.5.0.
  
  Announcement: https://blog.kitware.com/cmake-3-5-0-available-for-download/
  
  Most ports have already been fixed for this update, but science/orthanc was
  included in this commit because I am not entirely sure the changes in it work
  with CMake < 3.5.0. In short, FindDCMTK.cmake was rewritten and the way orthanc
  uses the DCMTK variables was incompatible with the use upstream intended.
  
  PR:		208033

Added:
  head/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake   (contents, props changed)
Deleted:
  head/devel/cmake/files/patch-Modules_FindDCMTK.cmake
  head/devel/cmake/files/patch-git_9d653f9c
Modified:
  head/devel/cmake-gui/Makefile
  head/devel/cmake-modules/pkg-plist
  head/devel/cmake/Makefile
  head/devel/cmake/distinfo
  head/devel/cmake/pkg-plist
  head/science/orthanc/Makefile

Modified: head/devel/cmake-gui/Makefile
==============================================================================
--- head/devel/cmake-gui/Makefile	Sat Mar 19 14:41:05 2016	(r411408)
+++ head/devel/cmake-gui/Makefile	Sat Mar 19 14:41:38 2016	(r411409)
@@ -1,9 +1,9 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5.0
 CATEGORIES=	devel
-MASTER_SITES=	https://www.cmake.org/files/v3.4/
+MASTER_SITES=	https://www.cmake.org/files/v3.5/
 PKGNAMESUFFIX=	-gui
 
 MAINTAINER=	kde at FreeBSD.org

Modified: head/devel/cmake-modules/pkg-plist
==============================================================================
--- head/devel/cmake-modules/pkg-plist	Sat Mar 19 14:41:05 2016	(r411408)
+++ head/devel/cmake-modules/pkg-plist	Sat Mar 19 14:41:38 2016	(r411409)
@@ -69,10 +69,12 @@
 %%DATADIR%%/Modules/CMakeFortranInformation.cmake
 %%DATADIR%%/Modules/CMakeGenericSystem.cmake
 %%DATADIR%%/Modules/CMakeGraphVizOptions.cmake
+%%DATADIR%%/Modules/CMakeIOSInstallCombined.cmake
 %%DATADIR%%/Modules/CMakeImportBuildSettings.cmake
 %%DATADIR%%/Modules/CMakeJOMFindMake.cmake
 %%DATADIR%%/Modules/CMakeJavaCompiler.cmake.in
 %%DATADIR%%/Modules/CMakeJavaInformation.cmake
+%%DATADIR%%/Modules/CMakeLanguageInformation.cmake
 %%DATADIR%%/Modules/CMakeMSYSFindMake.cmake
 %%DATADIR%%/Modules/CMakeMinGWFindMake.cmake
 %%DATADIR%%/Modules/CMakeNMakeFindMake.cmake
@@ -169,6 +171,11 @@
 %%DATADIR%%/Modules/CheckVariableExists.c
 %%DATADIR%%/Modules/CheckVariableExists.cmake
 %%DATADIR%%/Modules/Compiler/ADSP-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-ASM.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-C.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-CXX.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC-DetermineCompiler.cmake
+%%DATADIR%%/Modules/Compiler/ARMCC.cmake
 %%DATADIR%%/Modules/Compiler/Absoft-Fortran.cmake
 %%DATADIR%%/Modules/Compiler/AppleClang-ASM.cmake
 %%DATADIR%%/Modules/Compiler/AppleClang-C-FeatureTests.cmake
@@ -194,6 +201,22 @@
 %%DATADIR%%/Modules/Compiler/Cray-CXX.cmake
 %%DATADIR%%/Modules/Compiler/Cray-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Cray-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Cray-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-GNU-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-Intel-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-C.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-CXX.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv-PGI-Fortran.cmake
+%%DATADIR%%/Modules/Compiler/CrayPrgEnv.cmake
 %%DATADIR%%/Modules/Compiler/Embarcadero-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/Fujitsu-DetermineCompiler.cmake
 %%DATADIR%%/Modules/Compiler/G95-Fortran.cmake
@@ -422,6 +445,7 @@
 %%DATADIR%%/Modules/FindX11.cmake
 %%DATADIR%%/Modules/FindXCTest.cmake
 %%DATADIR%%/Modules/FindXMLRPC.cmake
+%%DATADIR%%/Modules/FindXalanC.cmake
 %%DATADIR%%/Modules/FindXercesC.cmake
 %%DATADIR%%/Modules/FindZLIB.cmake
 %%DATADIR%%/Modules/Findosg.cmake
@@ -541,6 +565,7 @@
 %%DATADIR%%/Modules/Platform/CYGWIN-windres.cmake
 %%DATADIR%%/Modules/Platform/CYGWIN.cmake
 %%DATADIR%%/Modules/Platform/Catamount.cmake
+%%DATADIR%%/Modules/Platform/CrayLinuxEnvironment.cmake
 %%DATADIR%%/Modules/Platform/Darwin-Absoft-Fortran.cmake
 %%DATADIR%%/Modules/Platform/Darwin-AppleClang-C.cmake
 %%DATADIR%%/Modules/Platform/Darwin-AppleClang-CXX.cmake

Modified: head/devel/cmake/Makefile
==============================================================================
--- head/devel/cmake/Makefile	Sat Mar 19 14:41:05 2016	(r411408)
+++ head/devel/cmake/Makefile	Sat Mar 19 14:41:38 2016	(r411409)
@@ -2,10 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	cmake
-PORTVERSION=	3.4.2
+PORTVERSION=	3.5.0
 PORTREVISION?=	0
 CATEGORIES=	devel
-MASTER_SITES=	https://www.cmake.org/files/v3.4/
+MASTER_SITES=	https://www.cmake.org/files/v3.5/
 
 MAINTAINER=	kde at FreeBSD.org
 COMMENT?=	Cross-platform Makefile generator

Modified: head/devel/cmake/distinfo
==============================================================================
--- head/devel/cmake/distinfo	Sat Mar 19 14:41:05 2016	(r411408)
+++ head/devel/cmake/distinfo	Sat Mar 19 14:41:38 2016	(r411409)
@@ -1,2 +1,2 @@
-SHA256 (cmake-3.4.2.tar.gz) = da7cc34e1ce1d82e67a32ab081c02c2845534cd8bf2e09d88077a1b282e97392
-SIZE (cmake-3.4.2.tar.gz) = 6722152
+SHA256 (cmake-3.5.0.tar.gz) = 92c83ad8a4fd6224cf6319a60b399854f55b38ebe9d297c942408b792b1a9efa
+SIZE (cmake-3.5.0.tar.gz) = 6861686

Modified: head/devel/cmake/pkg-plist
==============================================================================
--- head/devel/cmake/pkg-plist	Sat Mar 19 14:41:05 2016	(r411408)
+++ head/devel/cmake/pkg-plist	Sat Mar 19 14:41:38 2016	(r411409)
@@ -39,6 +39,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/command/build_name.rst
 %%DATADIR%%/Help/command/cmake_host_system_information.rst
 %%DATADIR%%/Help/command/cmake_minimum_required.rst
+%%DATADIR%%/Help/command/cmake_parse_arguments.rst
 %%DATADIR%%/Help/command/cmake_policy.rst
 %%DATADIR%%/Help/command/configure_file.rst
 %%DATADIR%%/Help/command/continue.rst
@@ -296,10 +297,10 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindHTMLHelp.rst
 %%DATADIR%%/Help/module/FindHg.rst
 %%DATADIR%%/Help/module/FindITK.rst
-%%DATADIR%%/Help/module/FindIntl.rst
 %%DATADIR%%/Help/module/FindIce.rst
 %%DATADIR%%/Help/module/FindIcotool.rst
 %%DATADIR%%/Help/module/FindImageMagick.rst
+%%DATADIR%%/Help/module/FindIntl.rst
 %%DATADIR%%/Help/module/FindJNI.rst
 %%DATADIR%%/Help/module/FindJPEG.rst
 %%DATADIR%%/Help/module/FindJasper.rst
@@ -370,6 +371,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/module/FindX11.rst
 %%DATADIR%%/Help/module/FindXCTest.rst
 %%DATADIR%%/Help/module/FindXMLRPC.rst
+%%DATADIR%%/Help/module/FindXalanC.rst
 %%DATADIR%%/Help/module/FindXercesC.rst
 %%DATADIR%%/Help/module/FindZLIB.rst
 %%DATADIR%%/Help/module/Findosg.rst
@@ -706,6 +708,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/prop_tgt/INTERFACE_SYSTEM_INCLUDE_DIRECTORIES.rst
 %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION.rst
 %%DATADIR%%/Help/prop_tgt/INTERPROCEDURAL_OPTIMIZATION_CONFIG.rst
+%%DATADIR%%/Help/prop_tgt/IOS_INSTALL_COMBINED.rst
 %%DATADIR%%/Help/prop_tgt/JOB_POOL_COMPILE.rst
 %%DATADIR%%/Help/prop_tgt/JOB_POOL_LINK.rst
 %%DATADIR%%/Help/prop_tgt/LABELS.rst
@@ -802,6 +805,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/release/3.2.rst
 %%DATADIR%%/Help/release/3.3.rst
 %%DATADIR%%/Help/release/3.4.rst
+%%DATADIR%%/Help/release/3.5.rst
 %%DATADIR%%/Help/release/dev.txt
 %%DATADIR%%/Help/release/index.rst
 %%DATADIR%%/Help/variable/APPLE.rst
@@ -884,6 +888,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_EXECUTABLE_SUFFIX.rst
 %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS.rst
 %%DATADIR%%/Help/variable/CMAKE_EXE_LINKER_FLAGS_CONFIG.rst
+%%DATADIR%%/Help/variable/CMAKE_EXPORT_COMPILE_COMMANDS.rst
 %%DATADIR%%/Help/variable/CMAKE_EXPORT_NO_PACKAGE_REGISTRY.rst
 %%DATADIR%%/Help/variable/CMAKE_EXTRA_GENERATOR.rst
 %%DATADIR%%/Help/variable/CMAKE_EXTRA_SHARED_LIBRARY_SUFFIXES.rst
@@ -935,6 +940,7 @@ share/aclocal/cmake.m4
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH.rst
 %%DATADIR%%/Help/variable/CMAKE_INSTALL_RPATH_USE_LINK_PATH.rst
 %%DATADIR%%/Help/variable/CMAKE_INTERNAL_PLATFORM_ABI.rst
+%%DATADIR%%/Help/variable/CMAKE_IOS_INSTALL_COMBINED.rst
 %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_COMPILE.rst
 %%DATADIR%%/Help/variable/CMAKE_JOB_POOL_LINK.rst
 %%DATADIR%%/Help/variable/CMAKE_LANG_ARCHIVE_APPEND.rst

Modified: head/science/orthanc/Makefile
==============================================================================
--- head/science/orthanc/Makefile	Sat Mar 19 14:41:05 2016	(r411408)
+++ head/science/orthanc/Makefile	Sat Mar 19 14:41:38 2016	(r411409)
@@ -34,6 +34,7 @@ LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/
 		libpugixml.so:${PORTSDIR}/textproc/pugixml
 
 CMAKE_ARGS=	-DDCMTK_LIBRARIES="dcmdsig;charls;dcmjpls" \
+		-DDCMTK_DIR="${LOCALBASE}" \
 		-DDCMTK_DICTIONARY_DIR="${LOCALBASE}/share/dcmtk" \
 		-DUSE_SYSTEM_MONGOOSE=OFF \
 		-DUNIT_TESTS_WITH_HTTP_CONNEXIONS=OFF

Added: head/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/science/orthanc/files/patch-Resources_CMake_DcmtkConfiguration.cmake	Sat Mar 19 14:41:38 2016	(r411409)
@@ -0,0 +1,22 @@
+Fix the build with CMake 3.5.0.
+
+FindDCMTK.cmake was rewritten upstream, and is incompatible with the uses in
+this file: we need to set DCMTK_DIR in the port's Makefile, and it does not
+match the directory used for searching for the headers below.
+--- Resources/CMake/DcmtkConfiguration.cmake.orig	2015-12-15 16:49:02 UTC
++++ Resources/CMake/DcmtkConfiguration.cmake
+@@ -186,10 +186,10 @@ else()
+     -DHAVE_CONFIG_H=1
+     )
+ 
+-  if (EXISTS "${DCMTK_DIR}/config/cfunix.h")
+-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/cfunix.h")
+-  elseif (EXISTS "${DCMTK_DIR}/config/osconfig.h")  # This is for Arch Linux
+-    set(DCMTK_CONFIGURATION_FILE "${DCMTK_DIR}/config/osconfig.h")
++  if (EXISTS "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
++    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/cfunix.h")
++  elseif (EXISTS "${DCMTK_config_INCLUDE_DIR}/osconfig.h")  # This is for Arch Linux
++    set(DCMTK_CONFIGURATION_FILE "${DCMTK_config_INCLUDE_DIR}/osconfig.h")
+   else()
+     message(FATAL_ERROR "Please install libdcmtk*-dev")
+   endif()

More information about the svn-ports-all mailing list