[vcpkg_acquire_msys,vcpkg-ci-msys2] Ensure msys2 package list freshness

ports/gettext/portfile.cmake

@@ -35,21 +35,32 @@ set(OPTIONS
     --disable-curses
     --disable-java
     --disable-openmp
+    # Avoid hidden ABI deps
+    --with-included-glib
+    --with-included-libunistring
+    --with-included-libxml
 )
 if(VCPKG_TARGET_IS_WINDOWS)
     list(APPEND OPTIONS
-        # Avoid unnecessary test.
-        --with-included-glib
         # This is required. For some reason these do not get correctly identified for release builds.
         ac_cv_func_wcslen=yes
         ac_cv_func_memmove=yes
         # The following are required for a full gettext built (libintl and tools).
         gl_cv_func_printf_directive_n=no  # segfaults otherwise with popup window
         ac_cv_func_memset=yes             # not detected in release builds
-        ac_cv_header_pthread_h=no
-        ac_cv_header_dirent_h=no
-        ac_cv_header_getopt_h=no
     )
+    if(NOT VCPKG_TARGET_IS_MINGW)
+        list(APPEND OPTIONS
+            # Don't take from port dirent
+            ac_cv_header_dirent_h=no
+            # Don't take from port getopt-win32
+            ac_cv_header_getopt_h=no
+            # Don't take from port pthreads
+            ac_cv_header_pthread_h=no
+            ac_cv_header_sched_h=no
+            ac_cv_header_semaphore_h=no
+        )
+    endif()
 endif()
 
 # These functions scope any changes to VCPKG_BUILD_TYPE

ports/gettext/vcpkg.json

@@ -1,6 +1,7 @@
 {
   "name": "gettext",
   "version": "0.21.1",
+  "port-version": 1,
   "description": "GNU gettext provides libintl and a set of tools to help produce multi-lingual messages.",
   "homepage": "https://www.gnu.org/software/gettext/",
   "license": null,

scripts/cmake/vcpkg_configure_make.cmake

@@ -220,7 +220,7 @@ function(vcpkg_configure_make)
 
     # Establish a bash environment as expected by autotools.
     if(CMAKE_HOST_WIN32)
-        list(APPEND msys_require_packages binutils libtool autoconf automake-wrapper automake1.16 m4 which)
+        list(APPEND msys_require_packages autoconf-wrapper automake-wrapper binutils libtool make pkgconf which)
         vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${msys_require_packages} ${arg_ADDITIONAL_MSYS_PACKAGES})
         set(base_cmd "${MSYS_ROOT}/usr/bin/bash.exe" --noprofile --norc --debug)
         vcpkg_list(SET add_to_env)

scripts/test_ports/vcpkg-ci-msys2/vcpkg.json

@@ -0,0 +1,24 @@
+{
+  "name": "vcpkg-ci-msys2",
+  "version": "1",
+  "description": "Test vcpkg msys2 freshness",
+  "license": "MIT",
+  "supports": "(windows | mingw) & native",
+  "features": {
+    "update-all": {
+      "description": "Update all outdated packages in vcpkg_acquire_msys.cmake",
+      "dependencies": [
+        {
+          "name": "vcpkg-ci-msys2",
+          "default-features": false,
+          "features": [
+            "update-critical"
+          ]
+        }
+      ]
+    },
+    "update-critical": {
+      "description": "Update overdue outdated packages in vcpkg_acquire_msys.cmake"
+    }
+  }
+}

versions/baseline.json

@@ -2750,7 +2750,7 @@
     },
     "gettext": {
       "baseline": "0.21.1",
-      "port-version": 0
+      "port-version": 1
     },
     "gettimeofday": {
       "baseline": "2017-10-14",

versions/g-/gettext.json

@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "35bc877b5cf4be0ea126ee3c82457065d78e22df",
+      "version": "0.21.1",
+      "port-version": 1
+    },
     {
       "git-tree": "4c583e9adc3ab9a044b241466cebedf162cdc410",
       "version": "0.21.1",