diff --git a/ports/argh/portfile.cmake b/ports/argh/portfile.cmake index ccaec1449ee..17656776703 100644 --- a/ports/argh/portfile.cmake +++ b/ports/argh/portfile.cmake @@ -3,32 +3,28 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO adishavit/argh - REF a1edee559757e076e570b8f6c2f555d8d00b373c - SHA512 a100c7ff20ef9ed39d53efeac5507a6ed59fb99ccba36ac4b5f8f5aaac6782f8e951b2f26b9b50f6c6fdbc53b5bceaabbb9dd9b9539f968fc1037733342e17a6 + REF v1.3.2 + SHA512 66073718ef1fc31fbd0feb9daf366a2e28c759de44fb1882dc46a6d10f7a44635ae1155882dff916f55c51fad88bedebdfe361418f7669fac241feead68f2b5b HEAD_REF master - PATCHES - remove_unnamespaced_license_file.patch # https://github.com/adishavit/argh/pull/51 ) -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA - DISABLE_PARALLEL_CONFIGURE +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=OFF -DBUILD_EXAMPLES=OFF ) -vcpkg_install_cmake() +vcpkg_cmake_install() -if(EXISTS ${CURRENT_PACKAGES_DIR}/CMake) - vcpkg_fixup_cmake_targets(CONFIG_PATH CMake) -elseif(EXISTS ${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}) - vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT}) +if(EXISTS "${CURRENT_PACKAGES_DIR}/CMake") + vcpkg_cmake_config_fixup(CONFIG_PATH CMake) +elseif(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/${PORT}") + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${PORT}") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib) -file(REMOVE ${CURRENT_PACKAGES_DIR}/README.md) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug" "${CURRENT_PACKAGES_DIR}/lib") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/share/doc") # Handle copyright -configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY) +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/argh/remove_unnamespaced_license_file.patch b/ports/argh/remove_unnamespaced_license_file.patch deleted file mode 100644 index f6742c86c63..00000000000 --- a/ports/argh/remove_unnamespaced_license_file.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 83f364a2eb1b137453772ae9fcf5d7973770637f Mon Sep 17 00:00:00 2001 -From: Billy Robert O'Neal III -Date: Wed, 29 Apr 2020 13:01:31 -0700 -Subject: [PATCH] Don't install 'LICENSE' or 'README.md' directly to the - installation directory. - -This change unconditionally uses GNUInstallDirs which will correctly 'namespace' these files with the 'argh' project name. - -========= - -The names 'LICENSE' and 'README.md' are extremely common and likely to be taken by other ports. This happened in a recent full vcpkg catalog rebuild: - -Starting package 757/1254: qt-advanced-docking-system:x86-windows -Building package qt-advanced-docking-system[core]:x86-windows... -Could not locate cached archive: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip --- Downloading https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz... --- Extracting source C:/agent/_work/1/s/downloads/githubuser0xFFFF-Qt-Advanced-Docking-System-661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz --- Applying patch config_changes.patch --- Using source at C:/agent/_work/1/s/buildtrees/qt-advanced-docking-system/src/bab86dad13-3088149a9b --- Configuring x86-windows --- Building x86-windows-dbg --- Building x86-windows-rel --- Installing: C:/agent/_work/1/s/packages/qt-advanced-docking-system_x86-windows/share/qt-advanced-docking-system/copyright --- Performing post-build validation --- Performing post-build validation done -Stored binary cache: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip -Building package qt-advanced-docking-system[core]:x86-windows... done -Installing package qt-advanced-docking-system[core]:x86-windows... -The following files are already installed in C:/agent/_work/1/s/installed/x86-windows and are in conflict with qt-advanced-docking-system:x86-windows - -Installed by argh:x86-windows - license/LICENSE - -Elapsed time for package qt-advanced-docking-system:x86-windows: 11.09 s ---- - CMakeLists.txt | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 13bc879..f6264f3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -36,19 +36,17 @@ endif() - - install(TARGETS argh EXPORT arghTargets) - -+include(GNUInstallDirs) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -+ - if(CMAKE_SYSTEM_NAME STREQUAL Linux) - # this might be a bit too restrictive, since for other (BSD, ...) this might apply also - # but this can be fixed later in extra pull requests from people on the platform -- include(GNUInstallDirs) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) - install(FILES argh-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) - install(EXPORT arghTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) - else() -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION include) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION license) -- install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION .) - install(FILES argh-config.cmake DESTINATION CMake) - install(EXPORT arghTargets DESTINATION CMake) - endif() diff --git a/ports/argh/vcpkg.json b/ports/argh/vcpkg.json index 38835e1cd37..2329517f071 100644 --- a/ports/argh/vcpkg.json +++ b/ports/argh/vcpkg.json @@ -1,6 +1,17 @@ { "name": "argh", - "version-string": "2018-12-18", - "port-version": 3, - "description": "Argh! A minimalist argument handler." + "version": "1.3.2", + "description": "Argh! A minimalist argument handler.", + "homepage": "https://github.com/adishavit/argh", + "license": "BSD-3-Clause", + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] } diff --git a/versions/a-/argh.json b/versions/a-/argh.json index a66b81ef4d9..0eea9255956 100644 --- a/versions/a-/argh.json +++ b/versions/a-/argh.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2ee3072431f9d1aa18b5810e61398b9373fdc0d7", + "version": "1.3.2", + "port-version": 0 + }, { "git-tree": "09027cc8017226ec7710f564346b5c0bff9e69aa", "version-string": "2018-12-18", diff --git a/versions/baseline.json b/versions/baseline.json index e1cb259ab24..3ec95c90aea 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -133,8 +133,8 @@ "port-version": 1 }, "argh": { - "baseline": "2018-12-18", - "port-version": 3 + "baseline": "1.3.2", + "port-version": 0 }, "argparse": { "baseline": "2.2",