From 8ead9c2674a808d7002075e6682c714d6d181a27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Wed, 8 Mar 2023 06:14:52 +0800 Subject: [PATCH] [many ports]switch to vcpkg-cmake / vckg-cmake-config part 3 (#29883) * [many ports]switch to vcpkg-cmake / vckg-cmake-config part 3 * version * typo * version * typo * version * Fix params * version * deprecated vcpkg_extract_source_archive_ex * version * fix arguments * version * Rename argument * version * Deprecate vcpkg_extract_source_archive_ex * version --------- Co-authored-by: jyu49 --- ports/libconfuse/portfile.cmake | 27 +++--- ports/libconfuse/vcpkg.json | 14 +++- ports/libcroco/portfile.cmake | 26 +++--- ports/libcroco/vcpkg.json | 12 ++- ports/libebur128/portfile.cmake | 9 +- ports/libebur128/vcpkg.json | 9 +- ports/libevhtp/portfile.cmake | 13 ++- ports/libevhtp/vcpkg.json | 12 ++- ports/libftdi/portfile.cmake | 15 ++-- ports/libftdi/vcpkg.json | 12 ++- ports/libgta/portfile.cmake | 22 +++-- ports/libgta/vcpkg.json | 6 +- ports/libhdfs3/portfile.cmake | 25 +++--- ports/libhdfs3/vcpkg.json | 8 +- ports/liblemon/portfile.cmake | 33 ++++---- ports/liblemon/vcpkg.json | 14 +++- ports/liblo/portfile.cmake | 15 ++-- ports/liblo/vcpkg.json | 14 +++- ports/libmad/portfile.cmake | 16 ++-- ports/libmad/vcpkg.json | 10 ++- ports/libmaxminddb/portfile.cmake | 11 ++- ports/libmaxminddb/vcpkg.json | 10 ++- ports/libmodbus/portfile.cmake | 17 ++-- ports/libmodbus/vcpkg.json | 14 +++- ports/libmpeg2/portfile.cmake | 19 ++--- ports/libmpeg2/vcpkg.json | 8 +- ports/libmspack/portfile.cmake | 23 +++--- ports/libmspack/vcpkg.json | 10 ++- ports/libodb-boost/portfile.cmake | 9 +- ports/libodb-boost/vcpkg.json | 8 +- ports/libodb-mysql/portfile.cmake | 11 ++- ports/libodb-mysql/vcpkg.json | 12 ++- ports/libodb-sqlite/portfile.cmake | 9 +- ports/libodb-sqlite/vcpkg.json | 8 +- ports/libodb/portfile.cmake | 41 +++++----- ports/libodb/vcpkg.json | 10 ++- ports/libopusenc/portfile.cmake | 14 ++-- ports/libopusenc/vcpkg.json | 8 +- ports/libosmscout/portfile.cmake | 11 +-- ports/libosmscout/vcpkg.json | 9 ++ ports/libp7client/portfile.cmake | 17 ++-- ports/libp7client/vcpkg.json | 10 ++- ports/libpopt/portfile.cmake | 23 +++--- ports/libpopt/vcpkg.json | 10 ++- ports/libprotobuf-mutator/portfile.cmake | 11 ++- ports/libprotobuf-mutator/vcpkg.json | 11 ++- ports/librtmp/portfile.cmake | 17 ++-- ports/librtmp/vcpkg.json | 6 +- ports/libsmb2/portfile.cmake | 9 +- ports/libsmb2/vcpkg.json | 6 +- ports/libsoundio/portfile.cmake | 15 ++-- ports/libsoundio/vcpkg.json | 12 ++- ports/libstemmer/portfile.cmake | 17 ++-- ports/libstemmer/vcpkg.json | 14 +++- ports/libstk/portfile.cmake | 21 +++-- ports/libstk/vcpkg.json | 14 +++- ports/libu2f-server/portfile.cmake | 21 +++-- ports/libu2f-server/vcpkg.json | 8 +- ports/libuuid/portfile.cmake | 29 ++++--- ports/libuuid/vcpkg.json | 14 +++- ports/libvmdk/portfile.cmake | 19 ++--- ports/libvmdk/vcpkg.json | 10 ++- ports/libxdiff/portfile.cmake | 15 ++-- ports/libxdiff/vcpkg.json | 14 +++- ports/licensepp/portfile.cmake | 15 ++-- ports/licensepp/vcpkg.json | 10 ++- ports/lilv/portfile.cmake | 7 +- ports/lilv/vcpkg.json | 12 ++- ports/linenoise-ng/portfile.cmake | 11 ++- ports/linenoise-ng/vcpkg.json | 10 ++- ports/llgl/portfile.cmake | 13 ++- ports/llgl/vcpkg.json | 8 +- ports/log4cpp/portfile.cmake | 19 ++--- ports/log4cpp/vcpkg.json | 14 +++- ports/lpeg/portfile.cmake | 21 +++-- ports/lpeg/vcpkg.json | 8 +- ports/luafilesystem/portfile.cmake | 13 ++- ports/luafilesystem/vcpkg.json | 8 +- ports/lzfse/portfile.cmake | 16 ++-- ports/lzfse/vcpkg.json | 10 ++- ports/lzo/portfile.cmake | 29 ++++--- ports/lzo/vcpkg.json | 10 ++- ports/lzokay/portfile.cmake | 11 ++- ports/lzokay/vcpkg.json | 13 ++- ports/mathc/portfile.cmake | 15 ++-- ports/mathc/vcpkg.json | 14 +++- ports/mcpp/portfile.cmake | 17 ++-- ports/mcpp/vcpkg.json | 10 ++- ports/mecab/portfile.cmake | 18 ++-- ports/mecab/vcpkg.json | 14 +++- ports/meschach/portfile.cmake | 17 ++-- ports/meschach/vcpkg.json | 10 ++- ports/metrohash/portfile.cmake | 19 ++--- ports/metrohash/vcpkg.json | 14 +++- ports/microsoft-signalr/portfile.cmake | 17 ++-- ports/microsoft-signalr/vcpkg.json | 12 ++- ports/mikktspace/portfile.cmake | 13 ++- ports/mikktspace/vcpkg.json | 14 +++- ports/miniupnpc/portfile.cmake | 16 ++-- ports/miniupnpc/vcpkg.json | 10 ++- versions/baseline.json | 100 +++++++++++------------ versions/l-/libconfuse.json | 5 ++ versions/l-/libcroco.json | 5 ++ versions/l-/libebur128.json | 5 ++ versions/l-/libevhtp.json | 5 ++ versions/l-/libftdi.json | 5 ++ versions/l-/libgta.json | 5 ++ versions/l-/libhdfs3.json | 5 ++ versions/l-/liblemon.json | 5 ++ versions/l-/liblo.json | 5 ++ versions/l-/libmad.json | 5 ++ versions/l-/libmaxminddb.json | 5 ++ versions/l-/libmodbus.json | 5 ++ versions/l-/libmpeg2.json | 5 ++ versions/l-/libmspack.json | 5 ++ versions/l-/libodb-boost.json | 5 ++ versions/l-/libodb-mysql.json | 5 ++ versions/l-/libodb-sqlite.json | 5 ++ versions/l-/libodb.json | 5 ++ versions/l-/libopusenc.json | 5 ++ versions/l-/libosmscout.json | 5 ++ versions/l-/libp7client.json | 5 ++ versions/l-/libpopt.json | 5 ++ versions/l-/libprotobuf-mutator.json | 5 ++ versions/l-/librtmp.json | 5 ++ versions/l-/libsmb2.json | 5 ++ versions/l-/libsoundio.json | 5 ++ versions/l-/libstemmer.json | 5 ++ versions/l-/libstk.json | 5 ++ versions/l-/libu2f-server.json | 5 ++ versions/l-/libuuid.json | 5 ++ versions/l-/libvmdk.json | 5 ++ versions/l-/libxdiff.json | 5 ++ versions/l-/licensepp.json | 5 ++ versions/l-/lilv.json | 5 ++ versions/l-/linenoise-ng.json | 5 ++ versions/l-/llgl.json | 5 ++ versions/l-/log4cpp.json | 5 ++ versions/l-/lpeg.json | 5 ++ versions/l-/luafilesystem.json | 5 ++ versions/l-/lzfse.json | 5 ++ versions/l-/lzo.json | 5 ++ versions/l-/lzokay.json | 5 ++ versions/m-/mathc.json | 5 ++ versions/m-/mcpp.json | 5 ++ versions/m-/mecab.json | 5 ++ versions/m-/meschach.json | 5 ++ versions/m-/metrohash.json | 5 ++ versions/m-/microsoft-signalr.json | 5 ++ versions/m-/mikktspace.json | 5 ++ versions/m-/miniupnpc.json | 5 ++ 151 files changed, 1162 insertions(+), 593 deletions(-) diff --git a/ports/libconfuse/portfile.cmake b/ports/libconfuse/portfile.cmake index 239c8dacfd..30c291ecc0 100644 --- a/ports/libconfuse/portfile.cmake +++ b/ports/libconfuse/portfile.cmake @@ -6,35 +6,34 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.in DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h.in" DESTINATION "${SOURCE_PATH}") vcpkg_find_acquire_program(FLEX) -get_filename_component(FLEX_DIR ${FLEX} DIRECTORY) -vcpkg_add_to_path(${FLEX_DIR}) +get_filename_component(FLEX_DIR "${FLEX}" DIRECTORY) +vcpkg_add_to_path("${FLEX_DIR}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL static) vcpkg_replace_string( - ${CURRENT_PACKAGES_DIR}/include/confuse.h + "${CURRENT_PACKAGES_DIR}/include/confuse.h" "ifdef BUILDING_STATIC" "if 1 // ifdef BUILDING_STATIC" ) endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) - -vcpkg_fixup_pkgconfig() +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) + +vcpkg_fixup_pkgconfig() diff --git a/ports/libconfuse/vcpkg.json b/ports/libconfuse/vcpkg.json index dd7416c670..570596daf1 100644 --- a/ports/libconfuse/vcpkg.json +++ b/ports/libconfuse/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libconfuse", "version-string": "2019-07-14", - "port-version": 2, + "port-version": 3, "description": "Small configuration file parser library for C", - "homepage": "https://github.com/martinh/libconfuse" + "homepage": "https://github.com/martinh/libconfuse", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libcroco/portfile.cmake b/ports/libcroco/portfile.cmake index de8c0fe2a9..b7429589a4 100644 --- a/ports/libcroco/portfile.cmake +++ b/ports/libcroco/portfile.cmake @@ -4,30 +4,30 @@ vcpkg_download_distfile(ARCHIVE SHA512 038a3ac9d160a8cf86a8a88c34367e154ef26ede289c93349332b7bc449a5199b51ea3611cebf3a2416ae23b9e45ecf8f9c6b24ea6d16a5519b796d3c7e272d4 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -configure_file(${SOURCE_PATH}/config.h.win32 ${SOURCE_PATH}/src/config.h COPYONLY) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +configure_file("${SOURCE_PATH}/config.h.win32" "${SOURCE_PATH}/src/config.h" COPYONLY) file(READ "${SOURCE_PATH}/src/libcroco.symbols" SYMBOLS) string(REGEX REPLACE ";[^\n]*\n" "" DEF "EXPORTS\n${SYMBOLS}") file(WRITE "${SOURCE_PATH}/src/libcroco.def" "${DEF}") + vcpkg_find_acquire_program(PKGCONFIG) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS - -DPKG_CONFIG_EXECUTABLE=${PKGCONFIG} + "-DPKG_CONFIG_EXECUTABLE=${PKGCONFIG}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libcroco TARGET_PATH share/unofficial-libcroco) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libcroco) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libcroco RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libcroco/vcpkg.json b/ports/libcroco/vcpkg.json index f6781ed63b..5a801f4766 100644 --- a/ports/libcroco/vcpkg.json +++ b/ports/libcroco/vcpkg.json @@ -1,10 +1,18 @@ { "name": "libcroco", "version": "0.6.13", - "port-version": 3, + "port-version": 4, "description": "A standalone css2 parsing and manipulation library", "dependencies": [ "glib", - "libxml2" + "libxml2", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libebur128/portfile.cmake b/ports/libebur128/portfile.cmake index c1ea6a9b92..4a054e04cb 100644 --- a/ports/libebur128/portfile.cmake +++ b/ports/libebur128/portfile.cmake @@ -8,13 +8,12 @@ vcpkg_from_github( REF v1.2.6 SHA512 ab188c6d32cd14613119258313a8a3fb1167b55501c9f5b6d3ba738d674bc58f24ac3034c23d9730ed8dc3e95a23619bfb81719e4c79807a9a16c1a5b3423582 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_INTERNAL_QUEUE_H=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libebur128/vcpkg.json b/ports/libebur128/vcpkg.json index 57cda28d3c..52dc271867 100644 --- a/ports/libebur128/vcpkg.json +++ b/ports/libebur128/vcpkg.json @@ -1,8 +1,15 @@ { "name": "libebur128", "version-string": "1.2.6", + "port-version": 1, "description": "A library implementing the EBU R128 audio loudness standard", "homepage": "https://github.com/jiixyj/libebur128", "license": "MIT", - "supports": "!(arm & windows)" + "supports": "!(arm & windows)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libevhtp/portfile.cmake b/ports/libevhtp/portfile.cmake index 07d8ee9376..48d496ac30 100644 --- a/ports/libevhtp/portfile.cmake +++ b/ports/libevhtp/portfile.cmake @@ -13,20 +13,19 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS regex EVHTP_DISABLE_REGEX ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() # 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) vcpkg_fixup_pkgconfig() diff --git a/ports/libevhtp/vcpkg.json b/ports/libevhtp/vcpkg.json index db641b8fcf..6928b00eb5 100644 --- a/ports/libevhtp/vcpkg.json +++ b/ports/libevhtp/vcpkg.json @@ -1,12 +1,20 @@ { "name": "libevhtp", "version": "1.2.18", - "port-version": 3, + "port-version": 4, "description": "Libevhtp was created as a replacement API for Libevent's current HTTP API.", "homepage": "https://github.com/criticalstack/libevhtp", "supports": "!windows", "dependencies": [ - "libevent" + "libevent", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ], "features": { "openssl": { diff --git a/ports/libftdi/portfile.cmake b/ports/libftdi/portfile.cmake index f44801849c..19362481f3 100644 --- a/ports/libftdi/portfile.cmake +++ b/ports/libftdi/portfile.cmake @@ -4,10 +4,10 @@ vcpkg_download_distfile(ARCHIVE SHA512 540e5eb201a65936c3dbabff70c251deba1615874b11ff27c5ca16c39d71c150cf61758a68b541135a444fe32ab403b0fba0daf55c587647aaf9b3f400f1dee7 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF 0.20 +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "0.20" PATCHES libusb-win32.patch shared-static.patch @@ -16,9 +16,8 @@ vcpkg_extract_source_archive_ex( file(COPY "${CMAKE_CURRENT_LIST_DIR}/exports.def" DESTINATION "${SOURCE_PATH}/src") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS -DDOCUMENTATION=OFF -DEXAMPLES=OFF @@ -33,9 +32,9 @@ vcpkg_configure_cmake( -DLIB_INSTALL_DIR=lib ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() vcpkg_fixup_pkgconfig() diff --git a/ports/libftdi/vcpkg.json b/ports/libftdi/vcpkg.json index b6300d9dd2..e864124003 100644 --- a/ports/libftdi/vcpkg.json +++ b/ports/libftdi/vcpkg.json @@ -1,9 +1,17 @@ { "name": "libftdi", "version-string": "0.20", - "port-version": 3, + "port-version": 4, "description": "FTDI USB driver with bitbang mode (v0.20)", "dependencies": [ - "libusb-win32" + "libusb-win32", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libgta/portfile.cmake b/ports/libgta/portfile.cmake index 65409dc33b..9c543b0b80 100644 --- a/ports/libgta/portfile.cmake +++ b/ports/libgta/portfile.cmake @@ -6,32 +6,30 @@ vcpkg_download_distfile(ARCHIVE FILENAME "libgta-${LIBGTA_VERSION}.tar.xz" SHA512 ${LIBGTA_HASH}) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${LIBGTA_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${LIBGTA_VERSION}" ) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" ENABLE_SHARED_LIBS) string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" ENABLE_STATIC_LIBS) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DGTA_BUILD_SHARED_LIB=${ENABLE_SHARED_LIBS} -DGTA_BUILD_STATIC_LIB=${ENABLE_STATIC_LIBS} -DGTA_BUILD_DOCUMENTATION=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin ${CURRENT_PACKAGES_DIR}/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") endif() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libgta) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libgta/COPYING ${CURRENT_PACKAGES_DIR}/share/libgta/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/libgta/vcpkg.json b/ports/libgta/vcpkg.json index 40aeadb4c9..b2fad2ce99 100644 --- a/ports/libgta/vcpkg.json +++ b/ports/libgta/vcpkg.json @@ -1,12 +1,16 @@ { "name": "libgta", "version-string": "1.0.8", - "port-version": 3, + "port-version": 4, "description": "Libgta is a portable library that implements the Generic Tagged Array (GTA) file format.", "homepage": "https://download.savannah.nongnu.org/releases/gta", "dependencies": [ "bzip2", "liblzma", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/ports/libhdfs3/portfile.cmake b/ports/libhdfs3/portfile.cmake index a656d149f8..ebe16a4fb4 100644 --- a/ports/libhdfs3/portfile.cmake +++ b/ports/libhdfs3/portfile.cmake @@ -1,21 +1,20 @@ vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO erikmuttersbach/libhdfs3 - REF 9a60d79812d6dee72455f61bff57a93c3c7d56f5 - SHA512 2b635ab979230c251243f01717105872245d7948f75832e58f50a09b0b06d1b366b3c5f3a3253fa538076e9f199003f28d10b9958293144dbc301276073a0633 - HEAD_REF apache-rpc-9 + OUT_SOURCE_PATH SOURCE_PATH + REPO erikmuttersbach/libhdfs3 + REF 9a60d79812d6dee72455f61bff57a93c3c7d56f5 + SHA512 2b635ab979230c251243f01717105872245d7948f75832e58f50a09b0b06d1b366b3c5f3a3253fa538076e9f199003f28d10b9958293144dbc301276073a0633 + HEAD_REF apache-rpc-9 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/libhdfs3Config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) -FILE(INSTALL ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/libhdfs3Config.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +FILE(INSTALL "${CMAKE_CURRENT_LIST_DIR}/usage" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/libhdfs3/vcpkg.json b/ports/libhdfs3/vcpkg.json index 050bcb5eea..490f819760 100644 --- a/ports/libhdfs3/vcpkg.json +++ b/ports/libhdfs3/vcpkg.json @@ -1,7 +1,7 @@ { "name": "libhdfs3", "version-date": "2019-11-05", - "port-version": 3, + "port-version": 4, "description": "Native Hadoop RPC protocol and HDFS data transfer protocol implementation", "homepage": "https://github.com/erikmuttersbach/libhdfs3", "supports": "!windows", @@ -12,6 +12,10 @@ "platform": "!windows & !osx" }, "libxml2", - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/liblemon/portfile.cmake b/ports/liblemon/portfile.cmake index 290b7e715b..28b1df9397 100644 --- a/ports/liblemon/portfile.cmake +++ b/ports/liblemon/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_download_distfile(ARCHIVE SHA512 029640e4f791a18068cb2e2b4e794d09822d9d56fb957eb3e2cceae3a30065c0041a31c465637cfcadf7b2473564070b34adc88513439cdf9046831854e2aa70 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${VERSION}" PATCHES cmake.patch fixup-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLEMON_ENABLE_GLPK=OFF -DLEMON_ENABLE_ILOG=OFF @@ -27,19 +26,19 @@ vcpkg_configure_cmake( -DLEMON_ENABLE_SOPLEX=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/lemon/cmake TARGET_PATH share/lemon) +vcpkg_cmake_config_fixup(CONFIG_PATH share/lemon/cmake PACKAGE_NAME lemon) -file(GLOB EXE ${CURRENT_PACKAGES_DIR}/bin/*.exe) -file(COPY ${EXE} DESTINATION ${CURRENT_PACKAGES_DIR}/tools/liblemon/) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblemon) +file(GLOB EXE "${CURRENT_PACKAGES_DIR}/bin/*.exe") +file(COPY ${EXE} DESTINATION "{CURRENT_PACKAGES_DIR}/tools/liblemon/") +vcpkg_copy_tool_dependencies("{CURRENT_PACKAGES_DIR}/tools/liblemon") -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") # 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) vcpkg_fixup_pkgconfig() diff --git a/ports/liblemon/vcpkg.json b/ports/liblemon/vcpkg.json index 7cbf85eb1a..eaca2c922a 100644 --- a/ports/liblemon/vcpkg.json +++ b/ports/liblemon/vcpkg.json @@ -1,7 +1,17 @@ { "name": "liblemon", "version-string": "2019-06-13", - "port-version": 3, + "port-version": 4, "description": "Library for Efficient Modeling and Optimization in Networks", - "homepage": "https://lemon.cs.elte.hu/trac/lemon" + "homepage": "https://lemon.cs.elte.hu/trac/lemon", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/liblo/portfile.cmake b/ports/liblo/portfile.cmake index f43a524239..a44864e5f7 100644 --- a/ports/liblo/portfile.cmake +++ b/ports/liblo/portfile.cmake @@ -6,27 +6,26 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/cmake - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/cmake" OPTIONS -DTHREADING=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Install needed files into package directory -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/liblo) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/liblo) vcpkg_copy_tools(TOOL_NAMES oscsend oscdump AUTO_CLEAN) # Remove unnecessary files -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblo RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_fixup_pkgconfig() diff --git a/ports/liblo/vcpkg.json b/ports/liblo/vcpkg.json index 6d060c7510..dca5a03188 100644 --- a/ports/liblo/vcpkg.json +++ b/ports/liblo/vcpkg.json @@ -1,7 +1,17 @@ { "name": "liblo", "version-string": "0.31", - "port-version": 2, + "port-version": 3, "description": "liblo is an implementation of the Open Sound Control protocol for POSIX systems", - "homepage": "https://github.com/radarsat1/liblo" + "homepage": "https://github.com/radarsat1/liblo", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libmad/portfile.cmake b/ports/libmad/portfile.cmake index ebf84de891..5981c3598a 100644 --- a/ports/libmad/portfile.cmake +++ b/ports/libmad/portfile.cmake @@ -10,20 +10,18 @@ vcpkg_from_sourceforge( ) #The archive only contains a Visual Studio 6.0 era DSP project file, so use a custom CMakeLists.txt -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") #Use the msvc++ config.h header -file(COPY ${SOURCE_PATH}/msvc++/config.h DESTINATION ${SOURCE_PATH}) +file(COPY "${SOURCE_PATH}/msvc++/config.h" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmad) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libmad/COPYING ${CURRENT_PACKAGES_DIR}/share/libmad/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libmad/vcpkg.json b/ports/libmad/vcpkg.json index 2e44d7571c..9a03de492b 100644 --- a/ports/libmad/vcpkg.json +++ b/ports/libmad/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libmad", "version-string": "0.15.1", - "port-version": 9, + "port-version": 10, "description": "high-quality MPEG audio decoder", - "homepage": "http://www.mars.org/home/rob/proj/mpeg/" + "homepage": "http://www.mars.org/home/rob/proj/mpeg/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libmaxminddb/portfile.cmake b/ports/libmaxminddb/portfile.cmake index db280fad8e..7c437a0917 100644 --- a/ports/libmaxminddb/portfile.cmake +++ b/ports/libmaxminddb/portfile.cmake @@ -9,17 +9,16 @@ vcpkg_from_github( PATCHES fix-linux-build.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/libmaxminddb/vcpkg.json b/ports/libmaxminddb/vcpkg.json index c24cb9c92c..142ae74e09 100644 --- a/ports/libmaxminddb/vcpkg.json +++ b/ports/libmaxminddb/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libmaxminddb", "version-string": "1.4.3", - "port-version": 1, + "port-version": 2, "description": "C library for the MaxMind DB file format", - "homepage": "https://github.com/maxmind/libmaxminddb" + "homepage": "https://github.com/maxmind/libmaxminddb", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libmodbus/portfile.cmake b/ports/libmodbus/portfile.cmake index 24b6bdfa13..59487c1ebe 100644 --- a/ports/libmodbus/portfile.cmake +++ b/ports/libmodbus/portfile.cmake @@ -7,24 +7,25 @@ vcpkg_from_github( PATCHES fix-static-linkage.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" "${CMAKE_CURRENT_LIST_DIR}/config.h.cmake" + DESTINATION "${SOURCE_PATH}" +) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/modbus.h "elif defined(LIBBUILD)" "elif 1") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/modbus.h" "elif defined(LIBBUILD)" "elif 1") endif() # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING.LESSER DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LESSER" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/libmodbus/vcpkg.json b/ports/libmodbus/vcpkg.json index 6cb4e41e0e..f42ee0aaee 100644 --- a/ports/libmodbus/vcpkg.json +++ b/ports/libmodbus/vcpkg.json @@ -1,9 +1,19 @@ { "name": "libmodbus", "version": "3.1.6", - "port-version": 3, + "port-version": 4, "description": "libmodbus is a free software library to send/receive data with a device which respects the Modbus protocol", "homepage": "https://github.com/stephane/libmodbus", "license": "LGPL-2.1-or-later", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libmpeg2/portfile.cmake b/ports/libmpeg2/portfile.cmake index 181ff2d5e2..7ee4ef5a0e 100644 --- a/ports/libmpeg2/portfile.cmake +++ b/ports/libmpeg2/portfile.cmake @@ -7,31 +7,30 @@ vcpkg_download_distfile(ARCHIVE SHA512 3648a2b3d7e2056d5adb328acd2fb983a1fa9a05ccb6f9388cc686c819445421811f42e8439418a0491a13080977f074a0d8bf8fa6bc101ff245ddea65a46fbc ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES 0001-Add-naive-MSVC-support-to-sources.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES tools TOOLS ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() # # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libmpeg2 RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() diff --git a/ports/libmpeg2/vcpkg.json b/ports/libmpeg2/vcpkg.json index 7942b34272..e83572e496 100644 --- a/ports/libmpeg2/vcpkg.json +++ b/ports/libmpeg2/vcpkg.json @@ -1,10 +1,16 @@ { "name": "libmpeg2", "version": "0.5.1", - "port-version": 2, + "port-version": 3, "description": "a free MPEG-2 video stream decoder", "homepage": "http://libmpeg2.sourceforge.net/", "supports": "!(linux | osx | uwp)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "tools": { "description": "Build tools provided with libmpeg2" diff --git a/ports/libmspack/portfile.cmake b/ports/libmspack/portfile.cmake index f4f19e7c37..ad80eadc35 100644 --- a/ports/libmspack/portfile.cmake +++ b/ports/libmspack/portfile.cmake @@ -8,25 +8,24 @@ vcpkg_download_distfile(ARCHIVE SHA512 a7b5f7caa49190c5021f3e768b92f2e51cc0ce685c9ab6ed6fb36de885c73231b58d47a8a3b5c5aa5c9ac56c25c500eb683d84dbf11f09f97f6cb4fff5adc245 ) -vcpkg_extract_source_archive_ex( - ARCHIVE ${ARCHIVE} - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/libmspack.def DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/libmspack.def" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # License and man -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${LIB_NAME} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libmspack/vcpkg.json b/ports/libmspack/vcpkg.json index 41ed734e0f..bbdb83f7a8 100644 --- a/ports/libmspack/vcpkg.json +++ b/ports/libmspack/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libmspack", "version-string": "0.10.1", - "port-version": 4, + "port-version": 5, "description": "libmspack is a portable library for some loosely related Microsoft compression formats.", - "homepage": "https://www.cabextract.org.uk/libmspack" + "homepage": "https://www.cabextract.org.uk/libmspack", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libodb-boost/portfile.cmake b/ports/libodb-boost/portfile.cmake index ef71f524fc..5e0c3b7d47 100644 --- a/ports/libodb-boost/portfile.cmake +++ b/ports/libodb-boost/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 af716b0385cf4ea18b20dcd5880c69c43cfc195eec4ff196a8e438833306489c39ab06a494e5d60cd08ba0d94caa05bd07e5f3fa836d835bad15c8a2ad7de306 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" ) file(REMOVE "${SOURCE_PATH}/version") @@ -15,14 +15,13 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() if(NOT VCPKG_BUILD_TYPE) diff --git a/ports/libodb-boost/vcpkg.json b/ports/libodb-boost/vcpkg.json index 422bcc8089..b216d72c22 100644 --- a/ports/libodb-boost/vcpkg.json +++ b/ports/libodb-boost/vcpkg.json @@ -1,9 +1,13 @@ { "name": "libodb-boost", "version": "2.4.0", - "port-version": 6, + "port-version": 7, "description": "Description: Boost support for the ODB ORM library", "dependencies": [ - "libodb" + "libodb", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/libodb-mysql/portfile.cmake b/ports/libodb-mysql/portfile.cmake index dc199f4661..a865089945 100644 --- a/ports/libodb-mysql/portfile.cmake +++ b/ports/libodb-mysql/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_download_distfile(ARCHIVE SHA512 c27b73c3f61dccdd149c11c122185f645a00d5bc346b366ee65b738f8719c39d03fad07a0d55b62b3db9e3ad2507679c24ddda331e5d110f367ad32f7cf8b910 ) -vcpkg_extract_source_archive_ex( +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" - OUT_SOURCE_PATH SOURCE_PATH PATCHES adapter_mysql_8.0.patch fix-redefinttion.patch @@ -22,10 +22,9 @@ set(MYSQL_INCLUDE_DIR "${CURRENT_INSTALLED_DIR}/include/mysql") find_library(MYSQL_LIB NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}" NO_DEFAULT_PATH REQUIRED) find_library(MYSQL_LIB_DEBUG NAMES libmysql mysqlclient PATH_SUFFIXES lib PATHS "${CURRENT_INSTALLED_DIR}/debug" NO_DEFAULT_PATH) -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE - PREFER_NINJA OPTIONS -DMYSQL_INCLUDE_DIR=${MYSQL_INCLUDE_DIR} OPTIONS_RELEASE @@ -35,9 +34,9 @@ vcpkg_configure_cmake( -DMYSQL_LIB=${MYSQL_LIB_DEBUG} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/odb TARGET_PATH share/odb) +vcpkg_cmake_config_fixup(CONFIG_PATH share/odb PACKAGE_NAME odb) vcpkg_copy_pdbs() diff --git a/ports/libodb-mysql/vcpkg.json b/ports/libodb-mysql/vcpkg.json index cad4c39f13..35509f1255 100644 --- a/ports/libodb-mysql/vcpkg.json +++ b/ports/libodb-mysql/vcpkg.json @@ -1,11 +1,19 @@ { "name": "libodb-mysql", "version": "2.4.0", - "port-version": 10, + "port-version": 11, "description": "MySQL support for the ODB ORM library", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ "libmysql", - "libodb" + "libodb", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/libodb-sqlite/portfile.cmake b/ports/libodb-sqlite/portfile.cmake index a8b6d18df3..ca5296489f 100644 --- a/ports/libodb-sqlite/portfile.cmake +++ b/ports/libodb-sqlite/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_download_distfile(ARCHIVE SHA512 af16da7c82cf8845ca3b393fbd8957a92b05ebc925a5191f20d414ab558345850073cd9c46457d0ef0edfb12ebcb27f267b934c9c69ef598380242fe920c8577 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" ) file(REMOVE "${SOURCE_PATH}/version") @@ -15,14 +15,13 @@ file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(NOT VCPKG_BUILD_TYPE) file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_sqliteConfig-debug.cmake" LIBODB_DEBUG_TARGETS) diff --git a/ports/libodb-sqlite/vcpkg.json b/ports/libodb-sqlite/vcpkg.json index 3fbf5a8354..fdea27da32 100644 --- a/ports/libodb-sqlite/vcpkg.json +++ b/ports/libodb-sqlite/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libodb-sqlite", "version": "2.4.0", - "port-version": 10, + "port-version": 11, "description": "Sqlite support for the ODB ORM library", "homepage": "https://www.codesynthesis.com/products/odb/", "dependencies": [ "libodb", - "sqlite3" + "sqlite3", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/libodb/portfile.cmake b/ports/libodb/portfile.cmake index 76fd7c968b..47becf880e 100644 --- a/ports/libodb/portfile.cmake +++ b/ports/libodb/portfile.cmake @@ -6,47 +6,46 @@ vcpkg_download_distfile(ARCHIVE SHA512 f1311458634695eb6ba307ebfd492e3b260e7beb06db1c5c46df58c339756be4006322cdc4e42d055bf5b2ad14ce4656ddcafcc4e16c282034db8a77d255c3eb ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) file(REMOVE "${SOURCE_PATH}/version") file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in - DESTINATION ${SOURCE_PATH}) + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in" + DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE OPTIONS_DEBUG -DLIBODB_INSTALL_HEADERS=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() if(NOT VCPKG_BUILD_TYPE) - file(READ ${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake LIBODB_DEBUG_TARGETS) + file(READ "${CURRENT_PACKAGES_DIR}/debug/share/odb/odb_libodbConfig-debug.cmake" LIBODB_DEBUG_TARGETS) string(REPLACE "\${_IMPORT_PREFIX}" "\${_IMPORT_PREFIX}/debug" LIBODB_DEBUG_TARGETS "${LIBODB_DEBUG_TARGETS}") - file(WRITE ${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake "${LIBODB_DEBUG_TARGETS}") + file(WRITE "${CURRENT_PACKAGES_DIR}/share/odb/odb_libodbConfig-debug.cmake" "${LIBODB_DEBUG_TARGETS}") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/odbConfig.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/odb) -write_basic_package_version_file(${CURRENT_PACKAGES_DIR}/share/odb/odbConfigVersion.cmake +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/odbConfig.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/odb") +write_basic_package_version_file("${CURRENT_PACKAGES_DIR}/share/odb/odbConfigVersion.cmake" VERSION 2.4.0 COMPATIBILITY SameMajorVersion ) -set(LIBODB_HEADER_PATH ${CURRENT_PACKAGES_DIR}/include/odb/details/export.hxx) -file(READ ${LIBODB_HEADER_PATH} LIBODB_HEADER) +set(LIBODB_HEADER_PATH "${CURRENT_PACKAGES_DIR}/include/odb/details/export.hxx") +file(READ "${LIBODB_HEADER_PATH}" LIBODB_HEADER) if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 1" LIBODB_HEADER ${LIBODB_HEADER}) + string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 1" LIBODB_HEADER "${LIBODB_HEADER}") else() - string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 0" LIBODB_HEADER ${LIBODB_HEADER}) + string(REPLACE "#ifdef LIBODB_STATIC_LIB" "#if 0" LIBODB_HEADER "${LIBODB_HEADER}") endif() -file(WRITE ${LIBODB_HEADER_PATH} "${LIBODB_HEADER}") +file(WRITE "${LIBODB_HEADER_PATH}" "${LIBODB_HEADER}") vcpkg_copy_pdbs() -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/libodb/vcpkg.json b/ports/libodb/vcpkg.json index 8e10e1cf7f..0c666c06a9 100644 --- a/ports/libodb/vcpkg.json +++ b/ports/libodb/vcpkg.json @@ -1,7 +1,13 @@ { "name": "libodb", "version": "2.4.0", - "port-version": 9, + "port-version": 10, "description": "ODB library, base runtime for the ODB ORM solution", - "homepage": "https://www.codesynthesis.com/products/odb/" + "homepage": "https://www.codesynthesis.com/products/odb/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libopusenc/portfile.cmake b/ports/libopusenc/portfile.cmake index 7a4eacee4d..1f04d8936e 100644 --- a/ports/libopusenc/portfile.cmake +++ b/ports/libopusenc/portfile.cmake @@ -9,20 +9,18 @@ vcpkg_from_github( SHA512 9681421a967b93770796dd3503c00e1418de86438d2bfe77011dc68f6db5d666508d33c0df7308db3b7ea18f5e1b14a3115fd63837987e16347ec801c3771d26 HEAD_REF master) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure(SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DOPUSENC_SKIP_HEADERS=ON) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # make includes work with MSBuild integration -file(READ ${CURRENT_PACKAGES_DIR}/include/opus/opusenc.h OPUSENC_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/opus/opusenc.h" OPUSENC_H) string(REPLACE "#include " "#include \"opus.h\"" OPUSENC_H "${OPUSENC_H}") -file(WRITE ${CURRENT_PACKAGES_DIR}/include/opus/opusenc.h "${OPUSENC_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/opus/opusenc.h" "${OPUSENC_H}") -file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/libopusenc) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/libopusenc/COPYING ${CURRENT_PACKAGES_DIR}/share/libopusenc/copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libopusenc/vcpkg.json b/ports/libopusenc/vcpkg.json index 0ce806c812..ea02bcad55 100644 --- a/ports/libopusenc/vcpkg.json +++ b/ports/libopusenc/vcpkg.json @@ -1,11 +1,15 @@ { "name": "libopusenc", "version-string": "0.2.1", - "port-version": 1, + "port-version": 2, "description": "Library for encoding .opus audio files and live streams.", "homepage": "https://github.com/xiph/libopusenc", "supports": "!uwp", "dependencies": [ - "opus" + "opus", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/libosmscout/portfile.cmake b/ports/libosmscout/portfile.cmake index 20125753c1..f1c4990fdf 100644 --- a/ports/libosmscout/portfile.cmake +++ b/ports/libosmscout/portfile.cmake @@ -21,8 +21,9 @@ else() list(APPEND FEATURE_OPTIONS -DOSMDCOUT_BUILD_MAP_DIRECTX=OFF -DOSMDCOUT_BUILD_MAP_GDI=OFF) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + WINDOWS_USE_MSBUILD OPTIONS -DOSMSCOUT_BUILD_DEMOS=OFF -DOSMSCOUT_BUILD_TOOL_DUMPDATA=OFF @@ -37,11 +38,11 @@ vcpkg_configure_cmake( ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_tools(TOOL_NAMES Import AUTO_CLEAN) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/cmake/libosmscout) +vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libosmscout) -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) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/libosmscout/vcpkg.json b/ports/libosmscout/vcpkg.json index 7a80efed0c..5715844879 100644 --- a/ports/libosmscout/vcpkg.json +++ b/ports/libosmscout/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libosmscout", "version-string": "1.1.1", + "port-version": 1, "description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.", "homepage": "http://libosmscout.sourceforge.net/", "documentation": "http://libosmscout.sourceforge.net/documentation/", @@ -10,6 +11,14 @@ "liblzma", "libxml2", "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ], "features": { diff --git a/ports/libp7client/portfile.cmake b/ports/libp7client/portfile.cmake index 95809babf0..0127ab91c5 100644 --- a/ports/libp7client/portfile.cmake +++ b/ports/libp7client/portfile.cmake @@ -4,22 +4,21 @@ vcpkg_download_distfile(ARCHIVE SHA512 992256854b717a45ae9e11ed16aa27b8b054de97718f027664634597d756aa26fe10dcad765cde7695802c90def46461abbcbfde81923fdd40ea2b659e1a8240 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH +vcpkg_extract_source_archive( + SOURCE_PATH ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/License.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}"RENAME copyright) diff --git a/ports/libp7client/vcpkg.json b/ports/libp7client/vcpkg.json index d5a77d32f4..a116182e7e 100644 --- a/ports/libp7client/vcpkg.json +++ b/ports/libp7client/vcpkg.json @@ -1,8 +1,14 @@ { "name": "libp7client", "version-string": "5.6", - "port-version": 2, + "port-version": 3, "description": "Open source, cross-platform, fastest library for sending logs, telemetry & trace data from your application.", "homepage": "https://baical.net/", - "supports": "!(arm | uwp | osx)" + "supports": "!(arm | uwp | osx)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libpopt/portfile.cmake b/ports/libpopt/portfile.cmake index a4ead066cc..538af68002 100644 --- a/ports/libpopt/portfile.cmake +++ b/ports/libpopt/portfile.cmake @@ -8,26 +8,25 @@ vcpkg_download_distfile(ARCHIVE SHA512 ${LIBPOPT_HASH} ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES 0004-vcpkg-fixmsvc.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/config.h.cmake DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/popt.def DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/config.h.cmake" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/popt.def" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DPOPT_USE_CONFIG=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libpopt/vcpkg.json b/ports/libpopt/vcpkg.json index cbb2f82541..1329ae49a1 100644 --- a/ports/libpopt/vcpkg.json +++ b/ports/libpopt/vcpkg.json @@ -1,6 +1,12 @@ { "name": "libpopt", "version-string": "1.16", - "port-version": 14, - "description": "Library for parsing command line parameters" + "port-version": 15, + "description": "Library for parsing command line parameters", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/libprotobuf-mutator/portfile.cmake b/ports/libprotobuf-mutator/portfile.cmake index 9ce795f255..6ffb602fb2 100644 --- a/ports/libprotobuf-mutator/portfile.cmake +++ b/ports/libprotobuf-mutator/portfile.cmake @@ -11,19 +11,18 @@ vcpkg_from_github( ) string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" STATIC_RUNTIME) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLIB_PROTO_MUTATOR_TESTING=OFF -DLIB_PROTO_MUTATOR_MSVC_STATIC_RUNTIME=${STATIC_RUNTIME} -DPKG_CONFIG_PATH=lib/pkgconfig ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_fixup_pkgconfig() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) 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/libprotobuf-mutator/vcpkg.json b/ports/libprotobuf-mutator/vcpkg.json index e41bf2652c..27feafd7b1 100644 --- a/ports/libprotobuf-mutator/vcpkg.json +++ b/ports/libprotobuf-mutator/vcpkg.json @@ -1,8 +1,17 @@ { "name": "libprotobuf-mutator", "version-string": "1.0", + "port-version": 1, "description": "Library for structured fuzzing with protobuffers.", "dependencies": [ - "protobuf" + "protobuf", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/librtmp/portfile.cmake b/ports/librtmp/portfile.cmake index 05a59fe34d..657517efa0 100644 --- a/ports/librtmp/portfile.cmake +++ b/ports/librtmp/portfile.cmake @@ -11,20 +11,19 @@ vcpkg_from_github( hide_netstackdump.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/librtmp.def DESTINATION ${SOURCE_PATH}/librtmp) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/librtmp.def" DESTINATION "${SOURCE_PATH}/librtmp") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # License and man -file(INSTALL ${SOURCE_PATH}/librtmp/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/librtmp RENAME copyright) -file(INSTALL ${SOURCE_PATH}/librtmp/librtmp.3.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/librtmp) +file(INSTALL "${SOURCE_PATH}/librtmp/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(INSTALL "${SOURCE_PATH}/librtmp/librtmp.3.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_copy_pdbs() diff --git a/ports/librtmp/vcpkg.json b/ports/librtmp/vcpkg.json index 90a2973153..7998d955a8 100644 --- a/ports/librtmp/vcpkg.json +++ b/ports/librtmp/vcpkg.json @@ -1,11 +1,15 @@ { "name": "librtmp", "version-date": "2019-11-11", - "port-version": 3, + "port-version": 4, "description": "RTMPDump Real-Time Messaging Protocol API", "homepage": "https://rtmpdump.mplayerhq.hu", "dependencies": [ "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, "zlib" ] } diff --git a/ports/libsmb2/portfile.cmake b/ports/libsmb2/portfile.cmake index bce687a711..958de2f59f 100644 --- a/ports/libsmb2/portfile.cmake +++ b/ports/libsmb2/portfile.cmake @@ -8,12 +8,11 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_fixup_pkgconfig() @@ -23,4 +22,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") #the debug/share folder is generated empty by the provided cmake system file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsmb2/vcpkg.json b/ports/libsmb2/vcpkg.json index 8bed89ce6d..303a41ab81 100644 --- a/ports/libsmb2/vcpkg.json +++ b/ports/libsmb2/vcpkg.json @@ -1,12 +1,16 @@ { "name": "libsmb2", "version-date": "2021-04-29", - "port-version": 1, + "port-version": 2, "description": "SMB2/3 Userspace Client", "homepage": "https://github.com/sahlberg/libsmb2", "supports": "!osx", "dependencies": [ "openssl", + { + "name": "vcpkg-cmake", + "host": true + }, { "name": "vcpkg-cmake-config", "host": true diff --git a/ports/libsoundio/portfile.cmake b/ports/libsoundio/portfile.cmake index 1e5946189f..86ceea181b 100644 --- a/ports/libsoundio/portfile.cmake +++ b/ports/libsoundio/portfile.cmake @@ -18,9 +18,8 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS pulseaudio ENABLE_PULSEAUDIO ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_DYNAMIC_LIBS=${BUILD_DYNAMIC_LIBS} -DBUILD_STATIC_LIBS=${BUILD_STATIC_LIBS} @@ -31,13 +30,13 @@ vcpkg_configure_cmake( -DENABLE_WASAPI=${VCPKG_TARGET_IS_WINDOWS} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") endif() -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libsoundio RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsoundio/vcpkg.json b/ports/libsoundio/vcpkg.json index 52ca059cdf..230ade61fb 100644 --- a/ports/libsoundio/vcpkg.json +++ b/ports/libsoundio/vcpkg.json @@ -1,10 +1,20 @@ { "name": "libsoundio", "version": "2.0.0", - "port-version": 6, + "port-version": 7, "description": "libsoundio is C library providing cross-platform audio input and output.", "homepage": "http://libsound.io/", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "features": { "alsa": { "description": "ALSA backend for libsoundio" diff --git a/ports/libstemmer/portfile.cmake b/ports/libstemmer/portfile.cmake index e28f90cc58..2e5b5ffba4 100644 --- a/ports/libstemmer/portfile.cmake +++ b/ports/libstemmer/portfile.cmake @@ -6,19 +6,18 @@ vcpkg_download_distfile(ARCHIVE SHA512 9ab5b8bfd5b4071dbbd63d769e09fae3971b49ee441ad970aa95d90b3297f5ffc9deed1613d99974d1485bf3b69292663591957f52bbeddcadbf9d9a4af432f2 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstemmer RENAME copyright) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libstemmer/vcpkg.json b/ports/libstemmer/vcpkg.json index 8dee5abc54..0934c2c02b 100644 --- a/ports/libstemmer/vcpkg.json +++ b/ports/libstemmer/vcpkg.json @@ -1,7 +1,17 @@ { "name": "libstemmer", "version-string": "2017-9", - "port-version": 6, + "port-version": 7, "description": "Snowball is a small string processing language designed for creating stemming algorithms for use in Information Retrieval", - "homepage": "https://snowball.tartarus.org/" + "homepage": "https://snowball.tartarus.org/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libstk/portfile.cmake b/ports/libstk/portfile.cmake index ffb9eeb8bb..843aef10ef 100644 --- a/ports/libstk/portfile.cmake +++ b/ports/libstk/portfile.cmake @@ -8,24 +8,23 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-libstk TARGET_PATH share/unofficial-libstk) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-libstk) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) -file(GLOB RAWFILES ${SOURCE_PATH}/rawwaves/*.raw) -file(COPY ${RAWFILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/libstk/rawwaves) +file(GLOB RAWFILES "${SOURCE_PATH}/rawwaves/*.raw") +file(COPY ${RAWFILES} DESTINATION "${CURRENT_PACKAGES_DIR}/share/libstk/rawwaves") diff --git a/ports/libstk/vcpkg.json b/ports/libstk/vcpkg.json index 0c4d307310..508767d2c9 100644 --- a/ports/libstk/vcpkg.json +++ b/ports/libstk/vcpkg.json @@ -1,6 +1,16 @@ { "name": "libstk", "version-string": "4.6.1", - "port-version": 1, - "description": "The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language." + "port-version": 2, + "description": "The Synthesis ToolKit in C++ (STK) is a set of open source audio signal processing and algorithmic synthesis classes written in the C++ programming language.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libu2f-server/portfile.cmake b/ports/libu2f-server/portfile.cmake index 6893718db6..b63bf5bbc1 100644 --- a/ports/libu2f-server/portfile.cmake +++ b/ports/libu2f-server/portfile.cmake @@ -11,25 +11,24 @@ vcpkg_from_github( strndup-fix.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/u2f-server-version.h DESTINATION ${SOURCE_PATH}/u2f-server) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/u2f-server-version.h" DESTINATION "${SOURCE_PATH}/u2f-server") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - ) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) -vcpkg_install_cmake() +vcpkg_cmake_install() # The include file must be patched after the build has completed, because the source files use the wrong subdirectory name! -vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/libu2f-server/u2f-server.h +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/libu2f-server/u2f-server.h" "#include " "#include " ) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") vcpkg_copy_pdbs() # Handle copyright -configure_file(${SOURCE_PATH}/COPYING ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/libu2f-server/vcpkg.json b/ports/libu2f-server/vcpkg.json index aade166cbf..a3e291ec7a 100644 --- a/ports/libu2f-server/vcpkg.json +++ b/ports/libu2f-server/vcpkg.json @@ -1,12 +1,16 @@ { "name": "libu2f-server", "version": "1.1.0", - "port-version": 4, + "port-version": 5, "description": "Yubico Universal 2nd Factor (U2F) Server C Library", "homepage": "https://developers.yubico.com/libu2f-server/", "supports": "(x86 | x64) & windows", "dependencies": [ "json-c", - "openssl" + "openssl", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/libuuid/portfile.cmake b/ports/libuuid/portfile.cmake index 7ed5400c2f..e42f64f220 100644 --- a/ports/libuuid/portfile.cmake +++ b/ports/libuuid/portfile.cmake @@ -8,36 +8,35 @@ vcpkg_from_sourceforge( ) file(COPY - ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt - ${CMAKE_CURRENT_LIST_DIR}/config.linux.h - ${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-config.cmake.in - DESTINATION ${SOURCE_PATH} + "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" + "${CMAKE_CURRENT_LIST_DIR}/config.linux.h" + "${CMAKE_CURRENT_LIST_DIR}/unofficial-libuuid-config.cmake.in" + DESTINATION "${SOURCE_PATH}" ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -set(prefix ${CURRENT_INSTALLED_DIR}) +set(prefix "${CURRENT_INSTALLED_DIR}") set(exec_prefix \$\{prefix\}) set(libdir \$\{exec_prefix\}/lib) set(includedir \$\{prefix\}/include) -configure_file(${SOURCE_PATH}/uuid.pc.in ${SOURCE_PATH}/uuid.pc @ONLY) +configure_file("${SOURCE_PATH}/uuid.pc.in" "${SOURCE_PATH}/uuid.pc" @ONLY) if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release") - file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/lib/pkgconfig) + file(INSTALL "${SOURCE_PATH}/uuid.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/lib/pkgconfig") endif() if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug") - file(INSTALL ${SOURCE_PATH}/uuid.pc DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig) + file(INSTALL "${SOURCE_PATH}/uuid.pc" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/unofficial-libuuid TARGET_PATH share/unofficial-libuuid) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/unofficial-libuuid PACKAGE_NAME unofficial-libuuid) vcpkg_fixup_pkgconfig() file(INSTALL - ${SOURCE_PATH}/COPYING - DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) + "${SOURCE_PATH}/COPYING" + DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libuuid/vcpkg.json b/ports/libuuid/vcpkg.json index 0abea1e938..4da714b0e9 100644 --- a/ports/libuuid/vcpkg.json +++ b/ports/libuuid/vcpkg.json @@ -1,8 +1,18 @@ { "name": "libuuid", "version": "1.0.3", - "port-version": 11, + "port-version": 12, "description": "Universally unique id library", "homepage": "https://sourceforge.net/projects/libuuid", - "supports": "!osx & !windows" + "supports": "!osx & !windows", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/libvmdk/portfile.cmake b/ports/libvmdk/portfile.cmake index 1aac7f717b..11c689cb0a 100644 --- a/ports/libvmdk/portfile.cmake +++ b/ports/libvmdk/portfile.cmake @@ -7,26 +7,25 @@ vcpkg_download_distfile(ARCHIVE SHA512 e70c42580dc58ad0a6459fe461504a8ef128f8d5df9d500f84f316e627232606f22eb4906fc1debc3e75e71daa6a07951af80822695de13d5e466adda4cfd5e0 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} - REF ${LIB_VERSION} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" + SOURCE_BASE "${LIB_VERSION}" ) file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/libvmdk" TARGET_PATH "share/libvmdk") +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/libvmdk) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() diff --git a/ports/libvmdk/vcpkg.json b/ports/libvmdk/vcpkg.json index 9a9f7f705c..3f753346a4 100644 --- a/ports/libvmdk/vcpkg.json +++ b/ports/libvmdk/vcpkg.json @@ -1,12 +1,20 @@ { "name": "libvmdk", "version-string": "20200926", - "port-version": 2, + "port-version": 3, "description": "Library and tools to access the VMware Virtual Disk (VMDK) format", "homepage": "https://github.com/libyal/libvmdk", "supports": "!uwp", "dependencies": [ "gettext", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "zlib" ] } diff --git a/ports/libxdiff/portfile.cmake b/ports/libxdiff/portfile.cmake index e0813a1209..eb2bc82771 100644 --- a/ports/libxdiff/portfile.cmake +++ b/ports/libxdiff/portfile.cmake @@ -11,19 +11,18 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_SHARED=${KEYSTONE_BUILD_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL debug) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/xdiff.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/xdiff.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/xdiff.dll") endif() endif() @@ -31,13 +30,13 @@ endif() if (NOT VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL release) if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/xdiff.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/xdiff.dll" DESTINATION "${CURRENT_PACKAGES_DIR}/bin") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/xdiff.dll") endif() endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/XDiff TARGET_PATH share/XDiff) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/XDiff PACKAGE_NAME XDiff) diff --git a/ports/libxdiff/vcpkg.json b/ports/libxdiff/vcpkg.json index 40e9f6d3ec..73a404c921 100644 --- a/ports/libxdiff/vcpkg.json +++ b/ports/libxdiff/vcpkg.json @@ -1,8 +1,18 @@ { "name": "libxdiff", "version": "0.23", - "port-version": 2, + "port-version": 3, "description": "The LibXDiff library implements basic and yet complete functionalities to create file differences/patches to both binary and text files. The library uses memory files as file abstraction to achieve both performance and portability.", "homepage": "https://github.com/Drako/libxdiff", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/licensepp/portfile.cmake b/ports/licensepp/portfile.cmake index c7e3fe3dad..c43eee7cfa 100644 --- a/ports/licensepp/portfile.cmake +++ b/ports/licensepp/portfile.cmake @@ -11,20 +11,19 @@ vcpkg_from_github( 0002-fix-cmake.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake DESTINATION ${SOURCE_PATH}/cmake) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/FindCryptoPP.cmake" DESTINATION "${SOURCE_PATH}/cmake") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -Dtest=OFF -Dtravis=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}/cmake) +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}/cmake) -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/licensepp/vcpkg.json b/ports/licensepp/vcpkg.json index 6365f1567e..d24f81b571 100644 --- a/ports/licensepp/vcpkg.json +++ b/ports/licensepp/vcpkg.json @@ -1,7 +1,7 @@ { "name": "licensepp", "version-date": "2020-05-19", - "port-version": 3, + "port-version": 4, "description": "Cross platform software licensing library", "homepage": "https://github.com/zuhd-org/licensepp", "supports": "!uwp", @@ -11,6 +11,14 @@ "features": [ "pem-pack" ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true } ] } diff --git a/ports/lilv/portfile.cmake b/ports/lilv/portfile.cmake index 2bb18d8985..9a7952360c 100644 --- a/ports/lilv/portfile.cmake +++ b/ports/lilv/portfile.cmake @@ -9,16 +9,15 @@ vcpkg_from_gitlab( file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" - PREFER_NINJA OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=1 ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_config_fixup() file( INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" diff --git a/ports/lilv/vcpkg.json b/ports/lilv/vcpkg.json index aab088cc08..748c91b23d 100644 --- a/ports/lilv/vcpkg.json +++ b/ports/lilv/vcpkg.json @@ -1,7 +1,7 @@ { "name": "lilv", "version": "0.24.10", - "port-version": 1, + "port-version": 2, "description": "Lilv is a C library for simple use of LV2 plugins in applications.", "homepage": "https://drobilla.net/software/lilv", "license": "ISC", @@ -10,6 +10,14 @@ "lv2", "serd", "sord", - "sratom" + "sratom", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/linenoise-ng/portfile.cmake b/ports/linenoise-ng/portfile.cmake index e0d1db9285..c85d8d31d1 100644 --- a/ports/linenoise-ng/portfile.cmake +++ b/ports/linenoise-ng/portfile.cmake @@ -7,16 +7,15 @@ vcpkg_from_github( ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/linenoise-ng RENAME copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/linenoise-ng/vcpkg.json b/ports/linenoise-ng/vcpkg.json index 01e6e121ef..8690f9deb0 100644 --- a/ports/linenoise-ng/vcpkg.json +++ b/ports/linenoise-ng/vcpkg.json @@ -1,6 +1,12 @@ { "name": "linenoise-ng", "version-string": "4754bee2d8eb3", - "port-version": 2, - "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters." + "port-version": 3, + "description": "A small, portable GNU readline replacement for Linux, Windows and MacOS which is capable of handling UTF-8 characters.", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/llgl/portfile.cmake b/ports/llgl/portfile.cmake index 6ee4bed6b9..8679acba99 100644 --- a/ports/llgl/portfile.cmake +++ b/ports/llgl/portfile.cmake @@ -18,21 +18,20 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS direct3d11 LLGL_BUILD_RENDERER_DIRECT3D11 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${FEATURE_OPTIONS} ) -vcpkg_install_cmake() +vcpkg_cmake_install() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() vcpkg_copy_pdbs() # Handle copyright -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/llgl/vcpkg.json b/ports/llgl/vcpkg.json index f653d01f59..2ea53670ab 100644 --- a/ports/llgl/vcpkg.json +++ b/ports/llgl/vcpkg.json @@ -1,10 +1,16 @@ { "name": "llgl", "version-string": "2019-08-15", - "port-version": 2, + "port-version": 3, "description": "Low Level Graphics Library (LLGL) is a thin abstraction layer for the modern graphics APIs OpenGL, Direct3D, Vulkan, and Metal.", "homepage": "https://github.com/LukasBanana/LLGL", "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ], "features": { "direct3d11": { "description": "Support for direct3d11" diff --git a/ports/log4cpp/portfile.cmake b/ports/log4cpp/portfile.cmake index 2548807f7d..dd203758a7 100644 --- a/ports/log4cpp/portfile.cmake +++ b/ports/log4cpp/portfile.cmake @@ -11,26 +11,25 @@ vcpkg_from_github( fix-export-targets.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -vcpkg_fixup_cmake_targets(CONFIG_PATH share/${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +vcpkg_cmake_config_fixup(CONFIG_PATH share/${PORT}) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") vcpkg_copy_pdbs() configure_file( - ${CMAKE_CURRENT_LIST_DIR}/log4cpp-config.in.cmake - ${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cpp-config.cmake + "${CMAKE_CURRENT_LIST_DIR}/log4cpp-config.in.cmake" + "${CURRENT_PACKAGES_DIR}/share/${PORT}/log4cpp-config.cmake" @ONLY ) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/log4cpp/vcpkg.json b/ports/log4cpp/vcpkg.json index a7729f41e0..52ed6df72d 100644 --- a/ports/log4cpp/vcpkg.json +++ b/ports/log4cpp/vcpkg.json @@ -1,8 +1,18 @@ { "name": "log4cpp", "version": "2.9.1", - "port-version": 7, + "port-version": 8, "description": "Log4cpp is library of C++ classes for flexible logging to files, syslog, IDSA and other destinations. It is modeled after the Log4j Java library, staying as close to their API as is reasonable.", "homepage": "https://github.com/orocos-toolchain/log4cpp", - "supports": "!uwp" + "supports": "!uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/lpeg/portfile.cmake b/ports/lpeg/portfile.cmake index 24d77f00b1..3a8fc8bfae 100644 --- a/ports/lpeg/portfile.cmake +++ b/ports/lpeg/portfile.cmake @@ -6,26 +6,25 @@ vcpkg_download_distfile(ARCHIVE SHA512 110527ddf9f8e5e8a80ef0ae8847c8ba8cd2597dba3bfe2865cba9af60daafbb885f21e74231952f5ab793d021e050b482066a821c6954d52090a5eae77e9814 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/lpeg.def DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/lpeg.def" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() # Remove debug share -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") # Handle copyright -file(INSTALL ${SOURCE_PATH}/lpeg.html DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/lpeg.html" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/lpeg/vcpkg.json b/ports/lpeg/vcpkg.json index 7e4c8b3037..55ba23e74e 100644 --- a/ports/lpeg/vcpkg.json +++ b/ports/lpeg/vcpkg.json @@ -1,10 +1,14 @@ { "name": "lpeg", "version-string": "1.0.2", - "port-version": 2, + "port-version": 3, "description": "LPeg is a pattern-matching library for Lua, based on Parsing Expression Grammars (PEGs).", "homepage": "https://www.inf.puc-rio.br/~roberto/lpeg", "dependencies": [ - "lua" + "lua", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/luafilesystem/portfile.cmake b/ports/luafilesystem/portfile.cmake index bd6f1ebd4e..9fde932cab 100644 --- a/ports/luafilesystem/portfile.cmake +++ b/ports/luafilesystem/portfile.cmake @@ -10,18 +10,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - OPTIONS) +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" +) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() # 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) # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) diff --git a/ports/luafilesystem/vcpkg.json b/ports/luafilesystem/vcpkg.json index bdc33582d6..57dd1b446d 100644 --- a/ports/luafilesystem/vcpkg.json +++ b/ports/luafilesystem/vcpkg.json @@ -1,10 +1,14 @@ { "name": "luafilesystem", "version-string": "1.8.0", - "port-version": 2, + "port-version": 3, "description": "LuaFileSystem is a Lua library developed to complement the set of functions related to file systems offered by the standard Lua distribution.", "homepage": "https://github.com/keplerproject/luafilesystem", "dependencies": [ - "lua" + "lua", + { + "name": "vcpkg-cmake", + "host": true + } ] } diff --git a/ports/lzfse/portfile.cmake b/ports/lzfse/portfile.cmake index 9ce60eeeb9..052008a688 100644 --- a/ports/lzfse/portfile.cmake +++ b/ports/lzfse/portfile.cmake @@ -12,25 +12,23 @@ vcpkg_from_github( disable-cli-option.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DLZFSE_DISABLE_TESTS=ON -DLZFSE_DISABLE_CLI=ON) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(READ ${CURRENT_PACKAGES_DIR}/include/lzfse.h LZFSE_H) +file(READ "${CURRENT_PACKAGES_DIR}/include/lzfse.h" LZFSE_H) if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") string(REPLACE "defined(LZFSE_DLL)" "1" LZFSE_H "${LZFSE_H}") else() string(REPLACE "defined(LZFSE_DLL)" "0" LZFSE_H "${LZFSE_H}") endif() -file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzfse.h "${LZFSE_H}") +file(WRITE "${CURRENT_PACKAGES_DIR}/include/lzfse.h" "${LZFSE_H}") -file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/lzfse) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/lzfse/LICENSE ${CURRENT_PACKAGES_DIR}/share/lzfse/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lzfse/vcpkg.json b/ports/lzfse/vcpkg.json index 774da1302a..0ce096d3c9 100644 --- a/ports/lzfse/vcpkg.json +++ b/ports/lzfse/vcpkg.json @@ -1,8 +1,14 @@ { "name": "lzfse", "version-string": "1.0", - "port-version": 3, + "port-version": 4, "description": "Lempel-Ziv style data compressor using Finite State Entropy coding.", "homepage": "https://github.com/lzfse/lzfse", - "supports": "!arm" + "supports": "!arm", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/lzo/portfile.cmake b/ports/lzo/portfile.cmake index 514c8555a4..1ab2376a41 100644 --- a/ports/lzo/portfile.cmake +++ b/ports/lzo/portfile.cmake @@ -4,9 +4,9 @@ vcpkg_download_distfile(ARCHIVE SHA512 a3dae5e4a6b93b1f5bf7435e8ab114a9be57252e9efc5dd444947d7a2d031b0819f34bcaeb35f60b5629a01b1238d738735a64db8f672be9690d3c80094511a4 ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" PATCHES always_install_pc.patch ) @@ -18,29 +18,28 @@ else() set(LZO_SHARED ON) endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DENABLE_STATIC=${LZO_STATIC} -DENABLE_SHARED=${LZO_SHARED} ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/share/doc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/libexec) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/libexec) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/libexec") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/libexec") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - file(READ ${CURRENT_PACKAGES_DIR}/include/lzo/lzoconf.h LZO_CONFIG) + file(READ "${CURRENT_PACKAGES_DIR}/include/lzo/lzoconf.h" LZO_CONFIG) string(REPLACE "# define __LZO_EXPORT1 /*empty*/" "# define __LZO_EXPORT1 __declspec(dllimport)" LZO_CONFIG "${LZO_CONFIG}") - file(WRITE ${CURRENT_PACKAGES_DIR}/include/lzo/lzoconf.h "${LZO_CONFIG}") + file(WRITE "${CURRENT_PACKAGES_DIR}/include/lzo/lzoconf.h" "${LZO_CONFIG}") endif() -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/lzo/vcpkg.json b/ports/lzo/vcpkg.json index 0e238c8253..0fa7596c0a 100644 --- a/ports/lzo/vcpkg.json +++ b/ports/lzo/vcpkg.json @@ -1,7 +1,13 @@ { "name": "lzo", "version-string": "2.10", - "port-version": 7, + "port-version": 8, "description": "Lossless data compression library", - "homepage": "https://www.oberhumer.com/opensource/lzo/" + "homepage": "https://www.oberhumer.com/opensource/lzo/", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/lzokay/portfile.cmake b/ports/lzokay/portfile.cmake index 719c63d979..496e115d10 100644 --- a/ports/lzokay/portfile.cmake +++ b/ports/lzokay/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) \ No newline at end of file diff --git a/ports/lzokay/vcpkg.json b/ports/lzokay/vcpkg.json index fb2b0787a5..9de82907a6 100644 --- a/ports/lzokay/vcpkg.json +++ b/ports/lzokay/vcpkg.json @@ -1,6 +1,17 @@ { "name": "lzokay", "version-string": "2020-07-30", + "port-version": 1, "description": "lzokay – MIT licensed C++ implementation of LZO compression/decompression algorithm", - "homepage": "https://github.com/jackoalan/lzokay" + "homepage": "https://github.com/jackoalan/lzokay", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/mathc/portfile.cmake b/ports/mathc/portfile.cmake index fde284632e..80149f3b9a 100644 --- a/ports/mathc/portfile.cmake +++ b/ports/mathc/portfile.cmake @@ -8,18 +8,17 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-${PORT} TARGET_PATH share/unofficial-${PORT}) +vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-${PORT}) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +configure_file("${SOURCE_PATH}/LICENSE" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY) diff --git a/ports/mathc/vcpkg.json b/ports/mathc/vcpkg.json index 1cabd8c53a..f326158215 100644 --- a/ports/mathc/vcpkg.json +++ b/ports/mathc/vcpkg.json @@ -1,7 +1,17 @@ { "name": "mathc", "version-string": "2019-09-29", - "port-version": 1, + "port-version": 2, "description": "Pure C math library for 2D and 3D programming", - "homepage": "https://github.com/felselva/mathc" + "homepage": "https://github.com/felselva/mathc", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/mcpp/portfile.cmake b/ports/mcpp/portfile.cmake index 8e2928ea1d..33a34aa47b 100644 --- a/ports/mcpp/portfile.cmake +++ b/ports/mcpp/portfile.cmake @@ -8,21 +8,20 @@ vcpkg_from_github( 0001-fix-_POSIX_C_SOURCE.patch ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() +vcpkg_cmake_install() file( INSTALL - ${SOURCE_PATH}/mcpp_lib.h - ${SOURCE_PATH}/mcpp_out.h + "${SOURCE_PATH}/mcpp_lib.h" + "${SOURCE_PATH}/mcpp_out.h" DESTINATION - ${CURRENT_PACKAGES_DIR}/include + "${CURRENT_PACKAGES_DIR}/include" ) -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/mcpp/vcpkg.json b/ports/mcpp/vcpkg.json index 4be6e6f68b..e7636ef29f 100644 --- a/ports/mcpp/vcpkg.json +++ b/ports/mcpp/vcpkg.json @@ -1,7 +1,13 @@ { "name": "mcpp", "version-string": "2.7.2.14", - "port-version": 3, + "port-version": 4, "description": "Fork of mcpp, a C/C++ preprocessor", - "homepage": "https://github.com/zeroc-ice/mcpp" + "homepage": "https://github.com/zeroc-ice/mcpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/mecab/portfile.cmake b/ports/mecab/portfile.cmake index 6bf0209458..62db155caf 100644 --- a/ports/mecab/portfile.cmake +++ b/ports/mecab/portfile.cmake @@ -12,17 +12,17 @@ vcpkg_from_github( fix_wpath_unsigned.patch ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}/mecab/src) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in DESTINATION ${SOURCE_PATH}/mecab/src) -file(COPY ${SOURCE_PATH}/mecab/COPYING DESTINATION ${SOURCE_PATH}/mecab/src) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}/mecab/src") +file(COPY "${CMAKE_CURRENT_LIST_DIR}/Config.cmake.in" DESTINATION "${SOURCE_PATH}/mecab/src") +file(COPY "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${SOURCE_PATH}/mecab/src") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/mecab/src +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/mecab/src" + WINDOWS_USE_MSBUILD ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() vcpkg_copy_pdbs() -file(COPY ${SOURCE_PATH}/mecab/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mecab) -file(RENAME ${CURRENT_PACKAGES_DIR}/share/mecab/COPYING ${CURRENT_PACKAGES_DIR}/share/mecab/copyright) +file(INSTALL "${SOURCE_PATH}/mecab/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mecab/vcpkg.json b/ports/mecab/vcpkg.json index 7475acf4a6..772720cdaa 100644 --- a/ports/mecab/vcpkg.json +++ b/ports/mecab/vcpkg.json @@ -1,7 +1,17 @@ { "name": "mecab", "version-string": "2019-09-25", - "port-version": 2, + "port-version": 3, "description": "A morphological analysis engine based on CRF", - "supports": "!(uwp | arm | arm64)" + "supports": "!(uwp | arm | arm64)", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/meschach/portfile.cmake b/ports/meschach/portfile.cmake index 5bbcff8faf..c592ed3162 100644 --- a/ports/meschach/portfile.cmake +++ b/ports/meschach/portfile.cmake @@ -6,21 +6,20 @@ vcpkg_download_distfile(ARCHIVE SHA512 9051e1502b8c9741400c61fd6038e514887f305f267ba4e97d747423de3da1270f835f65b2d1f538f8938677060bc0fcfd7a94022d74fbfd31a0450116e9d79e ) -vcpkg_extract_source_archive_ex( - OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} +vcpkg_extract_source_archive( + SOURCE_PATH + ARCHIVE "${ARCHIVE}" NO_REMOVE_ONE_LEVEL ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON ) -vcpkg_install_cmake() +vcpkg_cmake_install() vcpkg_copy_pdbs() -file(INSTALL ${SOURCE_PATH}/copyright DESTINATION ${CURRENT_PACKAGES_DIR}/share/meschach) +file(INSTALL "${SOURCE_PATH}/copyright" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") diff --git a/ports/meschach/vcpkg.json b/ports/meschach/vcpkg.json index 2cd52bfb1e..7729dbf84c 100644 --- a/ports/meschach/vcpkg.json +++ b/ports/meschach/vcpkg.json @@ -1,8 +1,14 @@ { "name": "meschach", "version-string": "1.2b", - "port-version": 5, + "port-version": 6, "description": "Matrix computations in C", "homepage": "https://homepage.math.uiowa.edu/~dstewart/meschach", - "supports": "windows & !uwp" + "supports": "windows & !uwp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/ports/metrohash/portfile.cmake b/ports/metrohash/portfile.cmake index d62741a2ad..f4c669bae6 100644 --- a/ports/metrohash/portfile.cmake +++ b/ports/metrohash/portfile.cmake @@ -8,23 +8,22 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CURRENT_PORT_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -configure_file(${CURRENT_PORT_DIR}/Config.cmake.in ${SOURCE_PATH}/cmake/Config.cmake.in COPYONLY) +file(COPY "${CURRENT_PORT_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") +configure_file("${CURRENT_PORT_DIR}/Config.cmake.in" "${SOURCE_PATH}/cmake/Config.cmake.in" COPYONLY) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT}) vcpkg_copy_pdbs() if(NOT EXISTS "${CURRENT_PACKAGES_DIR}/include/metrohash128crc.h") - vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/metrohash.h + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/metrohash.h" "#include \"metrohash128crc.h\"" "//#include \"metrohash128crc.h\" // The target platform does not support _mm_crc32_u64") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/metrohash/vcpkg.json b/ports/metrohash/vcpkg.json index 2f61a8670c..f12705e9dc 100644 --- a/ports/metrohash/vcpkg.json +++ b/ports/metrohash/vcpkg.json @@ -1,7 +1,17 @@ { "name": "metrohash", "version": "1.1.3", - "port-version": 4, + "port-version": 5, "description": "MetroHash is a set of state-of-the-art hash functions for non-cryptographic use cases", - "homepage": "https://github.com/jandrewrogers/MetroHash" + "homepage": "https://github.com/jandrewrogers/MetroHash", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/microsoft-signalr/portfile.cmake b/ports/microsoft-signalr/portfile.cmake index e1b4e124f1..3b71eafec9 100644 --- a/ports/microsoft-signalr/portfile.cmake +++ b/ports/microsoft-signalr/portfile.cmake @@ -17,22 +17,21 @@ if("cpprestsdk" IN_LIST FEATURES AND VCPKG_TARGET_IS_UWP) message(FATAL_ERROR "microsoft-signalr[cpprestsdk] is not supported on UWP, use microsoft-signalr[core] instead") endif() -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ${FEATURE_OPTIONS} -DWALL=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/share/microsoft-signalr) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/share/microsoft-signalr) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/share ${CURRENT_PACKAGES_DIR}/lib/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/lib/share" "${CURRENT_PACKAGES_DIR}/lib/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -file(COPY ${SOURCE_PATH}/third-party-notices.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(COPY "${SOURCE_PATH}/third-party-notices.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") vcpkg_copy_pdbs() \ No newline at end of file diff --git a/ports/microsoft-signalr/vcpkg.json b/ports/microsoft-signalr/vcpkg.json index b100735555..78df0f3dda 100644 --- a/ports/microsoft-signalr/vcpkg.json +++ b/ports/microsoft-signalr/vcpkg.json @@ -1,9 +1,19 @@ { "name": "microsoft-signalr", "version": "0.1.0-alpha4", - "port-version": 1, + "port-version": 2, "description": "C++ Client for ASP.NET Core SignalR.", "homepage": "https://github.com/aspnet/SignalR-Client-Cpp", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ], "default-features": [ "default-features" ], diff --git a/ports/mikktspace/portfile.cmake b/ports/mikktspace/portfile.cmake index 28493897f4..6398583857 100644 --- a/ports/mikktspace/portfile.cmake +++ b/ports/mikktspace/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS_DEBUG -DMIKKTSPACE_SKIP_HEADERS=ON ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup() -file(INSTALL ${SOURCE_PATH}/mikktspace.h DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/mikktspace.h" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/mikktspace/vcpkg.json b/ports/mikktspace/vcpkg.json index c26b3e3607..e9afd51007 100644 --- a/ports/mikktspace/vcpkg.json +++ b/ports/mikktspace/vcpkg.json @@ -1,7 +1,17 @@ { "name": "mikktspace", "version-string": "2020-10-06", - "port-version": 1, + "port-version": 2, "description": "A common standard for tangent space used in baking tools to produce normal maps", - "homepage": "https://github.com/mmikk/MikkTSpace" + "homepage": "https://github.com/mmikk/MikkTSpace", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/ports/miniupnpc/portfile.cmake b/ports/miniupnpc/portfile.cmake index b8c3ab7b90..3961a0321a 100644 --- a/ports/miniupnpc/portfile.cmake +++ b/ports/miniupnpc/portfile.cmake @@ -8,12 +8,11 @@ vcpkg_from_github( cmakelists.diff ) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "dynamic" MINIUPNPC_BUILD_SHARED) -string(COMPARE EQUAL ${VCPKG_LIBRARY_LINKAGE} "static" MINIUPNPC_BUILD_STATIC) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" MINIUPNPC_BUILD_SHARED) +string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" MINIUPNPC_BUILD_STATIC) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/miniupnpc - PREFER_NINJA # Disable this option if project cannot be built with Ninja +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}/miniupnpc" OPTIONS -DUPNPC_BUILD_STATIC=${MINIUPNPC_BUILD_STATIC} -DUPNPC_BUILD_SHARED=${MINIUPNPC_BUILD_SHARED} @@ -21,7 +20,8 @@ vcpkg_configure_cmake( -DUPNPC_BUILD_SAMPLE=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/miniupnpc RENAME copyright) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/miniupnpc/vcpkg.json b/ports/miniupnpc/vcpkg.json index 8621794bd5..c1798a9d4d 100644 --- a/ports/miniupnpc/vcpkg.json +++ b/ports/miniupnpc/vcpkg.json @@ -1,6 +1,12 @@ { "name": "miniupnpc", "version-string": "2.1", - "port-version": 2, - "description": "UPnP client library/tool to access Internet Gateway Devices" + "port-version": 3, + "description": "UPnP client library/tool to access Internet Gateway Devices", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + } + ] } diff --git a/versions/baseline.json b/versions/baseline.json index a0a32217de..603aeea12b 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3790,7 +3790,7 @@ }, "libconfuse": { "baseline": "2019-07-14", - "port-version": 2 + "port-version": 3 }, "libcopp": { "baseline": "2.1.2", @@ -3810,7 +3810,7 @@ }, "libcroco": { "baseline": "0.6.13", - "port-version": 3 + "port-version": 4 }, "libcsv": { "baseline": "3.0.3", @@ -3874,7 +3874,7 @@ }, "libebur128": { "baseline": "1.2.6", - "port-version": 0 + "port-version": 1 }, "libenvpp": { "baseline": "1.0.0", @@ -3890,7 +3890,7 @@ }, "libevhtp": { "baseline": "1.2.18", - "port-version": 3 + "port-version": 4 }, "libexif": { "baseline": "0.6.24", @@ -3930,7 +3930,7 @@ }, "libftdi": { "baseline": "0.20", - "port-version": 3 + "port-version": 4 }, "libftdi1": { "baseline": "1.5", @@ -3974,7 +3974,7 @@ }, "libgta": { "baseline": "1.0.8", - "port-version": 3 + "port-version": 4 }, "libguarded": { "baseline": "2019-08-27", @@ -3994,7 +3994,7 @@ }, "libhdfs3": { "baseline": "2019-11-05", - "port-version": 3 + "port-version": 4 }, "libheif": { "baseline": "1.15.1", @@ -4086,7 +4086,7 @@ }, "liblemon": { "baseline": "2019-06-13", - "port-version": 3 + "port-version": 4 }, "liblinear": { "baseline": "243", @@ -4094,7 +4094,7 @@ }, "liblo": { "baseline": "0.31", - "port-version": 2 + "port-version": 3 }, "liblrc": { "baseline": "1.0.0", @@ -4114,7 +4114,7 @@ }, "libmad": { "baseline": "0.15.1", - "port-version": 9 + "port-version": 10 }, "libmagic": { "baseline": "5.40", @@ -4126,7 +4126,7 @@ }, "libmaxminddb": { "baseline": "1.4.3", - "port-version": 1 + "port-version": 2 }, "libmediainfo": { "baseline": "21.03", @@ -4150,7 +4150,7 @@ }, "libmodbus": { "baseline": "3.1.6", - "port-version": 3 + "port-version": 4 }, "libmodman": { "baseline": "2.0.1", @@ -4170,11 +4170,11 @@ }, "libmpeg2": { "baseline": "0.5.1", - "port-version": 2 + "port-version": 3 }, "libmspack": { "baseline": "0.10.1", - "port-version": 4 + "port-version": 5 }, "libmt32emu": { "baseline": "2.7.0", @@ -4202,15 +4202,15 @@ }, "libodb": { "baseline": "2.4.0", - "port-version": 9 + "port-version": 10 }, "libodb-boost": { "baseline": "2.4.0", - "port-version": 6 + "port-version": 7 }, "libodb-mysql": { "baseline": "2.4.0", - "port-version": 10 + "port-version": 11 }, "libodb-pgsql": { "baseline": "2.4.0", @@ -4218,7 +4218,7 @@ }, "libodb-sqlite": { "baseline": "2.4.0", - "port-version": 10 + "port-version": 11 }, "libofx": { "baseline": "0.10.9", @@ -4238,7 +4238,7 @@ }, "libopusenc": { "baseline": "0.2.1", - "port-version": 1 + "port-version": 2 }, "libosip2": { "baseline": "5.2.0", @@ -4250,7 +4250,7 @@ }, "libosmscout": { "baseline": "1.1.1", - "port-version": 0 + "port-version": 1 }, "libp7-baical": { "baseline": "replaced", @@ -4258,7 +4258,7 @@ }, "libp7client": { "baseline": "5.6", - "port-version": 2 + "port-version": 3 }, "libpcap": { "baseline": "1.10.1", @@ -4286,7 +4286,7 @@ }, "libpopt": { "baseline": "1.16", - "port-version": 14 + "port-version": 15 }, "libpq": { "baseline": "15.2", @@ -4298,7 +4298,7 @@ }, "libprotobuf-mutator": { "baseline": "1.0", - "port-version": 0 + "port-version": 1 }, "libproxy": { "baseline": "0.4.18", @@ -4346,7 +4346,7 @@ }, "librtmp": { "baseline": "2019-11-11", - "port-version": 3 + "port-version": 4 }, "librttopo": { "baseline": "1.1.0", @@ -4398,7 +4398,7 @@ }, "libsmb2": { "baseline": "2021-04-29", - "port-version": 1 + "port-version": 2 }, "libsndfile": { "baseline": "1.2.0", @@ -4414,7 +4414,7 @@ }, "libsoundio": { "baseline": "2.0.0", - "port-version": 6 + "port-version": 7 }, "libspatialindex": { "baseline": "1.9.3", @@ -4450,11 +4450,11 @@ }, "libstemmer": { "baseline": "2017-9", - "port-version": 6 + "port-version": 7 }, "libstk": { "baseline": "4.6.1", - "port-version": 1 + "port-version": 2 }, "libsvm": { "baseline": "3.25", @@ -4498,7 +4498,7 @@ }, "libu2f-server": { "baseline": "1.1.0", - "port-version": 4 + "port-version": 5 }, "libudis86": { "baseline": "2018-01-28", @@ -4542,7 +4542,7 @@ }, "libuuid": { "baseline": "1.0.3", - "port-version": 11 + "port-version": 12 }, "libuv": { "baseline": "1.44.2", @@ -4554,7 +4554,7 @@ }, "libvmdk": { "baseline": "20200926", - "port-version": 2 + "port-version": 3 }, "libvorbis": { "baseline": "1.3.7", @@ -4606,7 +4606,7 @@ }, "libxdiff": { "baseline": "0.23", - "port-version": 2 + "port-version": 3 }, "libxdmcp": { "baseline": "1.1.3", @@ -4734,11 +4734,11 @@ }, "licensepp": { "baseline": "2020-05-19", - "port-version": 3 + "port-version": 4 }, "lilv": { "baseline": "0.24.10", - "port-version": 1 + "port-version": 2 }, "linalg": { "baseline": "2.1", @@ -4746,7 +4746,7 @@ }, "linenoise-ng": { "baseline": "4754bee2d8eb3", - "port-version": 2 + "port-version": 3 }, "linmath": { "baseline": "2022-07-30", @@ -4770,7 +4770,7 @@ }, "llgl": { "baseline": "2019-08-15", - "port-version": 2 + "port-version": 3 }, "llhttp": { "baseline": "8.1.0", @@ -4802,7 +4802,7 @@ }, "log4cpp": { "baseline": "2.9.1", - "port-version": 7 + "port-version": 8 }, "log4cxx": { "baseline": "0.13.0.1", @@ -4814,7 +4814,7 @@ }, "lpeg": { "baseline": "1.0.2", - "port-version": 2 + "port-version": 3 }, "lua": { "baseline": "5.4.4", @@ -4834,7 +4834,7 @@ }, "luafilesystem": { "baseline": "1.8.0", - "port-version": 2 + "port-version": 3 }, "luajit": { "baseline": "2023-01-04", @@ -4870,15 +4870,15 @@ }, "lzfse": { "baseline": "1.0", - "port-version": 3 + "port-version": 4 }, "lzo": { "baseline": "2.10", - "port-version": 7 + "port-version": 8 }, "lzokay": { "baseline": "2020-07-30", - "port-version": 0 + "port-version": 1 }, "magic-enum": { "baseline": "0.8.2", @@ -4958,7 +4958,7 @@ }, "mathc": { "baseline": "2019-09-29", - "port-version": 1 + "port-version": 2 }, "mathgl": { "baseline": "8.0.1", @@ -4990,7 +4990,7 @@ }, "mcpp": { "baseline": "2.7.2.14", - "port-version": 3 + "port-version": 4 }, "mdl-sdk": { "baseline": "2021.1.2", @@ -5010,7 +5010,7 @@ }, "mecab": { "baseline": "2019-09-25", - "port-version": 2 + "port-version": 3 }, "memorymodule": { "baseline": "2019-12-31", @@ -5022,7 +5022,7 @@ }, "meschach": { "baseline": "1.2b", - "port-version": 5 + "port-version": 6 }, "meshoptimizer": { "baseline": "0.18", @@ -5034,7 +5034,7 @@ }, "metrohash": { "baseline": "1.1.3", - "port-version": 4 + "port-version": 5 }, "mfl": { "baseline": "0.0.1", @@ -5054,11 +5054,11 @@ }, "microsoft-signalr": { "baseline": "0.1.0-alpha4", - "port-version": 1 + "port-version": 2 }, "mikktspace": { "baseline": "2020-10-06", - "port-version": 1 + "port-version": 2 }, "milerius-sfml-imgui": { "baseline": "1.1", @@ -5102,7 +5102,7 @@ }, "miniupnpc": { "baseline": "2.1", - "port-version": 2 + "port-version": 3 }, "miniz": { "baseline": "3.0.2", diff --git a/versions/l-/libconfuse.json b/versions/l-/libconfuse.json index 5d810f7bdb..3a22abe1e4 100644 --- a/versions/l-/libconfuse.json +++ b/versions/l-/libconfuse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3de4b13956cc303338de0b311a0c35a72c2d0a22", + "version-string": "2019-07-14", + "port-version": 3 + }, { "git-tree": "0af146d2f574294e6d2da2492203ebd1ddf5e2eb", "version-string": "2019-07-14", diff --git a/versions/l-/libcroco.json b/versions/l-/libcroco.json index 8a70fca46f..6451fe1ff0 100644 --- a/versions/l-/libcroco.json +++ b/versions/l-/libcroco.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "04dc173766f01e3ddad3bcd53c62ed56741ab3a8", + "version": "0.6.13", + "port-version": 4 + }, { "git-tree": "6235588ad9552c72690a152a0e4e108f0f7d1d64", "version": "0.6.13", diff --git a/versions/l-/libebur128.json b/versions/l-/libebur128.json index bc1c54e1e6..f306ea2bd6 100644 --- a/versions/l-/libebur128.json +++ b/versions/l-/libebur128.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "640f92877a6bde91d968b0b0668767b714297f6c", + "version-string": "1.2.6", + "port-version": 1 + }, { "git-tree": "44bed370ef5fdac0e6ec38493f00bebcd7b4c63c", "version-string": "1.2.6", diff --git a/versions/l-/libevhtp.json b/versions/l-/libevhtp.json index 9df827724c..9f95de9fb3 100644 --- a/versions/l-/libevhtp.json +++ b/versions/l-/libevhtp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9c59887d9051f4888af2a2ab5528e134ef9dce5a", + "version": "1.2.18", + "port-version": 4 + }, { "git-tree": "2180aafd93f4089a276e9a5de9fe2d28d8e0f88d", "version": "1.2.18", diff --git a/versions/l-/libftdi.json b/versions/l-/libftdi.json index e269393c73..56af2c4ebb 100644 --- a/versions/l-/libftdi.json +++ b/versions/l-/libftdi.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "8dbb6c205662e734acdf218146e78db6bd3795a1", + "version-string": "0.20", + "port-version": 4 + }, { "git-tree": "d9ba20048c2bbea3f1155e42faad0ab3b8a7e3f2", "version-string": "0.20", diff --git a/versions/l-/libgta.json b/versions/l-/libgta.json index cf86d9ae5c..11b71b662d 100644 --- a/versions/l-/libgta.json +++ b/versions/l-/libgta.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "644750a061baad1274a079365e11001849aa901e", + "version-string": "1.0.8", + "port-version": 4 + }, { "git-tree": "18ddcdbec1183e609dbb8a76bddbadd4b3ee6d72", "version-string": "1.0.8", diff --git a/versions/l-/libhdfs3.json b/versions/l-/libhdfs3.json index 3e3ad9c317..4a2c60eabb 100644 --- a/versions/l-/libhdfs3.json +++ b/versions/l-/libhdfs3.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "802dd2510f39b3d717606d2dfa047278e8772ff4", + "version-date": "2019-11-05", + "port-version": 4 + }, { "git-tree": "b672d2e93109f3909140f7315703ab2ea010d808", "version-date": "2019-11-05", diff --git a/versions/l-/liblemon.json b/versions/l-/liblemon.json index 054fcfe0c9..a416806544 100644 --- a/versions/l-/liblemon.json +++ b/versions/l-/liblemon.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49e74def611d3992ae671c2972eff648fe9437ed", + "version-string": "2019-06-13", + "port-version": 4 + }, { "git-tree": "b099f8cb08e44ae21fb5d019369cd4c598e305eb", "version-string": "2019-06-13", diff --git a/versions/l-/liblo.json b/versions/l-/liblo.json index 2088b8489c..e168020189 100644 --- a/versions/l-/liblo.json +++ b/versions/l-/liblo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a70409d660234bfbc8c3cbeaff029d9e5f5b890c", + "version-string": "0.31", + "port-version": 3 + }, { "git-tree": "00837a43b20b0ccf863f3574b34714f8f7d3bd37", "version-string": "0.31", diff --git a/versions/l-/libmad.json b/versions/l-/libmad.json index b05e2bd07a..5e0cd6eab7 100644 --- a/versions/l-/libmad.json +++ b/versions/l-/libmad.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff3cd79e45546dc58e00a69696ae1f8b900e231a", + "version-string": "0.15.1", + "port-version": 10 + }, { "git-tree": "820bd670c6652cdb1b381f9c55390a261f11e842", "version-string": "0.15.1", diff --git a/versions/l-/libmaxminddb.json b/versions/l-/libmaxminddb.json index b92f16aeca..f0b9548d55 100644 --- a/versions/l-/libmaxminddb.json +++ b/versions/l-/libmaxminddb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71bed10d6ad6ff2a80692e0b920e01e3c7509bf7", + "version-string": "1.4.3", + "port-version": 2 + }, { "git-tree": "7da47031497942277e14b01feab9e6d7d1491443", "version-string": "1.4.3", diff --git a/versions/l-/libmodbus.json b/versions/l-/libmodbus.json index 97f9dd5e9c..2b18b1f3bf 100644 --- a/versions/l-/libmodbus.json +++ b/versions/l-/libmodbus.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fedbd1a42b56a0b3325c6d4bf1e7682a99aafa4", + "version": "3.1.6", + "port-version": 4 + }, { "git-tree": "c6a0946db6d2956324bcaca62d6599adb3fbfea4", "version": "3.1.6", diff --git a/versions/l-/libmpeg2.json b/versions/l-/libmpeg2.json index a291c352e9..bf5ed3f853 100644 --- a/versions/l-/libmpeg2.json +++ b/versions/l-/libmpeg2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "549a0dcd10ec08c23e45edac9bd4987621b56115", + "version": "0.5.1", + "port-version": 3 + }, { "git-tree": "71e878d5483d51cab0d347f8e4e162b305216255", "version": "0.5.1", diff --git a/versions/l-/libmspack.json b/versions/l-/libmspack.json index 09d834c3dc..0cc8382538 100644 --- a/versions/l-/libmspack.json +++ b/versions/l-/libmspack.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4448cdf014a452f1da35c2dd48a2c8b9dca3e08b", + "version-string": "0.10.1", + "port-version": 5 + }, { "git-tree": "8faa2bfe071a7711a21a54139b84779c0d7f2cbe", "version-string": "0.10.1", diff --git a/versions/l-/libodb-boost.json b/versions/l-/libodb-boost.json index 051242d744..19e431262c 100644 --- a/versions/l-/libodb-boost.json +++ b/versions/l-/libodb-boost.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2ecfb7ccff63ea209a0b559e4acc342ff400e54", + "version": "2.4.0", + "port-version": 7 + }, { "git-tree": "86151d98ef2379eb1b3aaa89e3970e9301bd9318", "version": "2.4.0", diff --git a/versions/l-/libodb-mysql.json b/versions/l-/libodb-mysql.json index 0c91f7001e..2d3aee4fdd 100644 --- a/versions/l-/libodb-mysql.json +++ b/versions/l-/libodb-mysql.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e2a0c6a93301d619c25f0b01cb00a72be1256fa2", + "version": "2.4.0", + "port-version": 11 + }, { "git-tree": "c8969f77bfa4c1dd85950dc185f055f0b329aaec", "version": "2.4.0", diff --git a/versions/l-/libodb-sqlite.json b/versions/l-/libodb-sqlite.json index 8363079d16..ea7a506551 100644 --- a/versions/l-/libodb-sqlite.json +++ b/versions/l-/libodb-sqlite.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "99e10de8845c5171477dc00ef7b2afab6d0a40f7", + "version": "2.4.0", + "port-version": 11 + }, { "git-tree": "effa726b187029b9af2856f55a9674bdd5232eb7", "version": "2.4.0", diff --git a/versions/l-/libodb.json b/versions/l-/libodb.json index d459d74b4b..1581863743 100644 --- a/versions/l-/libodb.json +++ b/versions/l-/libodb.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e7f1f5aa4bec08ddcadab7f1f7512234b8c44155", + "version": "2.4.0", + "port-version": 10 + }, { "git-tree": "47f3bba38809da85d3a11f1a57cf1dce92a0ab54", "version": "2.4.0", diff --git a/versions/l-/libopusenc.json b/versions/l-/libopusenc.json index e40c0de5b0..b843b3e7ee 100644 --- a/versions/l-/libopusenc.json +++ b/versions/l-/libopusenc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "221b251f3848c9121ec517dc0c7d97cb19ea2297", + "version-string": "0.2.1", + "port-version": 2 + }, { "git-tree": "132909a5cb3c33e038cf9728427910fce455591d", "version-string": "0.2.1", diff --git a/versions/l-/libosmscout.json b/versions/l-/libosmscout.json index bfa3103f4c..bba085aebe 100644 --- a/versions/l-/libosmscout.json +++ b/versions/l-/libosmscout.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ebb31600572c819a33a2c7b5e013e2cd2bc85b85", + "version-string": "1.1.1", + "port-version": 1 + }, { "git-tree": "18f4ae0fd674282e4c45af88d054090e8ba9a80d", "version-string": "1.1.1", diff --git a/versions/l-/libp7client.json b/versions/l-/libp7client.json index e1b4da476d..238124ffc4 100644 --- a/versions/l-/libp7client.json +++ b/versions/l-/libp7client.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ff87a34ba0c530746a255fc3ee2ce3762781b50c", + "version-string": "5.6", + "port-version": 3 + }, { "git-tree": "dcf6b61cbaf4a0d50c256e830142176b49eabad6", "version-string": "5.6", diff --git a/versions/l-/libpopt.json b/versions/l-/libpopt.json index 0e8704d40b..1bc1a6143b 100644 --- a/versions/l-/libpopt.json +++ b/versions/l-/libpopt.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ba5769f936a4234dc9803bee2476b757d0a0f0f9", + "version-string": "1.16", + "port-version": 15 + }, { "git-tree": "8f86d53b62561f37ac20b8c66232b9d87e4a6750", "version-string": "1.16", diff --git a/versions/l-/libprotobuf-mutator.json b/versions/l-/libprotobuf-mutator.json index 38317dc4a5..a53656b975 100644 --- a/versions/l-/libprotobuf-mutator.json +++ b/versions/l-/libprotobuf-mutator.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f0ca8762869223e88b2fa7aad7e1dc89c1dc0568", + "version-string": "1.0", + "port-version": 1 + }, { "git-tree": "17b7f9e9cf92d23ffee15bd262f8dccb9dca3da0", "version-string": "1.0", diff --git a/versions/l-/librtmp.json b/versions/l-/librtmp.json index 6f0544b259..37256ae572 100644 --- a/versions/l-/librtmp.json +++ b/versions/l-/librtmp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dffe604262f6902df5c0beeb5e67650804ae2479", + "version-date": "2019-11-11", + "port-version": 4 + }, { "git-tree": "337fb3f8ed2cb44c9ed06d7dc8b00356e077aa40", "version-date": "2019-11-11", diff --git a/versions/l-/libsmb2.json b/versions/l-/libsmb2.json index 07034124af..4bc2bbdde8 100644 --- a/versions/l-/libsmb2.json +++ b/versions/l-/libsmb2.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a70cca2c9bcfe6b7848efbf21a9b2779b4e47055", + "version-date": "2021-04-29", + "port-version": 2 + }, { "git-tree": "2793ccd966a8c7b7cbe925000471c3ba3ef7d77b", "version-date": "2021-04-29", diff --git a/versions/l-/libsoundio.json b/versions/l-/libsoundio.json index b2a720c604..ec01534aef 100644 --- a/versions/l-/libsoundio.json +++ b/versions/l-/libsoundio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "895bbc3021b113976442836aa6da51c3647fb3c7", + "version": "2.0.0", + "port-version": 7 + }, { "git-tree": "ff8356daa64c082441be7beb2d51c5360a54a6cd", "version": "2.0.0", diff --git a/versions/l-/libstemmer.json b/versions/l-/libstemmer.json index 1c1e6f3d89..b3521b8878 100644 --- a/versions/l-/libstemmer.json +++ b/versions/l-/libstemmer.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "576c66a3306ca3023e63dcaf12edad79a3784f32", + "version-string": "2017-9", + "port-version": 7 + }, { "git-tree": "cf316e67e451a6b08bb44ff11854f613f32c7484", "version-string": "2017-9", diff --git a/versions/l-/libstk.json b/versions/l-/libstk.json index ab2aaf6107..317d631634 100644 --- a/versions/l-/libstk.json +++ b/versions/l-/libstk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "237ff5e1bfd88a6a20172fd888ac539749052486", + "version-string": "4.6.1", + "port-version": 2 + }, { "git-tree": "baa7a90e090c3793097d8368715e1e8f3b30a8ee", "version-string": "4.6.1", diff --git a/versions/l-/libu2f-server.json b/versions/l-/libu2f-server.json index 19fb01c5f7..19f2e136dd 100644 --- a/versions/l-/libu2f-server.json +++ b/versions/l-/libu2f-server.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "5d1eea42e71fe87d9270b391a2297326e698fdef", + "version": "1.1.0", + "port-version": 5 + }, { "git-tree": "cb5d1d70d0e3baab221910b12b33e9e34fd383f2", "version": "1.1.0", diff --git a/versions/l-/libuuid.json b/versions/l-/libuuid.json index aeb730dcdf..1636fbcf6f 100644 --- a/versions/l-/libuuid.json +++ b/versions/l-/libuuid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "70aca4a70f3235201b05de87aa7ee6258d7c0231", + "version": "1.0.3", + "port-version": 12 + }, { "git-tree": "4d0fcae0591fc7776a9cf39996796326222e72ad", "version": "1.0.3", diff --git a/versions/l-/libvmdk.json b/versions/l-/libvmdk.json index d62a1103c9..4d421a0a08 100644 --- a/versions/l-/libvmdk.json +++ b/versions/l-/libvmdk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f7144e40ca7cfd22875c2aa308e4e9b023ef3033", + "version-string": "20200926", + "port-version": 3 + }, { "git-tree": "f1d35304c7ab4940f834735c091eca7a2ee43305", "version-string": "20200926", diff --git a/versions/l-/libxdiff.json b/versions/l-/libxdiff.json index 130c9f6feb..09e24cee01 100644 --- a/versions/l-/libxdiff.json +++ b/versions/l-/libxdiff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ce9f54a13c2317e8249e154d852fa5d7ee0940c3", + "version": "0.23", + "port-version": 3 + }, { "git-tree": "88e90a302307649ee4266069f5f85a06941530ff", "version": "0.23", diff --git a/versions/l-/licensepp.json b/versions/l-/licensepp.json index 6318660c9a..382d7d62ad 100644 --- a/versions/l-/licensepp.json +++ b/versions/l-/licensepp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "242d2988823856d4bec19a6a8844fb0d6a30eb33", + "version-date": "2020-05-19", + "port-version": 4 + }, { "git-tree": "5bbecce6621b387f3522f31745fa839c6401f09d", "version-date": "2020-05-19", diff --git a/versions/l-/lilv.json b/versions/l-/lilv.json index 0cc4bdc77b..550e8478a6 100644 --- a/versions/l-/lilv.json +++ b/versions/l-/lilv.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a016d4a605d325266dcc5eb9cedc40532d10cce", + "version": "0.24.10", + "port-version": 2 + }, { "git-tree": "a4dc357aa0d6533993a18ec3a9358a39d9ed3a54", "version": "0.24.10", diff --git a/versions/l-/linenoise-ng.json b/versions/l-/linenoise-ng.json index e89496f6cc..ade6ebf010 100644 --- a/versions/l-/linenoise-ng.json +++ b/versions/l-/linenoise-ng.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "67d888e1b51167b10e18076f98f8021f69a59419", + "version-string": "4754bee2d8eb3", + "port-version": 3 + }, { "git-tree": "5e6ff5a6494c1913a8bd1ced80cf7037af500d26", "version-string": "4754bee2d8eb3", diff --git a/versions/l-/llgl.json b/versions/l-/llgl.json index ab5066e49c..f7da6a32d1 100644 --- a/versions/l-/llgl.json +++ b/versions/l-/llgl.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "9082946cd9da5bc58319a8280b80c20be4cc0023", + "version-string": "2019-08-15", + "port-version": 3 + }, { "git-tree": "24edfe12a80c340467e19d18b731ca53ce9f3ac7", "version-string": "2019-08-15", diff --git a/versions/l-/log4cpp.json b/versions/l-/log4cpp.json index 3f35bb86e7..e32da3f9c5 100644 --- a/versions/l-/log4cpp.json +++ b/versions/l-/log4cpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1ac1b2a3b0b4e7e19ad2b2d0d57ce3f7dc9a606", + "version": "2.9.1", + "port-version": 8 + }, { "git-tree": "ed51c9c96387b0e97754a2ede544d589ae3b5af2", "version": "2.9.1", diff --git a/versions/l-/lpeg.json b/versions/l-/lpeg.json index d12e83dcc0..4151d8e6bb 100644 --- a/versions/l-/lpeg.json +++ b/versions/l-/lpeg.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d8bf7969434ee53a126d419ba7387322658967bb", + "version-string": "1.0.2", + "port-version": 3 + }, { "git-tree": "582d8581a1bfef351571e1ba8ea8910bdc8291fc", "version-string": "1.0.2", diff --git a/versions/l-/luafilesystem.json b/versions/l-/luafilesystem.json index 2625adb287..237944ca12 100644 --- a/versions/l-/luafilesystem.json +++ b/versions/l-/luafilesystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b823db113deca954d5354f3e9f0cda24adcf9a7e", + "version-string": "1.8.0", + "port-version": 3 + }, { "git-tree": "e23447662c7ca83b4d681a5a0d4a451a683ce923", "version-string": "1.8.0", diff --git a/versions/l-/lzfse.json b/versions/l-/lzfse.json index f49ffa2bfd..d1b447fd46 100644 --- a/versions/l-/lzfse.json +++ b/versions/l-/lzfse.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c42d879181140bf395967f7c28e439056effc193", + "version-string": "1.0", + "port-version": 4 + }, { "git-tree": "cfd69474709e71cfd7aef5b4c7ee6a635435c51c", "version-string": "1.0", diff --git a/versions/l-/lzo.json b/versions/l-/lzo.json index b93eed6c07..b1b8c4a624 100644 --- a/versions/l-/lzo.json +++ b/versions/l-/lzo.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1a8143f905204b72c9753894bb397aa96a415216", + "version-string": "2.10", + "port-version": 8 + }, { "git-tree": "53ad9cb3534a54fd11bd559932edb1b5c67cd8d0", "version-string": "2.10", diff --git a/versions/l-/lzokay.json b/versions/l-/lzokay.json index 8e5bd897c8..900fdc6497 100644 --- a/versions/l-/lzokay.json +++ b/versions/l-/lzokay.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "909885572ad121a7c7504af41fd2571ca01870ec", + "version-string": "2020-07-30", + "port-version": 1 + }, { "git-tree": "81f62a460d83d622c05245700f599c3418eed715", "version-string": "2020-07-30", diff --git a/versions/m-/mathc.json b/versions/m-/mathc.json index 1637430f0d..1edddb103b 100644 --- a/versions/m-/mathc.json +++ b/versions/m-/mathc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "1bf40ce6eb363cb8981612f34fb96c41be4c804a", + "version-string": "2019-09-29", + "port-version": 2 + }, { "git-tree": "48feea0350aedda2b2e7470bdb52e3c6b215688a", "version-string": "2019-09-29", diff --git a/versions/m-/mcpp.json b/versions/m-/mcpp.json index 695c914c78..932f03470c 100644 --- a/versions/m-/mcpp.json +++ b/versions/m-/mcpp.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c8e9fb1b912244a0d844e2748210a805ae2a7a93", + "version-string": "2.7.2.14", + "port-version": 4 + }, { "git-tree": "beca539b781c4a50d092a4b02e9b2af455f14b40", "version-string": "2.7.2.14", diff --git a/versions/m-/mecab.json b/versions/m-/mecab.json index aabc6ec2c0..826e065e29 100644 --- a/versions/m-/mecab.json +++ b/versions/m-/mecab.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0728379df6bdd38f71f90bff5b1d75dcd3f0b6d0", + "version-string": "2019-09-25", + "port-version": 3 + }, { "git-tree": "b5a2f4cbcaaa4aac05dc3c6ab814cf8db0047aab", "version-string": "2019-09-25", diff --git a/versions/m-/meschach.json b/versions/m-/meschach.json index abd1ed099e..e3a295a01f 100644 --- a/versions/m-/meschach.json +++ b/versions/m-/meschach.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "959f30c07d83546ddf30dd03220bd52a6a5eb5b4", + "version-string": "1.2b", + "port-version": 6 + }, { "git-tree": "e475a3306653b4ab8f50dc691dff3f7fda152b83", "version-string": "1.2b", diff --git a/versions/m-/metrohash.json b/versions/m-/metrohash.json index 56847f9fbc..8c3080320e 100644 --- a/versions/m-/metrohash.json +++ b/versions/m-/metrohash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0a4c1767a943972ca5cab7773ff6f120a799fd77", + "version": "1.1.3", + "port-version": 5 + }, { "git-tree": "777a0ee61fdc53dcad0971184232d29b58e52f63", "version": "1.1.3", diff --git a/versions/m-/microsoft-signalr.json b/versions/m-/microsoft-signalr.json index 07df40cdac..e3bd9400b6 100644 --- a/versions/m-/microsoft-signalr.json +++ b/versions/m-/microsoft-signalr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3941fa934e8ae400f7cd47d0311f4e4f945dbacd", + "version": "0.1.0-alpha4", + "port-version": 2 + }, { "git-tree": "bfae1e03d5239a637b313baa81f03e6fa025c45a", "version": "0.1.0-alpha4", diff --git a/versions/m-/mikktspace.json b/versions/m-/mikktspace.json index 7e70385542..66a232d226 100644 --- a/versions/m-/mikktspace.json +++ b/versions/m-/mikktspace.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d568c517b4a55fcc8031ae6b7b1d9ccff6682185", + "version-string": "2020-10-06", + "port-version": 2 + }, { "git-tree": "28fd852185e2def3476be4d85d4643e1a90204ee", "version-string": "2020-10-06", diff --git a/versions/m-/miniupnpc.json b/versions/m-/miniupnpc.json index e32fe58e98..ffbbbfca64 100644 --- a/versions/m-/miniupnpc.json +++ b/versions/m-/miniupnpc.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0c33ab6d1ebb5bc580617eaf6fd34930ec0d8233", + "version-string": "2.1", + "port-version": 3 + }, { "git-tree": "4f623d60c7ff375be1f55daa12fb1fcf119bb5a6", "version-string": "2.1",