[libxml2] Use official CMakeLists and add feature tools

ports/azure-storage-common-cpp/fix-dependency-libxml2.patch

@@ -0,0 +1,36 @@
+diff --git a/sdk/storage/azure-storage-common/CMakeLists.txt b/sdk/storage/azure-storage-common/CMakeLists.txt
+index 285ae93..697de72 100644
+--- a/sdk/storage/azure-storage-common/CMakeLists.txt
++++ b/sdk/storage/azure-storage-common/CMakeLists.txt
+@@ -27,7 +27,7 @@ if(NOT AZ_ALL_LIBRARIES)
+ endif()
+
+ find_package(Threads REQUIRED)
+-find_package(LibXml2 REQUIRED)
++find_package(libxml2 CONFIG REQUIRED)
+
+ set(
+   AZURE_STORAGE_COMMON_HEADER
+@@ -79,8 +79,7 @@ target_include_directories(
+ )
+
+ target_link_libraries(azure-storage-common PUBLIC Azure::azure-core)
+-target_include_directories(azure-storage-common PRIVATE ${LIBXML2_INCLUDE_DIRS})
+-target_link_libraries(azure-storage-common PRIVATE ${LIBXML2_LIBRARIES})
++target_link_libraries(azure-storage-common PRIVATE LibXml2::LibXml2)
+
+ if(WIN32)
+     target_link_libraries(azure-storage-common PRIVATE bcrypt)
+diff --git a/sdk/storage/azure-storage-common/vcpkg/Config.cmake.in b/sdk/storage/azure-storage-common/vcpkg/Config.cmake.in
+index bfc3563..6e05f1a 100644
+--- a/sdk/storage/azure-storage-common/vcpkg/Config.cmake.in
++++ b/sdk/storage/azure-storage-common/vcpkg/Config.cmake.in
+@@ -4,7 +4,7 @@
+ @PACKAGE_INIT@
+
+ include(CMakeFindDependencyMacro)
+-find_dependency(LibXml2)
++find_dependency(libxml2 CONFIG)
+ find_dependency(Threads)
+ find_dependency(azure-core-cpp)
+

ports/azure-storage-common-cpp/portfile.cmake

@@ -3,6 +3,7 @@ vcpkg_from_github(
     REPO Azure/azure-sdk-for-cpp
     REF azure-storage-common_12.0.0-beta.10
     SHA512 f49f74c9a6d7b80b0f7c8a9b9d2e4595dc304439d30c8c83f520833f81ef7d3480b858ada61c12f76e82eea7960eb155453b0acdcea143f163a12d567adbf18d
+    PATCHES fix-dependency-libxml2.patch
 )
 
 vcpkg_cmake_configure(

ports/azure-storage-common-cpp/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "azure-storage-common-cpp",
   "version-semver": "12.0.0-beta.10",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "Microsoft Azure Common Storage SDK for C++",
     "This library provides common Azure Storage-related abstractions for Azure SDK."

ports/azure-storage-cpp/CONTROL

@@ -1,5 +1,6 @@
 Source: azure-storage-cpp
 Version: 7.5.0
+Port-Version: 1
 Build-Depends: cpprestsdk[core], atlmfc (windows), boost-log (!windows&!uwp), boost-locale (!windows&!uwp), libxml2 (!windows&!uwp), libuuid (!windows&!uwp&!osx), gettext (osx)
 Description: Microsoft Azure Storage Client SDK for C++
   A client library for working with Microsoft Azure storage services including blobs, files, tables, and queues. This client library enables working with the Microsoft Azure storage services which include the blob service for storing binary and text data, the file service for storing binary and text data, the table service for storing structured non-relational data, and the queue service for storing messages that may be accessed by a client.

ports/azure-storage-cpp/fix-dependency-libxml2.patch

@@ -0,0 +1,30 @@
+diff --git a/Microsoft.WindowsAzure.Storage/CMakeLists.txt b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
+index ac9e65d..7b9d82a 100644
+--- a/Microsoft.WindowsAzure.Storage/CMakeLists.txt
++++ b/Microsoft.WindowsAzure.Storage/CMakeLists.txt
+@@ -48,7 +48,7 @@ if(UNIX)
+
+   find_package(UUID REQUIRED)
+   find_package(Casablanca REQUIRED)
+-  find_package(LibXML2 REQUIRED)
++  find_package(libxml2 CONFIG REQUIRED)
+
+   if(BUILD_TESTS)
+     find_package(UnitTest++ REQUIRED)
+@@ -142,11 +142,14 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Binaries)
+
+ set(AZURESTORAGE_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/includes)
+-set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${CASABLANCA_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS} ${LibXML2_INCLUDE_DIR})
++set(AZURESTORAGE_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/includes ${CASABLANCA_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIRS} ${UUID_INCLUDE_DIRS})
+
+
+ set(AZURESTORAGE_LIBRARY azurestorage)
+-set(AZURESTORAGE_LIBRARIES ${AZURESTORAGE_LIBRARY} ${CASABLANCA_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK} ${OPENSSL_LIBRARIES} ${UUID_LIBRARIES} ${LibXML2_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
++set(AZURESTORAGE_LIBRARIES ${AZURESTORAGE_LIBRARY} ${CASABLANCA_LIBRARY} ${Boost_LIBRARIES} ${Boost_FRAMEWORK} ${OPENSSL_LIBRARIES} ${UUID_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
++if (UNIX)
++    list(APPEND AZURESTORAGE_LIBRARIES LibXml2::LibXml2)
++endif()
+
+ # Set version numbers centralized
+ set (AZURESTORAGE_VERSION_MAJOR 7)

ports/azure-storage-cpp/portfile.cmake

@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF v7.5.0
     SHA512 83eabcaf2114c8af1cabbc96b6ef2b57c934a06f68e7a870adf336feaa19edd57aedaf8507d5c40500e46d4e77f5059f9286e319fe7cadeb9ffc8fa018fb030c
     HEAD_REF master
+    PATCHES fix-dependency-libxml2.patch
 )
 
 vcpkg_configure_cmake(

ports/collada-dom/CONTROL

@@ -1,6 +1,6 @@
 Source: collada-dom
 Version: 2.5.0
-Port-Version: 4
+Port-Version: 5
 Homepage: https://github.com/rdiankov/collada-dom
 Description: The COLLADA Document Object Model (DOM) is an application programming interface (API) that provides a C++ object representation of a COLLADA XML instance document.
 Build-Depends: zlib, libxml2, minizip, pcre, uriparser, boost-filesystem, boost-system

ports/collada-dom/fix-dependency-libxml2.patch

@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3f044d3..ff92070 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -207,9 +207,10 @@ if( NOT ZLIB_FOUND )
+   set(ZLIB_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/dom/external-libs/zlib-1.2.5)
+ endif()
+
+-find_package(LibXml2)
++find_package(libxml2 CONFIG REQUIRED)
++set(LIBXML2_FOUND 1)
+ if( LIBXML2_FOUND )
+-  include_directories(${LIBXML2_INCLUDE_DIR})
++  include_directories(${LIBXML2_INCLUDE_DIRS})
+   add_definitions(${LIBXML2_DEFINITIONS} -DDOM_INCLUDE_LIBXML)
+   message(STATUS "libxml2 found")
+ else()

ports/collada-dom/portfile.cmake

@@ -9,6 +9,7 @@ vcpkg_from_github(
         use-uriparser.patch
         use-vcpkg-minizip.patch
         fix-shared-keyword.patch
+        fix-dependency-libxml2.patch
 )
 
 vcpkg_configure_cmake(

ports/commsdsl/fix-dependency-libxml2.patch

@@ -0,0 +1,27 @@
+diff --git a/lib/src/CMakeLists.txt b/lib/src/CMakeLists.txt
+index eaacb7a..cba902c 100644
+--- a/lib/src/CMakeLists.txt
++++ b/lib/src/CMakeLists.txt
+@@ -6,10 +6,10 @@ while (TRUE)
+         break()
+     endif ()
+
+-    find_package(LibXml2 QUIET)
+-    if (LIBXML2_FOUND)
++    find_package(libxml2 CONFIG QUIET)
++    if (1)
+         # Find again just to display info
+-        find_package(LibXml2 REQUIRED) 
++        find_package(libxml2 CONFIG REQUIRED) 
+         break()
+     endif ()
+
+@@ -123,7 +123,7 @@ endif ()
+ set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${COMMSDSL_VERSION})
+
+ target_include_directories(${PROJECT_NAME} 
+-    PRIVATE ${LIBXML2_INCLUDE_DIR}
++    PRIVATE ${LIBXML2_INCLUDE_DIRS}
+     PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/lib/include>
+     INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+ )

ports/commsdsl/portfile.cmake

@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF v3.6
     SHA512 80fab2e567191a468a079dd9964a651293d8e7996141a973e77d4bdfaa96bfc346156f50ce484be1dc2b3d9e661cccce0e712c70876f7b322bc459f81a328496
     HEAD_REF master
+    PATCHES fix-dependency-libxml2.patch
 )
 
 vcpkg_configure_cmake(

ports/commsdsl/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "commsdsl",
   "version-string": "3.6.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "DSL schemas parser and code generator for CommsChampion Ecosystem",
   "homepage": "https://commschamp.github.io/",
   "documentation": "https://github.com/commschamp/commsdsl",

ports/gdal/dependency_win.cmake

@@ -73,9 +73,14 @@ macro(find_dependency_win)
   set(WEBP_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/webpd.lib" )
 
   # Setup libxml2 libraries + include path
-  set(XML2_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" )
-  set(XML2_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" )
-  set(XML2_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2.lib" )
+  set(XML2_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/libxml2" )
+  if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    set(XML2_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2.lib" )
+    set(XML2_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2d.lib" )
+  else()
+    set(XML2_LIBRARY_REL "${CURRENT_INSTALLED_DIR}/lib/libxml2s.lib" )
+    set(XML2_LIBRARY_DBG "${CURRENT_INSTALLED_DIR}/debug/lib/libxml2sd.lib" )
+  endif()
 
   # Setup liblzma libraries + include path
   set(LZMA_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include" )

ports/gdal/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "gdal",
   "version-semver": "3.2.2",
+  "port-version": 1,
   "description": "The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data",
   "homepage": "https://gdal.org",
   "supports": "!arm",

ports/libarchive/fix-dependencies.patch

@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 39b5333..8164d8f 100644
+index 6a1dc1f..85b5050 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -433,7 +433,7 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
+@@ -436,7 +436,7 @@ MARK_AS_ADVANCED(CLEAR ZLIB_LIBRARY)
  # Find BZip2
  #
  IF(ENABLE_BZip2)
@@ -11,7 +11,7 @@ index 39b5333..8164d8f 100644
  ELSE()
    SET(BZIP2_FOUND FALSE) # Override cached value
  ENDIF()
-@@ -462,27 +462,15 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
+@@ -465,27 +465,15 @@ MARK_AS_ADVANCED(CLEAR BZIP2_LIBRARIES)
  # Find LZMA
  #
  IF(ENABLE_LZMA)
@@ -42,7 +42,7 @@ index 39b5333..8164d8f 100644
  ELSE(LIBLZMA_FOUND)
  # LZMA not found and will not be used.
  ENDIF(LIBLZMA_FOUND)
-@@ -555,22 +543,15 @@ IF(ENABLE_LZ4)
+@@ -558,22 +546,15 @@ IF(ENABLE_LZ4)
      SET(LZ4_FIND_QUIETLY TRUE)
    ENDIF (LZ4_INCLUDE_DIR)
 
@@ -69,7 +69,7 @@ index 39b5333..8164d8f 100644
    #
    # TODO: test for static library.
    #
-@@ -586,25 +566,20 @@ IF(ENABLE_ZSTD)
+@@ -589,25 +570,20 @@ IF(ENABLE_ZSTD)
      SET(ZSTD_FIND_QUIETLY TRUE)
    ENDIF (ZSTD_INCLUDE_DIR)
 
@@ -105,7 +105,7 @@ index 39b5333..8164d8f 100644
  ENDIF(ZSTD_FOUND)
  MARK_AS_ADVANCED(CLEAR ZSTD_INCLUDE_DIR)
  MARK_AS_ADVANCED(CLEAR ZSTD_LIBRARY)
-@@ -773,11 +742,11 @@ ENDIF(ENABLE_NETTLE)
+@@ -776,11 +752,11 @@ ENDIF(ENABLE_NETTLE)
  # (Except on Mac, where OpenSSL is deprecated.)
  #
  IF(ENABLE_OPENSSL AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin")
@@ -121,24 +121,24 @@ index 39b5333..8164d8f 100644
    ENDIF(OPENSSL_FOUND)
  ELSE()
    SET(OPENSSL_FOUND FALSE) # Override cached value
-@@ -896,7 +865,6 @@ main(int argc, char **argv)
+@@ -899,7 +875,6 @@ main(int argc, char **argv)
          IF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
            INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
  	  LIST(APPEND ADDITIONAL_LIBS ${OPENSSL_LIBRARIES})
 -	   LIST(REMOVE_DUPLICATES ADDITIONAL_LIBS)
          ENDIF ("${IMPLEMENTATION}" MATCHES "^OPENSSL$" AND OPENSSL_FOUND)
        ENDIF (ARCHIVE_CRYPTO_${ALGORITHM}_${IMPLEMENTATION})
        ENDIF(NOT ARCHIVE_CRYPTO_${ALGORITHM})
-@@ -1128,7 +1096,7 @@ ENDIF(ENABLE_ICONV)
+@@ -1131,7 +1106,7 @@ ENDIF(ENABLE_ICONV)
  # Find Libxml2
  #
  IF(ENABLE_LIBXML2)
 -  FIND_PACKAGE(LibXml2)
-+  FIND_PACKAGE(LibXml2 REQUIRED)
++  FIND_PACKAGE(libxml2 CONFIG REQUIRED)
  ELSE()
    SET(LIBXML2_FOUND FALSE)
  ENDIF()
-@@ -1432,8 +1400,7 @@ CHECK_C_SOURCE_COMPILES(
+@@ -1435,8 +1410,7 @@ CHECK_C_SOURCE_COMPILES(
    MAJOR_IN_SYSMACROS)
 
  CMAKE_PUSH_CHECK_STATE()

ports/libarchive/portfile.cmake

@@ -14,6 +14,7 @@ vcpkg_from_github(
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+    FEATURES
     bzip2   ENABLE_BZip2
     libxml2 ENABLE_LIBXML2
     lz4     ENABLE_LZ4

ports/libarchive/vcpkg-cmake-wrapper.cmake.in

@@ -9,7 +9,7 @@ if(@ENABLE_BZip2@)
     find_dependency(BZip2)
 endif()
 if(@ENABLE_LIBXML2@)
-    find_dependency(LibXml2)
+    find_dependency(libxml2 CONFIG)
 endif()
 if(@ENABLE_LZ4@)
     find_dependency(lz4)

ports/libarchive/vcpkg.json

@@ -1,7 +1,7 @@
 {
   "name": "libarchive",
   "version-semver": "3.4.3",
-  "port-version": 5,
+  "port-version": 6,
   "description": "Library for reading and writing streaming archives",
   "homepage": "https://github.com/libarchive/libarchive",
   "supports": "!uwp",

ports/libcroco/CMakeLists.txt

@@ -4,7 +4,7 @@ project(libcroco C)
 find_package(Iconv REQUIRED)
 find_package(Intl REQUIRED)
 find_package(unofficial-glib CONFIG REQUIRED)
-find_package(LibXml2 REQUIRED)
+find_package(libxml2 CONFIG REQUIRED)
 if(NOT WIN32)
     find_package(Threads REQUIRED)
 endif()
@@ -70,13 +70,13 @@ set(CMAKE_DEBUG_POSTFIX "d")
 
 add_library(croco-0.6 ${SOURCES})
 
-target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
+target_include_directories(croco-0.6 PRIVATE ${GLIB_INCLUDE_DIR})
 target_link_libraries(croco-0.6 PRIVATE 
     unofficial::glib::gio
     unofficial::glib::glib
     unofficial::glib::gmodule
     unofficial::glib::gobject
-    ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv
+    LibXml2::LibXml2 ${Intl_LIBRARIES} Iconv::Iconv
 )
 
 install(TARGETS croco-0.6
@@ -130,7 +130,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(Intl)
 find_dependency(Iconv)
 find_dependency(unofficial-glib CONFIG)
-find_dependency(LibXml2)
+find_dependency(libxml2 CONFIG)
 if(NOT WIN32)
     find_dependency(Threads)
 endif()

ports/libcroco/CONTROL

@@ -1,5 +1,5 @@
 Source: libcroco
 Version: 0.6.13
-Port-Version: 2
+Port-Version: 3
 Description: A standalone css2 parsing and manipulation library
 Build-Depends: glib, libxml2

ports/libosmscout/fix-find-iconv.patch

@@ -0,0 +1,17 @@
+diff --git a/cmake/features.cmake b/cmake/features.cmake
+index 8b5563e..19d639d 100644
+--- a/cmake/features.cmake
++++ b/cmake/features.cmake
+@@ -152,7 +152,11 @@ if (${PROTOBUF_FOUND} AND NOT EXISTS ${PROTOBUF_PROTOC_EXECUTABLE})
+   set(PROTOBUF_FOUND FALSE)
+ endif()
+ find_package(ZLIB)
+-find_package(iconv)
++find_package(Iconv REQUIRED)
++set(ICONV_FOUND 1)
++set(ICONV_INCLUDE_DIRS ${Iconv_INCLUDE_DIRS})
++set(ICONV_LIBRARIES ${Iconv_LIBRARIES})
++
+ find_package(LibLZMA)
+ find_package(PNG QUIET)
+ find_package(Cairo QUIET)

ports/libosmscout/portfile.cmake

@@ -4,17 +4,22 @@ vcpkg_from_github(
     REF c81e1d9a0f69cc5b93588dbe330b2af587162c5f
     SHA512 d6ddbc49dd40b1f938ae2cd1ea9342cab0a52db46bf7ed6716111a91d0a38acba12ff2e273d457db51fc240d578a5b849af77b53e600482cf52c3b22306f8c45
     HEAD_REF master
+    PATCHES fix-find-iconv.patch
 )
 
+file(REMOVE ${SOURCE_PATH}/cmake/Findiconv.cmake)
+
 if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
 	vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+        FEATURES
 		cairo OSMDCOUT_BUILD_MAP_CAIRO
 		directx OSMDCOUT_BUILD_MAP_DIRECTX
 		gdi OSMDCOUT_BUILD_MAP_GDI
 		svg OSMDCOUT_BUILD_MAP_SVG
 	)
 else()
 	vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+        FEATURES
 		cairo OSMDCOUT_BUILD_MAP_CAIRO
 		svg OSMDCOUT_BUILD_MAP_SVG
 	)

ports/libosmscout/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "libosmscout",
   "version-string": "1.1.1",
+  "port-version": 1,
   "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.",
   "homepage": "http://libosmscout.sourceforge.net/",
   "documentation": "http://libosmscout.sourceforge.net/documentation/",