From 2d378e70a6bed7ba05a23886dcc33b8a0ebc7739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Matte?= <BigSeb@users.noreply.github.com>
Date: Thu, 6 May 2021 16:41:47 -0400
Subject: [DCMTK] Update to 3.6.6 (#17641)

* [dcmtk] Update to 3.6.6

* [dcmtk] Update to 3.6.6
---
 ports/dcmtk/CONTROL        |  2 +-
 ports/dcmtk/dcmtk.patch    | 32 ++++++++++++++++----------------
 ports/dcmtk/portfile.cmake |  4 ++--
 versions/baseline.json     |  2 +-
 versions/d-/dcmtk.json     |  5 +++++
 5 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/ports/dcmtk/CONTROL b/ports/dcmtk/CONTROL
index 4d8698bdd..be526617e 100644
--- a/ports/dcmtk/CONTROL
+++ b/ports/dcmtk/CONTROL
@@ -1,3 +1,3 @@
 Source: dcmtk
-Version: 3.6.5+_20191213
+Version: 3.6.6
 Description: This DICOM ToolKit (DCMTK) package consists of source code, documentation and installation instructions for a set of software libraries and applications implementing part of the DICOM/MEDICOM Standard.
diff --git a/ports/dcmtk/dcmtk.patch b/ports/dcmtk/dcmtk.patch
index cca14e28e..7f2c95a40 100644
--- a/ports/dcmtk/dcmtk.patch
+++ b/ports/dcmtk/dcmtk.patch
@@ -1,16 +1,16 @@
-diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
-index e9f77b5..4f7ebe3 100644
---- a/CMake/dcmtkPrepare.cmake
-+++ b/CMake/dcmtkPrepare.cmake
-@@ -192,9 +192,9 @@ include(GNUInstallDirs)
- # CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed
- # to different installation paths under Unix- and Windows-based systems
- if(UNIX)
--  set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
-+  SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
- elseif(WIN32)
--  set(DCMTK_INSTALL_CMKDIR "cmake")
-+  SET(DCMTK_INSTALL_CMKDIR "share/dcmtk")
- endif()
- 
- #-----------------------------------------------------------------------------
+diff --git a/CMake/dcmtkPrepare.cmake b/CMake/dcmtkPrepare.cmake
+index 23a9278..15e9391 100644
+--- a/CMake/dcmtkPrepare.cmake
++++ b/CMake/dcmtkPrepare.cmake
+@@ -210,9 +210,9 @@ include(GNUInstallDirs)
+ # CMake's files (DCMTKTarget.cmake, DCMTKConfigVersion.cmake and DCMTKConfig.cmake) are installed
+ # to different installation paths under Unix- and Windows-based systems
+ if(UNIX)
+-  set(DCMTK_INSTALL_CMKDIR "${CMAKE_INSTALL_LIBDIR}/cmake/dcmtk")
++  set(DCMTK_INSTALL_CMKDIR "share/dcmtk")
+ elseif(WIN32)
+-  set(DCMTK_INSTALL_CMKDIR "cmake")
++  set(DCMTK_INSTALL_CMKDIR "share/dcmtk")
+ endif()
+ 
+ #-----------------------------------------------------------------------------
diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake
index 074c38a9f..a9b60e95a 100644
--- a/ports/dcmtk/portfile.cmake
+++ b/ports/dcmtk/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO DCMTK/dcmtk
-    REF 8eda253d9b7526498c2f6badb3acc695da808b49 # DCMTK-3.6.5+_20191213
-    SHA512 d0b716bb40a10872d3e4bc0e42c8ff8800038b2f11b169fd15e23a621f70433e9e70ec98879ebfcbfc01c6daf7a033f4b6b80ed7ada0357559594dce66742481
+    REF 6cb30bd7fb42190e0188afbd8cb961c62a6fb9c9 # DCMTK-3.6.6
+    SHA512 3fbd524bc0b9dced2cdddca850c88d8785ca5f333c5f1598ffbffb8e5c33d11eebdce9ed935245048ac45a7ccd7bd9e4ca79eaacf752cba64a5534b76e5efcdb
     HEAD_REF master
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/dcmtk.patch
 )
diff --git a/versions/baseline.json b/versions/baseline.json
index 356dd5164..66b45bd55 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1605,7 +1605,7 @@
       "port-version": 0
     },
     "dcmtk": {
-      "baseline": "3.6.5+_20191213",
+      "baseline": "3.6.6",
       "port-version": 0
     },
     "debug-assert": {
diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json
index 6ef310557..9f9eb3d0f 100644
--- a/versions/d-/dcmtk.json
+++ b/versions/d-/dcmtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0c53e59b36c487946025ebf3c2ea38ce5401d207",
+      "version-string": "3.6.6",
+      "port-version": 0
+    },
     {
       "git-tree": "c5cc40d9aabe103e79ca9315543646243b001814",
       "version-string": "3.6.5+_20191213",
-- 
cgit v1.2.3