[gdcm]Update to v3.0.0 and rename to gdcm. (#6348)

* [gdcm]Update to v3.0.0 and rename to gdcm.

* [gdcm2]Add empty port "gdcm2" mapping to port gdcm

3 files changed, 4 insertions, 97 deletions

diff --git a/ports/gdcm2/CONTROL b/ports/gdcm2/CONTROL
index baabd1df1..88d473b65 100644
--- a/ports/gdcm2/CONTROL
+++ b/ports/gdcm2/CONTROL
@@ -1,4 +1,4 @@
 Source: gdcm2
-Version: 2.8.9
-Description: Grassroots DICOM library
-Build-Depends: zlib, expat, openjpeg
+Version: deprecated
+Description: This port was renamed to gdcm.  The gdcm2 name is deprecated.
+Build-Depends: gdcm
\ No newline at end of file
diff --git a/ports/gdcm2/find-openjpeg.patch b/ports/gdcm2/find-openjpeg.patch
deleted file mode 100644
index c3fff18f5..000000000
--- a/ports/gdcm2/find-openjpeg.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/CMake/FindOpenJPEG.cmake
-+++ b/CMake/FindOpenJPEG.cmake
-@@ -20,14 +20,38 @@
- 
- # Try with pkg-config first
- find_package(PkgConfig)
--pkg_check_modules(OPENJPEG libopenjp2)
-+if (PKG_CONFIG_FOUND)
-+    pkg_check_modules(OPENJPEG libopenjp2)
-+    include(FindPackageHandleStandardArgs)
-+    find_package_handle_standard_args(OpenJPEG REQUIRED_VARS
-+      OPENJPEG_LIBRARIES
-+      OPENJPEG_INCLUDE_DIRS
-+      VERSION_VAR OPENJPEG_VERSION
-+    )
-+endif()
- 
--include(FindPackageHandleStandardArgs)
--find_package_handle_standard_args(OpenJPEG REQUIRED_VARS
--  OPENJPEG_LIBRARIES
--  OPENJPEG_INCLUDE_DIRS
--  VERSION_VAR OPENJPEG_VERSION
--)
-+find_path(OPENJPEG_INCLUDE_DIR NAMES openjpeg.h)
-+find_library(OPENJPEG_LIBRARY NAMES openjp2)
-+if (OPENJPEG_LIBRARY)
-+    string(FIND ${OPENJPEG_LIBRARY} debug _debug_substrpos)
-+    if (_debug_substrpos EQUAL -1)
-+        set(OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY})
-+        string(REPLACE "/lib" "/debug/lib" OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY_RELEASE})
-+    else()
-+        set(OPENJPEG_LIBRARY_DEBUG ${OPENJPEG_LIBRARY})
-+        string(REPLACE "/debug/lib" "/lib" OPENJPEG_LIBRARY_RELEASE ${OPENJPEG_LIBRARY_DEBUG})
-+    endif()
-+    set(OPENJPEG_LIBRARY optimized ${OPENJPEG_LIBRARY_RELEASE} debug ${OPENJPEG_LIBRARY_DEBUG})
-+    set(OPENJPEG_FOUND TRUE)
-+endif()
-+
-+if (OPENJPEG_FOUND)
-+    set(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY})
-+    set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG_INCLUDE_DIR})
-+    message(STATUS "Found OPENJPEG library ${OPENJPEG_LIBRARIES}")
-+else()
-+    message(FATAL_ERROR "NOT found OPENJPEG")
-+endif()
- 
- mark_as_advanced(
-   OPENJPEG_LIBRARIES
diff --git a/ports/gdcm2/portfile.cmake b/ports/gdcm2/portfile.cmake
index bc44a0a97..0015715fb 100644
--- a/ports/gdcm2/portfile.cmake
+++ b/ports/gdcm2/portfile.cmake
@@ -1,46 +1 @@
-include(vcpkg_common_functions)
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO malaterre/GDCM
-    REF v2.8.9
-    SHA512 3c80503de6df8fe2589849ae9334d11e3cb033701450e1d7ea2781d122d1c8c1fc205fefc358d0ad1b9c5199c838e1c7c1bb34949da1c73cc8ae174b72e7e70c
-    HEAD_REF master
-    PATCHES find-openjpeg.patch
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
-    set(GDCM_BUILD_SHARED_LIBS ON)
-else()
-    set(GDCM_BUILD_SHARED_LIBS OFF)
-endif()
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA # Disable this option if project cannot be built with Ninja
-    OPTIONS
-        -DGDCM_BUILD_DOCBOOK_MANPAGES=OFF
-        -DGDCM_BUILD_SHARED_LIBS=${GDCM_BUILD_SHARED_LIBS}
-        -DGDCM_INSTALL_INCLUDE_DIR=include
-        -DGDCM_USE_SYSTEM_EXPAT=ON
-        -DGDCM_USE_SYSTEM_ZLIB=ON
-        -DGDCM_USE_SYSTEM_OPENJPEG=ON
-        -DGDCM_BUILD_TESTING=OFF
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/gdcm-2.8 TARGET_PATH share/gdcm)
-
-file(REMOVE_RECURSE
-    ${CURRENT_PACKAGES_DIR}/debug/include
-    ${CURRENT_PACKAGES_DIR}/debug/share
-)
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-# Handle copyright
-file(INSTALL ${SOURCE_PATH}/Copyright.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/gdcm2 RENAME copyright)
-
-vcpkg_copy_pdbs()
+set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file