From 15ec0792d87e5332285aa8178d3c5ff17422c7f7 Mon Sep 17 00:00:00 2001
From: hannesweisbach <hannesweisbach@users.noreply.github.com>
Date: Tue, 13 Oct 2020 22:28:09 +0200
Subject: [PATCH] [icu] Update automake dependency 1.15 -> 1.16 (#13980)

* [icu] Update automake dependency 1.15 -> 1.16

automake 1.15 is not available through msys anymore; automake 1.16 is the oldest available version.

* [icu] Update CONTROL version

Co-authored-by: LilyWangL <wangli28@beyondsoft.com>
---
 ports/icu/CONTROL        | 3 ++-
 ports/icu/portfile.cmake | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 5cbf72816a..6ca647cad0 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,5 +1,6 @@
 Source: icu
-Version: 67.1-3
+Version: 67.1
+Port-Version: 4
 Homepage: http://icu-project.org/apiref/icu4c/
 Description: Mature and widely used Unicode and localization library.
 Supports: !(arm|uwp)
diff --git a/ports/icu/portfile.cmake b/ports/icu/portfile.cmake
index 20ca4dab17..49c87bfdd6 100644
--- a/ports/icu/portfile.cmake
+++ b/ports/icu/portfile.cmake
@@ -77,7 +77,7 @@ else()
     set(CONFIGURE_OPTIONS "${CONFIGURE_OPTIONS} --host=i686-pc-mingw32")
 
     # Acquire tools
-    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.15)
+    vcpkg_acquire_msys(MSYS_ROOT PACKAGES make automake1.16)
 
     # Insert msys into the path between the compiler toolset and windows system32. This prevents masking of "link.exe" but DOES mask "find.exe".
     string(REPLACE ";$ENV{SystemRoot}\\system32;" ";${MSYS_ROOT}/usr/bin;$ENV{SystemRoot}\\system32;" NEWPATH "$ENV{PATH}")
@@ -85,7 +85,7 @@ else()
     set(ENV{PATH} "${NEWPATH}")
     set(BASH ${MSYS_ROOT}/usr/bin/bash.exe)
 
-    set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.15)
+    set(AUTOMAKE_DIR ${MSYS_ROOT}/usr/share/automake-1.16)
     file(COPY ${AUTOMAKE_DIR}/config.guess ${AUTOMAKE_DIR}/config.sub DESTINATION ${SOURCE_PATH}/source)
 
     if(VCPKG_CRT_LINKAGE STREQUAL static)
@@ -236,4 +236,4 @@ vcpkg_copy_pdbs()
 vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES pthread m)
 
 # 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)