[inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision (#13584)

* [inja/kd-soap/fastrtps/graphite2/jsonnet] Update to latest release revision

* Fix license path for fastrtps and remove bin with static build for kd-soap

17 files changed, 183 insertions, 245 deletions

diff --git a/ports/fastrtps/CONTROL b/ports/fastrtps/CONTROL
index f97ba46c7..8d52ba9a2 100644
--- a/ports/fastrtps/CONTROL
+++ b/ports/fastrtps/CONTROL
@@ -1,4 +1,5 @@
 Source: fastrtps
-Version: 1.5.0-3
+Version: 2.0.1
+Homepage: https://www.eprosima.com/
 Description: Eprosima Fast RTPS is a C++ implementation of the RTPS (Real Time Publish Subscribe) protocol, which provides publisher-subscriber communications over unreliable transports such as UDP, as defined and maintained by the Object Management Group (OMG) consortium.
-Build-Depends: openssl, asio, tinyxml2
\ No newline at end of file
+Build-Depends: openssl, asio, tinyxml2, fastcdr, foonathan-memory
\ No newline at end of file
diff --git a/ports/fastrtps/fix-install.patch b/ports/fastrtps/fix-install.patch
deleted file mode 100644
index 4777ae3ee..000000000
--- a/ports/fastrtps/fix-install.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt

-index a1e91fd..f5578cd 100644

---- a/src/cpp/CMakeLists.txt

-+++ b/src/cpp/CMakeLists.txt

-@@ -416,7 +416,8 @@ if(MSVC OR MSVC_IDE)

-             PATTERN "*.pdb"

-             )

- 

--        if(NOT (("${MSVC_ARCH}" STREQUAL "i86Win32VS2013") OR ("${MSVC_ARCH}" STREQUAL "x64Win64VS2013")))

-+        if(NOT (("${MSVC_ARCH}" STREQUAL "i86Win32VS2013") OR ("${MSVC_ARCH}" STREQUAL "x64Win64VS2013")

-+            OR ("${MSVC_ARCH}" STREQUAL "i86Win32VS2015") OR ("${MSVC_ARCH}" STREQUAL "x64Win64VS2015")))

-             install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_static.dir/Debug/${PROJECT_NAME}_static.pdb

-                 DESTINATION ${LIB_INSTALL_DIR}${DIR_EXTENSION}

-                 COMPONENT libraries_${MSVC_ARCH}

diff --git a/ports/fastrtps/namespace_tinyxml2.patch b/ports/fastrtps/namespace_tinyxml2.patch
deleted file mode 100644
index 3df65996f..000000000
--- a/ports/fastrtps/namespace_tinyxml2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/cmake/modules/FindTinyXML2.cmake b/cmake/modules/FindTinyXML2.cmake

-index 24aa98a..4e2188e 100644

---- a/cmake/modules/FindTinyXML2.cmake

-+++ b/cmake/modules/FindTinyXML2.cmake

-@@ -7,10 +7,10 @@ option(TINYXML2_FROM_SOURCE "Integrate TinyXML2 source code inside Fast RTPS" OF

- find_package(TinyXML2 CONFIG QUIET)

- if(TinyXML2_FOUND)

-     message(STATUS "Found TinyXML2: ${TinyXML2_DIR}")

--    if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2)

-+    if(NOT TINYXML2_LIBRARY AND TARGET tinyxml2::tinyxml2)

-         # in this case, we're probably using TinyXML2 version 5.0.0 or greater

-         # in which case tinyxml2 is an exported target and we should use that

--        set(TINYXML2_LIBRARY tinyxml2)

-+        set(TINYXML2_LIBRARY tinyxml2::tinyxml2)

-     endif()

- else()

-     if(THIRDPARTY)

diff --git a/ports/fastrtps/portfile.cmake b/ports/fastrtps/portfile.cmake
index 3dfbe87c9..9f72b5d6f 100644
--- a/ports/fastrtps/portfile.cmake
+++ b/ports/fastrtps/portfile.cmake
@@ -1,12 +1,9 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO eProsima/Fast-DDS

-    REF b1779b608c7b5b2dcb101728f4213c58bdde74ee # waiting for next release

-    SHA512 f316a71784cdac5379b1cf59cee4bf57304aa59a73563fcbdd141b0d1297302048ca73817adca68baf18472e74f200af9490d2d6fa6124863ec260546fb373e4

+    REF 40568fa4784e846f95c461608d43a2b57eaef55b # v2.0.1

+    SHA512 a0cb48713a41ba3562c98dfc176508779e70e35b573428ac0a74c74254aa34c583bd545169f3a3961172bfc9e7bb14d08b5d56569e176fe8248d714bec5813a4

     HEAD_REF master

-    PATCHES 

-        fix-install.patch 

-        namespace_tinyxml2.patch 

 )

 

 vcpkg_configure_cmake(

@@ -17,13 +14,9 @@ vcpkg_configure_cmake(
 vcpkg_install_cmake()

 vcpkg_copy_pdbs()

 

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/fastrtps/cmake)

+vcpkg_fixup_cmake_targets(CONFIG_PATH share/fastrtps/cmake TARGET_PATH share/fastrtps)

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/examples)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/LICENSE)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/examples)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/fastrtps)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/fastrtps)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

 

-file(RENAME ${CURRENT_PACKAGES_DIR}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)

+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

diff --git a/ports/graphite2/CONTROL b/ports/graphite2/CONTROL
index 38bc0e4a4..0c4899fc9 100644
--- a/ports/graphite2/CONTROL
+++ b/ports/graphite2/CONTROL
@@ -1,5 +1,5 @@
 Source: graphite2
-Version: 1.3.13
+Version: 1.3.14
 Homepage: https://github.com/silnrsi/graphite
 Description: Graphite is a "smart font" system developed specifically to handle the complexities of lesser-known languages of the world.
   Graphite2 is a rework of the original Graphite engine that is faster, smaller, and uses an API that is better suited to the layout architecture of most text-processing applications.
diff --git a/ports/graphite2/disable-tests.patch b/ports/graphite2/disable-tests.patch
index 67a0d90e7..d1c1fd971 100644
--- a/ports/graphite2/disable-tests.patch
+++ b/ports/graphite2/disable-tests.patch
@@ -20,26 +20,29 @@ index 496712d..3df05c7 100644
  

  set(version 3.0.1)

 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt

-index 389cf5a..94b7f99 100644

+index b6ac26b..851a97f 100644

 --- a/src/CMakeLists.txt

 +++ b/src/CMakeLists.txt

-@@ -127,7 +127,7 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

+@@ -127,9 +127,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Linux")

          endif ()

      endif()

      include(Graphite)

 -    if (BUILD_SHARED_LIBS)

 +    if (NOT DISABLE_TESTS)

          nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

-     endif ()

+-    endif ()

++    endif()

      set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")

-@@ -141,7 +141,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")

-         LINKER_LANGUAGE C)

+     CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")

+ endif()

+@@ -144,7 +144,9 @@ if  (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")

+     endif()

      target_link_libraries(graphite2 c)

      include(Graphite)

 -    nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

 +    if (NOT DISABLE_TESTS)

 +        nolib_test(stdc++ $<TARGET_SONAME_FILE:graphite2>)

-+    endif ()

++    endif()

      set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "")

      CREATE_LIBTOOL_FILE(graphite2 "/lib${LIB_SUFFIX}")

  endif()

diff --git a/ports/graphite2/portfile.cmake b/ports/graphite2/portfile.cmake
index 110363571..44fe08ba6 100644
--- a/ports/graphite2/portfile.cmake
+++ b/ports/graphite2/portfile.cmake
@@ -1,11 +1,8 @@
-
-include(vcpkg_common_functions)
-
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO silnrsi/graphite
-    REF b45f9b271214b95f3b42e5c9863eae4b0bfb7fd7
-    SHA512 5bd1052c1e21ab523ce17804b7123858d17ca9893cbd972f0af58119c5419d771df13d374569a14dd82605536674d9b1a4787300eac4bd89a177a40df5a05282
+    REF 92f59dcc52f73ce747f1cdc831579ed2546884aa # 1.3.14
+    SHA512 011855576124b2f9ae9d7d3a0dfc5489794cf82b81bebc02c11c9cca350feb9fbb411844558811dff1ebbacac58a24a7cf56a374fc2c27e97a5fb4795a01486e
     HEAD_REF master
     PATCHES disable-tests.patch
 )
@@ -24,5 +21,5 @@ vcpkg_fixup_cmake_targets()
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
 
-file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphite2)
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/graphite2 RENAME copyright)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/inja/CONTROL b/ports/inja/CONTROL
index ae7291bfb..3f6f84cf6 100644
--- a/ports/inja/CONTROL
+++ b/ports/inja/CONTROL
@@ -1,4 +1,5 @@
 Source: inja
-Version: 2.1.0-1
-Build-Depends: nlohmann-json
+Version: 3.0.0
+Homepage: https://github.com/pantor/inja
 Description: Inja - A Template Engine for Modern C++
+Build-Depends: nlohmann-json
diff --git a/ports/inja/cmake-version.patch b/ports/inja/cmake-version.patch
deleted file mode 100644
index 37b048870..000000000
--- a/ports/inja/cmake-version.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 115c898..176bf2d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,7 +1,7 @@
- cmake_minimum_required(VERSION 3.5)
- 
- 
--project(inja LANGUAGES CXX VERSION 2.0.0)
-+project(inja LANGUAGES CXX VERSION 2.1.0)
- 
- 
- option(INJA_USE_EMBEDDED_JSON "Use the shipped json header if not available on the system" ON)
diff --git a/ports/inja/portfile.cmake b/ports/inja/portfile.cmake
index 4fb028a1e..a2051abd5 100644
--- a/ports/inja/portfile.cmake
+++ b/ports/inja/portfile.cmake
@@ -1,12 +1,9 @@
-include(vcpkg_common_functions)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO pantor/inja
-    REF v2.1.0
-    SHA512 6b3a3a6a9e2adff14083a8e83c95fdc5ccf0c930acff40c4cf6c11d67b0df18fd941307e5d1f0c45dcfcb4c4afd0026b718ca510a2b297b9c6be048f5b144d42
+    REF 02394683b151cdb520c8fb636f3bda77ed4f965d # v3.0.0
+    SHA512 52c4fa84ada673f517036ec41b64afbd12a14a6da256d3eeacb26ba3c65c1e3c79217d523a5f628bf1ffdddef7d42de2983c2e00ddbd0af2000d671a2a9d72f0
     HEAD_REF master
-    PATCHES
-        cmake-version.patch
 )
 
 vcpkg_configure_cmake(
@@ -28,4 +25,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib")
 # Don't need built-in nlohmann-json as this package depends on nlohmann-json
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/include/inja/json")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/inja RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch
index 12ddbed86..499c6713d 100644
--- a/ports/jsonnet/001-enable-msvc.patch
+++ b/ports/jsonnet/001-enable-msvc.patch
@@ -1,80 +1,81 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0418d4a..ac8f0f2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -2,6 +2,8 @@
- cmake_minimum_required(VERSION 2.8.7)
- project(jsonnet C CXX)
- 
-+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+
- include(ExternalProject)
- include(GNUInstallDirs)
- 
-@@ -89,6 +91,7 @@ else()
- endif()
- 
- # Compiler flags.
-+if (0)
- if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR
-         ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
-     set(OPT "-O3")
-@@ -98,6 +101,7 @@ else()
-     # TODO: Windows support.
-     message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported")
- endif()
-+endif()
- 
- # Look for libraries in global output path.
- link_directories(${GLOBAL_OUTPUT_PATH})
-diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt
-index c032f02..d80d2a0 100644
---- a/cmd/CMakeLists.txt
-+++ b/cmd/CMakeLists.txt
-@@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS)
-     add_dependencies(jsonnetfmt libjsonnet_for_binaries)
-     target_link_libraries(jsonnetfmt libjsonnet_for_binaries)
- 
--	install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}")
-+	install(TARGETS jsonnetfmt DESTINATION tools/jsonnet)
- endif()
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 60fdcb1..82fb7c2 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE
-     string_utils.cpp
-     vm.cpp)
- 
--add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
-+add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
- add_dependencies(libjsonnet md5 stdlib)
- target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)
- 
-@@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet
- 	PUBLIC_HEADER "${LIB_HEADER}")
- install(TARGETS libjsonnet
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
--	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
-+	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- 
- if (BUILD_STATIC_LIBS)
-diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
-index a481d9f..0dc3ab6 100644
---- a/stdlib/CMakeLists.txt
-+++ b/stdlib/CMakeLists.txt
-@@ -2,6 +2,7 @@
- 
- add_executable(to_c_array to_c_array.cpp)
- 
-+if (0)
- # Custom command that will only build stdlib when it changes.
- add_custom_command(
- 	OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h
-@@ -13,3 +14,4 @@ add_custom_command(
- # Standard library build target that libjsonnet can depend on.
- add_custom_target(stdlib ALL
- 	DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h)
-+endif()
-\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 385ea82..ebd12b6 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -2,6 +2,8 @@

+ cmake_minimum_required(VERSION 2.8.7)

+ project(jsonnet C CXX)

+ 

++add_definitions(-D_CRT_SECURE_NO_WARNINGS)

++

+ include(ExternalProject)

+ include(GNUInstallDirs)

+ 

+@@ -33,6 +35,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH})

+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${GLOBAL_OUTPUT_PATH})

+ 

+ # Compiler flags.

++if (0)

+ if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" OR

+         ${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")

+     set(OPT "-O3")

+@@ -42,7 +45,7 @@ else()

+     # TODO: Windows support.

+     message(FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} not supported")

+ endif()

+-

++endif()

+ set(CMAKE_CXX_STANDARD 11)

+ 

+ 

+diff --git a/cmd/CMakeLists.txt b/cmd/CMakeLists.txt

+index c032f02..d80d2a0 100644

+--- a/cmd/CMakeLists.txt

++++ b/cmd/CMakeLists.txt

+@@ -13,5 +13,5 @@ if (BUILD_JSONNETFMT OR BUILD_TESTS)

+     add_dependencies(jsonnetfmt libjsonnet_for_binaries)

+     target_link_libraries(jsonnetfmt libjsonnet_for_binaries)

+ 

+-	install(TARGETS jsonnetfmt DESTINATION "${CMAKE_INSTALL_BINDIR}")

++	install(TARGETS jsonnetfmt DESTINATION tools/jsonnet)

+ endif()

+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt

+index d277872..bbf67f7 100644

+--- a/core/CMakeLists.txt

++++ b/core/CMakeLists.txt

+@@ -28,7 +28,7 @@ set(LIBJSONNET_SOURCE

+     string_utils.cpp

+     vm.cpp)

+ 

+-add_library(libjsonnet SHARED ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})

++add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})

+ add_dependencies(libjsonnet md5 stdlib)

+ target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)

+ 

+@@ -46,7 +46,7 @@ set_target_properties(libjsonnet PROPERTIES OUTPUT_NAME jsonnet

+ 	PUBLIC_HEADER "${LIB_HEADER}")

+ install(TARGETS libjsonnet

+ 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+-	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

++	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"

+ 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

+ 

+ if (BUILD_STATIC_LIBS)

+diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt

+index a481d9f..2f58d2f 100644

+--- a/stdlib/CMakeLists.txt

++++ b/stdlib/CMakeLists.txt

+@@ -2,6 +2,7 @@

+ 

+ add_executable(to_c_array to_c_array.cpp)

+ 

++if(0)

+ # Custom command that will only build stdlib when it changes.

+ add_custom_command(

+ 	OUTPUT ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h

+@@ -13,3 +14,4 @@ add_custom_command(

+ # Standard library build target that libjsonnet can depend on.

+ add_custom_target(stdlib ALL

+ 	DEPENDS ${PROJECT_SOURCE_DIR}/core/std.jsonnet.h)

++endif()

+\ No newline at end of file

diff --git a/ports/jsonnet/002-fix-dependency-and-install.patch b/ports/jsonnet/002-fix-dependency-and-install.patch
index 7c7b5da77..90640e56c 100644
--- a/ports/jsonnet/002-fix-dependency-and-install.patch
+++ b/ports/jsonnet/002-fix-dependency-and-install.patch
@@ -1,61 +1,58 @@
-diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index 82fb7c2..a94b4ff 100644
---- a/core/CMakeLists.txt
-+++ b/core/CMakeLists.txt
-@@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE
-     string_utils.cpp
-     vm.cpp)
- 
-+if (BUILD_SHARED_BINARIES)
- add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})
- add_dependencies(libjsonnet md5 stdlib)
- target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)
-@@ -48,6 +49,7 @@ install(TARGETS libjsonnet
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+endif()
- 
- if (BUILD_STATIC_LIBS)
-     # Static library for jsonnet command-line tool.
-@@ -102,3 +104,6 @@ if (BUILD_TESTS)
-     add_test(jsonnet_test_snippet
-         ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET})
- endif()
-+
-+
-+install(FILES ${LIB_HEADER} DESTINATION include)
-\ No newline at end of file
-diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
-index bf349df..6ed1442 100644
---- a/cpp/CMakeLists.txt
-+++ b/cpp/CMakeLists.txt
-@@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE
-     libjsonnet++.cpp
- )
- 
-+if (BUILD_SHARED_BINARIES)
- add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})
--add_dependencies(libjsonnet++ jsonnet)
--# target_link_libraries(libjsonnet libjsonnet)
-+target_link_libraries(libjsonnet++ libjsonnet)
- 
- # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without
- # this step the output would be |liblibjsonnet|.
-@@ -22,6 +22,7 @@ install(TARGETS libjsonnet++
- 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
- 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
-+endif()
- 
- if (BUILD_STATIC_LIBS)
-     # Static library for jsonnet command-line tool.
-@@ -38,6 +39,8 @@ else()
-     add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static)
- endif()
- 
-+install(FILES ${LIBJSONNETPP_HEADERS} DESTINATION include)
-+
- # Tests
- function(add_test_executablepp test_name)
-     if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${test_name}.cpp)
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt

+index bbf67f7..7238a59 100644

+--- a/core/CMakeLists.txt

++++ b/core/CMakeLists.txt

+@@ -28,6 +28,7 @@ set(LIBJSONNET_SOURCE

+     string_utils.cpp

+     vm.cpp)

+ 

++if (BUILD_SHARED_BINARIES)

+ add_library(libjsonnet ${LIBJSONNET_HEADERS} ${LIBJSONNET_SOURCE})

+ add_dependencies(libjsonnet md5 stdlib)

+ target_link_libraries(libjsonnet md5 nlohmann_json::nlohmann_json)

+@@ -48,6 +49,7 @@ install(TARGETS libjsonnet

+ 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+ 	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"

+ 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

++endif()

+ 

+ if (BUILD_STATIC_LIBS)

+     # Static library for jsonnet command-line tool.

+@@ -102,3 +104,5 @@ if (BUILD_TESTS)

+     add_test(jsonnet_test_snippet

+         ${GLOBAL_OUTPUT_PATH}/jsonnet -e ${TEST_SNIPPET})

+ endif()

++

++install(FILES ${LIB_HEADER} DESTINATION include)

+diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt

+index 6b7b8c3..6dfa1fa 100644

+--- a/cpp/CMakeLists.txt

++++ b/cpp/CMakeLists.txt

+@@ -8,9 +8,9 @@ set(LIBJSONNETPP_SOURCE

+     libjsonnet++.cpp

+ )

+ 

++if (BUILD_SHARED_BINARIES)

+ add_library(libjsonnet++ SHARED ${LIBJSONNETPP_HEADERS} ${LIBJSONNETPP_SOURCE})

+-add_dependencies(libjsonnet++ jsonnet)

+-# target_link_libraries(libjsonnet libjsonnet)

++target_link_libraries(libjsonnet libjsonnet)

+ 

+ # CMake prepends CMAKE_SHARED_LIBRARY_PREFIX to shared libraries, so without

+ # this step the output would be |liblibjsonnet|.

+@@ -22,6 +22,7 @@ install(TARGETS libjsonnet++

+ 	LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+ 	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

+ 	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")

++endif()

+ 

+ if (BUILD_STATIC_LIBS)

+     # Static library for jsonnet command-line tool.

+@@ -38,6 +39,7 @@ else()

+     add_library(libjsonnet++_for_binaries ALIAS libjsonnet++_static)

+ endif()

+ 

++install(FILES ${LIBJSONNETPP_HEADERS} DESTINATION include)

+ # Tests

+ function(add_test_executablepp test_name)

+     if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${test_name}.cpp)

diff --git a/ports/jsonnet/CONTROL b/ports/jsonnet/CONTROL
index 78542024c..99d73af6c 100644
--- a/ports/jsonnet/CONTROL
+++ b/ports/jsonnet/CONTROL
@@ -1,5 +1,5 @@
 Source: jsonnet
-Version: 0.14.0-1
+Version: 0.16.0
 Homepage: https://github.com/google/jsonnet
 Description: Jsonnet - The data templating language
 Build-Depends: nlohmann-json
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 6b4a30a11..77e8b8783 100644
--- a/ports/jsonnet/portfile.cmake
+++ b/ports/jsonnet/portfile.cmake
@@ -5,8 +5,8 @@ endif()
 vcpkg_from_github(
   OUT_SOURCE_PATH SOURCE_PATH
   REPO google/jsonnet
-  REF 552d8ec6f6b973a6357b83eb9bacd707366d28f0 # v0.14.0
-  SHA512 a4a9c6285155addbc5b7ef1a0c02b99b4d941bfc8e6536eaf029bff77c9c303a5c36f654ca8ab6b9757d2710c100c3e4a05f310269d82b0385ae55ea6ead14ef
+  REF 3f58aa551c917d6a7a2c6d042ee27f93d895ac0b # v0.16.0
+  SHA512 448f4ff433a43ec21c3b67ea508d624e03dac420878e453e908a465cd517c79ae657f107c92e28a4ae2d2527baaf9a3ae1c6ea4c7e7e4f5062d3fad4e76e668c
   HEAD_REF master
   PATCHES
     001-enable-msvc.patch
diff --git a/ports/kd-soap/CONTROL b/ports/kd-soap/CONTROL
index e9d922e0f..edcba960d 100644
--- a/ports/kd-soap/CONTROL
+++ b/ports/kd-soap/CONTROL
@@ -1,5 +1,5 @@
 Source: kd-soap

-Version: 1.8.0-2

-Description: A Qt-based client-side and server-side SOAP component

+Version: 1.9.0

 Homepage: https://www.kdab.com/products/kd-soap

+Description: A Qt-based client-side and server-side SOAP component

 Build-Depends: qt5-base[core]

diff --git a/ports/kd-soap/kd-soap.patch b/ports/kd-soap/kd-soap.patch
deleted file mode 100644
index d48050faf..000000000
--- a/ports/kd-soap/kd-soap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c3c824e..d7a1cce 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -168,6 +168,6 @@ if(${PROJECT_NAME}_IS_ROOT_PROJECT)
-     enable_testing()
-     add_subdirectory(testtools)
-     add_subdirectory(unittests)
-+    add_subdirectory(examples)
-   endif()
--  add_subdirectory(examples)
- endif()
diff --git a/ports/kd-soap/portfile.cmake b/ports/kd-soap/portfile.cmake
index d924d1c65..03f99fab8 100644
--- a/ports/kd-soap/portfile.cmake
+++ b/ports/kd-soap/portfile.cmake
@@ -1,28 +1,32 @@
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO KDAB/KDSoap

-    REF kdsoap-1.8.0

-    SHA512 e118f2083887d1b5d613d793e87ec23a570a8a749ef7f4de65582998b735979b4c389a939169a893d735bdf110dc84a4cca5ee38146e4009be715902f6323bb9

+    REF fb0e905e242c2044fd25683a406eb6d369db052f # kdsoap-1.9.0

+    SHA512 30f78602702f2bb77f72bf0637b413d70976cf10789b18d1eb9c097f6b3821b86e75d0ae921454b2d39b7d023f479dc089cde1915533a37054f9b26893f611d3

     HEAD_REF master

-    PATCHES kd-soap.patch

 )

 

+string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" KDSoap_STATIC)

+

 vcpkg_configure_cmake(

     SOURCE_PATH ${SOURCE_PATH}

     PREFER_NINJA

+    OPTIONS

+        -DKDSoap_STATIC=${KDSoap_STATIC}

+        -DKDSoap_EXAMPLES=OFF

 )

 

 vcpkg_install_cmake()

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KDSoap TARGET_PATH share/KDSoap)

 

-# Handle copyright

-file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/kd-soap RENAME copyright)

 file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)

 file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX} ${CURRENT_PACKAGES_DIR}/tools/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})

 file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kdwsdl2cpp${VCPKG_TARGET_EXECUTABLE_SUFFIX})

 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

     file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)

 endif()

+

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

+

+file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)