From 2b66d082f4cc6ab6027b7a86cc2082ae0bada0bf Mon Sep 17 00:00:00 2001
From: Kai Pastor <dg0yt@darc.de>
Date: Tue, 23 Jan 2024 20:51:00 +0100
Subject: [PATCH] [acl] Add feature nls for gettext dependency (#36269)

---
 ports/acl/portfile.cmake | 18 ++++++++++++++----
 ports/acl/vcpkg.json     | 19 +++++++++++++++++--
 versions/a-/acl.json     |  5 +++++
 versions/baseline.json   |  2 +-
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/ports/acl/portfile.cmake b/ports/acl/portfile.cmake
index c51946b21b..68e4d52451 100644
--- a/ports/acl/portfile.cmake
+++ b/ports/acl/portfile.cmake
@@ -1,7 +1,7 @@
-vcpkg_minimum_required(VERSION 2022-10-12) # for ${VERSION}
-
 vcpkg_download_distfile(ARCHIVE
     URLS "http://download.savannah.nongnu.org/releases/acl/acl-${VERSION}.tar.xz"
+         "https://www.mirrorservice.org/sites/download.savannah.gnu.org/releases/acl/acl-${VERSION}.tar.xz"
+         
     FILENAME "acl-${VERSION}.tar.xz"
     SHA512 7d02f05d17305f8587ab485395b00c7fdb8e44c1906d0d04b70a43a3020803e8b2b8c707abb6147f794867dfa87bd51769c2d3e11a3db55ecbd2006a6e6231dc
 )
@@ -11,15 +11,25 @@ vcpkg_extract_source_archive(
     ARCHIVE ${ARCHIVE}
 )
 
+vcpkg_list(SET options)
+if("nls" IN_LIST FEATURES)
+    vcpkg_list(APPEND options "--enable-nls")
+    vcpkg_add_to_path(PREPEND "${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin")
+else()
+    set(ENV{AUTOPOINT} true) # true, the program
+    vcpkg_list(APPEND options "--disable-nls")
+endif()
+
 vcpkg_configure_make(
     SOURCE_PATH "${SOURCE_PATH}"
     AUTOCONFIG
+    OPTIONS
+        ${options}
 )
 
 vcpkg_install_make()
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-vcpkg_fixup_pkgconfig()
-
 vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/doc/COPYING.LGPL")
diff --git a/ports/acl/vcpkg.json b/ports/acl/vcpkg.json
index 712b7fbfbe..f79ddb643a 100644
--- a/ports/acl/vcpkg.json
+++ b/ports/acl/vcpkg.json
@@ -1,12 +1,27 @@
 {
   "name": "acl",
   "version-semver": "2.3.1",
-  "port-version": 1,
+  "port-version": 2,
   "description": "Commands for Manipulating POSIX Access Control Lists",
   "homepage": "https://savannah.nongnu.org/projects/acl",
   "license": "LGPL-2.1-or-later",
   "supports": "linux",
   "dependencies": [
     "attr"
-  ]
+  ],
+  "features": {
+    "nls": {
+      "description": "Enable native language support",
+      "dependencies": [
+        {
+          "name": "gettext",
+          "host": true,
+          "features": [
+            "tools"
+          ]
+        },
+        "gettext-libintl"
+      ]
+    }
+  }
 }
diff --git a/versions/a-/acl.json b/versions/a-/acl.json
index f09a71ef29..86639be0b7 100644
--- a/versions/a-/acl.json
+++ b/versions/a-/acl.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "2d8c536397cb3a1f7c8979db3df870ae53a439cf",
+      "version-semver": "2.3.1",
+      "port-version": 2
+    },
     {
       "git-tree": "4c930bf34406e76819ad7b83ff26536e64ad09f0",
       "version-semver": "2.3.1",
diff --git a/versions/baseline.json b/versions/baseline.json
index faa9c7b3fe..1048d8e014 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -30,7 +30,7 @@
     },
     "acl": {
       "baseline": "2.3.1",
-      "port-version": 1
+      "port-version": 2
     },
     "activemq-cpp": {
       "baseline": "3.9.5",