[many ports] Local license ripe out 1/x (#24432)

* [zlib] Use readme as copyright * [soil2] update to 1.3.0 * [bento4] update to 1.6.0-639 * [bento4] fix version db * [zlib] Format manifest * [anglescript] Remove local license * [bustache] Update to master * [bustache] Don't update * version * version * remove version string * remove v * version * version * Fix version database. Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2024-11-27 19:09:00 +08:00 · 2022-05-10 01:12:37 +02:00 · 2022-05-10 01:12:37 +02:00 · 659b6b5eea
commit 659b6b5eea
parent 19033ddfa6
24 changed files with 142 additions and 170 deletions
--- a/ports/angelscript/LICENSE
+++ b/ports/angelscript/LICENSE
@ -1,13 +0,0 @@
-AngelCode Scripting Library
-
-Copyright © 2003-2018 Andreas Jönsson
-
-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
-
-    The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
-
-    Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
-
-    This notice may not be removed or altered from any source distribution.
--- a/ports/angelscript/portfile.cmake
+++ b/ports/angelscript/portfile.cmake
@ -6,25 +6,24 @@ vcpkg_download_distfile(ARCHIVE

 vcpkg_extract_source_archive_ex(
    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
+    ARCHIVE "${ARCHIVE}"
    PATCHES
-       mark-threads-private.patch
+        mark-threads-private.patch
 )

 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}/angelscript/projects/cmake
-    PREFER_NINJA
+    SOURCE_PATH "${SOURCE_PATH}/angelscript/projects/cmake"
 )

 vcpkg_cmake_install()
 vcpkg_copy_pdbs()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Angelscript)

 # Copy the addon files
 if("addons" IN_LIST FEATURES)
-    file(INSTALL ${SOURCE_PATH}/add_on/ DESTINATION ${CURRENT_PACKAGES_DIR}/include/angelscript FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
+    file(INSTALL "${SOURCE_PATH}/add_on/" DESTINATION "${CURRENT_PACKAGES_DIR}/include/angelscript" FILES_MATCHING PATTERN "*.h" PATTERN "*.cpp")
 endif()

-file(INSTALL ${CURRENT_PORT_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/docs/manual/doc_license.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/angelscript/vcpkg.json
+++ b/ports/angelscript/vcpkg.json
@ -1,8 +1,10 @@
 {
  "name": "angelscript",
  "version": "2.35.1",
+  "port-version": 1,
  "description": "The AngelCode Scripting Library, or AngelScript as it is also known, is an extremely flexible cross-platform scripting library designed to allow applications to extend their functionality through external scripts. It has been designed from the beginning to be an easy to use component, both for the application programmer and the script writer.",
  "homepage": "https://angelcode.com/angelscript",
+  "license": "Zlib",
  "supports": "!arm",
  "dependencies": [
    {
--- a/ports/bento4/LICENSE
+++ b/ports/bento4/LICENSE
@ -1,6 +0,0 @@
-Bento4 is developed by Axiomatic Systems LLC in San Francisco, California.
-
-This software is available under two different licenses
-For applications that are entirely distributable under the terms of the GPL(https://www.gnu.org/licenses/old-licenses/gpl-2.0-standalone.html), the Bento4 GPL license applies.
-For applications that cannot be entirely distributable under the terms of the GPL (either the application, or code modules linked with the application are not compatible with the terms of the GPL licence), a non-GPL commercial license is available from Axiomatic Systems LLC.
-Contact Gilles Boccon-Gibod (licensing@axiosys.com or bok@bok.net) for more information.
--- a/ports/bento4/fix-install-and-c4996-error.patch
+++ b/ports/bento4/fix-install-and-c4996-error.patch
@ -1,43 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2f08b2f..fccf2a8 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,6 +35,8 @@ endif()
- 
- add_library(ap4 STATIC ${AP4_SOURCES})
- 
-+add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-+
- # Includes
- include_directories(
-   ${SOURCE_CORE}
-@@ -43,6 +45,14 @@ include_directories(
-   ${SOURCE_METADATA}
- )
- 
-+# AP4 includes
-+file(GLOB AP4_INCLUDES
-+  ${SOURCE_CODECS}/*.h
-+  ${SOURCE_CORE}/*.h
-+  ${SOURCE_CRYPTO}/*.h
-+  ${SOURCE_METADATA}/*.h
-+)
-+
- # Apps
- file(GLOB BENTO4_APPS RELATIVE ${SOURCE_ROOT}/Apps ${SOURCE_ROOT}/Apps/*)
- foreach(app ${BENTO4_APPS})
-@@ -50,3 +60,13 @@ foreach(app ${BENTO4_APPS})
-   add_executable(${binary_name} ${SOURCE_ROOT}/Apps/${app}/${app}.cpp)
-   target_link_libraries(${binary_name} ap4)
- endforeach()
-+
-+# Install targets
-+install(TARGETS ap4
-+  RUNTIME DESTINATION bin
-+  LIBRARY DESTINATION lib
-+  ARCHIVE DESTINATION lib
-+)
-+
-+# Install headers
-+install(FILES ${AP4_INCLUDES} DESTINATION include)
-\ No newline at end of file
--- a/ports/bento4/fix-install.patch
+++ b/ports/bento4/fix-install.patch
@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 6de3bfe..2b2239a 100644
+--- a/CMakeLists.txt
+++ b/CMakeLists.txt
+@@ -81,3 +81,20 @@ foreach(app ${BENTO4_APPS})
+   endif()
+ endforeach()
+ endif(BUILD_APPS)
+
+file(GLOB AP4_INCLUDES
+  ${SOURCE_CODECS}/*.h
+  ${SOURCE_CORE}/*.h
+  ${SOURCE_CRYPTO}/*.h
+  ${SOURCE_METADATA}/*.h
+)
+
+# Install targets
+install(TARGETS ap4
+  RUNTIME DESTINATION bin
+  LIBRARY DESTINATION lib
+  ARCHIVE DESTINATION lib
+)
+
+# Install headers
+install(FILES ${AP4_INCLUDES} DESTINATION include/bento4)
--- a/ports/bento4/portfile.cmake
+++ b/ports/bento4/portfile.cmake
@ -3,21 +3,23 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO axiomatic-systems/Bento4
-    REF v1.5.1-628
-    SHA512 2bf44f55307178cc9128e323904acbfaa2f88e06beff26cf27fc0a7707875942de89778a0ee1a8315ef2c3b19754edad77d32fdb74f3d651f03c2623e7a9122d 
+    REF 83c48e6e2a3f8e4be7ad2eddaa0639303184146d # v1.6.0-639
+    SHA512 764c1102dc1e2a0f48395427b5b0a96f87d7124cceb61eb24008f245cf1f5f057753307c38f6f7e74d6838d6600c436d8540e94cbca12385cb4fffb02995069b
    HEAD_REF master 
-    PATCHES fix-install-and-c4996-error.patch
+    PATCHES
+        fix-install.patch
 )

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
+    OPTIONS
+        -DBUILD_APPS=OFF
 )

-vcpkg_install_cmake()
+vcpkg_cmake_install()

-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

 vcpkg_copy_pdbs()

-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/Documents/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/bento4/vcpkg.json
+++ b/ports/bento4/vcpkg.json
@ -1,7 +1,13 @@
 {
  "name": "bento4",
-  "version-string": "1.5.1",
-  "port-version": 629,
+  "version": "1.6.0-639",
  "description": "Bento4 is a C++ class library and tools designed to read and write ISO-MP4 files. This format is defined in international specifications ISO/IEC 14496-12, 14496-14 and 14496-15.",
-  "homepage": "https://github.com/axiomatic-systems/Bento4"
+  "homepage": "https://github.com/axiomatic-systems/Bento4",
+  "license": "GPL-2.0",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
--- a/ports/bustache/LICENSE
+++ b/ports/bustache/LICENSE
@ -1,4 +0,0 @@
-Copyright (c) 2014-2018 Jamboree
-
-Distributed under the Boost Software License, Version 1.0. (See accompanying
-file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
--- a/ports/bustache/portfile.cmake
+++ b/ports/bustache/portfile.cmake
@ -6,16 +6,16 @@ vcpkg_from_github(
    HEAD_REF master
 )

-vcpkg_configure_cmake(
+vcpkg_cmake_configure(
    SOURCE_PATH "${SOURCE_PATH}"
-    PREFER_NINJA
 )

-vcpkg_install_cmake()
-vcpkg_fixup_cmake_targets(CONFIG_PATH "share/bustache/cmake")
+vcpkg_cmake_install()
+vcpkg_cmake_config_fixup(CONFIG_PATH "share/bustache/cmake")

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

-file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+# No license file --> use Readme
+file(INSTALL "${SOURCE_PATH}/README.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/bustache/vcpkg.json
+++ b/ports/bustache/vcpkg.json
@ -1,11 +1,20 @@
 {
  "name": "bustache",
-  "version-string": "1.1.0",
-  "port-version": 1,
+  "version": "1.1.0",
+  "port-version": 2,
  "description": "C++11 implementation of {{ mustache }}",
  "homepage": "https://github.com/jamboree/bustache",
+  "license": "BSL-1.0",
  "dependencies": [
    "boost-unordered",
-    "boost-utility"
+    "boost-utility",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
  ]
 }
--- a/ports/soil2/LICENSE
+++ b/ports/soil2/LICENSE
@ -1,7 +0,0 @@
-Copyright 2018 Matrin Lucas Golini
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/ports/soil2/portfile.cmake
+++ b/ports/soil2/portfile.cmake
@ -1,26 +1,25 @@
 vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
    REPO SpartanJ/soil2
-    REF 51023d551d895fb4beb576d726d798ccfe358d34
-    SHA512 5ce8b3f04eea674cdef7ee58778e81bcefa5df7afb1013ad28dcd2d502e26915529da8bf06b751b8c350165172866e4f99d4b1081bb6c7ba04ac83a78faba83c
+    REF ddcb35d13cc4129103de1c1a3cb74b828fe46b4a # 1.3.0
+    SHA512 627c7bf4fddd5afef85ba7634c5ec0e10005c700abc1eb07c6346c1604e430c34aa4c33f6ffecbecb3dc2b04de7b855a3f6d923e94f23621ae0184e706358908
    HEAD_REF master
-    PATCHES Workaround-ICE-in-release.patch
+    PATCHES Workaround-ICE-in-release.patch
 )

 file(
    COPY 
-    "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
-    "${CMAKE_CURRENT_LIST_DIR}/LICENSE"
-    "${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in"
-    DESTINATION "${SOURCE_PATH}"
+    "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt"
+    "${CMAKE_CURRENT_LIST_DIR}/soil2Config.cmake.in"
+    DESTINATION "${SOURCE_PATH}"
 )

-vcpkg_cmake_configure(
-    SOURCE_PATH "${SOURCE_PATH}"
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS_DEBUG -DINSTALL_HEADERS=OFF
 )

-vcpkg_cmake_install()
+vcpkg_cmake_install()

 # Handle copyright
-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)
--- a/ports/soil2/vcpkg.json
+++ b/ports/soil2/vcpkg.json
@ -1,7 +1,6 @@
 {
  "name": "soil2",
-  "version-date": "2021-05-01",
-  "port-version": 1,
+  "version": "1.3.0",
  "description": "Simple OpenGL Image Library 2",
  "homepage": "https://github.com/SpartanJ/SOIL2",
  "license": "MIT-0",
--- a/ports/zlib/LICENSE
+++ b/ports/zlib/LICENSE
@ -1,20 +0,0 @@
-  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-  Jean-loup Gailly        Mark Adler
-  jloup@gzip.org          madler@alumni.caltech.edu
--- a/ports/zlib/add_debug_postfix_on_mingw.patch
+++ b/ports/zlib/add_debug_postfix_on_mingw.patch
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@ -1,28 +1,21 @@
-set(VERSION 1.2.12)
-
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "https://www.zlib.net/zlib-${VERSION}.tar.gz"
-    FILENAME "zlib1212.tar.gz"
-    SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE_FILE}
-    REF ${VERSION}
+    REPO madler/zlib
+    REF v1.2.12
+    SHA512 5b029532a9f5f12ad425c12eccdf1b77c8d91801342c5b5e26ffb539f76a204e6c4882b40f0130f143f2cd38df90e90af2978cf4bb997e1fa3a0d1eff2ca979e
+    HEAD_REF master
    PATCHES
-        "cmake_dont_build_more_than_needed.patch"
-        "0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch"
-        "add_debug_postfix_on_mingw.patch"
-        "0002-android-build-mingw.patch"
+        cmake_dont_build_more_than_needed.patch
+        0001-Prevent-invalid-inclusions-when-HAVE_-is-set-to-0.patch
+        debug-postfix-mingw.patch
+        0002-android-build-mingw.patch
 )

 # This is generated during the cmake build
-file(REMOVE ${SOURCE_PATH}/zconf.h)
+file(REMOVE "${SOURCE_PATH}/zconf.h")

-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
    OPTIONS
        -DSKIP_INSTALL_FILES=ON
        -DSKIP_BUILD_EXAMPLES=ON
@ -30,27 +23,25 @@ vcpkg_configure_cmake(
        -DSKIP_INSTALL_HEADERS=ON
 )

-vcpkg_install_cmake()
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+vcpkg_cmake_install()
+file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")

 # Install the pkgconfig file
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
    if(VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc "-lz" "-lzlib")
+        vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" "-lz" "-lzlib")
    endif()
-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig")
 endif()
 if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
    if(VCPKG_TARGET_IS_WINDOWS)
-        vcpkg_replace_string(${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc "-lz" "-lzlibd")
+        vcpkg_replace_string("${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" "-lz" "-lzlibd")
    endif()
-    file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+    file(COPY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/zlib.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")
 endif()

 vcpkg_fixup_pkgconfig()
-
-file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
-
 vcpkg_copy_pdbs()

-file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}")
+file(INSTALL "${SOURCE_PATH}/README" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
--- a/ports/zlib/vcpkg.json
+++ b/ports/zlib/vcpkg.json
@ -1,6 +1,14 @@
 {
  "name": "zlib",
  "version": "1.2.12",
+  "port-version": 1,
  "description": "A compression library",
-  "homepage": "https://www.zlib.net/"
+  "homepage": "https://www.zlib.net/",
+  "license": "Zlib",
+  "dependencies": [
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    }
+  ]
 }
--- a/versions/a-/angelscript.json
+++ b/versions/a-/angelscript.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "4f2a9b2d8cad46707e241ac52565fa50656c0dad",
+      "version": "2.35.1",
+      "port-version": 1
+    },
    {
      "git-tree": "342bbf5e5b2f9492dc70589d4f73b9ee2990f6d4",
      "version": "2.35.1",
--- a/versions/b-/bento4.json
+++ b/versions/b-/bento4.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "834cb05380588e07628713420e709264f168a567",
+      "version": "1.6.0-639",
+      "port-version": 0
+    },
    {
      "git-tree": "bfedfc70c05cececac8e23b744b43619e2ae3125",
      "version-string": "1.5.1",
--- a/versions/b-/bustache.json
+++ b/versions/b-/bustache.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "888d4f529ac5ecc9a12049beb50337d237f97e28",
+      "version": "1.1.0",
+      "port-version": 2
+    },
    {
      "git-tree": "746808aa3bda8d2627ecc6da664cc58ebf57896e",
      "version-string": "1.1.0",
--- a/versions/baseline.json
+++ b/versions/baseline.json
@ -82,7 +82,7 @@
    },
    "angelscript": {
      "baseline": "2.35.1",
-      "port-version": 0
+      "port-version": 1
    },
    "angle": {
      "baseline": "chromium_4472",
@ -425,8 +425,8 @@
      "port-version": 0
    },
    "bento4": {
-      "baseline": "1.5.1",
-      "port-version": 629
+      "baseline": "1.6.0-639",
+      "port-version": 0
    },
    "berkeleydb": {
      "baseline": "4.8.30",
@ -1186,7 +1186,7 @@
    },
    "bustache": {
      "baseline": "1.1.0",
-      "port-version": 1
+      "port-version": 2
    },
    "butteraugli": {
      "baseline": "2019-05-08",
@ -6605,8 +6605,8 @@
      "port-version": 1
    },
    "soil2": {
-      "baseline": "2021-05-01",
-      "port-version": 1
+      "baseline": "1.3.0",
+      "port-version": 0
    },
    "sokol": {
      "baseline": "2019-09-09",
@ -7710,7 +7710,7 @@
    },
    "zlib": {
      "baseline": "1.2.12",
-      "port-version": 0
+      "port-version": 1
    },
    "zlib-ng": {
      "baseline": "2.0.6",
--- a/versions/s-/soil2.json
+++ b/versions/s-/soil2.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "9d6004f9bd4f228751d31a1921bb8ece30d3c6eb",
+      "version": "1.3.0",
+      "port-version": 0
+    },
    {
      "git-tree": "20e7e06d73b0119e99f870bcffc70be22a7c8287",
      "version-date": "2021-05-01",
--- a/versions/z-/zlib.json
+++ b/versions/z-/zlib.json
@ -1,5 +1,10 @@
 {
  "versions": [
+    {
+      "git-tree": "ecc4c064d4911faf12d8bf5fd6bcd5c556d89774",
+      "version": "1.2.12",
+      "port-version": 1
+    },
    {
      "git-tree": "9c4edb1fabbd87dd236a200ba55eaf241cd8c8d0",
      "version": "1.2.12",