7 files changed, 31 insertions, 26 deletions
diff --git a/ports/jsonnet/0004-incorporate-md5.patch b/ports/jsonnet/0004-incorporate-md5.patch
index 2f62c13f9..830fb8d98 100644
--- a/ports/jsonnet/0004-incorporate-md5.patch
+++ b/ports/jsonnet/0004-incorporate-md5.patch
@@ -1,5 +1,4 @@
 diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
-index d4e77a8..5d36314 100644
 --- a/core/CMakeLists.txt
 +++ b/core/CMakeLists.txt
 @@ -15,7 +15,8 @@ set(LIBJSONNET_HEADERS
@@ -39,4 +38,4 @@ index d4e77a8..5d36314 100644
 +    target_link_libraries(libjsonnet_static nlohmann_json::nlohmann_json)
      set_target_properties(libjsonnet_static PROPERTIES OUTPUT_NAME jsonnet)
      install(TARGETS libjsonnet_static DESTINATION "${CMAKE_INSTALL_LIBDIR}")
- endif()
+     target_include_directories(libjsonnet_static INTERFACE
diff --git a/ports/jsonnet/001-enable-msvc.patch b/ports/jsonnet/001-enable-msvc.patch
index 499c6713d..d5ec55149 100644
--- a/ports/jsonnet/001-enable-msvc.patch
+++ b/ports/jsonnet/001-enable-msvc.patch
@@ -40,7 +40,6 @@ index c032f02..d80d2a0 100644
 +	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
@@ -59,8 +58,8 @@ index d277872..bbf67f7 100644
 -	ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
 +	ARCHIVE DESTINATION "${CMAKE_INSTALL_BINDIR}"
  	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
- 
- if (BUILD_STATIC_LIBS)
+ target_include_directories(libjsonnet INTERFACE
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
 diff --git a/stdlib/CMakeLists.txt b/stdlib/CMakeLists.txt
 index a481d9f..2f58d2f 100644
 --- a/stdlib/CMakeLists.txt
diff --git a/ports/jsonnet/002-fix-dependency-and-install.patch b/ports/jsonnet/002-fix-dependency-and-install.patch
index 90640e56c..51b63134b 100644
--- a/ports/jsonnet/002-fix-dependency-and-install.patch
+++ b/ports/jsonnet/002-fix-dependency-and-install.patch
@@ -1,5 +1,4 @@
 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
@@ -11,9 +10,9 @@ index bbf67f7..7238a59 100644
  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}")
+ target_include_directories(libjsonnet INTERFACE
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
 +endif()
  
  if (BUILD_STATIC_LIBS)
@@ -25,7 +24,6 @@ index bbf67f7..7238a59 100644
 +
 +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
@@ -40,10 +38,10 @@ index 6b7b8c3..6dfa1fa 100644
  
  # 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}"
+@@ -24,6 +24,7 @@ install(TARGETS libjsonnet++
  	PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
+ target_include_directories(libjsonnet++ INTERFACE
+   $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>)
 +endif()
  
  if (BUILD_STATIC_LIBS)
diff --git a/ports/jsonnet/portfile.cmake b/ports/jsonnet/portfile.cmake
index 6542aba75..f7821c1b4 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 3f58aa551c917d6a7a2c6d042ee27f93d895ac0b # v0.16.0
-  SHA512 448f4ff433a43ec21c3b67ea508d624e03dac420878e453e908a465cd517c79ae657f107c92e28a4ae2d2527baaf9a3ae1c6ea4c7e7e4f5062d3fad4e76e668c
+  REF v0.17.0
+  SHA512 D3EE6947163D8ABCED504FF37ECF365C0311164CBF243D4C635D34944F0831CA9FCE2470ACF00EB9A218F82A2E553B3F885DB9BD21BB9DCEFBD707FA0202925D
   HEAD_REF master
   PATCHES
     001-enable-msvc.patch
@@ -15,6 +15,7 @@ vcpkg_from_github(
     0004-incorporate-md5.patch
 )
 
+# see https://github.com/google/jsonnet/blob/v0.17.0/Makefile#L214
 if(VCPKG_TARGET_IS_WINDOWS)
   find_program(PWSH_PATH pwsh)
   vcpkg_execute_required_process(
@@ -38,9 +39,8 @@ else()
     set(BUILD_STATIC ON)
 endif()
 
-vcpkg_configure_cmake(
-  SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
+vcpkg_cmake_configure(
+  SOURCE_PATH "${SOURCE_PATH}"
   OPTIONS
     -DBUILD_SHARED_BINARIES=${BUILD_SHARED}
     -DBUILD_STATIC_LIBS=${BUILD_STATIC}
@@ -50,10 +50,10 @@ vcpkg_configure_cmake(
     -DUSE_SYSTEM_JSON=ON
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/jsonnet)
+vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/jsonnet")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/jsonnet/vcpkg.json b/ports/jsonnet/vcpkg.json
index fd4541d3f..92984b1dd 100644
--- a/ports/jsonnet/vcpkg.json
+++ b/ports/jsonnet/vcpkg.json
@@ -1,10 +1,14 @@
 {
   "name": "jsonnet",
-  "version-string": "0.16.0",
-  "port-version": 3,
+  "version": "0.17.0",
   "description": "Jsonnet - The data templating language",
   "homepage": "https://github.com/google/jsonnet",
+  "supports": "!(windows & !static)",
   "dependencies": [
-    "nlohmann-json"
+    "nlohmann-json",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
index ac2c662c8..c0f6c9ba3 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2941,8 +2941,8 @@
       "port-version": 1
     },
     "jsonnet": {
-      "baseline": "0.16.0",
-      "port-version": 3
+      "baseline": "0.17.0",
+      "port-version": 0
     },
     "jwt-cpp": {
       "baseline": "0.5.1",
diff --git a/versions/j-/jsonnet.json b/versions/j-/jsonnet.json
index 58d630609..f3dcfe0c2 100644
--- a/versions/j-/jsonnet.json
+++ b/versions/j-/jsonnet.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "24a514c5bcece6b71ac13744ec40f92f285fc689",
+      "version": "0.17.0",
+      "port-version": 0
+    },
+    {
       "git-tree": "c6d19c002863644237c3ac276db26c576664f56d",
       "version-string": "0.16.0",
       "port-version": 3