From 6a4dcc1ae4c29086ba381179f159842bb733e30e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 24 May 2021 21:47:48 +0200 Subject: [PATCH 01/11] Format manifest --- ports/netcdf-c/CONTROL | 6 ------ ports/netcdf-c/vcpkg.json | 11 +++++++++++ 2 files changed, 11 insertions(+), 6 deletions(-) delete mode 100644 ports/netcdf-c/CONTROL create mode 100644 ports/netcdf-c/vcpkg.json diff --git a/ports/netcdf-c/CONTROL b/ports/netcdf-c/CONTROL deleted file mode 100644 index f770d30204914a..00000000000000 --- a/ports/netcdf-c/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: netcdf-c -Version: 4.7.4 -Port-Version: 2 -Build-Depends: hdf5, curl -Homepage: https://github.com/Unidata/netcdf-c -Description: a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data. diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json new file mode 100644 index 00000000000000..f9034f1ad7a791 --- /dev/null +++ b/ports/netcdf-c/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "netcdf-c", + "version-string": "4.7.4", + "port-version": 2, + "description": "a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", + "homepage": "https://github.com/Unidata/netcdf-c", + "dependencies": [ + "curl", + "hdf5" + ] +} From 70689f092d2831993483d914d7cd9762566655ec Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 24 May 2021 21:48:59 +0200 Subject: [PATCH 02/11] New port-version --- ports/netcdf-c/vcpkg.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index f9034f1ad7a791..4ff891831f4402 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -1,8 +1,8 @@ { "name": "netcdf-c", "version-string": "4.7.4", - "port-version": 2, - "description": "a set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", + "port-version": 3, + "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ "curl", From d98ed1d5b5266ed774dde422ff553f3bca82bff0 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 24 May 2021 21:57:12 +0200 Subject: [PATCH 03/11] Quote filepath expressions --- ports/netcdf-c/portfile.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 23e20f462c2de3..eb1f46e065b68a 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -24,7 +24,7 @@ else() endif() vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! PREFER_NINJA OPTIONS @@ -44,10 +44,10 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf) 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(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") -file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) \ No newline at end of file +file(INSTALL "${SOURCE_PATH}/COPYRIGHT" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) From 34f25dec41fb774f0b43f6442fb32a1b0f7aa0aa Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Mon, 24 May 2021 22:12:39 +0200 Subject: [PATCH 04/11] Port to vcpkg-cmake ports --- ports/netcdf-c/config-pkg-location.patch | 15 --------------- ports/netcdf-c/portfile.cmake | 9 +++------ ports/netcdf-c/vcpkg.json | 8 ++++++++ 3 files changed, 11 insertions(+), 21 deletions(-) delete mode 100644 ports/netcdf-c/config-pkg-location.patch diff --git a/ports/netcdf-c/config-pkg-location.patch b/ports/netcdf-c/config-pkg-location.patch deleted file mode 100644 index 13f0aeaa69eba3..00000000000000 --- a/ports/netcdf-c/config-pkg-location.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd7c4f8..e4e92c6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -2050,7 +2050,9 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ncdap_test/pingurl.c ${CMAKE_CURRENT_ - # Create CMake package configuration files. With these, other packages using - # cmake should be able to find netcdf using find_package and find_library. - # The EXPORT call is paired with one in liblib. --set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/netCDF) -+if(NOT DEFINED ConfigPackageLocation) -+ set(ConfigPackageLocation ${CMAKE_INSTALL_LIBDIR}/cmake/netCDF) -+endif(NOT DEFINED ConfigPackageLocation) - - install(EXPORT netCDFTargets - DESTINATION ${ConfigPackageLocation} diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index eb1f46e065b68a..baec6a762fffe5 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -6,7 +6,6 @@ vcpkg_from_github( HEAD_REF master PATCHES no-install-deps.patch - config-pkg-location.patch use_targets.patch fix-dependency-libmath.patch fix-linkage-error.patch @@ -23,10 +22,9 @@ else() set(NC_USE_STATIC_CRT OFF) endif() -vcpkg_configure_cmake( +vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! - PREFER_NINJA OPTIONS -DBUILD_UTILITIES=OFF -DBUILD_TESTING=OFF @@ -37,11 +35,10 @@ vcpkg_configure_cmake( -DENABLE_DAP_REMOTE_TESTS=OFF -DDISABLE_INSTALL_DEPENDENCIES=ON -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} - -DConfigPackageLocation=share/netcdf ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH share/netcdf TARGET_PATH share/netcdf) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME "netcdf" CONFIG_PATH "lib/cmake/netCDF") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index 4ff891831f4402..7d2ddd17556f22 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -5,6 +5,14 @@ "description": "A set of self-describing, machine-independent data formats that support the creation, access, and sharing of array-oriented scientific data.", "homepage": "https://github.com/Unidata/netcdf-c", "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, "curl", "hdf5" ] From f8787b14060db2178ad0d2680f88d525a4b9fcc5 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 25 May 2021 07:52:53 +0200 Subject: [PATCH 05/11] Remove invalid nc-config file --- ports/netcdf-c/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index baec6a762fffe5..042a56c8f89964 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -42,6 +42,8 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME "netcdf" CONFIG_PATH "lib/cmake/netCDF") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") +else() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/nc-config" "${CURRENT_PACKAGES_DIR}/bin/nc-config") # invalid endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") From 4e72284d22c551b403a6f79997756b152daa6590 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Tue, 25 May 2021 09:28:19 +0200 Subject: [PATCH 06/11] Fix pc files --- ports/netcdf-c/fix-pkgconfig.patch | 37 ++++++++++++++++++++++++++++++ ports/netcdf-c/portfile.cmake | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 ports/netcdf-c/fix-pkgconfig.patch diff --git a/ports/netcdf-c/fix-pkgconfig.patch b/ports/netcdf-c/fix-pkgconfig.patch new file mode 100644 index 00000000000000..f7827d6cb50c10 --- /dev/null +++ b/ports/netcdf-c/fix-pkgconfig.patch @@ -0,0 +1,37 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 57d2d4b..3de6f8c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1892,6 +1892,20 @@ LIST(REMOVE_DUPLICATES LINKFLAGS) + SET(LIBS ${NC_LIBS}) + SET(NC_LIBS "-lnetcdf") + ++set(NC_LIBS_PRIVATE " ${LIBS} ") ++set(NC_REQUIRES_PRIVATE "") ++macro(replace_pkgconfig_module PATTERN MODULE) ++ if(NC_LIBS_PRIVATE MATCHES " ${PATTERN} ") ++ string(REPLACE "${CMAKE_MATCH_0}" " " NC_LIBS_PRIVATE "${NC_LIBS_PRIVATE}") ++ string(APPEND NC_REQUIRES_PRIVATE " ${MODULE}") ++ endif() ++endmacro() ++replace_pkgconfig_module("-lhdf5_hl" "hdf5_hl") ++replace_pkgconfig_module("-lhdf5" "hdf5") ++replace_pkgconfig_module("-lmpi" "ompi-c") ++replace_pkgconfig_module("-lCURL[^ ]*" "libcurl") ++replace_pkgconfig_module("-lZLIB[^ ]*" "zlib") ++ + configure_file( + ${netCDF_SOURCE_DIR}/netcdf.pc.in + ${netCDF_BINARY_DIR}/netcdf.pc @ONLY) +diff --git a/netcdf.pc.in b/netcdf.pc.in +index 22b5594..a48b7c2 100644 +--- a/netcdf.pc.in ++++ b/netcdf.pc.in +@@ -9,5 +9,6 @@ Description: NetCDF Client Library for C + URL: http://www.unidata.ucar.edu/netcdf + Version: @PACKAGE_VERSION@ + Libs: -L${libdir} @NC_LIBS@ +-Libs.private: @LIBS@ ++Libs.private: @NC_LIBS_PRIVATE@ + Cflags: -I${includedir} ++Requires.private: @NC_REQUIRES_PRIVATE@ diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 042a56c8f89964..7cf3b73e1a7eb1 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( use_targets.patch fix-dependency-libmath.patch fix-linkage-error.patch + fix-pkgconfig.patch ) #Remove outdated find modules @@ -39,6 +40,7 @@ vcpkg_cmake_configure( vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "netcdf" CONFIG_PATH "lib/cmake/netCDF") +vcpkg_fixup_pkgconfig() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") From 918cdd1cb91b41babb48605ef8535d64213b7909 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Wed, 26 May 2021 09:29:55 +0200 Subject: [PATCH 07/11] Use features --- ports/netcdf-c/fix-dependency-zlib.patch | 13 ++++++++++++ ports/netcdf-c/portfile.cmake | 13 +++++++++++- ports/netcdf-c/vcpkg.json | 27 +++++++++++++++++++++--- 3 files changed, 49 insertions(+), 4 deletions(-) create mode 100644 ports/netcdf-c/fix-dependency-zlib.patch diff --git a/ports/netcdf-c/fix-dependency-zlib.patch b/ports/netcdf-c/fix-dependency-zlib.patch new file mode 100644 index 00000000000000..52c5d2ecdaef94 --- /dev/null +++ b/ports/netcdf-c/fix-dependency-zlib.patch @@ -0,0 +1,13 @@ +diff --git a/liblib/CMakeLists.txt b/liblib/CMakeLists.txt +index 5b578f7..0731460 100644 +--- a/liblib/CMakeLists.txt ++++ b/liblib/CMakeLists.txt +@@ -58,7 +58,7 @@ ENDIF() + + SET(TLL_LIBS "") + +-SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM} ZLIB::ZLIB) ++SET(TLL_LIBS ${TLL_LIBS} ${HAVE_LIBM}) + + # Add extra dependencies specified via NC_EXTRA_DEPS + SET(TLL_LIBS ${TLL_LIBS} ${EXTRA_DEPS}) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index 7cf3b73e1a7eb1..c75fa84b53c6e0 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -10,6 +10,7 @@ vcpkg_from_github( fix-dependency-libmath.patch fix-linkage-error.patch fix-pkgconfig.patch + fix-dependency-zlib.patch ) #Remove outdated find modules @@ -23,6 +24,16 @@ else() set(NC_USE_STATIC_CRT OFF) endif() +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + dap ENABLE_DAP + netcdf-4 ENABLE_NETCDF_4 + netcdf-4 USE_HDF5 + INVERTED_FEATURES + dap CMAKE_DISABLE_FIND_PACKAGE_CURL + netcdf-4 CMAKE_DISABLE_FIND_PACKAGE_HDF5 +) + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! @@ -32,10 +43,10 @@ vcpkg_cmake_configure( -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF -DENABLE_FILTER_TESTING=OFF - -DUSE_HDF5=ON -DENABLE_DAP_REMOTE_TESTS=OFF -DDISABLE_INSTALL_DEPENDENCIES=ON -DNC_USE_STATIC_CRT=${NC_USE_STATIC_CRT} + ${FEATURE_OPTIONS} ) vcpkg_cmake_install() diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index 7d2ddd17556f22..f930914f2ab669 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -12,8 +12,29 @@ { "name": "vcpkg-cmake-config", "host": true + } + ], + "default-features": [ + "dap", + "netcdf-4" + ], + "features": { + "dap": { + "description": "Build with DAP remote access client support", + "dependencies": [ + "curl" + ] }, - "curl", - "hdf5" - ] + "netcdf-4": { + "description": "Build with netCDF-4/HDF5 support", + "dependencies": [ + { + "name": "hdf5", + "features": [ + "zlib" + ] + } + ] + } + } } From 8fd6f9c55d8188925ee04a384f54b5536a55eaa1 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 27 May 2021 09:38:35 +0200 Subject: [PATCH 08/11] Add feature 'tools' --- ports/netcdf-c/portfile.cmake | 12 ++++++++---- ports/netcdf-c/vcpkg.json | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index c75fa84b53c6e0..a99f143090662a 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -29,6 +29,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS dap ENABLE_DAP netcdf-4 ENABLE_NETCDF_4 netcdf-4 USE_HDF5 + tools BUILD_UTILITIES INVERTED_FEATURES dap CMAKE_DISABLE_FIND_PACKAGE_CURL netcdf-4 CMAKE_DISABLE_FIND_PACKAGE_HDF5 @@ -38,7 +39,6 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" DISABLE_PARALLEL_CONFIGURE # netcdf-c configures in the source! OPTIONS - -DBUILD_UTILITIES=OFF -DBUILD_TESTING=OFF -DENABLE_EXAMPLES=OFF -DENABLE_TESTS=OFF @@ -53,10 +53,14 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME "netcdf" CONFIG_PATH "lib/cmake/netCDF") vcpkg_fixup_pkgconfig() -if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/nc-config" "${CURRENT_PACKAGES_DIR}/bin/nc-config") # invalid +if("tools" IN_LIST FEATURES) + vcpkg_copy_tools( + TOOL_NAMES nccopy ncdump ncgen ncgen3 + AUTO_CLEAN + ) +elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin" "${CURRENT_PACKAGES_DIR}/bin") -else() - file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/nc-config" "${CURRENT_PACKAGES_DIR}/bin/nc-config") # invalid endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/netcdf-c/vcpkg.json b/ports/netcdf-c/vcpkg.json index f930914f2ab669..6e65236081bedb 100644 --- a/ports/netcdf-c/vcpkg.json +++ b/ports/netcdf-c/vcpkg.json @@ -35,6 +35,9 @@ ] } ] + }, + "tools": { + "description": "Build utilities" } } } From d2c36fbac8895b16cbb58a8e03f6d4988e33724d Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Thu, 10 Jun 2021 09:41:11 +0200 Subject: [PATCH 09/11] x-add-version --- versions/baseline.json | 2 +- versions/n-/netcdf-c.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index b346ec608d2fb9..1ad83df3af763d 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4278,7 +4278,7 @@ }, "netcdf-c": { "baseline": "4.7.4", - "port-version": 2 + "port-version": 3 }, "netcdf-cxx4": { "baseline": "4.3.1", diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index d30a4c2ada2ae4..abf6910701d3a4 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bf58f4f9c83368a46782135cf289c24af377c431", + "version-string": "4.7.4", + "port-version": 3 + }, { "git-tree": "aa42781f00db0c2de52798f0345801b667977c79", "version-string": "4.7.4", From 6f3b4402fc9428bfd9ac9df29655f942201def8e Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 11 Jun 2021 15:47:07 +0200 Subject: [PATCH 10/11] Fix build with msys2 mingw --- ports/netcdf-c/fix-manpage-msys.patch | 13 +++++++++++++ ports/netcdf-c/portfile.cmake | 1 + 2 files changed, 14 insertions(+) create mode 100644 ports/netcdf-c/fix-manpage-msys.patch diff --git a/ports/netcdf-c/fix-manpage-msys.patch b/ports/netcdf-c/fix-manpage-msys.patch new file mode 100644 index 00000000000000..24374c95e62469 --- /dev/null +++ b/ports/netcdf-c/fix-manpage-msys.patch @@ -0,0 +1,13 @@ +diff --git a/libsrc/CMakeLists.txt b/libsrc/CMakeLists.txt +index 65a3f87..30a008d 100644 +--- a/libsrc/CMakeLists.txt ++++ b/libsrc/CMakeLists.txt +@@ -61,7 +61,7 @@ IF(HAVE_M4) + IF(NOT MSVC) + ADD_CUSTOM_TARGET(manpage ALL + +- COMMAND ${NC_M4} ${ARGS_MANPAGE} '${CMAKE_CURRENT_BINARY_DIR}/netcdf.m4' > '${CMAKE_CURRENT_BINARY_DIR}/netcdf.3' ++ COMMAND ${NC_M4} ${ARGS_MANPAGE} "${CMAKE_CURRENT_BINARY_DIR}/netcdf.m4" > "${CMAKE_CURRENT_BINARY_DIR}/netcdf.3" VERBATIM + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + ) + diff --git a/ports/netcdf-c/portfile.cmake b/ports/netcdf-c/portfile.cmake index a99f143090662a..468237d2cbffc5 100644 --- a/ports/netcdf-c/portfile.cmake +++ b/ports/netcdf-c/portfile.cmake @@ -11,6 +11,7 @@ vcpkg_from_github( fix-linkage-error.patch fix-pkgconfig.patch fix-dependency-zlib.patch + fix-manpage-msys.patch ) #Remove outdated find modules From 1283ffa828a0699ca9adc34cf9c6216972237673 Mon Sep 17 00:00:00 2001 From: Kai Pastor Date: Fri, 11 Jun 2021 15:51:19 +0200 Subject: [PATCH 11/11] Update git-tree --- versions/n-/netcdf-c.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/n-/netcdf-c.json b/versions/n-/netcdf-c.json index abf6910701d3a4..75fcc46b1f377d 100644 --- a/versions/n-/netcdf-c.json +++ b/versions/n-/netcdf-c.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "bf58f4f9c83368a46782135cf289c24af377c431", + "git-tree": "069ccb40f8ce75d6ec88b8fe31966c11fcf6906b", "version-string": "4.7.4", "port-version": 3 },