Merge remote-tracking branch 'upstream/master' into path_separator

author: Alexander Neumann <alexander.neumann@hamburg.de> 2019-08-12 09:28:24 +0200
committer: Alexander Neumann <alexander.neumann@hamburg.de> 2019-08-12 09:28:24 +0200
commit: c4231c51e47221345525ce68b65b28ab905087e2 (patch)
tree: 3f387da83563b5aeaaad91b3fec05580236d057e /ports
parent: 5899cd1d25c134f8a30476f4939ab57952c59815 (diff)
parent: fffcd0a5ae21d0b7ae0c8cdbd7bd1210f5a29031 (diff)
download: vcpkg-c4231c51e47221345525ce68b65b28ab905087e2.tar.gz
vcpkg-c4231c51e47221345525ce68b65b28ab905087e2.zip
64 files changed, 1096 insertions, 570 deletions
diff --git a/ports/aws-lambda-cpp/CONTROL b/ports/aws-lambda-cpp/CONTROL
index 048f28fac..53d7a917f 100644
--- a/ports/aws-lambda-cpp/CONTROL
+++ b/ports/aws-lambda-cpp/CONTROL
@@ -1,4 +1,4 @@
 Source: aws-lambda-cpp
-Version: 0.1.0-1
+Version: 0.1.0-2
 Build-Depends: curl
 Description: C++ Runtime for AWS Lambda.
diff --git a/ports/aws-lambda-cpp/portfile.cmake b/ports/aws-lambda-cpp/portfile.cmake
index 4a4cddafd..7ba33e8f1 100644
--- a/ports/aws-lambda-cpp/portfile.cmake
+++ b/ports/aws-lambda-cpp/portfile.cmake
@@ -1,8 +1,9 @@
 include(vcpkg_common_functions)
 
-if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
-endif()
+vcpkg_fail_port_install(MESSAGE "aws-lambda-cpp currently only supports Linux and Mac platforms" ON_TARGET "Windows")
+#if(NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux" AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+#    message(FATAL_ERROR "aws-lambda-cpp currently only supports Linux and Mac platforms")
+#endif()
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
diff --git a/ports/chakracore/CONTROL b/ports/chakracore/CONTROL
index 919391eb6..44c6fe4c4 100644
--- a/ports/chakracore/CONTROL
+++ b/ports/chakracore/CONTROL
@@ -1,4 +1,4 @@
 Source: chakracore
-Version: 1.11.9
+Version: 1.11.11
 Homepage: https://github.com/Microsoft/ChakraCore
 Description: Core part of the Chakra Javascript engine
diff --git a/ports/chakracore/portfile.cmake b/ports/chakracore/portfile.cmake
index 04b253b15..5263b3a16 100644
--- a/ports/chakracore/portfile.cmake
+++ b/ports/chakracore/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Microsoft/ChakraCore
-    REF v1.11.9
-    SHA512 4703e28f04925074bfc2057dcccee0427aacdd48f7b9f715d08a9385e4de9e804e1620cd49e8b3db7cd330d00ecd374bfaa3205dbe1f3cfce51ed0eea439a55e
+    REF v1.11.11
+    SHA512 67fd364090632c4187c43dc7bb50d2a6cd18ebb2963f86b7f07c6394c243a94963dd9a1e2dc8f4ab9653ab1316921dbac2c1f5fa235e241e9c605e63f2551a10
     HEAD_REF master
 )
 
diff --git a/ports/discount/CONTROL b/ports/discount/CONTROL
new file mode 100644
index 000000000..51c8b5e90
--- /dev/null
+++ b/ports/discount/CONTROL
@@ -0,0 +1,4 @@
+Source: discount
+Version: 2.2.6
+Homepage: https://github.com/Orc/discount
+Description: DISCOUNT is a implementation of John Gruber & Aaron Swartz's Markdown markup language.
diff --git a/ports/discount/blocktags b/ports/discount/blocktags
new file mode 100644
index 000000000..dfd3957c3
--- /dev/null
+++ b/ports/discount/blocktags
@@ -0,0 +1,34 @@
+static struct kw blocktags[] = {
+   { "P", 1, 0 },
+   { "DL", 2, 0 },
+   { "H1", 2, 0 },
+   { "H2", 2, 0 },
+   { "H3", 2, 0 },
+   { "H4", 2, 0 },
+   { "H5", 2, 0 },
+   { "H6", 2, 0 },
+   { "HR", 2, 1 },
+   { "OL", 2, 0 },
+   { "UL", 2, 0 },
+   { "BDO", 3, 0 },
+   { "DFN", 3, 0 },
+   { "DIV", 3, 0 },
+   { "MAP", 3, 0 },
+   { "PRE", 3, 0 },
+   { "WBR", 3, 0 },
+   { "XMP", 3, 0 },
+   { "FORM", 4, 0 },
+   { "NOBR", 4, 0 },
+   { "STYLE", 5, 0 },
+   { "TABLE", 5, 0 },
+   { "CENTER", 6, 0 },
+   { "IFRAME", 6, 0 },
+   { "OBJECT", 6, 0 },
+   { "SCRIPT", 6, 0 },
+   { "ADDRESS", 7, 0 },
+   { "LISTING", 7, 0 },
+   { "PLAINTEXT", 9, 0 },
+   { "BLOCKQUOTE", 10, 0 },
+};
+
+#define NR_blocktags 30
diff --git a/ports/discount/cmake.patch b/ports/discount/cmake.patch
new file mode 100644
index 000000000..8a2278cf7
--- /dev/null
+++ b/ports/discount/cmake.patch
@@ -0,0 +1,27 @@
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 3895fdb..a183836 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -182,7 +182,10 @@ if(${PROJECT_NAME}_MAKE_INSTALL)
+     target_include_directories(libmarkdown INTERFACE
+       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+     )
+-    set(_TARGETS libmarkdown markdown)
++    set(_TARGETS libmarkdown)
++    if(NOT ${PROJECT_NAME}_ONLY_LIBRARY)
++        set(_TARGETS ${_TARGETS} markdown)
++    endif()
+     if(${PROJECT_NAME}_INSTALL_SAMPLES)
+         list(APPEND _TARGETS mkd2html makepage)
+     endif()
+diff --git a/cmake/config.h.in b/cmake/config.h.in
+index e08220d..e630934 100644
+--- a/cmake/config.h.in
++++ b/cmake/config.h.in
+@@ -74,4 +74,6 @@
+ 
+ #define TABSTOP @TABSTOP@
+ 
++#define DESTRUCTOR
++
+ #endif /* _CONFIG_D */
diff --git a/ports/discount/disable-deprecated-warnings.patch b/ports/discount/disable-deprecated-warnings.patch
new file mode 100644
index 000000000..e8f4f0fb7
--- /dev/null
+++ b/ports/discount/disable-deprecated-warnings.patch
@@ -0,0 +1,16 @@
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 11fa675..34cc9ed 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -20,6 +20,11 @@ set(${PROJECT_NAME}_INSTALL_SAMPLES OFF CACHE BOOL
+ set(${PROJECT_NAME}_ONLY_LIBRARY OFF CACHE BOOL
+     "Set to ON to only build markdown library (default is OFF)")
+
++# MSVC deprecated warnings (C4996,strdup, ...)
++if(MSVC)
++    add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS)
++endif()
++
+ # Check headers
+ include(CheckIncludeFile)
+ check_include_file(libgen.h HAVE_LIBGEN_H)
diff --git a/ports/discount/generate-blocktags-command.patch b/ports/discount/generate-blocktags-command.patch
new file mode 100644
index 000000000..13d63a25d
--- /dev/null
+++ b/ports/discount/generate-blocktags-command.patch
@@ -0,0 +1,29 @@
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index a183836..e9deef5 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -113,12 +115,19 @@ configure_file("${_ROOT}/mkdio.h.in"
+
+ include_directories("${_ROOT}")
+
+-add_executable(mktags
+-    "${_ROOT}/mktags.c")
+
+-add_custom_command(OUTPUT "${_ROOT}/blocktags"
+-    COMMAND mktags > blocktags
+-    WORKING_DIRECTORY "${_ROOT}")
++if(NOT GENERATE_BLOCKTAGS)
++    message(STATUS "Not generating blocktags")
++else()
++    message(STATUS "Using mktags to generate blocktags")
++
++    add_executable(mktags
++        "${_ROOT}/mktags.c")
++
++    add_custom_command(OUTPUT "${_ROOT}/blocktags"
++        COMMAND mktags > blocktags
++        WORKING_DIRECTORY "${_ROOT}")
++endif()
+
+ add_library(libmarkdown
+     "${_ROOT}/mkdio.c"
diff --git a/ports/discount/portfile.cmake b/ports/discount/portfile.cmake
new file mode 100644
index 000000000..6a40d5105
--- /dev/null
+++ b/ports/discount/portfile.cmake
@@ -0,0 +1,45 @@
+include(vcpkg_common_functions)
+
+# No dynamic link for MSVC
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO Orc/discount
+    REF v2.2.6
+    SHA512 4c5956dea78aacd3a105ddac13f1671d811a5b2b04990cdf8485c36190c8872c4b1b9432a7236f669c34b07564ecd0096632dced54d67de9eaf4f23641417ecc
+    HEAD_REF master
+    PATCHES
+      cmake.patch
+      generate-blocktags-command.patch
+      disable-deprecated-warnings.patch
+)
+
+set(GENERATE_BLOCKTAGS ON)
+if(VCPKG_TARGET_ARCHITECTURE MATCHES "arm" OR VCPKG_TARGET_ARCHITECTURE MATCHES "arm64" OR VCPKG_CMAKE_SYSTEM_NAME MATCHES "WindowsStore")
+    set(GENERATE_BLOCKTAGS OFF)
+endif()
+
+if(NOT GENERATE_BLOCKTAGS)
+    configure_file("${CURRENT_PORT_DIR}/blocktags" "${SOURCE_PATH}/blocktags" COPYONLY)
+    message(STATUS "Copied blocktags")
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH "${SOURCE_PATH}/cmake"
+    PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
+    OPTIONS
+        -DDISCOUNT_ONLY_LIBRARY=ON
+        -DGENERATE_BLOCKTAGS=${GENERATE_BLOCKTAGS}
+)
+
+vcpkg_install_cmake()
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/discount)
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+
+# Handle copyright
+file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/discount" RENAME copyright)
+
diff --git a/ports/duckx/CONTROL b/ports/duckx/CONTROL
new file mode 100644
index 000000000..59dda99b7
--- /dev/null
+++ b/ports/duckx/CONTROL
@@ -0,0 +1,4 @@
+Source: duckx
+Version: 2019-08-06
+Homepage: https://github.com/amiremohamadi/DuckX
+Description: DuckX is a library for creation of Office docx files.
diff --git a/ports/duckx/portfile.cmake b/ports/duckx/portfile.cmake
new file mode 100644
index 000000000..66bcdff25
--- /dev/null
+++ b/ports/duckx/portfile.cmake
@@ -0,0 +1,20 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO amiremohamadi/DuckX
+    REF 98c946ad13559c03e9c7f2b050b9f70d5caf509e
+    SHA512 20e8970a1faff6e2ff5bc106bd038396d05ace3517ac83583712263870c4b007ebc407b5d69c482f7117ac155aa85f9928d5ee524f75897e8e12eb3659d16c15
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
+
+file(COPY ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/duckx)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/duckx RENAME copyright)
diff --git a/ports/expat/CONTROL b/ports/expat/CONTROL
index f01b5b9e1..68629eb2d 100644
--- a/ports/expat/CONTROL
+++ b/ports/expat/CONTROL
@@ -1,4 +1,4 @@
 Source: expat
-Version: 2.2.6
+Version: 2.2.7
 Homepage: https://github.com/libexpat/libexpat
 Description: XML parser library written in C
diff --git a/ports/expat/portfile.cmake b/ports/expat/portfile.cmake
index 7e2c322db..7b97fb3de 100644
--- a/ports/expat/portfile.cmake
+++ b/ports/expat/portfile.cmake
@@ -6,8 +6,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO libexpat/libexpat
-    REF R_2_2_6
-    SHA512 727fbd24041c9af71b32353448583a6d8b38ddf93b10c97510e847939c2ad2be9b40ff6e6e27b725bff277982c2fc96c75f19c4a3ac4a246133eb62870c963d8
+    REF R_2_2_7
+    SHA512 11b1f9a135c4501ef0112e17da8381e956366165a11a384daedd4cdef9a00c3112c8f6ff8c8f6d3b5e7b71b9a73041f23beac0f27e9cfafe1ec0266d95870408
     HEAD_REF master)
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
diff --git a/ports/google-cloud-cpp/CONTROL b/ports/google-cloud-cpp/CONTROL
index 0adc8a16b..a844f9749 100644
--- a/ports/google-cloud-cpp/CONTROL
+++ b/ports/google-cloud-cpp/CONTROL
@@ -1,4 +1,5 @@
 Source: google-cloud-cpp
-Version: 0.11.0
-Build-Depends: grpc, curl[ssl], crc32c
+Version: 0.12.0
+Build-Depends: grpc, curl[ssl], crc32c, googleapis
 Description: C++ Client Libraries for Google Cloud Platform APIs.
+Homepage: https://github.com/googleapis/google-cloud-cpp
diff --git a/ports/google-cloud-cpp/portfile.cmake b/ports/google-cloud-cpp/portfile.cmake
index 0ae85412a..e9ffdd014 100644
--- a/ports/google-cloud-cpp/portfile.cmake
+++ b/ports/google-cloud-cpp/portfile.cmake
@@ -5,18 +5,19 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO googleapis/google-cloud-cpp
-    REF v0.11.0
-    SHA512 059322c73a9632644faec7dc33fc9e390cd5aeb1576a2e6ddeeb6e4078040c47f71fe687702f04173ee86638886872046ea22e60fae3f6a8bf16f6bfb9478962
+    REF v0.12.0
+    SHA512 14d83e099b9d425475b963b6b4fe11c1881988afc90d87a63b2a0d17cd18f3000f725fa230b6b7487e14e383e7f3c5803122dbadd9dacdeeadc541b55074a805
     HEAD_REF master
 )
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
     PREFER_NINJA
+    DISABLE_PARALLEL_CONFIGURE
     OPTIONS
         -DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
         -DGOOGLE_CLOUD_CPP_ENABLE_MACOS_OPENSSL_CHECK=OFF
-	-DBUILD_TESTING=OFF
+	    -DBUILD_TESTING=OFF
 )
 
 vcpkg_install_cmake(ADD_BIN_TO_PATH)
diff --git a/ports/googleapis/CONTROL b/ports/googleapis/CONTROL
new file mode 100644
index 000000000..b77e35eed
--- /dev/null
+++ b/ports/googleapis/CONTROL
@@ -0,0 +1,5 @@
+Source: googleapis
+Version: 0.1.1
+Build-Depends: grpc, protobuf
+Description: C++ Proto Libraries for Google APIs.
+Homepage: https://github.com/googleapis/cpp-cmakefiles
diff --git a/ports/googleapis/portfile.cmake b/ports/googleapis/portfile.cmake
new file mode 100644
index 000000000..684b4cbdb
--- /dev/null
+++ b/ports/googleapis/portfile.cmake
@@ -0,0 +1,32 @@
+include(vcpkg_common_functions)
+
+if (VCPKG_TARGET_IS_UWP)
+    message(FATAL_ERROR "Package `googleapis` doesn't support UWP")
+endif()
+
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO googleapis/cpp-cmakefiles
+    REF v0.1.1
+    SHA512 e23af2d0d36d4e13da761473b78b958326b9c7fd4aaf0c4b6742ae498b65aafe73976f7c858365b041aa667f280c10eca6df7e87644c260fc022ec4eee7a7bc6
+    HEAD_REF master
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+)
+
+vcpkg_install_cmake(ADD_BIN_TO_PATH)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake TARGET_PATH share)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/googleapis RENAME copyright)
+
+vcpkg_copy_pdbs()
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
diff --git a/ports/googleapis/usage b/ports/googleapis/usage
new file mode 100644
index 000000000..00ca628e5
--- /dev/null
+++ b/ports/googleapis/usage
@@ -0,0 +1,6 @@
+The package googleapis is compatible with built-in CMake targets:
+
+    find_package(googleapis CONFIG REQUIRED)
+
+    # Then link against the proto libraries that you want to use, for example:
+    target_link_libraries(main PRIVATE googleapis-c++::bigtable_protos gRPC::grpc gRPC::grpc++)
diff --git a/ports/itk/CONTROL b/ports/itk/CONTROL
index b77968554..d9e0bde62 100644
--- a/ports/itk/CONTROL
+++ b/ports/itk/CONTROL
@@ -1,5 +1,5 @@
 Source: itk
-Version: 5.0.0-2
+Version: 5.0.1
 Description: Insight Segmentation and Registration Toolkit (ITK) is used for image processing and analysis.
 Homepage: https://github.com/InsightSoftwareConsortium/ITK
 Build-Depends: double-conversion, libjpeg-turbo, zlib, libpng, tiff, expat, eigen3, hdf5[cpp], openjpeg
diff --git a/ports/itk/portfile.cmake b/ports/itk/portfile.cmake
index a83527a51..e0ebaaecf 100644
--- a/ports/itk/portfile.cmake
+++ b/ports/itk/portfile.cmake
@@ -10,8 +10,8 @@ endif()
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO InsightSoftwareConsortium/ITK
-    REF v5.0.0
-    SHA512 7eecd62ab3124147f0abce482699dfdc43610703959d4a3f667c8ce12a6ecacf836a863d146f3cc7d5220b4aa05adf70a0d4dc6fa8e87bac215565badc96acff
+    REF v5.0.1
+    SHA512 242ce66cf83f82d26f20d2099108295e28c8875e7679126ba023834bf0e94454460ba86452a94c8ddaea93d2314befc399f2b151d7294370d4b47f0e9798e77f
     HEAD_REF master
     PATCHES
         fix_openjpeg_search.patch
@@ -35,8 +35,6 @@ vcpkg_configure_cmake(
         -DITK_INSTALL_DATA_DIR=share/itk/data
         -DITK_INSTALL_DOC_DIR=share/itk/doc
         -DITK_INSTALL_PACKAGE_DIR=share/itk
-        -DITK_LEGACY_REMOVE=ON
-        -DITK_FUTURE_LEGACY_REMOVE=ON
         -DITK_USE_64BITS_IDS=ON
         -DITK_USE_CONCEPT_CHECKING=ON
         #-DITK_USE_SYSTEM_LIBRARIES=ON # enables USE_SYSTEM for all third party libraries, some of which do not have vcpkg ports such as CastXML, SWIG, MINC etc
diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index 35c870658..508f1e7af 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,4 +1,4 @@
 Source: jsonnet
-Version: 2019-05-08
+Version: 2019-05-08-1
 Homepage: https://github.com/google/jsonnet
 Description: Jsonnet - The data templating language
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 5472445da..ffa2973fb 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -11,12 +11,12 @@ vcpkg_from_github(
   SHA512 d9f84c39929e9e80272e2b834f68a13b48c1cb4d64b70f5b6fa16e677555d947f7cf57372453e23066a330faa6a429b9aa750271b46f763581977a223d238785
   HEAD_REF master
   PATCHES
-	001-enable-msvc.patch
+  001-enable-msvc.patch
 )
 
 if (NOT VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
   vcpkg_execute_required_process(
-    COMMAND Powershell -Command "((Get-Content -Encoding Byte \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' > \"${SOURCE_PATH}/core/std.jsonnet.h\""
+    COMMAND Powershell -Command "((Get-Content -AsByteStream \"${SOURCE_PATH}/stdlib/std.jsonnet\") -join ',') + ',0' | Out-File -Encoding Ascii \"${SOURCE_PATH}/core/std.jsonnet.h\""
     WORKING_DIRECTORY "${SOURCE_PATH}"
     LOGNAME "std.jsonnet"
   )
@@ -31,7 +31,7 @@ endif()
 vcpkg_configure_cmake(
   SOURCE_PATH ${SOURCE_PATH}
   PREFER_NINJA
-  OPTIONS -DBUILD_JSONNET=OFF -DBUILD_TESTS=OFF
+  OPTIONS -DBUILD_JSONNET=OFF -DBUILD_JSONNETFMT=OFF -DBUILD_TESTS=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/libcerf/001-fix-static-build.patch b/ports/libcerf/001-fix-static-build.patch
new file mode 100644
index 000000000..ffaeaedfb
--- /dev/null
+++ b/ports/libcerf/001-fix-static-build.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f79581f..4fc9457 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,6 +56,8 @@ if(MSVC)
+     # set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$<CONFIG>)
+     if(BUILD_SHARED_LIBS)
+         set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
++    else()
++        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /MTd")
+     endif()
+ else()
+     add_compile_options(-O2 -Wno-sign-compare -fno-omit-frame-pointer)
diff --git a/ports/libcerf/CONTROL b/ports/libcerf/CONTROL
new file mode 100644
index 000000000..72b1324d3
--- /dev/null
+++ b/ports/libcerf/CONTROL
@@ -0,0 +1,4 @@
+Source: libcerf
+Version: 1.13
+Description: A self-contained numeric library that provides an efficient and accurate implementation of complex error functions, along with Dawson, Faddeeva, and Voigt functions.
+Homepage: https://jugit.fz-juelich.de/mlz/libcerf
diff --git a/ports/libcerf/portfile.cmake b/ports/libcerf/portfile.cmake
new file mode 100644
index 000000000..20e3c7c70
--- /dev/null
+++ b/ports/libcerf/portfile.cmake
@@ -0,0 +1,35 @@
+include(vcpkg_common_functions)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+  set(BUILD_SHARED_LIBS ON)
+else()
+  set(BUILD_SHARED_LIBS OFF)
+endif()
+
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://jugit.fz-juelich.de/mlz/libcerf/uploads/924b8d245ad3461107ec630734dfc781/libcerf-1.13.tgz"
+    FILENAME "libcerf-1.13.tgz"
+    SHA512 4df711d3e9fd00de99959c3253a9565d1dc2c41f75a5800ced9c52f89cbd13185fbdca3ad75de788fd16c044082738ab345b7fb6a8820ac588edafe1812944aa
+)
+
+vcpkg_extract_source_archive_ex(
+    OUT_SOURCE_PATH SOURCE_PATH
+    ARCHIVE ${ARCHIVE}
+    PATCHES 001-fix-static-build.patch
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DCERF_CPP=ON
+        -DLIB_MAN=OFF
+        -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcerf RENAME copyright)
+
+vcpkg_test_cmake(PACKAGE_NAME libcerf)
diff --git a/ports/librdkafka/CONTROL b/ports/librdkafka/CONTROL
index f4030ff08..9b520bbe3 100644
--- a/ports/librdkafka/CONTROL
+++ b/ports/librdkafka/CONTROL
@@ -1,5 +1,5 @@
 Source: librdkafka
-Version: 1.1.0
+Version: 1.1.0-1
 Description: The Apache Kafka C/C++ library
 Homepage: https://github.com/edenhill/librdkafka
 
@@ -18,3 +18,6 @@ Build-Depends: zlib
 Feature: zstd
 Description: Build with zstd
 Build-Depends: zstd
+
+Feature: snappy
+Description: Build with snappy
diff --git a/ports/librdkafka/portfile.cmake b/ports/librdkafka/portfile.cmake
index 5bc66fdfa..84c50c8fa 100644
--- a/ports/librdkafka/portfile.cmake
+++ b/ports/librdkafka/portfile.cmake
@@ -17,6 +17,7 @@ vcpkg_check_features(
     ssl WITH_SSL
     zlib WITH_ZLIB
     zstd WITH_ZSTD
+    snappy WITH_SNAPPY
 )
 
 vcpkg_configure_cmake(
diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL
index 684c54ba6..f69dc61ad 100644
--- a/ports/netcdf-c/CONTROL
+++ b/ports/netcdf-c/CONTROL
@@ -1,5 +1,5 @@
 Source: netcdf-c
-Version: 4.7.0-3
+Version: 4.7.0-4
 Build-Depends: hdf5, curl
 Homepage: https://github.com/Unidata/netcdf-c
 Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.
diff --git a/ports/netcdf-c/hdf5_3.patch b/ports/netcdf-c/hdf5_3.patch
index ba9a168c8..502a8ea99 100644
--- a/ports/netcdf-c/hdf5_3.patch
+++ b/ports/netcdf-c/hdf5_3.patch
@@ -2,11 +2,13 @@ diff --git a/libhdf5/CMakeLists.txt b/libhdf5/CMakeLists.txt
 index f3c7bbc..34fc2ab 100644
 --- a/libhdf5/CMakeLists.txt
 +++ b/libhdf5/CMakeLists.txt
-@@ -20,3 +20,7 @@ add_library(netcdfhdf5 OBJECT ${libnchdf5_SOURCES})
+@@ -20,3 +20,9 @@ add_library(netcdfhdf5 OBJECT ${libnchdf5_SOURCES})
  
  # Remember to package this file for CMake builds.
  ADD_EXTRA_DIST(${libnchdf5_SOURCES} CMakeLists.txt)
 +
-+if(BUILD_SHARED_LIBS)
-+target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-shared hdf5::hdf5-static hdf5::hdf5_hl-shared hdf5::hdf5_hl-static)
++if(HDF5_BUILD_SHARED_LIBS) 
++ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-shared hdf5::hdf5_hl-shared)
++else()
++ target_link_libraries(netcdfhdf5 PRIVATE hdf5::hdf5-static hdf5::hdf5_hl-static) 
 +endif()
diff --git a/ports/open62541/CONTROL b/ports/open62541/CONTROL
index 28bfd2c0b..bff3217bb 100644
--- a/ports/open62541/CONTROL
+++ b/ports/open62541/CONTROL
@@ -1,3 +1,3 @@
 Source: open62541
-Version: 0.3.0-2
+Version: 0.3.0-3
 Description: open62541 is an open source C (C99) implementation of OPC UA licensed under the Mozilla Public License v2.0.
diff --git a/ports/open62541/portfile.cmake b/ports/open62541/portfile.cmake
index 5132fa7f0..d0e26df3f 100644
--- a/ports/open62541/portfile.cmake
+++ b/ports/open62541/portfile.cmake
@@ -1,6 +1,6 @@
 include(vcpkg_common_functions)
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(NOT CMAKE_HOST_WIN32)
     message("${PORT} currently requires the following tools from the system package manager:\n    python-six\n\nThis can be installed on Ubuntu systems via apt-get install python-six python3-six (depending on your current python default interpreter)")
 endif()
 
@@ -31,21 +31,24 @@ endif()
 
 vcpkg_find_acquire_program(PYTHON3)
 get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-get_filename_component(PYTHON3_DIR_NAME "${PYTHON3_DIR}" NAME)
 vcpkg_add_to_path("${PYTHON3_DIR}")
 
-if(NOT EXISTS ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX})
-    if(NOT EXISTS ${PYTHON3_DIR}/Scripts/pip${EXECUTABLE_SUFFIX})
-        vcpkg_download_distfile(GET_PIP
-            URLS "https://bootstrap.pypa.io/get-pip.py"
-            FILENAME "tools/python/${PYTHON3_DIR_NAME}/get-pip.py"
-            SHA512 99520d223819708b8f6e4b839d1fa215e4e8adc7fcd0db6c25a0399cf2fa10034b35673cf450609303646d12497f301ef53b7e7cc65c78e7bce4af0c673555ad
-        )
-        execute_process(COMMAND ${PYTHON3_DIR}/python${EXECUTABLE_SUFFIX} ${PYTHON3_DIR}/get-pip.py)
+if(CMAKE_HOST_WIN32)
+    # Must not modify system copy of python3 -- on CMAKE_HOST_WIN32, we have our own private copy
+    if(NOT EXISTS ${PYTHON3_DIR}/easy_install.exe)
+        if(NOT EXISTS ${PYTHON3_DIR}/Scripts/pip.exe)
+            get_filename_component(PYTHON3_DIR_NAME "${PYTHON3_DIR}" NAME)
+            vcpkg_download_distfile(GET_PIP
+                URLS "https://bootstrap.pypa.io/3.3/get-pip.py"
+                FILENAME "tools/python/${PYTHON3_DIR_NAME}/get-pip.py"
+                SHA512 92e68525830bb23955a31cb19ebc3021ef16b6337eab83d5db2961b791283d2867207545faf83635f6027f2f7b7f8fee2c85f2cfd8e8267df25406474571c741
+            )
+            execute_process(COMMAND ${PYTHON3_DIR}/python.exe ${GET_PIP})
+        endif()
+        execute_process(COMMAND ${PYTHON3_DIR}/Scripts/pip.exe install six)
+    else()
+        execute_process(COMMAND ${PYTHON3_DIR}/easy_install.exe six)
     endif()
-    execute_process(COMMAND ${PYTHON3_DIR}/Scripts/pip${EXECUTABLE_SUFFIX} install six)
-else()
-    execute_process(COMMAND ${PYTHON3_DIR}/easy_install${EXECUTABLE_SUFFIX} six)
 endif()
 
 vcpkg_configure_cmake(
diff --git a/ports/openimageio/CONTROL b/ports/openimageio/CONTROL
index ceb4b9408..94ae8654e 100644
--- a/ports/openimageio/CONTROL
+++ b/ports/openimageio/CONTROL
@@ -1,5 +1,5 @@
 Source: openimageio
-Version: 2.0.8
+Version: 2019-08-08-1
 Homepage: https://github.com/OpenImageIO/oiio
 Description: A library for reading and writing images, and a bunch of related classes, utilities, and application
 Build-Depends: libjpeg-turbo, tiff, libpng, openexr, boost-thread, boost-smart-ptr, boost-foreach, boost-regex, boost-type-traits, boost-static-assert, boost-unordered, boost-config, boost-algorithm, boost-filesystem, boost-system, boost-thread, boost-asio, boost-random, robin-map, boost-stacktrace
diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
index e40441e4c..7284d58b8 100644
--- a/ports/openimageio/portfile.cmake
+++ b/ports/openimageio/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO OpenImageIO/oiio
-    REF Release-2.0.8
-    SHA512 412d240916780b784b89d9eeb36b5b9451e8448100fce494c0d95f0b274506d2946cae0eb929dbe8118b8b04a8bd2a926270a971aad7d0542abcff5f35404953
+    REF ad1ab61a56c63d770e4beb335efe8b1f1a9e36cd
+    SHA512 48ee7862583e7adb86b56b20634c34aebf83ef0a3a14ad96182494ce6a84cb027334840a6c4c335e9342110c3a36532e3eeae22a3ed7363cd91b27cb7ca58154
     HEAD_REF master
     PATCHES
         fix_libraw.patch
@@ -71,6 +71,9 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/doc)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
+file(COPY ${SOURCE_PATH}/src/cmake/modules/FindOpenImageIO.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/openimageio)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/openimageio/LICENSE.md ${CURRENT_PACKAGES_DIR}/share/openimageio/copyright)
diff --git a/ports/openimageio/remove_wrong_dependency.patch b/ports/openimageio/remove_wrong_dependency.patch
index 307ef1dec..5338c6563 100644
--- a/ports/openimageio/remove_wrong_dependency.patch
+++ b/ports/openimageio/remove_wrong_dependency.patch
@@ -1,15 +1,15 @@
-diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
-index 61ed97b..4435426 100644
---- a/src/libOpenImageIO/CMakeLists.txt
-+++ b/src/libOpenImageIO/CMakeLists.txt
-@@ -164,10 +164,6 @@ if (WIN32)
-     target_link_libraries (OpenImageIO psapi.lib)
- endif ()
- 
--if (VISIBILITY_MAP_FILE)
--    add_dependencies (OpenImageIO "${VISIBILITY_MAP_FILE}")
--endif ()
--
- if (USE_EXTERNAL_PUGIXML)
-     target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES})
- endif ()
+diff --git a/src/libOpenImageIO/CMakeLists.txt b/src/libOpenImageIO/CMakeLists.txt
+index 5449675..cdd5235 100644
+--- a/src/libOpenImageIO/CMakeLists.txt
++++ b/src/libOpenImageIO/CMakeLists.txt
+@@ -171,10 +171,6 @@ elseif(MINGW)
+     target_link_libraries (OpenImageIO psapi ws2_32)
+ endif ()
+ 
+-if (VISIBILITY_MAP_FILE)
+-    add_dependencies (OpenImageIO "${VISIBILITY_MAP_FILE}")
+-endif ()
+-
+ if (USE_EXTERNAL_PUGIXML)
+     target_link_libraries (OpenImageIO ${PUGIXML_LIBRARIES})
+ endif ()
diff --git a/ports/openimageio/vcpkg-cmake-wrapper.cmake b/ports/openimageio/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..82dc991f0
--- /dev/null
+++ b/ports/openimageio/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,8 @@
+set(OPENIMAGEIO_PREV_MODULE_PATH ${CMAKE_MODULE_PATH})
+list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR})
+
+if(NOT OPENIMAGEIO_LIBRARIES)
+  _find_package(${ARGS})
+endif()
+
+set(CMAKE_MODULE_PATH ${OPENIMAGEIO_PREV_MODULE_PATH})
diff --git a/ports/pdqsort/CONTROL b/ports/pdqsort/CONTROL
new file mode 100644
index 000000000..6d1d9e660
--- /dev/null
+++ b/ports/pdqsort/CONTROL
@@ -0,0 +1,4 @@
+Source: pdqsort
+Version: 2019-07-30
+Homepage: https://github.com/orlp/pdqsort
+Description: Pattern-defeating quicksort (pdqsort) is a novel sorting algorithm
diff --git a/ports/pdqsort/portfile.cmake b/ports/pdqsort/portfile.cmake
new file mode 100644
index 000000000..a9c6a9211
--- /dev/null
+++ b/ports/pdqsort/portfile.cmake
@@ -0,0 +1,15 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+	OUT_SOURCE_PATH SOURCE_PATH
+	REPO orlp/pdqsort
+	REF 08879029ab8dcb80a70142acb709e3df02de5d37
+	SHA512 38e8b6e35edf1e88e26850a13ce892d8adc0d3e1d7954287d024b3bb858a6b2284e25fbf7c92a694b3ec77cacaf6bbc27fc365187115f7cca6bc88088f67a18f
+	HEAD_REF master
+)
+
+file(COPY ${SOURCE_PATH}/pdqsort.h  DESTINATION ${CURRENT_PACKAGES_DIR}/include/pdqsort)
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/license.txt ${SOURCE_PATH}/readme.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/pdqsort)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/pdqsort/license.txt ${CURRENT_PACKAGES_DIR}/share/pdqsort/copyright)
+\ No newline at end of file
diff --git a/ports/qhull/CONTROL b/ports/qhull/CONTROL
index 9ea30f011..67812997b 100644
--- a/ports/qhull/CONTROL
+++ b/ports/qhull/CONTROL
@@ -1,4 +1,4 @@
 Source: qhull
-Version: 7.3.2
+Version: 7.3.2-1
 Homepage: https://github.com/qhull/qhull
 Description: computes the convex hull, Delaunay triangulation, Voronoi diagram
diff --git a/ports/qhull/portfile.cmake b/ports/qhull/portfile.cmake
index a9c689923..ade241dc8 100644
--- a/ports/qhull/portfile.cmake
+++ b/ports/qhull/portfile.cmake
@@ -6,6 +6,7 @@ vcpkg_from_github(
     REF v7.3.2 # Qhull 2019.1
     SHA512 aea2c70179de10f648aba960129a3b9a3fe309a0eb085bdb86f697e3d4b214570c241e88d4f0b4d2974137759ee7086452d0a3957c4b2a256708402fb3c9eb3d
     HEAD_REF master
+	PATCHES uwp.patch
 )
 if(${TARGET_TRIPLET} STREQUAL "x64-windows-static") 
 # workaround for visual studio toolset regression LNK1201 (remove if solved)
diff --git a/ports/qhull/uwp.patch b/ports/qhull/uwp.patch
new file mode 100644
index 000000000..98c74564e
--- /dev/null
+++ b/ports/qhull/uwp.patch
@@ -0,0 +1,26 @@
+diff --git a/src/libqhull/global.c b/src/libqhull/global.c
+index e7de8e6..81be9df 100644
+--- a/src/libqhull/global.c
++++ b/src/libqhull/global.c
+@@ -636,7 +636,7 @@ void qh_init_qhull_command(int argc, char *argv[]) {
+ */
+ void qh_initflags(char *command) {
+   int k, i, lastproject;
+-  char *s= command, *t, *prev_s, *start, key, *lastwarning= NULL;
++  char *s= command, *t = NULL, *prev_s, *start, key, *lastwarning= NULL;
+   boolT isgeom= False, wasproject;
+   realT r;
+ 
+diff --git a/src/libqhull_r/global_r.c b/src/libqhull_r/global_r.c
+index 3e6919f..8d13e47 100644
+--- a/src/libqhull_r/global_r.c
++++ b/src/libqhull_r/global_r.c
+@@ -610,7 +610,7 @@ void qh_init_qhull_command(qhT *qh, int argc, char *argv[]) {
+ */
+ void qh_initflags(qhT *qh, char *command) {
+   int k, i, lastproject;
+-  char *s= command, *t, *prev_s, *start, key, *lastwarning= NULL;
++  char *s= command, *t = NULL, *prev_s, *start, key, *lastwarning= NULL;
+   boolT isgeom= False, wasproject;
+   realT r;
+ 
diff --git a/ports/rocksdb/CONTROL b/ports/rocksdb/CONTROL
index 6daf694b5..1d37c85ca 100644
--- a/ports/rocksdb/CONTROL
+++ b/ports/rocksdb/CONTROL
@@ -1,5 +1,5 @@
 Source: rocksdb
-Version: 6.1.2
+Version: 6.1.2-1
 Homepage: https://github.com/facebook/rocksdb
 Description: A library that provides an embeddable, persistent key-value store for fast storage
 Default-Features: zlib
diff --git a/ports/rocksdb/portfile.cmake b/ports/rocksdb/portfile.cmake
index 7cab8b7d9..535f3708c 100644
--- a/ports/rocksdb/portfile.cmake
+++ b/ports/rocksdb/portfile.cmake
@@ -1,5 +1,7 @@
 include(vcpkg_common_functions)
 
+vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO facebook/rocksdb
diff --git a/ports/stormlib/CMakeLists.txt b/ports/stormlib/CMakeLists.txt
new file mode 100644
index 000000000..6b0e2a66c
--- /dev/null
+++ b/ports/stormlib/CMakeLists.txt
@@ -0,0 +1,279 @@
+cmake_minimum_required(VERSION 3.9)
+project(stormlib)
+
+set(SRC_FILES
+	stormlib_dll/StormLib.def
+	src/adpcm/adpcm.cpp
+	src/huffman/huff.cpp
+	src/jenkins/lookup3.c
+	src/lzma/C/LzFind.c
+	src/lzma/C/LzmaDec.c
+	src/lzma/C/LzmaEnc.c
+	src/pklib/explode.c
+	src/pklib/implode.c
+	src/sparse/sparse.cpp
+	src/FileStream.cpp
+	src/SBaseCommon.cpp
+	src/SBaseDumpData.cpp
+	src/SBaseFileTable.cpp
+	src/SBaseSubTypes.cpp
+	src/SCompression.cpp
+	src/SFileAddFile.cpp
+	src/SFileAttributes.cpp
+	src/SFileCompactArchive.cpp
+	src/SFileCreateArchive.cpp
+	src/SFileExtractFile.cpp
+	src/SFileFindFile.cpp
+	src/SFileGetFileInfo.cpp
+	src/SFileListFile.cpp
+	src/SFileOpenArchive.cpp
+	src/SFileOpenFileEx.cpp
+	src/SFilePatchArchives.cpp
+	src/SFileReadFile.cpp
+	src/SFileVerify.cpp
+	src/libtomcrypt/src/pk/rsa/rsa_verify_simple.c
+	src/libtomcrypt/src/misc/crypt_libc.c
+)
+
+if(MSVC)
+    # This file is used to create a DLL on windows
+    # Use BUILD_SHARED_LIBS to create StormLib.dll
+    set(STORM_DEF_FILES
+           stormlib_dll/StormLib.def
+    )
+endif()
+
+set(TOMCRYPT_FILES
+	src/libtomcrypt/src/hashes/hash_memory.c
+	src/libtomcrypt/src/hashes/md5.c
+	src/libtomcrypt/src/hashes/sha1.c
+	src/libtomcrypt/src/math/ltm_desc.c
+	src/libtomcrypt/src/math/multi.c
+	src/libtomcrypt/src/math/rand_prime.c
+	src/libtomcrypt/src/misc/base64_decode.c
+	src/libtomcrypt/src/misc/crypt_argchk.c
+	src/libtomcrypt/src/misc/crypt_find_hash.c
+	src/libtomcrypt/src/misc/crypt_find_prng.c
+	src/libtomcrypt/src/misc/crypt_hash_descriptor.c
+	src/libtomcrypt/src/misc/crypt_hash_is_valid.c
+	src/libtomcrypt/src/misc/crypt_ltc_mp_descriptor.c
+	src/libtomcrypt/src/misc/crypt_prng_descriptor.c
+	src/libtomcrypt/src/misc/crypt_prng_is_valid.c
+	src/libtomcrypt/src/misc/crypt_register_hash.c
+	src/libtomcrypt/src/misc/crypt_register_prng.c
+	src/libtomcrypt/src/misc/zeromem.c
+	src/libtomcrypt/src/pk/asn1/der_decode_bit_string.c
+	src/libtomcrypt/src/pk/asn1/der_decode_boolean.c
+	src/libtomcrypt/src/pk/asn1/der_decode_choice.c
+	src/libtomcrypt/src/pk/asn1/der_decode_ia5_string.c
+	src/libtomcrypt/src/pk/asn1/der_decode_integer.c
+	src/libtomcrypt/src/pk/asn1/der_decode_object_identifier.c
+	src/libtomcrypt/src/pk/asn1/der_decode_octet_string.c
+	src/libtomcrypt/src/pk/asn1/der_decode_printable_string.c
+	src/libtomcrypt/src/pk/asn1/der_decode_sequence_ex.c
+	src/libtomcrypt/src/pk/asn1/der_decode_sequence_flexi.c
+	src/libtomcrypt/src/pk/asn1/der_decode_sequence_multi.c
+	src/libtomcrypt/src/pk/asn1/der_decode_short_integer.c
+	src/libtomcrypt/src/pk/asn1/der_decode_utctime.c
+	src/libtomcrypt/src/pk/asn1/der_decode_utf8_string.c
+	src/libtomcrypt/src/pk/asn1/der_encode_bit_string.c
+	src/libtomcrypt/src/pk/asn1/der_encode_boolean.c
+	src/libtomcrypt/src/pk/asn1/der_encode_ia5_string.c
+	src/libtomcrypt/src/pk/asn1/der_encode_integer.c
+	src/libtomcrypt/src/pk/asn1/der_encode_object_identifier.c
+	src/libtomcrypt/src/pk/asn1/der_encode_octet_string.c
+	src/libtomcrypt/src/pk/asn1/der_encode_printable_string.c
+	src/libtomcrypt/src/pk/asn1/der_encode_sequence_ex.c
+	src/libtomcrypt/src/pk/asn1/der_encode_sequence_multi.c
+	src/libtomcrypt/src/pk/asn1/der_encode_set.c
+	src/libtomcrypt/src/pk/asn1/der_encode_setof.c
+	src/libtomcrypt/src/pk/asn1/der_encode_short_integer.c
+	src/libtomcrypt/src/pk/asn1/der_encode_utctime.c
+	src/libtomcrypt/src/pk/asn1/der_encode_utf8_string.c
+	src/libtomcrypt/src/pk/asn1/der_length_bit_string.c
+	src/libtomcrypt/src/pk/asn1/der_length_boolean.c
+	src/libtomcrypt/src/pk/asn1/der_length_ia5_string.c
+	src/libtomcrypt/src/pk/asn1/der_length_integer.c
+	src/libtomcrypt/src/pk/asn1/der_length_object_identifier.c
+	src/libtomcrypt/src/pk/asn1/der_length_octet_string.c
+	src/libtomcrypt/src/pk/asn1/der_length_printable_string.c
+	src/libtomcrypt/src/pk/asn1/der_length_sequence.c
+	src/libtomcrypt/src/pk/asn1/der_length_utctime.c
+	src/libtomcrypt/src/pk/asn1/der_sequence_free.c
+	src/libtomcrypt/src/pk/asn1/der_length_utf8_string.c
+	src/libtomcrypt/src/pk/asn1/der_length_short_integer.c
+	src/libtomcrypt/src/pk/ecc/ltc_ecc_map.c
+	src/libtomcrypt/src/pk/ecc/ltc_ecc_mul2add.c
+	src/libtomcrypt/src/pk/ecc/ltc_ecc_mulmod.c
+	src/libtomcrypt/src/pk/ecc/ltc_ecc_points.c
+	src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_add_point.c
+	src/libtomcrypt/src/pk/ecc/ltc_ecc_projective_dbl_point.c
+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_mgf1.c
+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_oaep_decode.c
+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_decode.c
+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_pss_encode.c
+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_decode.c
+	src/libtomcrypt/src/pk/pkcs1/pkcs_1_v1_5_encode.c
+	src/libtomcrypt/src/pk/rsa/rsa_exptmod.c
+	src/libtomcrypt/src/pk/rsa/rsa_free.c
+	src/libtomcrypt/src/pk/rsa/rsa_import.c
+	src/libtomcrypt/src/pk/rsa/rsa_make_key.c
+	src/libtomcrypt/src/pk/rsa/rsa_sign_hash.c
+	src/libtomcrypt/src/pk/rsa/rsa_verify_hash.c
+)
+
+set(TOMMATH_FILES
+	src/libtommath/bncore.c
+	src/libtommath/bn_fast_mp_invmod.c
+	src/libtommath/bn_fast_mp_montgomery_reduce.c
+	src/libtommath/bn_fast_s_mp_mul_digs.c
+	src/libtommath/bn_fast_s_mp_mul_high_digs.c
+	src/libtommath/bn_fast_s_mp_sqr.c
+	src/libtommath/bn_mp_2expt.c
+	src/libtommath/bn_mp_abs.c
+	src/libtommath/bn_mp_add.c
+	src/libtommath/bn_mp_addmod.c
+	src/libtommath/bn_mp_add_d.c
+	src/libtommath/bn_mp_and.c
+	src/libtommath/bn_mp_clamp.c
+	src/libtommath/bn_mp_clear.c
+	src/libtommath/bn_mp_clear_multi.c
+	src/libtommath/bn_mp_cmp.c
+	src/libtommath/bn_mp_cmp_d.c
+	src/libtommath/bn_mp_cmp_mag.c
+	src/libtommath/bn_mp_cnt_lsb.c
+	src/libtommath/bn_mp_copy.c
+	src/libtommath/bn_mp_count_bits.c
+	src/libtommath/bn_mp_div.c
+	src/libtommath/bn_mp_div_2.c
+	src/libtommath/bn_mp_div_2d.c
+	src/libtommath/bn_mp_div_3.c
+	src/libtommath/bn_mp_div_d.c
+	src/libtommath/bn_mp_dr_is_modulus.c
+	src/libtommath/bn_mp_dr_reduce.c
+	src/libtommath/bn_mp_dr_setup.c
+	src/libtommath/bn_mp_exch.c
+	src/libtommath/bn_mp_exptmod.c
+	src/libtommath/bn_mp_exptmod_fast.c
+	src/libtommath/bn_mp_expt_d.c
+	src/libtommath/bn_mp_exteuclid.c
+	src/libtommath/bn_mp_fread.c
+	src/libtommath/bn_mp_fwrite.c
+	src/libtommath/bn_mp_gcd.c
+	src/libtommath/bn_mp_get_int.c
+	src/libtommath/bn_mp_grow.c
+	src/libtommath/bn_mp_init.c
+	src/libtommath/bn_mp_init_copy.c
+	src/libtommath/bn_mp_init_multi.c
+	src/libtommath/bn_mp_init_set.c
+	src/libtommath/bn_mp_init_set_int.c
+	src/libtommath/bn_mp_init_size.c
+	src/libtommath/bn_mp_invmod.c
+	src/libtommath/bn_mp_invmod_slow.c
+	src/libtommath/bn_mp_is_square.c
+	src/libtommath/bn_mp_jacobi.c
+	src/libtommath/bn_mp_karatsuba_mul.c
+	src/libtommath/bn_mp_karatsuba_sqr.c
+	src/libtommath/bn_mp_lcm.c
+	src/libtommath/bn_mp_lshd.c
+	src/libtommath/bn_mp_mod.c
+	src/libtommath/bn_mp_mod_2d.c
+	src/libtommath/bn_mp_mod_d.c
+	src/libtommath/bn_mp_montgomery_calc_normalization.c
+	src/libtommath/bn_mp_montgomery_reduce.c
+	src/libtommath/bn_mp_montgomery_setup.c
+	src/libtommath/bn_mp_mul.c
+	src/libtommath/bn_mp_mulmod.c
+	src/libtommath/bn_mp_mul_2.c
+	src/libtommath/bn_mp_mul_2d.c
+	src/libtommath/bn_mp_mul_d.c
+	src/libtommath/bn_mp_neg.c
+	src/libtommath/bn_mp_n_root.c
+	src/libtommath/bn_mp_or.c
+	src/libtommath/bn_mp_prime_fermat.c
+	src/libtommath/bn_mp_prime_is_divisible.c
+	src/libtommath/bn_mp_prime_is_prime.c
+	src/libtommath/bn_mp_prime_miller_rabin.c
+	src/libtommath/bn_mp_prime_next_prime.c
+	src/libtommath/bn_mp_prime_rabin_miller_trials.c
+	src/libtommath/bn_mp_prime_random_ex.c
+	src/libtommath/bn_mp_radix_size.c
+	src/libtommath/bn_mp_radix_smap.c
+	src/libtommath/bn_mp_rand.c
+	src/libtommath/bn_mp_read_radix.c
+	src/libtommath/bn_mp_read_signed_bin.c
+	src/libtommath/bn_mp_read_unsigned_bin.c
+	src/libtommath/bn_mp_reduce.c
+	src/libtommath/bn_mp_reduce_2k.c
+	src/libtommath/bn_mp_reduce_2k_l.c
+	src/libtommath/bn_mp_reduce_2k_setup.c
+	src/libtommath/bn_mp_reduce_2k_setup_l.c
+	src/libtommath/bn_mp_reduce_is_2k.c
+	src/libtommath/bn_mp_reduce_is_2k_l.c
+	src/libtommath/bn_mp_reduce_setup.c
+	src/libtommath/bn_mp_rshd.c
+	src/libtommath/bn_mp_set.c
+	src/libtommath/bn_mp_set_int.c
+	src/libtommath/bn_mp_shrink.c
+	src/libtommath/bn_mp_signed_bin_size.c
+	src/libtommath/bn_mp_sqr.c
+	src/libtommath/bn_mp_sqrmod.c
+	src/libtommath/bn_mp_sqrt.c
+	src/libtommath/bn_mp_sub.c
+	src/libtommath/bn_mp_submod.c
+	src/libtommath/bn_mp_sub_d.c
+	src/libtommath/bn_mp_toom_mul.c
+	src/libtommath/bn_mp_toom_sqr.c
+	src/libtommath/bn_mp_toradix.c
+	src/libtommath/bn_mp_toradix_n.c
+	src/libtommath/bn_mp_to_signed_bin.c
+	src/libtommath/bn_mp_to_signed_bin_n.c
+	src/libtommath/bn_mp_to_unsigned_bin.c
+	src/libtommath/bn_mp_to_unsigned_bin_n.c
+	src/libtommath/bn_mp_unsigned_bin_size.c
+	src/libtommath/bn_mp_xor.c
+	src/libtommath/bn_mp_zero.c
+	src/libtommath/bn_prime_tab.c
+	src/libtommath/bn_reverse.c
+	src/libtommath/bn_s_mp_add.c
+	src/libtommath/bn_s_mp_exptmod.c
+	src/libtommath/bn_s_mp_mul_digs.c
+	src/libtommath/bn_s_mp_mul_high_digs.c
+	src/libtommath/bn_s_mp_sqr.c
+	src/libtommath/bn_s_mp_sub.c
+)
+
+find_package(ZLIB REQUIRED)
+find_package(BZip2 REQUIRED)
+
+if(WIN32)
+	set(LINK_LIBS wininet)
+endif()
+
+list(APPEND LINK_LIBS ZLIB::ZLIB BZip2::BZip2)
+
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+	message(STATUS "Using FreeBSD port")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DO_LARGEFILE=0 -Dstat64=stat -Dlstat64=lstat -Dlseek64=lseek -Doff64_t=off_t -Dfstat64=fstat -Dftruncate64=ftruncate")
+endif()
+
+add_library(stormlib ${LIB_TYPE} ${SRC_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES} ${STORM_DEF_FILES})
+add_definitions(-D__SYS_ZLIB -D__SYS_BZLIB)
+
+target_link_libraries(stormlib PRIVATE ${LINK_LIBS})
+
+target_compile_definitions(stormlib PRIVATE _7ZIP_ST BZ_STRICT_ANSI)
+
+if(WIN32)
+	target_compile_definitions(stormlib PRIVATE  UNICODE _UNICODE)
+endif()
+
+set_target_properties(stormlib PROPERTIES PUBLIC_HEADER "src/StormLib.h;src/StormPort.h")
+
+install(TARGETS stormlib EXPORT stormlibConfig
+		RUNTIME DESTINATION bin
+		ARCHIVE DESTINATION lib
+		LIBRARY DESTINATION lib
+)
+
+install(EXPORT stormlibConfig NAMESPACE stormlib:: DESTINATION share/stormlib)
+\ No newline at end of file
diff --git a/ports/stormlib/CONTROL b/ports/stormlib/CONTROL
index 348e09616..beb6fd3c1 100644
--- a/ports/stormlib/CONTROL
+++ b/ports/stormlib/CONTROL
@@ -1,4 +1,4 @@
 Source: stormlib
-Version: 9.22
+Version: 2019-05-10
 Build-Depends: zlib, bzip2
 Description: StormLib is a library for opening and manipulating Blizzard MPQ files
diff --git a/ports/stormlib/disable-building-tests.patch b/ports/stormlib/disable-building-tests.patch
deleted file mode 100644
index fe0d7f70c..000000000
--- a/ports/stormlib/disable-building-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f5211b1..4025ea1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -358,10 +358,4 @@ install(TARGETS ${LIBRARY_NAME}
-
-     INCLUDE(CPack)
-
--if(STORM_BUILD_TESTS)
--    target_link_libraries(storm_test ${LIBRARY_NAME})
--    install(TARGETS storm_test DESTINATION bin)
--endif()
-
--add_executable(storm_test ${SRC_FILES} ${TOMCRYPT_FILES} ${TOMMATH_FILES} ${ZLIB_BZIP2_FILES} ${TEST_SRC_FILES})
--install(TARGETS storm_test RUNTIME DESTINATION bin)
diff --git a/ports/stormlib/portfile.cmake b/ports/stormlib/portfile.cmake
index 82e0aedf9..d0e9e36a4 100644
--- a/ports/stormlib/portfile.cmake
+++ b/ports/stormlib/portfile.cmake
@@ -3,15 +3,14 @@ include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO ladislav-zezula/StormLib
-    REF v9.22
-    SHA512 e08571fca21be2e853d390b8feda32001df810b8f4b60d36822a9de2a877f2be9d3dadacfeec181a2eb80e00b8fed66d0dc9a0d8d9e043e2959478a41ed4d13a
+    REF 2f0e0e69e6b3739d7c450ac3d38816aee45ac3c2
+    SHA512 54cbe4270963944edf3d75b845047add2b004e0d95b20b75a4c4790c2a12a41bf19cc4f55aaeaec697a0a913827e11cfabde2123b2b13730556310dd89eef1e9
     HEAD_REF master
 )
 
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES
-    ${CMAKE_CURRENT_LIST_DIR}/disable-building-tests.patch
+file(COPY 
+    ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
+    DESTINATION ${SOURCE_PATH}
 )
 
 vcpkg_configure_cmake(
@@ -20,5 +19,7 @@ vcpkg_configure_cmake(
 )
 
 vcpkg_install_cmake()
+
 file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/stormlib RENAME copyright)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+vcpkg_fixup_cmake_targets()
+\ No newline at end of file
diff --git a/ports/stxxl/0001-fix-visual-studio.patch b/ports/stxxl/0001-fix-visual-studio.patch
new file mode 100644
index 000000000..3506c51ab
--- /dev/null
+++ b/ports/stxxl/0001-fix-visual-studio.patch
@@ -0,0 +1,272 @@
+diff --git a/include/stxxl/bits/algo/ksort.h b/include/stxxl/bits/algo/ksort.h
+index 33ec8cf..4079a57 100644
+--- a/include/stxxl/bits/algo/ksort.h
++++ b/include/stxxl/bits/algo/ksort.h
+@@ -299,11 +299,7 @@ create_runs(
+ template <typename BlockType,
+           typename prefetcher_type,
+           typename KeyExtractor>
+-struct run_cursor2_cmp : public std::binary_function<
+-                             run_cursor2<BlockType, prefetcher_type>,
+-                             run_cursor2<BlockType, prefetcher_type>,
+-                             bool
+-                             >
++struct run_cursor2_cmp
+ {
+     typedef run_cursor2<BlockType, prefetcher_type> cursor_type;
+     KeyExtractor keyobj;
+@@ -327,7 +323,7 @@ private:
+ };
+ 
+ template <typename RecordType, typename KeyExtractor>
+-class key_comparison : public std::binary_function<RecordType, RecordType, bool>
++class key_comparison
+ {
+     KeyExtractor ke;
+ 
+diff --git a/include/stxxl/bits/algo/sort_helper.h b/include/stxxl/bits/algo/sort_helper.h
+index 524e40d..69234c4 100644
+--- a/include/stxxl/bits/algo/sort_helper.h
++++ b/include/stxxl/bits/algo/sort_helper.h
+@@ -51,7 +51,6 @@ struct trigger_entry
+ 
+ template <typename TriggerEntryType, typename ValueCmp>
+ struct trigger_entry_cmp
+-    : public std::binary_function<TriggerEntryType, TriggerEntryType, bool>
+ {
+     typedef TriggerEntryType trigger_entry_type;
+     ValueCmp cmp;
+@@ -67,11 +66,6 @@ template <typename BlockType,
+           typename PrefetcherType,
+           typename ValueCmp>
+ struct run_cursor2_cmp
+-    : public std::binary_function<
+-          run_cursor2<BlockType, PrefetcherType>,
+-          run_cursor2<BlockType, PrefetcherType>,
+-          bool
+-          >
+ {
+     typedef BlockType block_type;
+     typedef PrefetcherType prefetcher_type;
+diff --git a/include/stxxl/bits/compat/unique_ptr.h b/include/stxxl/bits/compat/unique_ptr.h
+index 9df12ff..7110246 100644
+--- a/include/stxxl/bits/compat/unique_ptr.h
++++ b/include/stxxl/bits/compat/unique_ptr.h
+@@ -22,12 +22,7 @@ STXXL_BEGIN_NAMESPACE
+ 
+ template <class Type>
+ struct compat_unique_ptr {
+-#if __cplusplus >= 201103L && ((__GNUC__ * 10000 + __GNUC_MINOR__ * 100) >= 40400)
+     typedef std::unique_ptr<Type> result;
+-#else
+-    // auto_ptr is inherently broken and is deprecated by unique_ptr in c++0x
+-    typedef std::auto_ptr<Type> result;
+-#endif
+ };
+ 
+ STXXL_END_NAMESPACE
+diff --git a/include/stxxl/bits/containers/btree/leaf.h b/include/stxxl/bits/containers/btree/leaf.h
+index d7c619f..c6b2fcc 100644
+--- a/include/stxxl/bits/containers/btree/leaf.h
++++ b/include/stxxl/bits/containers/btree/leaf.h
+@@ -66,7 +66,7 @@ public:
+     typedef node_cache<normal_leaf, btree_type> leaf_cache_type;
+ 
+ public:
+-    struct value_compare : public std::binary_function<value_type, value_type, bool>
++    struct value_compare
+     {
+         key_compare comp;
+ 
+diff --git a/include/stxxl/bits/containers/btree/node.h b/include/stxxl/bits/containers/btree/node.h
+index 13dec7b..a4c47d8 100644
+--- a/include/stxxl/bits/containers/btree/node.h
++++ b/include/stxxl/bits/containers/btree/node.h
+@@ -71,7 +71,7 @@ public:
+     typedef node_cache<normal_node, btree_type> node_cache_type;
+ 
+ private:
+-    struct value_compare : public std::binary_function<value_type, value_type, bool>
++    struct value_compare
+     {
+         key_compare comp;
+ 
+diff --git a/include/stxxl/bits/containers/hash_map/hash_map.h b/include/stxxl/bits/containers/hash_map/hash_map.h
+index 0759bd2..ecf19cd 100644
+--- a/include/stxxl/bits/containers/hash_map/hash_map.h
++++ b/include/stxxl/bits/containers/hash_map/hash_map.h
+@@ -1258,10 +1258,7 @@ protected:
+      * lexicographically by <hash-value, key> Note: the hash-value has already
+      * been computed.
+      */
+-    struct Cmp : public std::binary_function<
+-                     std::pair<internal_size_type, value_type>,
+-                     std::pair<internal_size_type, value_type>, bool
+-                     >
++    struct Cmp
+     {
+         self_type& map_;
+         Cmp(self_type& map) : map_(map) { }
+@@ -1520,7 +1517,7 @@ protected:
+ 
+ public:
+     //! Construct an equality predicate from the comparison operator
+-    struct equal_to : public std::binary_function<key_type, key_type, bool>
++    struct equal_to
+     {
+         //! reference to hash_map
+         const self_type& m_map;
+diff --git a/include/stxxl/bits/io/wbtl_file.h b/include/stxxl/bits/io/wbtl_file.h
+index 933a216..30828a0 100644
+--- a/include/stxxl/bits/io/wbtl_file.h
++++ b/include/stxxl/bits/io/wbtl_file.h
+@@ -65,7 +65,7 @@ class wbtl_file : public disk_queued_file
+     size_type curpos;
+     request_ptr backend_request;
+ 
+-    struct FirstFit : public std::binary_function<place, offset_type, bool>
++    struct FirstFit
+     {
+         bool operator () (
+             const place& entry,
+diff --git a/include/stxxl/bits/mng/block_alloc.h b/include/stxxl/bits/mng/block_alloc.h
+index 19ade8b..887f0e6 100644
+--- a/include/stxxl/bits/mng/block_alloc.h
++++ b/include/stxxl/bits/mng/block_alloc.h
+@@ -138,7 +138,7 @@ private:
+             perm[i] = i;
+ 
+         stxxl::random_number<random_uniform_fast> rnd;
+-        std::random_shuffle(perm.begin(), perm.end(), rnd _STXXL_FORCE_SEQUENTIAL);
++        std::shuffle(perm.begin(), perm.end(), std::mt19937(std::random_device()()));
+     }
+ 
+ public:
+diff --git a/include/stxxl/bits/mng/block_alloc_interleaved.h b/include/stxxl/bits/mng/block_alloc_interleaved.h
+index a82ee34..5aba23a 100644
+--- a/include/stxxl/bits/mng/block_alloc_interleaved.h
++++ b/include/stxxl/bits/mng/block_alloc_interleaved.h
+@@ -93,7 +93,7 @@ struct interleaved_RC : public interleaved_striping
+                 perms[i][j] = j;
+ 
+             random_number<random_uniform_fast> rnd;
+-            std::random_shuffle(perms[i].begin(), perms[i].end(), rnd _STXXL_FORCE_SEQUENTIAL);
++            std::shuffle(perms[i].begin(), perms[i].end(), std::mt19937(std::random_device()()));
+         }
+     }
+ 
+diff --git a/include/stxxl/bits/mng/disk_allocator.h b/include/stxxl/bits/mng/disk_allocator.h
+index 59ad085..c1e0f83 100644
+--- a/include/stxxl/bits/mng/disk_allocator.h
++++ b/include/stxxl/bits/mng/disk_allocator.h
+@@ -44,7 +44,7 @@ class disk_allocator : private noncopyable
+ {
+     typedef std::pair<stxxl::int64, stxxl::int64> place;
+ 
+-    struct first_fit : public std::binary_function<place, stxxl::int64, bool>
++    struct first_fit
+     {
+         bool operator () (
+             const place& entry,
+@@ -189,7 +189,7 @@ void disk_allocator::new_blocks(BID<BlockSize>* begin, BID<BlockSize>* end)
+ 
+     sortseq::iterator space;
+     space = std::find_if(free_space.begin(), free_space.end(),
+-                         bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL);
++                         std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL);
+ 
+     if (space == free_space.end() && requested_size == BlockSize)
+     {
+@@ -207,7 +207,7 @@ void disk_allocator::new_blocks(BID<BlockSize>* begin, BID<BlockSize>* end)
+         grow_file(BlockSize);
+ 
+         space = std::find_if(free_space.begin(), free_space.end(),
+-                             bind2nd(first_fit(), requested_size) _STXXL_FORCE_SEQUENTIAL);
++                             std::bind(first_fit(), std::placeholders::_1, requested_size) _STXXL_FORCE_SEQUENTIAL);
+     }
+ 
+     if (space != free_space.end())
+diff --git a/include/stxxl/bits/parallel.h b/include/stxxl/bits/parallel.h
+index d973861..c858d87 100644
+--- a/include/stxxl/bits/parallel.h
++++ b/include/stxxl/bits/parallel.h
+@@ -121,7 +121,6 @@ using __gnu_parallel::random_shuffle;
+ #elif STXXL_PARALLEL
+ 
+ using std::sort;
+-using std::random_shuffle;
+ 
+ #else
+ 
+diff --git a/include/stxxl/bits/parallel/base.h b/include/stxxl/bits/parallel/base.h
+index 141d515..7dae74f 100644
+--- a/include/stxxl/bits/parallel/base.h
++++ b/include/stxxl/bits/parallel/base.h
+@@ -33,7 +33,6 @@ namespace parallel {
+  */
+ template <class Predicate, typename first_argument_type, typename second_argument_type>
+ class binary_negate
+-    : public std::binary_function<first_argument_type, second_argument_type, bool>
+ {
+ protected:
+     Predicate pred;
+@@ -80,7 +79,7 @@ static inline void decode2(lcas_t x, int& a, int& b)
+  * Constructs predicate for equality from strict weak ordering predicate
+  */
+ template <class Comparator, typename T1, typename T2>
+-class equal_from_less : public std::binary_function<T1, T2, bool>
++class equal_from_less
+ {
+ private:
+     Comparator& comp;
+@@ -126,7 +125,7 @@ median_of_three_iterators(RandomAccessIterator a, RandomAccessIterator b,
+ 
+ /** Similar to std::equal_to, but allows two different types. */
+ template <typename T1, typename T2>
+-struct equal_to : std::binary_function<T1, T2, bool>
++struct equal_to
+ {
+     bool operator () (const T1& t1, const T2& t2) const
+     {
+@@ -136,7 +135,7 @@ struct equal_to : std::binary_function<T1, T2, bool>
+ 
+ /** Similar to std::less, but allows two different types. */
+ template <typename T1, typename T2>
+-struct less : std::binary_function<T1, T2, bool>
++struct less
+ {
+     bool operator () (const T1& t1, const T2& t2) const
+     {
+diff --git a/include/stxxl/bits/parallel/multiseq_selection.h b/include/stxxl/bits/parallel/multiseq_selection.h
+index 57e7599..f41d9aa 100644
+--- a/include/stxxl/bits/parallel/multiseq_selection.h
++++ b/include/stxxl/bits/parallel/multiseq_selection.h
+@@ -35,7 +35,6 @@ namespace parallel {
+ //! Compare a pair of types lexcigraphically, ascending.
+ template <typename T1, typename T2, typename Comparator>
+ class lexicographic
+-    : public std::binary_function<std::pair<T1, T2>, std::pair<T1, T2>, bool>
+ {
+ protected:
+     Comparator& m_comp;
+@@ -60,7 +59,6 @@ public:
+ //! Compare a pair of types lexcigraphically, descending.
+ template <typename T1, typename T2, typename Comparator>
+ class lexicographic_rev
+-    : public std::binary_function<std::pair<T1, T2>, std::pair<T1, T2>, bool>
+ {
+ protected:
+     Comparator& m_comp;
+diff --git a/lib/io/wbtl_file.cpp b/lib/io/wbtl_file.cpp
+index 310d76a..6d52e2e 100644
+--- a/lib/io/wbtl_file.cpp
++++ b/lib/io/wbtl_file.cpp
+@@ -304,7 +304,7 @@ wbtl_file::offset_type wbtl_file::get_next_write_block()
+     // mapping_lock has to be aquired by caller
+     sortseq::iterator space =
+         std::find_if(free_space.begin(), free_space.end(),
+-                     bind2nd(FirstFit(), write_block_size) _STXXL_FORCE_SEQUENTIAL);
++                     std::bind(FirstFit(), std::placeholders::_1, write_block_size) _STXXL_FORCE_SEQUENTIAL);
+ 
+     if (space != free_space.end())
+     {
diff --git a/ports/stxxl/portfile.cmake b/ports/stxxl/portfile.cmake
index 23414f08e..01d072d09 100644
--- a/ports/stxxl/portfile.cmake
+++ b/ports/stxxl/portfile.cmake
@@ -11,6 +11,7 @@ vcpkg_from_github(
     PATCHES
         # This patch can be removed when stxxl/stxxl/#95 is accepted
         fix-include-dir.patch
+        0001-fix-visual-studio.patch
 )
 
 vcpkg_configure_cmake(
@@ -32,7 +33,7 @@ vcpkg_configure_cmake(
     OPTIONS_DEBUG
         -DSTXXL_DEBUG_ASSERTIONS=ON
     OPTIONS_RELEASE
-        -DSTXXL_DEBUG_ASSERTIONS=OFF    
+        -DSTXXL_DEBUG_ASSERTIONS=OFF
 )
 
 vcpkg_install_cmake()
diff --git a/ports/tinyexif/CONTROL b/ports/tinyexif/CONTROL
index 24350d8be..7d2da6da0 100644
--- a/ports/tinyexif/CONTROL
+++ b/ports/tinyexif/CONTROL
@@ -1,5 +1,5 @@
 Source: tinyexif
-Version: 1.0.2-5
+Version: 1.0.2-6
 Build-Depends: tinyxml2
 Homepage: https://github.com/cdcseacave/TinyEXIF
 Description: tiny ISO-compliant C++ EXIF and XMP parsing library for JPEG images
diff --git a/ports/tinyexif/portfile.cmake b/ports/tinyexif/portfile.cmake
index b6e489384..b1940ad94 100644
--- a/ports/tinyexif/portfile.cmake
+++ b/ports/tinyexif/portfile.cmake
@@ -20,7 +20,7 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/tinyexif)
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/TinyEXIF)
 
 vcpkg_copy_pdbs()
 
diff --git a/ports/tinynpy/CONTROL b/ports/tinynpy/CONTROL
new file mode 100644
index 000000000..ccef53ad8
--- /dev/null
+++ b/ports/tinynpy/CONTROL
@@ -0,0 +1,4 @@
+Source: tinynpy
+Version: 1.0.0-2
+Build-Depends: zlib
+Description: tiny C++ loader/exporter of python numpy array NPY/NPZ files
diff --git a/ports/tinynpy/portfile.cmake b/ports/tinynpy/portfile.cmake
new file mode 100644
index 000000000..7daf6f7a3
--- /dev/null
+++ b/ports/tinynpy/portfile.cmake
@@ -0,0 +1,30 @@
+include(vcpkg_common_functions)
+
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO cdcseacave/TinyNPY
+    REF 721a498ebff5ba537a136c9df330158f5c85c00c
+    SHA512 c22382306ed7c33b147a93093cfb1217504e6dee8172b1684c0519e3b95bb3ac7ed48de7c6b6759db5187ce85301880702e28e08f149f369dbc630e5b646a06a
+    HEAD_REF master
+)
+
+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" BUILD_STATIC_LIBS)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS}
+        -DBUILD_DEMO=OFF
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/TinyNPY")
+
+vcpkg_copy_pdbs()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/README.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/tinynpy RENAME copyright)
diff --git a/ports/xalan-c/0001-ALLOW_RTCc_IN_STL.patch b/ports/xalan-c/0001-ALLOW_RTCc_IN_STL.patch
deleted file mode 100644
index a01096b0d..000000000
--- a/ports/xalan-c/0001-ALLOW_RTCc_IN_STL.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff --git a/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj b/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
-index 5a9d6a0..a0d12e8 100644
---- a/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
-+++ b/c/Projects/Win32/VC10/AllInOne/AllInOne.vcxproj
-@@ -159,7 +159,7 @@
-     <ClCompile>
-       <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\src\;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-@@ -197,7 +197,7 @@
-     <ClCompile>
-       <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\src\;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_BUILD_DLL;XALAN_INMEM_MSG_LOADER;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-diff --git a/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj b/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
-index 27958b5..9f7767b 100644
---- a/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
-+++ b/c/Projects/Win32/VC10/Utils/MsgCreator/MsgCreator.vcxproj
-@@ -159,6 +159,7 @@
-     <ClCompile>
-       <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-+      <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-@@ -191,7 +192,7 @@
-     <ClCompile>
-       <Optimization>Disabled</Optimization>
-       <AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <MinimalRebuild>true</MinimalRebuild>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-diff --git a/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj b/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
-index facbbc1..53b83a8 100644
---- a/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
-+++ b/c/Projects/Win32/VC10/Utils/XalanMsgLib/XalanMsgLib.vcxproj
-@@ -144,7 +144,7 @@
-       <Optimization>Disabled</Optimization>
-       <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-       <SmallerTypeCheck>true</SmallerTypeCheck>
-@@ -170,7 +170,7 @@
-       <Optimization>Disabled</Optimization>
-       <WholeProgramOptimization>false</WholeProgramOptimization>
-       <AdditionalIncludeDirectories>$(XERCESCROOT)\include;$(XERCESCROOT)\src;..\..\..\..\..\src;$(OutDir)Nls\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
--      <PreprocessorDefinitions>XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-+      <PreprocessorDefinitions>_ALLOW_RTCc_IN_STL;XALAN_XALANMSGLIB_BUILD_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-       <StringPooling>true</StringPooling>
-       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-       <SmallerTypeCheck>true</SmallerTypeCheck>
diff --git a/ports/xalan-c/0002-no-mfc.patch b/ports/xalan-c/0002-no-mfc.patch
deleted file mode 100644
index 3935251f5..000000000
--- a/ports/xalan-c/0002-no-mfc.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN a/c/Projects/Win32/Res/AllInOne/AllInOne.rc b/c/Projects/Win32/Res/AllInOne/AllInOne.rc
---- a/c/Projects/Win32/Res/AllInOne/AllInOne.rc	2012-03-19 16:18:11.000000000 +0000
-+++ b/c/Projects/Win32/Res/AllInOne/AllInOne.rc	2018-09-07 16:08:59.871434376 +0100
-@@ -7,7 +7,7 @@
- //
- // Generated from the TEXTINCLUDE 2 resource.
- //
--#include "afxres.h"
-+#include "windows.h"
- 
- 
- /////////////////////////////////////////////////////////////////////////////
-@@ -75,7 +75,7 @@
- 
- 2 TEXTINCLUDE 
- BEGIN
--    "#include ""afxres.h""\r\n"
-+    "#include ""windows.h""\r\n"
-     "\r\n"
-     "\0"
- END
diff --git a/ports/xalan-c/0003-char16_t.patch b/ports/xalan-c/0003-char16_t.patch
deleted file mode 100644
index e8ed83bb0..000000000
--- a/ports/xalan-c/0003-char16_t.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -urN a/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp b/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp
---- a/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp	2012-03-19 16:18:10.000000000 +0000
-+++ b/c/src/xalanc/PlatformSupport/DirectoryEnumerator.hpp	2018-09-07 16:08:39.207316486 +0100
-@@ -84,7 +84,7 @@
-     const XalanDOMChar*
-     getName() const
-     {
--        return name;
-+        return const_cast<XalanDOMChar*>(reinterpret_cast<const XalanDOMChar*>(&name[0]));
-     }
- 
-     /**
-@@ -261,7 +261,7 @@
- #pragma warning(disable: 4244)
-     theHandleType   theSearchHandle =
-         _wfindfirst(
--            const_cast<wchar_t*>(theConversionFunction(theFullSearchSpec)),
-+            reinterpret_cast<wchar_t*>(const_cast<XalanDOMChar*>(theConversionFunction(theFullSearchSpec))),
-             &theFindData);
- #pragma warning(pop)
- 
-diff -urN a/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp b/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp
---- a/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp	2012-03-19 16:18:10.000000000 +0000
-+++ b/c/src/xalanc/PlatformSupport/DOMStringHelper.cpp	2018-09-07 16:08:39.207316486 +0100
-@@ -868,7 +868,7 @@
-             const XalanDOMChar*     theRHS)
- {
- #if defined(XALAN_USE_WINDOWS_COLLATION)
--    return _wcscoll_l(theLHS, theRHS, s_locale);
-+    return _wcscoll_l(reinterpret_cast<const wchar_t *>(theLHS), reinterpret_cast<const wchar_t *>(theRHS), s_locale);
- #else
-     return doCollationCompare(
-                 theLHS,
-diff -urN a/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp b/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp
---- a/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp	2012-03-19 16:18:10.000000000 +0000
-+++ b/c/src/xalanc/PlatformSupport/XalanFileOutputStream.cpp	2018-09-07 16:08:39.207316486 +0100
-@@ -123,7 +123,7 @@
- 
- #if defined(XALAN_WINDOWS)
-     HandleType  theFileHandle = CreateFileW(
--            theFileName.c_str(),
-+            reinterpret_cast<const wchar_t *>(theFileName.c_str()),
-             GENERIC_WRITE,
-             0,
-             0,
diff --git a/ports/xalan-c/0004-macosx-dyld-fallback.patch b/ports/xalan-c/0004-macosx-dyld-fallback.patch
deleted file mode 100644
index db0871698..000000000
--- a/ports/xalan-c/0004-macosx-dyld-fallback.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/c/Makefile.incl.in b/c/Makefile.incl.in
---- a/c/Makefile.incl.in	2012-10-14 21:54:01.000000000 +0100
-+++ b/c/Makefile.incl.in	2018-09-07 16:08:15.559182228 +0100
-@@ -598,7 +598,7 @@
-   MAKE_SHARED = ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib -prebind -seg1addr 0x38000000  -compatibility_version 1 -current_version $(LIB_MAJOR_DOT_VER) -install_name ${LINK_NAME} ${LDFLAGS}
-   LINK = ${CXX} $(CXXFLAGS) ${PLATFORM_COMPILE_OPTIONS} ${LDFLAGS}
-   
--  export DYLD_LIBRARY_PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(DYLD_LIBRARY_PATH)
-+  export DYLD_FALLBACK_LIBRARY_PATH := $(XERCESCROOT)/lib:$(ICULIB_LOC):$(DYLD_FALLBACK_LIBRARY_PATH)
-   LOC_LIB = ${LOC_LIBNAME}.${LIB_MAJOR_VER}.${LIB_MINOR_VER}$(SHLIBSUFFIX)
-   LOC_SONAME = ${LOC_LIBNAME}.${LIB_MAJOR_VER}${SHLIBSUFFIX}
-   MAKE_SHARED_LOC= ${CXX} $(CXXFLAGS) -D${PLATFORM} -dynamiclib -prebind -seg1addr 0x40000000  -compatibility_version 1 -current_version $(LIB_MAJOR_DOT_VER) -install_name ${LOC_LIBNAME}${SHLIBSUFFIX} ${LDFLAGS}
diff --git a/ports/xalan-c/0005-fix-ftbfs-ld-as-needed.patch b/ports/xalan-c/0005-fix-ftbfs-ld-as-needed.patch
deleted file mode 100644
index 434877214..000000000
--- a/ports/xalan-c/0005-fix-ftbfs-ld-as-needed.patch
+++ /dev/null
@@ -1,186 +0,0 @@
-diff -urN a/c/samples/Makefile.in b/c/samples/Makefile.in
---- a/c/samples/Makefile.in	2012-03-19 16:18:12.000000000 +0000
-+++ b/c/samples/Makefile.in	2018-09-07 16:07:59.063089005 +0100
-@@ -88,7 +88,7 @@
- 
- $(XSL_LIB_DIR)/mod_xslt$(SHLIBSUFFIX) : $(XSL_OBJ_DIR)/mod_xslt.o
- 	$(MAKE_SHARED) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/ApacheModuleXSLT/%.c
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) -I/usr/include/apache/ $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -96,7 +96,7 @@
- 
- $(XSL_BIN_DIR)/CompileStylesheet: $(XSL_OBJ_DIR)/CompileStylesheet.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/CompileStylesheet/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -104,7 +104,7 @@
- 
- $(XSL_BIN_DIR)/DocumentBuilder: $(XSL_OBJ_DIR)/DocumentBuilder.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/DocumentBuilder/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -112,7 +112,7 @@
- 
- $(XSL_BIN_DIR)/EntityResolver: $(XSL_OBJ_DIR)/EntityResolver.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/EntityResolver/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -120,7 +120,7 @@
- 
- $(XSL_BIN_DIR)/ExternalFunction: $(XSL_OBJ_DIR)/ExternalFunction.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/ExternalFunction/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -128,7 +128,7 @@
- 
- $(XSL_BIN_DIR)/ParsedSourceWrappers: $(XSL_OBJ_DIR)/ParsedSourceWrappers.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/ParsedSourceWrappers/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -136,7 +136,7 @@
- 
- $(XSL_BIN_DIR)/SerializeNodeSet: $(XSL_OBJ_DIR)/SerializeNodeSet.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/SerializeNodeSet/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -144,7 +144,7 @@
- 
- $(XSL_BIN_DIR)/SimpleTransform: $(XSL_OBJ_DIR)/SimpleTransform.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/SimpleTransform/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -152,7 +152,7 @@
- 
- $(XSL_BIN_DIR)/SimpleXPathAPI: $(XSL_OBJ_DIR)/SimpleXPathAPI.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/SimpleXPathAPI/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -160,7 +160,7 @@
- 
- $(XSL_BIN_DIR)/SimpleXPathCAPI: $(XSL_OBJ_DIR)/SimpleXPathCAPI.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/SimpleXPathCAPI/%.c
- 	$(CC4) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -168,7 +168,7 @@
- 
- $(XSL_BIN_DIR)/StreamTransform: $(XSL_OBJ_DIR)/StreamTransform.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/StreamTransform/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
- 
-@@ -176,7 +176,7 @@
- 
- $(XSL_BIN_DIR)/TraceListen: $(XSL_OBJ_DIR)/TraceListen.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/TraceListen/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
- 
-@@ -184,7 +184,7 @@
- 
- $(XSL_BIN_DIR)/TransformToXercesDOM: $(XSL_OBJ_DIR)/TransformToXercesDOM.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/TransformToXercesDOM/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<		
- 
-@@ -192,7 +192,7 @@
- 
- $(XSL_BIN_DIR)/UseStylesheetParam: $(XSL_OBJ_DIR)/UseStylesheetParam.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/UseStylesheetParam/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<	
- 
-@@ -200,7 +200,7 @@
- 
- $(XSL_BIN_DIR)/XalanTransform: $(XSL_OBJ_DIR)/XalanTransform.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/XalanTransform/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -208,7 +208,7 @@
- 
- $(XSL_BIN_DIR)/XalanTransformerCallback: $(XSL_OBJ_DIR)/XalanTransformerCallback.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/XalanTransformerCallback/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -216,7 +216,7 @@
- 
- $(XSL_BIN_DIR)/ThreadSafe: $(XSL_OBJ_DIR)/ThreadSafe.o
- 	$(LINK) $(XSL_BUILD_OPTIONS) $(PLATFORM_LIB_LINK_OPTIONS)  \
--	$(EXTRA_LINK_OPTIONS) $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	$(EXTRA_LINK_OPTIONS) $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- $(XSL_OBJ_DIR)/%.o:$(SAMPLES_DIR)/ThreadSafe/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-diff -urN a/c/Tests/Makefile.in b/c/Tests/Makefile.in
---- a/c/Tests/Makefile.in	2012-03-19 16:18:12.000000000 +0000
-+++ b/c/Tests/Makefile.in	2018-09-07 16:07:59.063089005 +0100
-@@ -62,7 +62,7 @@
- 
- $(XSL_BIN_DIR)/ThreadTest: ${XSL_OBJ_DIR}/ThreadTest.o 
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	${EXTRA_LINK_OPTIONS}  $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Threads/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -70,7 +70,7 @@
- 
- $(XSL_BIN_DIR)/Conf: ${XSL_OBJ_DIR}/conf.o
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	${EXTRA_LINK_OPTIONS}  $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Conf/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
- 
-@@ -92,7 +92,7 @@
- 
- $(XSL_BIN_DIR)/Perf: $(PERF_OBJECTS)
- 	${LINK} $(XSL_BUILD_OPTIONS) ${PLATFORM_LIB_LINK_OPTIONS}  \
--	${EXTRA_LINK_OPTIONS}  $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) $^ -o $@	 $(OTHER_LINK_PARAMETERS)
-+	${EXTRA_LINK_OPTIONS}  $^ $(XALAN_LIB) $(ALLLIBS) $(CXXFLAGS) -o $@	 $(OTHER_LINK_PARAMETERS)
- 	
- ${XSL_OBJ_DIR}/%.o:$(TESTS_DIR)/Performance/%.cpp
- 	$(CC1) $(XSL_BUILD_OPTIONS) -c $(XSL_INCL) $(EXTRA_COMPILE_OPTIONS) -o $@ $<
diff --git a/ports/xalan-c/0006-fix-testxslt-segfault.patch b/ports/xalan-c/0006-fix-testxslt-segfault.patch
deleted file mode 100644
index b8f9b09ab..000000000
--- a/ports/xalan-c/0006-fix-testxslt-segfault.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN a/c/src/xalanc/PlatformSupport/XalanLocator.hpp b/c/src/xalanc/PlatformSupport/XalanLocator.hpp
---- a/c/src/xalanc/PlatformSupport/XalanLocator.hpp	2012-09-27 07:59:33.000000000 +0100
-+++ b/c/src/xalanc/PlatformSupport/XalanLocator.hpp	2018-09-07 16:07:11.070819930 +0100
-@@ -91,7 +91,7 @@
-             const XalanDOMChar*     theAlternateId = getEmptyPtr())
-     {
-         return theLocator == 0 ? theAlternateId : (theLocator->getSystemId() ?
--            theLocator->getPublicId() : theAlternateId);
-+            theLocator->getSystemId() : theAlternateId);
-     }
- 
-     /**
diff --git a/ports/xalan-c/0007-fix-readme-typos.patch b/ports/xalan-c/0007-fix-readme-typos.patch
deleted file mode 100644
index e97d16749..000000000
--- a/ports/xalan-c/0007-fix-readme-typos.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -urN a/c/README b/c/README
---- a/c/README	2012-10-13 05:52:45.000000000 +0100
-+++ b/c/README	2018-09-07 16:06:24.602562653 +0100
-@@ -3,7 +3,7 @@
- 
- Project Description:
-     The Apache Xalan C/C++ Project provides a library and a 
--    comand line program to transform XML documents using a
-+    command line program to transform XML documents using a
-     stylesheet that conforms to XSLT 1.0 standards.
- 
-     The source package contains all the code to create the library,
-@@ -84,7 +84,7 @@
-     XalanMessages_1_11.exp   - Windows DLL export definitions
-     XalanMessages_1_11.lib   - Windows DLL library definitions
-     XalanMessages_1_11D.exp  - Windows DLL export definitions
--    XalanMessages_1_11D.lib  - Windows DLL library defnitions
-+    XalanMessages_1_11D.lib  - Windows DLL library definitions
- 
- SUPPORTED PLATFORMS:
-     - This is only a partial list
diff --git a/ports/xalan-c/CONTROL b/ports/xalan-c/CONTROL
index 3748326b7..6a6ead6ad 100644
--- a/ports/xalan-c/CONTROL
+++ b/ports/xalan-c/CONTROL
@@ -1,5 +1,5 @@
 Source: xalan-c
-Version: 1.11-6
-Homepage: https://www-us.apache.org/dist/xalan/xalan-c/
+Version: 1.11-7
+Homepage: https://github.com/apache/xalan-c
 Description: Xalan is an XSLT processor for transforming XML documents into HTML, text, or other XML document types
 Build-Depends: xerces-c
diff --git a/ports/xalan-c/fix-missing-dll-error.patch b/ports/xalan-c/fix-missing-dll-error.patch
new file mode 100644
index 000000000..db49a2be6
--- /dev/null
+++ b/ports/xalan-c/fix-missing-dll-error.patch
@@ -0,0 +1,48 @@
+diff --git a/src/xalanc/Utils/CMakeLists.txt b/src/xalanc/Utils/CMakeLists.txt
+index dc39ad0..2d78685 100644
+--- a/src/xalanc/Utils/CMakeLists.txt
++++ b/src/xalanc/Utils/CMakeLists.txt
+@@ -40,6 +40,13 @@ set(SUPPORTMSGINDEX "${GEN_SUPPORTDIR}/LocalMsgIndex.hpp")
+ add_custom_target(locale ALL)
+ set_target_properties(locale PROPERTIES FOLDER "Message Library")
+ 
++# workaround for case of missing xerces-c dll
++if(EXISTS ${XercesC_INCLUDE_DIR}/../bin)
++  set(MsgCreator_WD $<TARGET_FILE_DIR:XercesC::XercesC>/../bin)
++else()
++  set(MsgCreator_WD "${XSL_NLS_GEN_DIR}")
++endif()
++
+ if(msgloader STREQUAL "inmemory")
+   add_custom_command(
+     OUTPUT "${GENMSGINDEX}"
+@@ -48,7 +55,8 @@ if(msgloader STREQUAL "inmemory")
+            "${XLIFF_FILE_NAME}"
+            -TYPE inmem
+            -LOCALE ${LOCALE}
+-    WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}"
++           -OUTDIR "${XSL_NLS_GEN_DIR}"
++    WORKING_DIRECTORY "${MsgCreator_WD}"
+     COMMENT "Generating inmemory locale message data"
+     DEPENDS MsgCreator "${XLIFF_FILE_NAME}")
+ 
+@@ -92,7 +100,8 @@ if(msgloader STREQUAL "icu")
+             "${XLIFF_FILE_NAME}"
+             -TYPE icu
+             -LOCALE ${LOCALE}
+-    WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}"
++            -OUTDIR "${XSL_NLS_GEN_DIR}"
++    WORKING_DIRECTORY "${MsgCreator_WD}"
+     COMMENT "Generating ICU locale message data"
+     DEPENDS MsgCreator "${XLIFF_FILE_NAME}")
+ 
+@@ -141,7 +150,8 @@ if(msgloader STREQUAL "nls")
+             "${XLIFF_FILE_NAME}"
+             -TYPE nls
+             -LOCALE ${LOCALE}
+-    WORKING_DIRECTORY "${XSL_NLS_GEN_DIR}"
++            -OUTDIR "${XSL_NLS_GEN_DIR}"
++    WORKING_DIRECTORY "${MsgCreator_WD}"
+     COMMENT "Generating nls locale message data"
+     DEPENDS MsgCreator "${XLIFF_FILE_NAME}")
+ 
diff --git a/ports/xalan-c/fix-win-deprecated-err.patch b/ports/xalan-c/fix-win-deprecated-err.patch
new file mode 100644
index 000000000..1484f4e27
--- /dev/null
+++ b/ports/xalan-c/fix-win-deprecated-err.patch
@@ -0,0 +1,15 @@
+diff --git a/src/xalanc/Utils/MsgCreator/CMakeLists.txt b/src/xalanc/Utils/MsgCreator/CMakeLists.txt
+index 20215d4..dc74c1b 100644
+--- a/src/xalanc/Utils/MsgCreator/CMakeLists.txt
++++ b/src/xalanc/Utils/MsgCreator/CMakeLists.txt
+@@ -37,6 +37,10 @@ set(msgcreator_headers
+   NLSHandler.hpp
+   SAX2Handler.hpp)
+
++if(MSVC)
++  add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
++endif()
++
+ add_executable(MsgCreator ${msgcreator_sources} ${msgcreator_headers})
+ target_include_directories(MsgCreator PUBLIC
+   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>
diff --git a/ports/xalan-c/portfile.cmake b/ports/xalan-c/portfile.cmake
index 114a9a2b8..0460c7464 100644
--- a/ports/xalan-c/portfile.cmake
+++ b/ports/xalan-c/portfile.cmake
@@ -1,132 +1,42 @@
 include(vcpkg_common_functions)
 
-string(LENGTH "${CURRENT_BUILDTREES_DIR}" BUILDTREES_PATH_LENGTH)
-if(BUILDTREES_PATH_LENGTH GREATER 37 AND CMAKE_HOST_WIN32)
-    message(WARNING "${PORT}'s buildsystem uses very long paths and may fail on your system.\n"
-        "We recommend moving vcpkg to a short path such as 'C:\\src\\vcpkg' or using the subst command."
-    )
-endif()
-
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
-
-set(XALANC_VERSION 1.11)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "http://www-us.apache.org/dist/xalan/xalan-c/sources/xalan_c-${XALANC_VERSION}-src.zip"
-    FILENAME "xalan_c-${XALANC_VERSION}-src.zip"
-    SHA512 2e79a2c8f755c9660ffc94b26b6bd4b140685e05a88d8e5abb19a2f271383a3f2f398b173ef403f65dc33af75206214bd21ac012c39b4c0051b3a9f61f642fe6
-)
-
-vcpkg_download_distfile(XALAN_PATCH8
-    URLS "https://github.com/rleigh-codelibre/vcpkg-patches/raw/ca09d69280469ce8f787c67b48f86e46a463ef5d/xalan-c/0008-remove-unary-binary-function.patch"
-    FILENAME "0008-remove-unary-binary-function.patch"
-    SHA512 059d9a39b29125ae770369e4c44ab7804ae16d4ff5c90e35f25b7990dc987161bf1187ceb2dcbab181ffb72490a9d9f45e30ab5928644734e7627cb74b03e201
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO apache/xalan-c
+    REF 177da75646a80fae2c22a315c0d987a5eadba143
+    SHA512 e0f095b7031394c39c8e0fdca1f820c4222466f8c6e9df7bc40a21f9ca0e9291b7b6cdfb0a2d67db275ae97d7a7cdd447637102639e74716f0fb23a946b30ebe
+    PATCHES
+        fix-win-deprecated-err.patch
+		fix-missing-dll-error.patch
 )
 
-vcpkg_download_distfile(XALAN_PATCH9
-    URLS "https://raw.githubusercontent.com/rleigh-codelibre/vcpkg-patches/ca09d69280469ce8f787c67b48f86e46a463ef5d/xalan-c/0009-remove-select-workaround.patch"
-    FILENAME "0009-remove-select-workaround.patch"
-    SHA512 73730736cd1f1809ebcc35562017402d606cbfd5a64665d104a21d89d679ab3274f6f5685ab63305c57fffab74e62084c0e18c76d19eb5f9c2e36be6679fd4d3
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
 )
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${XALANC_VERSION}
-    PATCHES
-        0001-ALLOW_RTCc_IN_STL.patch
-        0002-no-mfc.patch
-        0003-char16_t.patch
-        0004-macosx-dyld-fallback.patch
-        0005-fix-ftbfs-ld-as-needed.patch
-        0006-fix-testxslt-segfault.patch
-        0007-fix-readme-typos.patch
-        ${XALAN_PATCH8}
-        ${XALAN_PATCH9}
-)
+vcpkg_install_cmake()
 
-if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86")
-    set(BITS 32)
-elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64")
-    set(BITS 64)
+if(EXISTS ${CURRENT_PACKAGES_DIR}/cmake)
+    vcpkg_fixup_cmake_targets(CONFIG_PATH cmake TARGET_PATH share/xalan-c)
 else()
-    message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}")
+    vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XalanC TARGET_PATH share/xalan-c)
 endif()
 
-if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux")
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-        list(APPEND BUILD_TYPES "release")
-    endif()
-    if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-        list(APPEND BUILD_TYPES "debug")
-    endif()
+# cleanup
+file(REMOVE_RECURSE
+    ${CURRENT_PACKAGES_DIR}/debug/include
+    ${CURRENT_PACKAGES_DIR}/debug/share
+)
 
-    set(XALANCROOT ${SOURCE_PATH}/c)
-    set(ENV{XALANCROOT} ${XALANCROOT})
-    foreach(BUILD_TYPE IN LISTS BUILD_TYPES)
-        if(BUILD_TYPE STREQUAL "release")
-            set(P ${CURRENT_PACKAGES_DIR})
-            set(SHORT rel)
-            set(OPTS)
-            set(ENV{XERCESCROOT} ${CURRENT_INSTALLED_DIR})
-        else()
-            set(P ${CURRENT_PACKAGES_DIR}/debug)
-            set(SHORT dbg)
-            set(OPTS -d -z -I${CURRENT_INSTALLED_DIR}/include)
-            set(ENV{XERCESCROOT} ${CURRENT_INSTALLED_DIR}/debug)
-        endif()
-        set(DIR ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${SHORT})
-        file(REMOVE_RECURSE ${DIR})
-        file(MAKE_DIRECTORY ${DIR})
-        message(STATUS "Configuring ${TARGET_TRIPLET}-${SHORT}")
-        vcpkg_execute_required_process(
-            COMMAND ${XALANCROOT}/runConfigure -p linux -c gcc -x g++ -b ${BITS} -P ${P} ${OPTS}
-            WORKING_DIRECTORY ${DIR}
-            LOGNAME configure-${TARGET_TRIPLET}-${SHORT}
-        )
-        message(STATUS "Building ${TARGET_TRIPLET}-${SHORT}")
-        vcpkg_execute_required_process(
-            COMMAND make -i -j${VCPKG_CONCURRENCY}
-            WORKING_DIRECTORY ${DIR}
-            LOGNAME make-${TARGET_TRIPLET}-${SHORT}
-        )
-        message(STATUS "Installing ${TARGET_TRIPLET}-${SHORT}")
-        vcpkg_execute_required_process(
-            COMMAND make install
-            WORKING_DIRECTORY ${DIR}
-            LOGNAME install-${TARGET_TRIPLET}-${SHORT}
-        )
-    endforeach()
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/debug/include)
-    file(COPY ${SOURCE_PATH}/c/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-    file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
 else()
-    set(ENV{CL} "$ENV{CL} \"/I${CURRENT_INSTALLED_DIR}/include\"")
-    set(ENV{PATH} "$ENV{PATH};${CURRENT_INSTALLED_DIR}/bin;${CURRENT_INSTALLED_DIR}/debug/bin")
+    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/Xalan.exe ${CURRENT_PACKAGES_DIR}/debug/bin/Xalan.exe)
+endif()	
 
-    vcpkg_install_msbuild(
-        SOURCE_PATH ${SOURCE_PATH}
-        PROJECT_SUBPATH c/projects/Win32/VC10/AllInOne/AllInOne.vcxproj
-        OPTIONS_RELEASE /p:XERCESCROOT=${CURRENT_INSTALLED_DIR}
-        OPTIONS_DEBUG /p:XERCESCROOT=${CURRENT_INSTALLED_DIR}/debug
-        LICENSE_SUBPATH c/LICENSE
-        SKIP_CLEAN
-    )
+# Handle copyright
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xalan-c)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/xalan-c/LICENSE ${CURRENT_PACKAGES_DIR}/share/xalan-c/copyright)
 
-    file(COPY ${SOURCE_PATH}/c/src/xalanc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.hpp)
-
-    # LocalMsgIndex.hpp and LocalMsgData.hpp are here
-    file(GLOB NLS_INCLUDES "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/*/c/Build/*/VC10/Release/Nls/Include/*.hpp")
-    if(NOT NLS_INCLUDES)
-        message(FATAL_ERROR "Could not locate LocalMsgIndex.hpp")
-    endif()
-    file(COPY ${NLS_INCLUDES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/xalanc/PlatformSupport)
-
-    vcpkg_clean_msbuild()
-
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/NLS)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/util/MsgLoaders/ICU/resources)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/TestXSLT)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/XalanExe)
-    file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xalanc/XPathCAPI)
-endif()
+vcpkg_copy_pdbs()
author	Alexander Neumann <alexander.neumann@hamburg.de>	2019-08-12 09:28:24 +0200
committer	Alexander Neumann <alexander.neumann@hamburg.de>	2019-08-12 09:28:24 +0200
commit	c4231c51e47221345525ce68b65b28ab905087e2 (patch)
tree	3f387da83563b5aeaaad91b3fec05580236d057e /ports
parent	5899cd1d25c134f8a30476f4939ab57952c59815 (diff)
parent	fffcd0a5ae21d0b7ae0c8cdbd7bd1210f5a29031 (diff)
download	vcpkg-c4231c51e47221345525ce68b65b28ab905087e2.tar.gz vcpkg-c4231c51e47221345525ce68b65b28ab905087e2.zip