<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/30cae4d688544423bd41f967dfc05c5f4d1d6865">https://github.com/macports/macports-ports/commit/30cae4d688544423bd41f967dfc05c5f4d1d6865</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 30cae4d6885 dcmtk: 3.6.7 (#14878)
</span>30cae4d6885 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 30cae4d688544423bd41f967dfc05c5f4d1d6865
</span>Author: Eric A. Borisch <eborisch@gmail.com>
AuthorDate: Wed May 18 15:30:29 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> dcmtk: 3.6.7 (#14878)
</span>---
graphics/dcmtk/Portfile | 13 ++---
graphics/dcmtk/files/CMake_3rdparty.cmake.patch | 78 -------------------------
graphics/dcmtk/files/arm64.patch | 32 ----------
3 files changed, 5 insertions(+), 118 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/Portfile b/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f69161f9b6c..515f1273a14 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/dcmtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup muniversal 1.0
</span> PortGroup cmake 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup DCMTK dcmtk 3.6.6 DCMTK-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup DCMTK dcmtk 3.6.7 DCMTK-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span>
set unpatched_version [lindex [split ${version} _] 0]
set stripped_version [string map {. ""} ${unpatched_version}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,12 +31,9 @@ long_description DCMTK is a collection of libraries and applications \
</span> homepage https://dicom.offis.de/dcmtk
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1b146dd976ef31e7779d7b481fd947f31860c57e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 204d8b4e99c71a3239453a127ccb65e35bf49c1ae46af65d1bc019e960911c40 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6512834
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles CMake_3rdparty.cmake.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append arm64.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 98b3015c36b0113f339a1ea2a31bdb49593cdbe9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 98c0c93473badbd79322202a6d36c915de88287e0ce16dd3b9f193376e848c83 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6640330
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/files/CMake_3rdparty.cmake.patch b/graphics/dcmtk/files/CMake_3rdparty.cmake.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 04feb567f50..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dcmtk/files/CMake_3rdparty.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,78 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMake/3rdparty.cmake.orig 2021-10-15 16:07:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMake/3rdparty.cmake 2021-10-15 16:08:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -19,6 +19,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mark_as_advanced(DCMTK_USE_FIND_PACKAGE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(DCMTK_USE_FIND_PACKAGE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # Find OpenSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(DCMTK_WITH_OPENSSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find_package(OpenSSL QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(NOT OPENSSL_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Warning: OPENSSL support will be disabled because openssl was not found.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include(CheckLibraryExists)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include(CheckCXXSourceCompiles)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(TEMP_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ list(APPEND CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHECK_CXX_SOURCE_COMPILES("extern \"C\" {\n#include <openssl/ssl.h>\n}\nint main(){\n#if OPENSSL_VERSION_NUMBER < 0x10001000L\n#error OpenSSL too old\n#endif\n}\n" OPENSSL_VERSION_CHECK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(CMAKE_REQUIRED_INCLUDES "${TEMP_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(OPENSSL_VERSION_CHECK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Info: DCMTK OPENSSL support will be enabled")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WITH_OPENSSL 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ include_directories(${OPENSSL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENSSL_LIBS ${OPENSSL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(OPENSSL_LIBS ${OPENSSL_LIBS} dl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ message(STATUS "Info: DCMTK OPENSSL support will be disabled: DCMTK requires OpenSSL version 1.0.1 or newer")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find TIFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(DCMTK_WITH_TIFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(TIFF QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,37 +88,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Find OpenSSL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(DCMTK_WITH_OPENSSL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find_package(OpenSSL QUIET)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(NOT OPENSSL_FOUND)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Warning: OPENSSL support will be disabled because openssl was not found.")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include(CheckLibraryExists)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include(CheckCXXSourceCompiles)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(TEMP_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- list(APPEND CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHECK_CXX_SOURCE_COMPILES("extern \"C\" {\n#include <openssl/ssl.h>\n}\nint main(){\n#if OPENSSL_VERSION_NUMBER < 0x10001000L\n#error OpenSSL too old\n#endif\n}\n" OPENSSL_VERSION_CHECK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(CMAKE_REQUIRED_INCLUDES "${TEMP_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(OPENSSL_VERSION_CHECK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Info: DCMTK OPENSSL support will be enabled")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(WITH_OPENSSL 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_directories(${OPENSSL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_LIBS ${OPENSSL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(OPENSSL_LIBS ${OPENSSL_LIBS} dl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- message(STATUS "Info: DCMTK OPENSSL support will be disabled: DCMTK requires OpenSSL version 1.0.1 or newer")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Find libXML2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(DCMTK_WITH_XML)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find_package(LibXml2 QUIET)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/dcmtk/files/arm64.patch b/graphics/dcmtk/files/arm64.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 93ab9e80e66..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/dcmtk/files/arm64.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,32 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build for arm64.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://support.dcmtk.org/redmine/issues/957
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/DCMTK/dcmtk/commit/5fba853b6f7c13b02bed28bd9f7d3f450e4c72bb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- config/tests/arith.cc.orig 2021-01-14 08:16:29.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ config/tests/arith.cc 2022-01-10 13:40:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ieeefp.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // For controlling floating point exceptions on OS X.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <xmmintrin.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -340,7 +340,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_WINDOWS_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _clearfp();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _controlfp( _controlfp(0,0) & ~_EM_INVALID, _MCW_EM );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__APPLE__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() & ~_MM_MASK_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- feenableexcept( FE_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -382,7 +382,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _controlfp( _controlfp(0,0) | _EM_INVALID, _MCW_EM );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_FENV_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- feclearexcept( FE_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__) && !defined(__aarch64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _MM_SET_EXCEPTION_MASK( _MM_GET_EXCEPTION_MASK() | _MM_MASK_INVALID );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_FENV_H) && defined(HAVE_PROTOTYPE_FEENABLEEXCEPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fedisableexcept( FE_INVALID );
</span></pre><pre style='margin:0'>
</pre>