From a26fc81350ab139c72dfeae07822ce3db3ca7ebb Mon Sep 17 00:00:00 2001
From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com>
Date: Tue, 27 Jun 2023 04:08:05 +0800
Subject: [PATCH] [vcpkg baseline][dcmtk] Remove the leading spaces of pc file
 (#32049)

* [vcpkg baseline][dcmtk] Adding SKIP_CHECK for vcpkg_fixup_pkgconfig()

* Fix the format of pc.in file

* Remove local change
---
 ports/dcmtk/fix-pc-format.patch | 32 ++++++++++++++++++++++++++++++++
 ports/dcmtk/portfile.cmake      |  3 ++-
 ports/dcmtk/vcpkg.json          |  2 +-
 versions/baseline.json          |  2 +-
 versions/d-/dcmtk.json          |  5 +++++
 5 files changed, 41 insertions(+), 3 deletions(-)
 create mode 100644 ports/dcmtk/fix-pc-format.patch

diff --git a/ports/dcmtk/fix-pc-format.patch b/ports/dcmtk/fix-pc-format.patch
new file mode 100644
index 0000000000..4cbffe98b0
--- /dev/null
+++ b/ports/dcmtk/fix-pc-format.patch
@@ -0,0 +1,32 @@
+diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in
+index 13c79c0..46fc98a 100644
+--- a/CMake/dcmtk.pc.in
++++ b/CMake/dcmtk.pc.in
+@@ -1,14 +1,14 @@
+- prefix="@CMAKE_INSTALL_PREFIX@"
+- exec_prefix="${prefix}"
+- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
+- includedir="${prefix}/include/"
++prefix="@CMAKE_INSTALL_PREFIX@"
++exec_prefix="${prefix}"
++libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@"
++includedir="${prefix}/include/"
+ 
+- Name: DCMTK
+- Description: DICOM Toolkit (DCMTK)
+- URL: https://dcmtk.org
+- Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@
+- Requires: @PKGCONF_REQ_PUB@
+- Requires.private: @PKGCONF_REQ_PRIV@
+- Cflags: -I"${includedir}"
+- Libs: -L"${libdir}" @PKGCONF_LIBS@
+- Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@
++Name: DCMTK
++Description: DICOM Toolkit (DCMTK)
++URL: https://dcmtk.org
++Version: @DCMTK_MAJOR_VERSION@.@DCMTK_MINOR_VERSION@.@DCMTK_BUILD_VERSION@
++Requires: @PKGCONF_REQ_PUB@
++Requires.private: @PKGCONF_REQ_PRIV@
++Cflags: -I"${includedir}"
++Libs: -L"${libdir}" @PKGCONF_LIBS@
++Libs.private: -L"${libdir}" @PKGCONF_LIBS_PRIV@
diff --git a/ports/dcmtk/portfile.cmake b/ports/dcmtk/portfile.cmake
index 4dcbeb8247..724876e274 100644
--- a/ports/dcmtk/portfile.cmake
+++ b/ports/dcmtk/portfile.cmake
@@ -7,6 +7,7 @@ vcpkg_from_github(
     PATCHES
         dcmtk.patch
         windows-patch.patch
+        fix-pc-format.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -134,6 +135,6 @@ vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/dcmtk/config/osconfig.h" "
 
 vcpkg_fixup_pkgconfig()
 
-file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYRIGHT")
 
 file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
diff --git a/ports/dcmtk/vcpkg.json b/ports/dcmtk/vcpkg.json
index 7b4067ddab..7adfe71059 100644
--- a/ports/dcmtk/vcpkg.json
+++ b/ports/dcmtk/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "dcmtk",
   "version": "3.6.7",
-  "port-version": 4,
+  "port-version": 5,
   "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.",
   "homepage": "https://github.com/DCMTK/dcmtk",
   "license": "BSD-3-Clause OR BSD-2-Clause OR libtiff OR MIT OR Zlib OR Libpng",
diff --git a/versions/baseline.json b/versions/baseline.json
index ad48ede136..75c5422d07 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2050,7 +2050,7 @@
     },
     "dcmtk": {
       "baseline": "3.6.7",
-      "port-version": 4
+      "port-version": 5
     },
     "debug-assert": {
       "baseline": "1.3.3",
diff --git a/versions/d-/dcmtk.json b/versions/d-/dcmtk.json
index e0d808fc07..0e5e9f7f96 100644
--- a/versions/d-/dcmtk.json
+++ b/versions/d-/dcmtk.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "a66dd62879ace07389aae2f77cc909744f9d7458",
+      "version": "3.6.7",
+      "port-version": 5
+    },
     {
       "git-tree": "99287653b98406054ee56cb8447c38aff0528444",
       "version": "3.6.7",