From 9033fcdf28413264f5ac8a638d36fefd65db2ca3 Mon Sep 17 00:00:00 2001
From: Lily Wang <94091114+LilyWangLL@users.noreply.github.com>
Date: Wed, 4 Jan 2023 12:11:05 -0800
Subject: [PATCH] [vcpkg baseline][marisa-trie] Fix conflict file
 include/Makefile.am with hunspell (#28352)

* [vcpkg baseline][marisa-trie] Fix conflict file include/Makefile.am with hunspell

* x-add-version

* update vcpkg_install_msbuild.cmake

* x-add-version

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

* update vcpkg_install_msbuild.cmake

Co-authored-by: Jonliu1993 <13720414433@163.com>
---
 ports/marisa-trie/portfile.cmake          | 4 ++++
 ports/marisa-trie/vcpkg.json              | 1 +
 scripts/cmake/vcpkg_install_msbuild.cmake | 8 ++++++++
 versions/baseline.json                    | 2 +-
 versions/m-/marisa-trie.json              | 5 +++++
 5 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/ports/marisa-trie/portfile.cmake b/ports/marisa-trie/portfile.cmake
index 5b30b5b9ba..b69734a2c1 100644
--- a/ports/marisa-trie/portfile.cmake
+++ b/ports/marisa-trie/portfile.cmake
@@ -2,6 +2,10 @@ if (VCPKG_TARGET_IS_WINDOWS)
     vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
 endif()
 
+if(VCPKG_TARGET_IS_LINUX)
+    message(WARNING "${PORT} currently requires the following packages:\n    libtool\n    This can be installed on Ubuntu systems via\n    sudo apt-get install -y libtool\n")
+endif()
+
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO s-yata/marisa-trie
diff --git a/ports/marisa-trie/vcpkg.json b/ports/marisa-trie/vcpkg.json
index fe1b00cdbd..4595f11542 100644
--- a/ports/marisa-trie/vcpkg.json
+++ b/ports/marisa-trie/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "marisa-trie",
   "version": "0.2.6+20200926",
+  "port-version": 1,
   "description": "Matching Algorithm with Recursively Implemented StorAge (MARISA) is a space-efficient trie data structure. This is a C++ library for an implementation of MARISA.",
   "homepage": "https://github.com/s-yata/marisa-trie",
   "license": "BSD-2-Clause OR LGPL-2.1-or-later",
diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake
index eb93d2e250..01d901155f 100644
--- a/scripts/cmake/vcpkg_install_msbuild.cmake
+++ b/scripts/cmake/vcpkg_install_msbuild.cmake
@@ -133,6 +133,14 @@ function(vcpkg_install_msbuild)
         file(COPY "${arg_SOURCE_PATH}/${arg_INCLUDES_SUBPATH}/"
             DESTINATION "${CURRENT_PACKAGES_DIR}/include/"
         )
+        file(GLOB_RECURSE all_am_file "${CURRENT_PACKAGES_DIR}/include/*.am")
+        file(GLOB_RECURSE all_in_file "${CURRENT_PACKAGES_DIR}/include/*.in")
+        if(NOT "${all_am_file}" STREQUAL "")
+            file(REMOVE ${all_am_file})
+        endif()
+        if(NOT "${all_in_file}" STREQUAL "")
+            file(REMOVE ${all_in_file})
+        endif()
         file(GLOB root_includes
             LIST_DIRECTORIES false
             "${CURRENT_PACKAGES_DIR}/include/*")
diff --git a/versions/baseline.json b/versions/baseline.json
index 81df3290bb..d2720fec3d 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4782,7 +4782,7 @@
     },
     "marisa-trie": {
       "baseline": "0.2.6+20200926",
-      "port-version": 0
+      "port-version": 1
     },
     "marl": {
       "baseline": "2022-03-02",
diff --git a/versions/m-/marisa-trie.json b/versions/m-/marisa-trie.json
index 8071cdd359..82a234e1df 100644
--- a/versions/m-/marisa-trie.json
+++ b/versions/m-/marisa-trie.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "35722f742acbc4cb5e0ce48eccf06830ca2cf2ba",
+      "version": "0.2.6+20200926",
+      "port-version": 1
+    },
     {
       "git-tree": "aec2055269a2ed80494b6cc8876c48787b65d265",
       "version": "0.2.6+20200926",