From 4ef16cd07edc4cc9570d543a4eb09c51006588ab Mon Sep 17 00:00:00 2001
From: pastdue <30942300+past-due@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:37:29 -0500
Subject: [libidn2] Fix cross-compile (non-Windows) (#15868)

* [libidn2] Fix cross-compile (non-Windows)

* Convert CONTROL, bump port-version

* x-add-version libidn2
---
 ports/libidn2/CONTROL        |  6 ------
 ports/libidn2/portfile.cmake |  1 +
 ports/libidn2/vcpkg.json     | 10 ++++++++++
 versions/baseline.json       |  2 +-
 versions/l-/libidn2.json     |  5 +++++
 5 files changed, 17 insertions(+), 7 deletions(-)
 delete mode 100644 ports/libidn2/CONTROL
 create mode 100644 ports/libidn2/vcpkg.json

diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL
deleted file mode 100644
index fb29df032..000000000
--- a/ports/libidn2/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: libidn2
-Version: 2.3.0
-Port-Version: 1
-Build-Depends: libiconv
-Homepage: https://www.gnu.org/software/libidn/
-Description: GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.
diff --git a/ports/libidn2/portfile.cmake b/ports/libidn2/portfile.cmake
index 7c3054b1c..9509d6675 100644
--- a/ports/libidn2/portfile.cmake
+++ b/ports/libidn2/portfile.cmake
@@ -50,6 +50,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
 else()
     vcpkg_configure_make(
         SOURCE_PATH ${SOURCE_PATH}
+        AUTOCONFIG
         COPY_SOURCE
         OPTIONS
             --with-libiconv-prefix=${CURRENT_INSTALLED_DIR}
diff --git a/ports/libidn2/vcpkg.json b/ports/libidn2/vcpkg.json
new file mode 100644
index 000000000..5b5a6b639
--- /dev/null
+++ b/ports/libidn2/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "libidn2",
+  "version-string": "2.3.0",
+  "port-version": 2,
+  "description": "GNU Libidn is an implementation of the Stringprep, Punycode and IDNA 2003 specifications. Libidn's purpose is to encode and decode internationalized domain names.",
+  "homepage": "https://www.gnu.org/software/libidn/",
+  "dependencies": [
+    "libiconv"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index e6f949d91..6e5aefd04 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3026,7 +3026,7 @@
     },
     "libidn2": {
       "baseline": "2.3.0",
-      "port-version": 1
+      "port-version": 2
     },
     "libigl": {
       "baseline": "2.2.0",
diff --git a/versions/l-/libidn2.json b/versions/l-/libidn2.json
index cbf0a4fb2..688c8a1ac 100644
--- a/versions/l-/libidn2.json
+++ b/versions/l-/libidn2.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "6f5a62105488c9eb440e97c4d49a1ac6c8fa996c",
+      "version-string": "2.3.0",
+      "port-version": 2
+    },
     {
       "git-tree": "6d198421acf88e8196da7f2d1389100307f92133",
       "version-string": "2.3.0",
-- 
cgit v1.2.3