6 files changed, 51 insertions, 18 deletions
diff --git a/ports/libmariadb/CONTROL b/ports/libmariadb/CONTROL
deleted file mode 100644
index 949f66ce2..000000000
--- a/ports/libmariadb/CONTROL
+++ /dev/null
@@ -1,17 +0,0 @@
-Source: libmariadb
-Version: 3.1.12
-Homepage: https://github.com/MariaDB/mariadb-connector-c
-Description: MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases
-Default-Features: zlib, openssl
-
-Feature: zlib
-Build-Depends: zlib
-Description: Use internal zlib
-
-Feature: openssl
-Build-Depends: openssl
-Description: Enable SSL support
-
-Feature: iconv
-Build-Depends: libiconv
-Description: Enables character set conversion
-\ No newline at end of file
diff --git a/ports/libmariadb/fix-build-error-with-cmake3.20.patch b/ports/libmariadb/fix-build-error-with-cmake3.20.patch
new file mode 100644
index 000000000..1eed4ee47
--- /dev/null
+++ b/ports/libmariadb/fix-build-error-with-cmake3.20.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/ConnectorName.cmake b/cmake/ConnectorName.cmake
+index b7bbbad..357b8ac 100644
+--- a/cmake/ConnectorName.cmake
++++ b/cmake/ConnectorName.cmake
+@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
+     SET(MACHINE_NAME "x64")
+   ELSE()
+     SET(MACHINE_NAME "32")
+-  END()
++  ENDIF()
+ ENDIF()
+ 
+ SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/ports/libmariadb/portfile.cmake b/ports/libmariadb/portfile.cmake
index e2d37d640..6a3c6e690 100644
--- a/ports/libmariadb/portfile.cmake
+++ b/ports/libmariadb/portfile.cmake
@@ -15,6 +15,7 @@ vcpkg_from_github(
         fix-InstallPath.patch
         fix-iconv.patch
         export-cmake-targets.patch
+        fix-build-error-with-cmake3.20.patch #This can be removed in next release, which has been merged to upstream.
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
diff --git a/ports/libmariadb/vcpkg.json b/ports/libmariadb/vcpkg.json
new file mode 100644
index 000000000..622fe62dc
--- /dev/null
+++ b/ports/libmariadb/vcpkg.json
@@ -0,0 +1,31 @@
+{
+  "name": "libmariadb",
+  "version-semver": "3.1.12",
+  "port-version": 1,
+  "description": "MariaDB Connector/C is used to connect C/C++ applications to MariaDB and MySQL databases",
+  "homepage": "https://github.com/MariaDB/mariadb-connector-c",
+  "default-features": [
+    "openssl",
+    "zlib"
+  ],
+  "features": {
+    "iconv": {
+      "description": "Enables character set conversion",
+      "dependencies": [
+        "libiconv"
+      ]
+    },
+    "openssl": {
+      "description": "Enable SSL support",
+      "dependencies": [
+        "openssl"
+      ]
+    },
+    "zlib": {
+      "description": "Use internal zlib",
+      "dependencies": [
+        "zlib"
+      ]
+    }
+  }
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index c126a99d2..a28e6ae27 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3218,7 +3218,7 @@
     },
     "libmariadb": {
       "baseline": "3.1.12",
-      "port-version": 0
+      "port-version": 1
     },
     "libmaxminddb": {
       "baseline": "1.4.3",
diff --git a/versions/l-/libmariadb.json b/versions/l-/libmariadb.json
index 87f111a2c..ac0343559 100644
--- a/versions/l-/libmariadb.json
+++ b/versions/l-/libmariadb.json
@@ -1,6 +1,11 @@
 {
   "versions": [
     {
+      "git-tree": "98ab3766e520cc0e6804bdba42090eae12f9f24f",
+      "version-semver": "3.1.12",
+      "port-version": 1
+    },
+    {
       "git-tree": "9bac7cad6eff90bd3227093a10ff9b85175922da",
       "version-string": "3.1.12",
       "port-version": 0