microsoft · strega-nil-ms · Jan 20, 2022 · Dec 13, 2021 · Dec 13, 2021 · Dec 13, 2021
diff --git a/ports/ace/fix-macos-12.patch b/ports/ace/fix-macos-12.patch
@@ -0,0 +1,31 @@
+--- /dev/null
++++ b/include/makeinclude/platform_macosx_monterey.GNU
+@@ -0,0 +1,2 @@
++include $(ACE_ROOT)/include/makeinclude/platform_macosx_bigsur.GNU
++
+
+--- a/include/makeinclude/platform_macosx.GNU
++++ b/include/makeinclude/platform_macosx.GNU
+@@ -24,6 +24,9 @@
+ MACOS_CODENAME_VER_11_1   := bigsur
+ MACOS_CODENAME_VER_11_2   := bigsur
+ MACOS_CODENAME_VER_11_latest := bigsur
++MACOS_CODENAME_VER_12_0   := monterey
++MACOS_CODENAME_VER_12_1   := monterey
++MACOS_CODENAME_VER_12_latest := monterey
+
+ MACOS_CODENAME = $(MACOS_CODENAME_VER_$(MACOS_MAJOR_VERSION)_$(MACOS_MINOR_VERSION))
+
+@@ -42,6 +45,12 @@ else ifeq ($(MACOS_MAJOR_VERSION), 11)
+     ## just use the latest known version
+     MACOS_CODENAME = $(MACOS_CODENAME_VER_11_latest)
+   endif
++else ifeq ($(MACOS_MAJOR_VERSION),12)
++  ifeq ($(shell test $(MACOS_MINOR_VERSION) -gt 1; echo $$?),0)
++    ## if the detected version is greater than the latest know version,
++    ## just use the latest known version
++    MACOS_CODENAME = $(MACOS_CODENAME_VER_12_latest)
++  endif
+ else
+   ## Unsupported major version
+   $(error Unsupported MacOS version $(MACOS_RELEASE_VERSION))
diff --git a/ports/ace/portfile.cmake b/ports/ace/portfile.cmake
@@ -13,7 +13,6 @@ if("tao" IN_LIST FEATURES)
           SHA512 3ea0cc7b35433d7c41f51137caacd394a976cf4d5c2972a35015901b3ba172bacff0216a3146bf632b929a63853b7123019382c22d14c6d64e43a71a61b88023
       )
     else()
-      # VCPKG_TARGET_IS_LINUX
       vcpkg_download_distfile(ARCHIVE
           URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE%2BTAO-src-${ACE_VERSION}.tar.gz"
           FILENAME ACE-TAO-${ACE_VERSION}.tar.gz
@@ -28,8 +27,7 @@ else()
         FILENAME ACE-src-${ACE_VERSION}.zip
         SHA512 73707c92a0533ab60f090cfb620d508755b8267e2b83fb52d9903c4d780d2e2b504545433fdbe34801d4895cf938ecc5a5f26c34528851080bcce07f5a501ac1
     )
-  else(VCPKG_TARGET_IS_WINDOWS)
-    # VCPKG_TARGET_IS_LINUX
+  else()
     vcpkg_download_distfile(ARCHIVE
         URLS "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-${ACE_VERSION_DIRECTORY}/ACE-src-${ACE_VERSION}.tar.gz"
         FILENAME ACE-src-${ACE_VERSION}.tar.gz
@@ -41,6 +39,8 @@ endif()
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
+    PATCHES
+      fix-macos-12.patch
 )
 
 set(ACE_ROOT ${SOURCE_PATH})

diff --git a/ports/ace/vcpkg.json b/ports/ace/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ace",
   "version": "7.0.5",
-  "port-version": 2,
+  "port-version": 3,
   "maintainers": "Johnny Willemsen <[email protected]>",
   "description": "The ADAPTIVE Communication Environment",
   "homepage": "https://www.dre.vanderbilt.edu/~schmidt/ACE.html",

diff --git a/ports/activemq-cpp/vcpkg.json b/ports/activemq-cpp/vcpkg.json
@@ -1,14 +1,14 @@
 {
   "name": "activemq-cpp",
   "version-semver": "3.9.5",
-  "port-version": 7,
+  "port-version": 8,
   "description": "Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.",
   "supports": "!(uwp | osx)",
   "dependencies": [
     "apr",
     {
       "name": "libuuid",
-      "platform": "!windows"
+      "platform": "!windows & !osx"
     }
   ]
 }
diff --git a/ports/antlr4/export_guid.patch b/ports/antlr4/export_guid.patch
@@ -1,22 +1,22 @@
-diff -urN a/runtime/src/support/guid.h b/runtime/src/support/guid.h
---- a/runtime/src/support/guid.h
-+++ b/runtime/src/support/guid.h
-@@ -38,7 +38,7 @@
+diff -urN a/runtime/src/support/Guid.h b/runtime/src/support/Guid.h
+--- a/runtime/src/support/Guid.h
++++ b/runtime/src/support/Guid.h
+@@ -42,7 +42,7 @@ namespace antlrcpp {
  // 16 byte value that can be passed around by value. It also supports
  // conversion to string (via the stream operator <<) and conversion from a
  // string via constructor.
--class Guid
-+class ANTLR4CPP_PUBLIC Guid
- {
+-class Guid final {
++class ANTLR4CPP_PUBLIC Guid final {
  public:
-
-@@ -90,7 +90,7 @@
+   using size_type = typename std::array<uint8_t, 16>::size_type;
+   using pointer = typename std::array<uint8_t, 16>::pointer;
+@@ -131,7 +131,7 @@ private:
  // function would no longer be cross-platform if we parameterized the android
  // version. Instead, construction of the GuidGenerator may be different on
  // each platform, but the use of newGuid is uniform.
--class GuidGenerator
-+class ANTLR4CPP_PUBLIC GuidGenerator
- {
+-class GuidGenerator final {
++class ANTLR4CPP_PUBLIC GuidGenerator final {
  public:
  #ifdef GUID_ANDROID
-
+   GuidGenerator(JNIEnv *env);
+
diff --git a/ports/antlr4/fix_utfcpp_dependency.patch b/ports/antlr4/fix_utfcpp_dependency.patch
@@ -1,45 +1,31 @@
-diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt
-index a8503bb61..e7b01b7cb 100644
+diff -urN a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
 --- a/runtime/CMakeLists.txt
 +++ b/runtime/CMakeLists.txt
-@@ -1,17 +1,3 @@
+@@ -51,27 +51,6 @@ else()
+
+   if (utf8cpp_HEADER)
+     include_directories(${utf8cpp_HEADER})
+-  else()
+-    include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+-    set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty)
+-    set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp)
+-    ExternalProject_Add(
+-      utf8cpp
+-      GIT_REPOSITORY        "https://github.com/nemtrif/utfcpp"
+-      GIT_TAG               "v3.1.1"
+-      SOURCE_DIR            ${UTFCPP_DIR}
+-      UPDATE_DISCONNECTED   1
+-      CMAKE_ARGS            -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -DUTF8_TESTS=off -DUTF8_SAMPLES=off
+-      STEP_TARGETS          build)
 -
--include(${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+-    include_directories(
+-      ${UTFCPP_DIR}/install/include/utf8cpp
+-      ${UTFCPP_DIR}/install/include/utf8cpp/utf8
+-      )
 -
--set(THIRDPARTY_DIR ${CMAKE_BINARY_DIR}/runtime/thirdparty)
--set(UTFCPP_DIR ${THIRDPARTY_DIR}/utfcpp)
--ExternalProject_Add(
--  utfcpp
--  GIT_REPOSITORY        "git://github.com/nemtrif/utfcpp"
--  GIT_TAG               "v3.1.1"
--  SOURCE_DIR            ${UTFCPP_DIR}
--  UPDATE_DISCONNECTED   1
--  CMAKE_ARGS            -DCMAKE_INSTALL_PREFIX=${UTFCPP_DIR}/install -Dgtest_force_shared_crt=ON
--  TEST_AFTER_INSTALL    1
--  STEP_TARGETS          build)
-
-
- include_directories(
-@@ -23,8 +13,6 @@ include_directories(
-   ${PROJECT_SOURCE_DIR}/runtime/src/tree
-   ${PROJECT_SOURCE_DIR}/runtime/src/tree/pattern
-   ${PROJECT_SOURCE_DIR}/runtime/src/tree/xpath
--  ${UTFCPP_DIR}/install/include/utf8cpp
--  ${UTFCPP_DIR}/install/include/utf8cpp/utf8
- )
-
-
-@@ -131,13 +119,6 @@ install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
-         FILES_MATCHING PATTERN "*.h"
-         )
-
--install(FILES "${UTFCPP_DIR}/source/utf8.h"
--        DESTINATION "include/antlr4-runtime")
--install(DIRECTORY "${UTFCPP_DIR}/source/utf8"
--        DESTINATION "include/antlr4-runtime"
--        COMPONENT dev
--        FILES_MATCHING PATTERN "*.h"
--        )
-
-
+-    add_dependencies(antlr4_shared utf8cpp)
+-    add_dependencies(antlr4_static utf8cpp)
+-    set(INSTALL_utf8cpp TRUE)
+   endif()
+ endif()
 
diff --git a/ports/antlr4/portfile.cmake b/ports/antlr4/portfile.cmake
@@ -1,11 +1,11 @@
 vcpkg_fail_port_install(ON_TARGET "uwp")
 
-set(VERSION 4.9.1)
+set(VERSION 4.9.3)
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip"
+    URLS "https://www.antlr.org/download/antlr4-cpp-runtime-${VERSION}-source.zip"
     FILENAME "antlr4-cpp-runtime-${VERSION}-source.zip"
-    SHA512 fe33005f73f8d408fcea8ebab62c0def119bbe0c075f04a66404d0df258126eb6caf0a8bbac34d5c4c9e79d4aa8896f32698a560d4be7d71a32dcc3457245cee
+    SHA512 23995a6fa661ff038142fa7220a195db3a9a26744d516011dedc3192f152b06a8e31f6cc8f969f8927b86392a960d03e89572e753f033f950839a5bd38d4c722
 )
 
 # license not exist in antlr folder.
@@ -27,14 +27,13 @@ vcpkg_extract_source_archive_ex(
         fix_utfcpp_dependency.patch
 )
 
-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS_DEBUG -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/dist
     OPTIONS_RELEASE -DLIB_OUTPUT_DIR=${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/dist
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc
                     ${CURRENT_PACKAGES_DIR}/debug/share

diff --git a/ports/antlr4/uuid_discovery_fix.patch b/ports/antlr4/uuid_discovery_fix.patch
@@ -1,9 +1,9 @@
 diff -urN a/CMakeLists.txt b/CMakeLists.txt
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -40,8 +40,10 @@
+@@ -42,8 +42,10 @@ if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR
  endif()
-
+ 
  if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 -  find_package(PkgConfig REQUIRED)
 -  pkg_check_modules(UUID REQUIRED uuid)
@@ -14,15 +14,22 @@ diff -urN a/CMakeLists.txt b/CMakeLists.txt
  endif()
  if(APPLE)
    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
-diff -urN a/runtime/src/support/guid.cpp b/runtime/src/support/guid.cpp
---- a/runtime/src/support/guid.cpp
-+++ b/runtime/src/support/guid.cpp
-@@ -22,6 +22,7 @@
-  THE SOFTWARE.
-  */
-
+diff --git a/runtime/src/support/Guid.cpp b/runtime/src/support/Guid.cpp
+--- a/runtime/src/support/Guid.cpp
++++ b/runtime/src/support/Guid.cpp
+@@ -24,6 +24,7 @@
+
+ #include <algorithm>
+ 
 +#include "antlr4-common.h"
- #include "guid.h"
-
+ #include "Guid.h"
+ 
  #ifdef GUID_LIBUUID
-
+@@ -35,6 +36,7 @@
+ #endif
+
+ #ifdef GUID_WINDOWS
++#define NOMINMAX
+ #include <objbase.h>
+ #endif
+
diff --git a/ports/antlr4/vcpkg.json b/ports/antlr4/vcpkg.json
@@ -1,14 +1,17 @@
 {
   "name": "antlr4",
-  "version-string": "4.9.1",
-  "port-version": 1,
+  "version": "4.9.3",
   "description": "ANother Tool for Language Recognition",
   "homepage": "https://www.antlr.org",
   "supports": "!uwp",
   "dependencies": [
     {
       "name": "libuuid",
       "platform": "!uwp & !windows & !osx"
+    },
+    {
+      "name": "vcpkg-cmake",
+      "host": true
     }
   ]
 }
diff --git a/ports/apr-util/portfile.cmake b/ports/apr-util/portfile.cmake
@@ -1,5 +1,5 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2"
+    URLS "https://archive.apache.org/dist/apr/apr-util-1.6.1.tar.bz2"
     FILENAME "apr-util-1.6.1.tar.bz2"
     SHA512 40eff8a37c0634f7fdddd6ca5e596b38de15fd10767a34c30bbe49c632816e8f3e1e230678034f578dd5816a94f246fb5dfdf48d644829af13bf28de3225205d
 

diff --git a/ports/apr-util/vcpkg.json b/ports/apr-util/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "apr-util",
-  "version-string": "1.6.1",
-  "port-version": 5,
+  "version": "1.6.1",
+  "port-version": 6,
   "description": "Apache Portable Runtime (APR) project  mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation",
   "homepage": "https://apr.apache.org/",
   "dependencies": [

diff --git a/ports/avisynthplus/vcpkg.json b/ports/avisynthplus/vcpkg.json
@@ -1,8 +1,8 @@
 {
   "name": "avisynthplus",
   "version-semver": "3.7.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "An improved version of the AviSynth frameserver, with improved features and developer friendliness",
-  "homepage": "http://avs-plus.net/",
+  "homepage": "https://avs-plus.net/",
   "supports": "!arm & !uwp"
 }
diff --git a/ports/azure-identity-cpp/portfile.cmake b/ports/azure-identity-cpp/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Azure/azure-sdk-for-cpp
-    REF azure-identity_1.1.0
-    SHA512 83893ae2bc5edf7d63615e6017ea0474e9c620171e9320dabbe41d40b5659dca4f6d8a10599ec02054b2d3265eebfbd419ceab43669ba5ba0e04e72a38297a07
+    REF azure-identity_1.1.1
+    SHA512 a2a17a297c74a82b4c64b984699a4e2c76391ed060cd04e61d74641e5dc96c61df0d4139553bee9024aa2b694c1dac94e9e2ed2b54f11512258c66dca2b21823
 )
 
 vcpkg_cmake_configure(

diff --git a/ports/azure-identity-cpp/vcpkg.json b/ports/azure-identity-cpp/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-identity-cpp",
-  "version-semver": "1.1.0",
+  "version-semver": "1.1.1",
   "description": [
     "Microsoft Azure Identity SDK for C++",
     "This library provides common authentication-related abstractions for Azure SDK."
@@ -10,7 +10,8 @@
   "dependencies": [
     {
       "name": "azure-core-cpp",
-      "default-features": false
+      "default-features": false,
+      "version>=": "1.3.1"
     },
     {
       "name": "vcpkg-cmake",

diff --git a/ports/berkeleydb/portfile.cmake b/ports/berkeleydb/portfile.cmake
@@ -1,7 +1,7 @@
 vcpkg_fail_port_install( ON_TARGET "uwp" "linux" "osx")
 
 vcpkg_download_distfile(ARCHIVE
-    URLS "http://download.oracle.com/berkeley-db/db-4.8.30.NC.zip"
+    URLS "https://download.oracle.com/berkeley-db/db-4.8.30.NC.zip"
     FILENAME "db-4.8.30.NC.zip"
     SHA512 59c1d2d5a3551f988ab1dc063900572b67ad087537e0d71760de34601f9ebd4d5c070a49b809bec4a599a62417e9a162683ce0f6442deb1a0dadb80764bf6eab
 )

diff --git a/ports/berkeleydb/vcpkg.json b/ports/berkeleydb/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "berkeleydb",
-  "version-string": "4.8.30",
-  "port-version": 6,
+  "version": "4.8.30",
+  "port-version": 7,
   "description": "BDB - A high-performance embedded database for key/value data.",
   "homepage": "https://download.oracle.com/",
   "supports": "!(uwp | linux | osx)"

diff --git a/ports/bext-di/portfile.cmake b/ports/bext-di/portfile.cmake
@@ -10,7 +10,7 @@ file(INSTALL ${SOURCE_PATH}/include/boost
     DESTINATION ${CURRENT_PACKAGES_DIR}/include)
 
 vcpkg_download_distfile(LICENSE
-    URLS http://www.boost.org/LICENSE_1_0.txt
+    URLS https://www.boost.org/LICENSE_1_0.txt
     FILENAME "di-copyright"
     SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
 )

diff --git a/ports/bext-di/vcpkg.json b/ports/bext-di/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "bext-di",
-  "version-string": "1.2.0",
+  "version": "1.2.0",
+  "port-version": 1,
   "description": "C++14 Dependency Injection Library.",
   "homepage": "https://github.com/boost-ext/di"
 }
diff --git a/ports/boost-accumulators/portfile.cmake b/ports/boost-accumulators/portfile.cmake
@@ -3,8 +3,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO boostorg/accumulators
-    REF boost-1.77.0
-    SHA512 6d742d26ae382a753274d0c2055653d5b6368f939c0ccbd0e79283e993736a5369cdaacac648361730937dab8e5b412f265abf9f99de3c42de60baa34afe7029
+    REF boost-1.78.0
+    SHA512 b72d1d2eac58261487ec9c87a2bb6fdd0eed229c39fef62fa83b188f423e9ad96bfd6e5d177b01dec2e541d2e94ca9e548f823a05af24338d97ad98f8d85ef9c
     HEAD_REF master
 )