<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/4dd21e6d18add6250162a5f7a8a2579c908bb86e">https://github.com/macports/macports-ports/commit/4dd21e6d18add6250162a5f7a8a2579c908bb86e</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 4dd21e6d18a dcmtk: Migrate to openssl3 (#12593)
</span>4dd21e6d18a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 4dd21e6d18add6250162a5f7a8a2579c908bb86e
</span>Author: Eric A. Borisch <borisch.eric@mayo.edu>
AuthorDate: Fri Oct 15 19:44:21 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> dcmtk: Migrate to openssl3 (#12593)
</span>---
graphics/dcmtk/Portfile | 10 ++--
graphics/dcmtk/files/CMake_3rdparty.cmake.patch | 78 +++++++++++++++++++++++++
2 files changed, 84 insertions(+), 4 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 4520c5f9158..0a5a8f2807c 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;'>@@ -7,8 +7,8 @@ PortGroup cmake 1.1
</span> PortGroup github 1.0
github.setup DCMTK dcmtk 3.6.6 DCMTK-
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span> set unpatched_version [lindex [split ${version} _] 0]
set stripped_version [string map {. ""} ${unpatched_version}]
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,6 +36,8 @@ checksums \
</span> sha256 204d8b4e99c71a3239453a127ccb65e35bf49c1ae46af65d1bc019e960911c40 \
size 6512834
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles CMake_3rdparty.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> compiler.cxx_standard 2011
# avoid self-conflict
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -144,9 +146,9 @@ variant sound description "Enable sndfile support" {
</span> }
variant ssl description "Enable openssl support" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete -DDCMTK_WITH_OPENSSL=OFF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append -DDCMTK_WITH_OPENSSL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append path:lib/openssl-3/libssl.dylib:openssl3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-replace -DDCMTK_WITH_OPENSSL=OFF -DDCMTK_WITH_OPENSSL=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DOPENSSL_ROOT_DIR=${prefix}/libexec/openssl3
</span> }
default_variants +ssl
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..04feb567f50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/dcmtk/files/CMake_3rdparty.cmake.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,78 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMake/3rdparty.cmake.orig 2021-10-15 16:07:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMake/3rdparty.cmake 2021-10-15 16:08:08.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark_as_advanced(DCMTK_USE_FIND_PACKAGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DCMTK_USE_FIND_PACKAGE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ # Find OpenSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(DCMTK_WITH_OPENSSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_package(OpenSSL QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(NOT OPENSSL_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Warning: OPENSSL support will be disabled because openssl was not found.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include(CheckLibraryExists)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include(CheckCXXSourceCompiles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(TEMP_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list(APPEND CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 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:#e0ffe0;'>++ set(CMAKE_REQUIRED_INCLUDES "${TEMP_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(OPENSSL_VERSION_CHECK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Info: DCMTK OPENSSL support will be enabled")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(WITH_OPENSSL 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include_directories(${OPENSSL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(OPENSSL_LIBS ${OPENSSL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(OPENSSL_LIBS ${OPENSSL_LIBS} dl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ 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:#e0ffe0;'>++ set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find TIFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DCMTK_WITH_TIFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(TIFF QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -57,37 +88,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- # Find OpenSSL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(DCMTK_WITH_OPENSSL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_package(OpenSSL QUIET)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(NOT OPENSSL_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "Warning: OPENSSL support will be disabled because openssl was not found.")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include(CheckLibraryExists)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include(CheckCXXSourceCompiles)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(TEMP_INCLUDES "${CMAKE_REQUIRED_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>+- set(CMAKE_REQUIRED_INCLUDES "${TEMP_INCLUDES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(OPENSSL_VERSION_CHECK)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "Info: DCMTK OPENSSL support will be enabled")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(WITH_OPENSSL 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include_directories(${OPENSSL_INCLUDE_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_LIBS ${OPENSSL_LIBRARIES})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CHECK_LIBRARY_EXISTS(dl dlopen "" HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(HAVE_LIBDL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(OPENSSL_LIBS ${OPENSSL_LIBS} dl)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 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:#e0ffe0;'>+- set(DCMTK_WITH_OPENSSL OFF CACHE BOOL "" FORCE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(WITH_OPENSSL "")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Find libXML2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(DCMTK_WITH_XML)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(LibXml2 QUIET)
</span></pre><pre style='margin:0'>
</pre>