From 816b26a2fd3b62eb80d5833c87954d24ac5ac40d Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Sun, 8 Aug 2021 14:47:46 +0200
Subject: [PATCH 01/19] Added libb64 port

---
 ports/libb64/CONTROL         |  4 ++++
 ports/libb64/add-cmake.patch | 23 +++++++++++++++++++++++
 ports/libb64/portfile.cmake  | 23 +++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 ports/libb64/CONTROL
 create mode 100644 ports/libb64/add-cmake.patch
 create mode 100644 ports/libb64/portfile.cmake

diff --git a/ports/libb64/CONTROL b/ports/libb64/CONTROL
new file mode 100644
index 00000000000000..70bad6ac539559
--- /dev/null
+++ b/ports/libb64/CONTROL
@@ -0,0 +1,4 @@
+Source: libb64
+Version: 2.0.0.1
+Homepage: https://github.com/libb64/libb64
+Description: libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format.
diff --git a/ports/libb64/add-cmake.patch b/ports/libb64/add-cmake.patch
new file mode 100644
index 00000000000000..db54ea7f21663b
--- /dev/null
+++ b/ports/libb64/add-cmake.patch
@@ -0,0 +1,23 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..baabe4f
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,15 @@
++cmake_minimum_required(VERSION 3.20)
++project(libb64)
++
++set(SOURCE_FILES src/cdecode.c src/cencode.c)
++set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h)
++
++add_library(b64 STATIC ${SOURCE_FILES} ${HEADER_FILES})
++target_include_directories(b64 PRIVATE include)
++
++set_target_properties(b64 PROPERTIES PUBLIC_HEADER "include/b64/cdecode.h;include/b64/cencode.h;include/b64/decode.h;include/b64/encode.h")
++
++install(TARGETS b64
++        LIBRARY DESTINATION lib
++        PUBLIC_HEADER DESTINATION include/b64
++)
++
+
diff --git a/ports/libb64/portfile.cmake b/ports/libb64/portfile.cmake
new file mode 100644
index 00000000000000..b83f426ef135a4
--- /dev/null
+++ b/ports/libb64/portfile.cmake
@@ -0,0 +1,23 @@
+vcpkg_from_github(
+    OUT_SOURCE_PATH SOURCE_PATH
+    REPO libb64/libb64
+    REF v2.0.0.1
+    SHA512 72c2fd4c81575b505f4851cd3820b6a2d8e78cd031a1ed138ffe5667ca711558f43b515428971966f7a73ace7c9951f1f0b39c362a59fe4691958875775cce23
+    HEAD_REF master
+    PATCHES "add-cmake.patch"
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
+#vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+
+vcpkg_copy_pdbs()
+
+# handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

From 8465fadff45401dda0ede0c77e61dc7f6488eab7 Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Sun, 8 Aug 2021 15:09:51 +0200
Subject: [PATCH 02/19] baseline.json updated

---
 versions/baseline.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/versions/baseline.json b/versions/baseline.json
index 19650fadcb7400..503c9e4c0fd1a5 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3080,6 +3080,10 @@
       "baseline": "0.98.1",
       "port-version": 5
     },
+    "libb64": {
+      "baseline": "2.0.0.1",
+      "port-version": 0
+    },
     "libbacktrace": {
       "baseline": "2021-03-14",
       "port-version": 0

From 0e32228982c4d9628972893964625639b47ac6ef Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Sun, 8 Aug 2021 15:36:32 +0200
Subject: [PATCH 03/19] windows build fix. cmakelists copied to source tree

---
 ports/libb64/CMakeLists.txt                     | 17 +++++++++++++++++
 ports/libb64/portfile.cmake                     |  4 +++-
 .../{add-cmake.patch => windows-fix.patch}      | 14 ++++++++++++++
 3 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 ports/libb64/CMakeLists.txt
 rename ports/libb64/{add-cmake.patch => windows-fix.patch} (56%)

diff --git a/ports/libb64/CMakeLists.txt b/ports/libb64/CMakeLists.txt
new file mode 100644
index 00000000000000..b5c208985e8995
--- /dev/null
+++ b/ports/libb64/CMakeLists.txt
@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.20)
+project(libb64)
+
+set(SOURCE_FILES src/cdecode.c src/cencode.c)
+set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h)
+
+add_library(b64 STATIC ${SOURCE_FILES} ${HEADER_FILES})
+target_include_directories(b64 PRIVATE include)
+
+set_target_properties(b64 PROPERTIES PUBLIC_HEADER "include/b64/cdecode.h;include/b64/cencode.h;include/b64/decode.h;include/b64/encode.h")
+
+install(TARGETS b64
+        LIBRARY DESTINATION lib
+        PUBLIC_HEADER DESTINATION include/b64
+)
+
+
diff --git a/ports/libb64/portfile.cmake b/ports/libb64/portfile.cmake
index b83f426ef135a4..42274665aa2c9c 100644
--- a/ports/libb64/portfile.cmake
+++ b/ports/libb64/portfile.cmake
@@ -4,9 +4,11 @@ vcpkg_from_github(
     REF v2.0.0.1
     SHA512 72c2fd4c81575b505f4851cd3820b6a2d8e78cd031a1ed138ffe5667ca711558f43b515428971966f7a73ace7c9951f1f0b39c362a59fe4691958875775cce23
     HEAD_REF master
-    PATCHES "add-cmake.patch"
+    PATCHES "windows-fix.patch"
 )
 
+file(COPY ports/libb64/CMakeLists.txt DESTINATION ${SOURCE_PATH}/)
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
 )
diff --git a/ports/libb64/add-cmake.patch b/ports/libb64/windows-fix.patch
similarity index 56%
rename from ports/libb64/add-cmake.patch
rename to ports/libb64/windows-fix.patch
index db54ea7f21663b..70024cd0e8a886 100644
--- a/ports/libb64/add-cmake.patch
+++ b/ports/libb64/windows-fix.patch
@@ -21,3 +21,17 @@ index 0000000..baabe4f
 +)
 +
 
+diff --git a/include/b64/ccommon.h b/include/b64/ccommon.h
+index 2b614df..28a9936 100644
+--- a/include/b64/ccommon.h
++++ b/include/b64/ccommon.h
+@@ -14,7 +14,7 @@ For details, see http://sourceforge.net/projects/libb64
+ #ifndef HAVE_SIZE_T
+   #ifdef _WIN32
+     #include <crtdefs.h>
+-  #elseif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
++  #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
+     #include <stdlib.h>
+   #else
+     typedef unsigned long size_t;
+

From 3b49b26dfd3317fd77ba6d1f2f70128052b2a524 Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Sun, 8 Aug 2021 16:09:37 +0200
Subject: [PATCH 04/19] libb64.json added

---
 versions/l-/libb64.json | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 versions/l-/libb64.json

diff --git a/versions/l-/libb64.json b/versions/l-/libb64.json
new file mode 100644
index 00000000000000..b41357b3f2a3b1
--- /dev/null
+++ b/versions/l-/libb64.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "4d76f006dba0db9a73b4eed985bc7966c42b1d2e",
+      "version-string": "2.0.0.1",
+      "port-version": 0
+    }
+  ]
+}

From 394a432460f4792d7ed48211ef493d3dbb8706a0 Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Sun, 8 Aug 2021 16:16:00 +0200
Subject: [PATCH 05/19] PR comment, libb64 renamed to b64

---
 ports/{libb64 => b64}/CMakeLists.txt |  11 ++-
 ports/{libb64 => b64}/portfile.cmake |   5 +-
 ports/b64/vcpkg.json                 |   5 +
 ports/b64/windows-fix.patch          | 139 +++++++++++++++++++++++++++
 ports/libb64/CONTROL                 |   4 -
 ports/libb64/windows-fix.patch       |  37 -------
 versions/b-/b64.json                 |   9 ++
 versions/baseline.json               |   8 +-
 versions/l-/libb64.json              |   9 --
 9 files changed, 168 insertions(+), 59 deletions(-)
 rename ports/{libb64 => b64}/CMakeLists.txt (56%)
 rename ports/{libb64 => b64}/portfile.cmake (82%)
 create mode 100644 ports/b64/vcpkg.json
 create mode 100644 ports/b64/windows-fix.patch
 delete mode 100644 ports/libb64/CONTROL
 delete mode 100644 ports/libb64/windows-fix.patch
 create mode 100644 versions/b-/b64.json
 delete mode 100644 versions/l-/libb64.json

diff --git a/ports/libb64/CMakeLists.txt b/ports/b64/CMakeLists.txt
similarity index 56%
rename from ports/libb64/CMakeLists.txt
rename to ports/b64/CMakeLists.txt
index b5c208985e8995..71cd486918806b 100644
--- a/ports/libb64/CMakeLists.txt
+++ b/ports/b64/CMakeLists.txt
@@ -1,17 +1,22 @@
 cmake_minimum_required(VERSION 3.20)
-project(libb64)
+project(b64)
 
 set(SOURCE_FILES src/cdecode.c src/cencode.c)
-set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h)
+set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h include/b64/decode.h include/b64/encode.h)
 
-add_library(b64 STATIC ${SOURCE_FILES} ${HEADER_FILES})
+set(LIBB64_EXPORTS 1)
+add_library(b64 ${SOURCE_FILES} ${HEADER_FILES})
 target_include_directories(b64 PRIVATE include)
 
 set_target_properties(b64 PROPERTIES PUBLIC_HEADER "include/b64/cdecode.h;include/b64/cencode.h;include/b64/decode.h;include/b64/encode.h")
 
 install(TARGETS b64
+	EXPORT b64-targets
         LIBRARY DESTINATION lib
         PUBLIC_HEADER DESTINATION include/b64
 )
 
+install(EXPORT b64-targets 
+	FILE b64-targets.cmake
+	DESTINATION lib/cmake/b64)
 
diff --git a/ports/libb64/portfile.cmake b/ports/b64/portfile.cmake
similarity index 82%
rename from ports/libb64/portfile.cmake
rename to ports/b64/portfile.cmake
index 42274665aa2c9c..5c154478bc7069 100644
--- a/ports/libb64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     PATCHES "windows-fix.patch"
 )
 
-file(COPY ports/libb64/CMakeLists.txt DESTINATION ${SOURCE_PATH}/)
+file(COPY ports/b64/CMakeLists.txt DESTINATION ${SOURCE_PATH}/)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -17,9 +17,10 @@ vcpkg_install_cmake()
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
 
-#vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
 
 vcpkg_copy_pdbs()
 
+
 # handle copyright
 file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/b64/vcpkg.json b/ports/b64/vcpkg.json
new file mode 100644
index 00000000000000..f9ec27a5f4e633
--- /dev/null
+++ b/ports/b64/vcpkg.json
@@ -0,0 +1,5 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
+  "name": "b64",
+  "version": "2.0.0.1"
+}
diff --git a/ports/b64/windows-fix.patch b/ports/b64/windows-fix.patch
new file mode 100644
index 00000000000000..3140e5cab0c6ef
--- /dev/null
+++ b/ports/b64/windows-fix.patch
@@ -0,0 +1,139 @@
+diff --git a/include/b64/ccommon.h b/include/b64/ccommon.h
+index 2b614df..6c5b52a 100644
+--- a/include/b64/ccommon.h
++++ b/include/b64/ccommon.h
+@@ -14,11 +14,21 @@ For details, see http://sourceforge.net/projects/libb64
+ #ifndef HAVE_SIZE_T
+   #ifdef _WIN32
+     #include <crtdefs.h>
+-  #elseif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
++  #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
+     #include <stdlib.h>
+   #else
+     typedef unsigned long size_t;
+   #endif
+ #endif
+ 
++#ifdef _WIN32
++  #ifdef LIBB64_EXPORTS
++    #define LIBB64 __declspec(dllexport)
++  #else
++    #define LIBB64 __declspec(dllimport)
++  #endif
++#else
++#define LIBB64
++#endif
++
+ #endif /* BASE64_CCOMMON_H */
+diff --git a/include/b64/cdecode.h b/include/b64/cdecode.h
+index d6ff24c..4553efc 100644
+--- a/include/b64/cdecode.h
++++ b/include/b64/cdecode.h
+@@ -24,11 +24,11 @@ typedef struct
+ 	char plainchar;
+ } base64_decodestate;
+ 
+-extern void base64_init_decodestate(base64_decodestate* state_in);
++extern LIBB64 void base64_init_decodestate(base64_decodestate* state_in);
+ 
+-extern size_t base64_decode_maxlength(size_t encode_len);
++extern LIBB64 size_t base64_decode_maxlength(size_t encode_len);
+ 
+-extern int base64_decode_value(signed char value_in);
+-extern size_t base64_decode_block(const char* code_in, const size_t length_in, void* plaintext_out, base64_decodestate* state_in);
++extern LIBB64 int base64_decode_value(signed char value_in);
++extern LIBB64 size_t base64_decode_block(const char* code_in, const size_t length_in, void* plaintext_out, base64_decodestate* state_in);
+ 
+ #endif /* BASE64_CDECODE_H */
+diff --git a/include/b64/cencode.h b/include/b64/cencode.h
+index 96b0cdb..1feb695 100644
+--- a/include/b64/cencode.h
++++ b/include/b64/cencode.h
+@@ -31,12 +31,12 @@ typedef struct
+ 	char result;
+ } base64_encodestate;
+ 
+-extern void base64_init_encodestate(base64_encodestate* state_in);
++extern LIBB64 void base64_init_encodestate(base64_encodestate* state_in);
+ 
+-extern size_t base64_encode_length(size_t plain_len, base64_encodestate* state_in);
++extern LIBB64 size_t base64_encode_length(size_t plain_len, base64_encodestate* state_in);
+ 
+-extern char base64_encode_value(signed char value_in);
+-extern size_t base64_encode_block(const void* plaintext_in, const size_t length_in, char* code_out, base64_encodestate* state_in);
+-extern size_t base64_encode_blockend(char* code_out, base64_encodestate* state_in);
++extern LIBB64 char base64_encode_value(signed char value_in);
++extern LIBB64 size_t base64_encode_block(const void* plaintext_in, const size_t length_in, char* code_out, base64_encodestate* state_in);
++extern LIBB64 size_t base64_encode_blockend(char* code_out, base64_encodestate* state_in);
+ 
+ #endif /* BASE64_CENCODE_H */
+diff --git a/include/b64/decode.h b/include/b64/decode.h
+index b2362e5..dd772d4 100644
+--- a/include/b64/decode.h
++++ b/include/b64/decode.h
+@@ -22,23 +22,23 @@ namespace base64
+ 		base64_decodestate _state;
+ 		int _buffersize;
+ 
+-		decoder(int buffersize_in = BUFFERSIZE)
++		LIBB64 decoder(int buffersize_in = BUFFERSIZE)
+ 		: _buffersize(buffersize_in)
+ 		{
+ 			base64_init_decodestate(&_state);
+ 		}
+ 
+-		int decode(char value_in)
++		LIBB64 int decode(char value_in)
+ 		{
+ 			return base64_decode_value(value_in);
+ 		}
+ 
+-		std::streamsize decode(const char* code_in, const std::streamsize length_in, char* plaintext_out)
++		LIBB64 std::streamsize decode(const char* code_in, const std::streamsize length_in, char* plaintext_out)
+ 		{
+ 			return base64_decode_block(code_in, static_cast<int>(length_in), plaintext_out, &_state);
+ 		}
+ 
+-		void decode(std::istream& istream_in, std::ostream& ostream_in)
++		LIBB64 void decode(std::istream& istream_in, std::ostream& ostream_in)
+ 		{
+ 			base64_init_decodestate(&_state);
+ 			//
+diff --git a/include/b64/encode.h b/include/b64/encode.h
+index c1a5f88..ff2c9b4 100644
+--- a/include/b64/encode.h
++++ b/include/b64/encode.h
+@@ -22,28 +22,28 @@ namespace base64
+ 		base64_encodestate _state;
+ 		int _buffersize;
+ 
+-		encoder(int buffersize_in = BUFFERSIZE)
++		LIBB64 encoder(int buffersize_in = BUFFERSIZE)
+ 			: _buffersize(buffersize_in)
+ 		{
+ 			base64_init_encodestate(&_state);
+ 		}
+ 
+-		int encode(char value_in)
++		LIBB64 int encode(char value_in)
+ 		{
+ 			return base64_encode_value(value_in);
+ 		}
+ 
+-		std::streamsize encode(const char* code_in, const std::streamsize length_in, char* plaintext_out)
++		LIBB64 std::streamsize encode(const char* code_in, const std::streamsize length_in, char* plaintext_out)
+ 		{
+ 			return base64_encode_block(code_in, static_cast<int>(length_in), plaintext_out, &_state);
+ 		}
+ 
+-		int encode_end(char* plaintext_out)
++		LIBB64 int encode_end(char* plaintext_out)
+ 		{
+ 			return base64_encode_blockend(plaintext_out, &_state);
+ 		}
+ 
+-		void encode(std::istream& istream_in, std::ostream& ostream_in)
++		LIBB64 void encode(std::istream& istream_in, std::ostream& ostream_in)
+ 		{
+ 			base64_init_encodestate(&_state);
+ 			//
diff --git a/ports/libb64/CONTROL b/ports/libb64/CONTROL
deleted file mode 100644
index 70bad6ac539559..00000000000000
--- a/ports/libb64/CONTROL
+++ /dev/null
@@ -1,4 +0,0 @@
-Source: libb64
-Version: 2.0.0.1
-Homepage: https://github.com/libb64/libb64
-Description: libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format.
diff --git a/ports/libb64/windows-fix.patch b/ports/libb64/windows-fix.patch
deleted file mode 100644
index 70024cd0e8a886..00000000000000
--- a/ports/libb64/windows-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-new file mode 100644
-index 0000000..baabe4f
---- /dev/null
-+++ b/CMakeLists.txt
-@@ -0,0 +1,15 @@
-+cmake_minimum_required(VERSION 3.20)
-+project(libb64)
-+
-+set(SOURCE_FILES src/cdecode.c src/cencode.c)
-+set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h)
-+
-+add_library(b64 STATIC ${SOURCE_FILES} ${HEADER_FILES})
-+target_include_directories(b64 PRIVATE include)
-+
-+set_target_properties(b64 PROPERTIES PUBLIC_HEADER "include/b64/cdecode.h;include/b64/cencode.h;include/b64/decode.h;include/b64/encode.h")
-+
-+install(TARGETS b64
-+        LIBRARY DESTINATION lib
-+        PUBLIC_HEADER DESTINATION include/b64
-+)
-+
-
-diff --git a/include/b64/ccommon.h b/include/b64/ccommon.h
-index 2b614df..28a9936 100644
---- a/include/b64/ccommon.h
-+++ b/include/b64/ccommon.h
-@@ -14,7 +14,7 @@ For details, see http://sourceforge.net/projects/libb64
- #ifndef HAVE_SIZE_T
-   #ifdef _WIN32
-     #include <crtdefs.h>
--  #elseif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-+  #elif defined (__unix__) || (defined (__APPLE__) && defined (__MACH__))
-     #include <stdlib.h>
-   #else
-     typedef unsigned long size_t;
-
diff --git a/versions/b-/b64.json b/versions/b-/b64.json
new file mode 100644
index 00000000000000..9f1d0cea08cf14
--- /dev/null
+++ b/versions/b-/b64.json
@@ -0,0 +1,9 @@
+{
+  "versions": [
+    {
+      "git-tree": "a7956b4e87345289516555bf5208e8d2a9aa1f80",
+      "version": "2.0.0.1",
+      "port-version": 0
+    }
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 503c9e4c0fd1a5..7f63467983b740 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -332,6 +332,10 @@
       "baseline": "2020-12-09",
       "port-version": 0
     },
+    "b64": {
+      "baseline": "2.0.0.1",
+      "port-version": 0
+    },
     "basisu": {
       "baseline": "1.11-4",
       "port-version": 0
@@ -3080,10 +3084,6 @@
       "baseline": "0.98.1",
       "port-version": 5
     },
-    "libb64": {
-      "baseline": "2.0.0.1",
-      "port-version": 0
-    },
     "libbacktrace": {
       "baseline": "2021-03-14",
       "port-version": 0
diff --git a/versions/l-/libb64.json b/versions/l-/libb64.json
deleted file mode 100644
index b41357b3f2a3b1..00000000000000
--- a/versions/l-/libb64.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "versions": [
-    {
-      "git-tree": "4d76f006dba0db9a73b4eed985bc7966c42b1d2e",
-      "version-string": "2.0.0.1",
-      "port-version": 0
-    }
-  ]
-}

From 6a2b76ff1ff9920ad414023fa6897f52ee80de69 Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Sun, 8 Aug 2021 20:12:02 +0200
Subject: [PATCH 06/19] Update version database

---
 versions/b-/b64.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/b-/b64.json b/versions/b-/b64.json
index 9f1d0cea08cf14..e7c03b1d3bc553 100644
--- a/versions/b-/b64.json
+++ b/versions/b-/b64.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a7956b4e87345289516555bf5208e8d2a9aa1f80",
+      "git-tree": "e88dbb8ac8a4186b3d7ae49825ef8c4afe120dd6",
       "version": "2.0.0.1",
       "port-version": 0
     }

From 92a4756f9c4223e0132d26e4629e9ce9f9d6acaa Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 14:14:46 +0200
Subject: [PATCH 07/19] Update ports/b64/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
---
 ports/b64/vcpkg.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/ports/b64/vcpkg.json b/ports/b64/vcpkg.json
index f9ec27a5f4e633..a276166a5cd5d5 100644
--- a/ports/b64/vcpkg.json
+++ b/ports/b64/vcpkg.json
@@ -2,4 +2,14 @@
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "b64",
   "version": "2.0.0.1"
+  "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format"
+  "dependencies": [
+  {
+    "name": "vcpkg-cmake",
+    "host": true
+  },
+  {
+    "name": "vcpkg-cmake-config",
+    "host": true
+  }
 }

From e232fe466be0e4dc1bbbde1dedfa50c602e8a4ed Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 14:16:23 +0200
Subject: [PATCH 08/19] Update ports/b64/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
---
 ports/b64/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake
index 5c154478bc7069..fda3e95090e584 100644
--- a/ports/b64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -15,9 +15,9 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
 
 vcpkg_copy_pdbs()
 

From 0d06c4ac4364d388535a3e4fc2ef1cb5d1fb0ff6 Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 14:16:39 +0200
Subject: [PATCH 09/19] Update ports/b64/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
---
 ports/b64/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake
index fda3e95090e584..f2b5358c888493 100644
--- a/ports/b64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -23,4 +23,4 @@ vcpkg_copy_pdbs()
 
 
 # handle copyright
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

From d14a4681f3c08d7c98b2e8c76704bc0b5af373c5 Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 14:17:08 +0200
Subject: [PATCH 10/19] Update ports/b64/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
---
 ports/b64/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake
index f2b5358c888493..baddfd5de39260 100644
--- a/ports/b64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -13,7 +13,7 @@ vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 

From 7c13e79c5a777a218dab054ba016f82ea539d85c Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 14:17:50 +0200
Subject: [PATCH 11/19] Update ports/b64/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
---
 ports/b64/portfile.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake
index baddfd5de39260..e3fd94dfcfd763 100644
--- a/ports/b64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -9,8 +9,8 @@ vcpkg_from_github(
 
 file(COPY ports/b64/CMakeLists.txt DESTINATION ${SOURCE_PATH}/)
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
 )
 
 vcpkg_cmake_install()

From 83026aa48f5aafcaf3c14f264a61fe70b2fd2572 Mon Sep 17 00:00:00 2001
From: 9cvele3 <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 14:34:29 +0200
Subject: [PATCH 12/19] Update ports/b64/portfile.cmake

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
---
 ports/b64/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake
index e3fd94dfcfd763..ccaa341c3622d3 100644
--- a/ports/b64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -7,7 +7,7 @@ vcpkg_from_github(
     PATCHES "windows-fix.patch"
 )
 
-file(COPY ports/b64/CMakeLists.txt DESTINATION ${SOURCE_PATH}/)
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"

From 2a846a5d0d701a2ee243ca892131e9d5575ed786 Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 15:28:40 +0200
Subject: [PATCH 13/19] fixes

---
 ports/b64/vcpkg.json | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/ports/b64/vcpkg.json b/ports/b64/vcpkg.json
index a276166a5cd5d5..ba4dba7a21fd0d 100644
--- a/ports/b64/vcpkg.json
+++ b/ports/b64/vcpkg.json
@@ -1,15 +1,16 @@
 {
   "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json",
   "name": "b64",
-  "version": "2.0.0.1"
-  "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format"
+  "version": "2.0.0.1",
+  "description": "libb64 is a library of ANSI C routines for fast encoding/decoding data into and from a base64-encoded format",
   "dependencies": [
-  {
-    "name": "vcpkg-cmake",
-    "host": true
-  },
-  {
-    "name": "vcpkg-cmake-config",
-    "host": true
-  }
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
+  ]
 }

From 975e69b51a336992d727b0e4c75d62e4208fcc44 Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Tue, 10 Aug 2021 15:42:10 +0200
Subject: [PATCH 14/19] update version database

---
 versions/b-/b64.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/b-/b64.json b/versions/b-/b64.json
index e7c03b1d3bc553..40e1ff49eec5b5 100644
--- a/versions/b-/b64.json
+++ b/versions/b-/b64.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "e88dbb8ac8a4186b3d7ae49825ef8c4afe120dd6",
+      "git-tree": "a71f96eeab3c6cafe6f8d52966bccb23381bbc69",
       "version": "2.0.0.1",
       "port-version": 0
     }

From 13b86c1f56f216c9c0aa7e3674e3b7791854711b Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <dusan.cvetkovic@teralogics.gmail>
Date: Thu, 12 Aug 2021 12:14:02 +0200
Subject: [PATCH 15/19] set -> add_compile_definitions

---
 ports/b64/CMakeLists.txt | 2 +-
 versions/b-/b64.json     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/b64/CMakeLists.txt b/ports/b64/CMakeLists.txt
index 71cd486918806b..72fb716bd6392f 100644
--- a/ports/b64/CMakeLists.txt
+++ b/ports/b64/CMakeLists.txt
@@ -4,7 +4,7 @@ project(b64)
 set(SOURCE_FILES src/cdecode.c src/cencode.c)
 set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h include/b64/decode.h include/b64/encode.h)
 
-set(LIBB64_EXPORTS 1)
+add_compile_definitions(-DLIBB64_EXPORTS)
 add_library(b64 ${SOURCE_FILES} ${HEADER_FILES})
 target_include_directories(b64 PRIVATE include)
 
diff --git a/versions/b-/b64.json b/versions/b-/b64.json
index 40e1ff49eec5b5..1b6696f8275b51 100644
--- a/versions/b-/b64.json
+++ b/versions/b-/b64.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "a71f96eeab3c6cafe6f8d52966bccb23381bbc69",
+      "git-tree": "2bcfb5c3436d46857f1287a04d72566c0b65ecec",
       "version": "2.0.0.1",
       "port-version": 0
     }

From 7bd655b349f02f81ea452d4585bfcec4b956a9dd Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Thu, 12 Aug 2021 22:03:53 +0200
Subject: [PATCH 16/19] linux fix

---
 ports/b64/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ports/b64/CMakeLists.txt b/ports/b64/CMakeLists.txt
index 72fb716bd6392f..cd3f8213a60b17 100644
--- a/ports/b64/CMakeLists.txt
+++ b/ports/b64/CMakeLists.txt
@@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.20)
 project(b64)
 
 set(SOURCE_FILES src/cdecode.c src/cencode.c)
-set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h include/b64/decode.h include/b64/encode.h)
+set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h include/b64/decode.h include/b64/encode.h include/b64/ccommon.h)
 
-add_compile_definitions(-DLIBB64_EXPORTS)
 add_library(b64 ${SOURCE_FILES} ${HEADER_FILES})
+target_compile_definitions(b64 PUBLIC LIBB64_EXPORTS=1)
 target_include_directories(b64 PRIVATE include)
 
-set_target_properties(b64 PROPERTIES PUBLIC_HEADER "include/b64/cdecode.h;include/b64/cencode.h;include/b64/decode.h;include/b64/encode.h")
+set_target_properties(b64 PROPERTIES PUBLIC_HEADER "include/b64/cdecode.h;include/b64/cencode.h;include/b64/decode.h;include/b64/encode.h;include/b64/ccommon.h")
 
 install(TARGETS b64
 	EXPORT b64-targets

From 81e93e2817b2ddbcff8734d63d076b626c6a0cfc Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Fri, 13 Aug 2021 12:34:48 +0200
Subject: [PATCH 17/19] updated database

---
 versions/b-/b64.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/b-/b64.json b/versions/b-/b64.json
index 1b6696f8275b51..3179cd1ecb589c 100644
--- a/versions/b-/b64.json
+++ b/versions/b-/b64.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "2bcfb5c3436d46857f1287a04d72566c0b65ecec",
+      "git-tree": "bad275a9cff10041111040199a9d0a4622c9c919",
       "version": "2.0.0.1",
       "port-version": 0
     }

From c46e30d5a5df5ce8297617f2b8b5222f8c677d69 Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Sat, 14 Aug 2021 13:55:20 +0200
Subject: [PATCH 18/19] correctly handling static and dynamic libs

---
 ports/b64/CMakeLists.txt       | 27 ++++++++++++++++++++-------
 ports/b64/b64_dynamic_config.h | 14 ++++++++++++++
 ports/b64/b64_static_config.h  |  6 ++++++
 ports/b64/portfile.cmake       |  2 ++
 ports/b64/windows-fix.patch    | 23 +++++++----------------
 5 files changed, 49 insertions(+), 23 deletions(-)
 create mode 100644 ports/b64/b64_dynamic_config.h
 create mode 100644 ports/b64/b64_static_config.h

diff --git a/ports/b64/CMakeLists.txt b/ports/b64/CMakeLists.txt
index cd3f8213a60b17..274fc0788b3048 100644
--- a/ports/b64/CMakeLists.txt
+++ b/ports/b64/CMakeLists.txt
@@ -1,19 +1,32 @@
 cmake_minimum_required(VERSION 3.20)
 project(b64)
 
-set(SOURCE_FILES src/cdecode.c src/cencode.c)
-set(HEADER_FILES include/b64/cdecode.h include/b64/cencode.h include/b64/decode.h include/b64/encode.h include/b64/ccommon.h)
+if (BUILD_SHARED_LIBS)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/b64_dynamic_config.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h)
+else()
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/b64_static_config.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h)
+endif()
+
+set(SRC_DIR src)
+set(INC_DIR include/b64)
+set(SOURCE_FILES ${SRC_DIR}/cdecode.c ${SRC_DIR}/cencode.c)
+set(HEADER_FILES ${INC_DIR}/cdecode.h ${INC_DIR}/cencode.h ${INC_DIR}/decode.h ${INC_DIR}/encode.h ${INC_DIR}/ccommon.h ${CMAKE_CURRENT_BINARY_DIR}/b64_config.h)
 
 add_library(b64 ${SOURCE_FILES} ${HEADER_FILES})
-target_compile_definitions(b64 PUBLIC LIBB64_EXPORTS=1)
-target_include_directories(b64 PRIVATE include)
 
-set_target_properties(b64 PROPERTIES PUBLIC_HEADER "include/b64/cdecode.h;include/b64/cencode.h;include/b64/decode.h;include/b64/encode.h;include/b64/ccommon.h")
+if (BUILD_SHARED_LIBS)
+    target_compile_definitions(b64 PRIVATE LIBB64_EXPORTS=1)
+endif()
+
+target_include_directories(b64 PRIVATE include ${CMAKE_CURRENT_BINARY_DIR})
+
+set_property(TARGET b64 
+            PROPERTY PUBLIC_HEADER ${HEADER_FILES})
 
 install(TARGETS b64
 	EXPORT b64-targets
-        LIBRARY DESTINATION lib
-        PUBLIC_HEADER DESTINATION include/b64
+    LIBRARY DESTINATION lib
+    PUBLIC_HEADER DESTINATION include/b64
 )
 
 install(EXPORT b64-targets 
diff --git a/ports/b64/b64_dynamic_config.h b/ports/b64/b64_dynamic_config.h
new file mode 100644
index 00000000000000..b836ca2a5b7593
--- /dev/null
+++ b/ports/b64/b64_dynamic_config.h
@@ -0,0 +1,14 @@
+#ifndef B64_CONFIG_H
+#define B64_CONFIG_H
+
+#ifdef _WIN32
+  #ifdef LIBB64_EXPORTS
+    #define LIBB64 __declspec(dllexport)
+  #else
+    #define LIBB64 __declspec(dllimport)
+  #endif
+#else
+#define LIBB64
+#endif
+
+#endif
diff --git a/ports/b64/b64_static_config.h b/ports/b64/b64_static_config.h
new file mode 100644
index 00000000000000..f261c7cf219b02
--- /dev/null
+++ b/ports/b64/b64_static_config.h
@@ -0,0 +1,6 @@
+#ifndef B64_CONFIG_H
+#define B64_CONFIG_H
+
+#define LIBB64
+
+#endif
diff --git a/ports/b64/portfile.cmake b/ports/b64/portfile.cmake
index ccaa341c3622d3..dbe41a9372cf20 100644
--- a/ports/b64/portfile.cmake
+++ b/ports/b64/portfile.cmake
@@ -7,6 +7,8 @@ vcpkg_from_github(
     PATCHES "windows-fix.patch"
 )
 
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/b64_dynamic_config.h" DESTINATION "${SOURCE_PATH}")
+file(COPY "${CMAKE_CURRENT_LIST_DIR}/b64_static_config.h" DESTINATION "${SOURCE_PATH}")
 file(COPY "${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt" DESTINATION "${SOURCE_PATH}")
 
 vcpkg_cmake_configure(
diff --git a/ports/b64/windows-fix.patch b/ports/b64/windows-fix.patch
index 3140e5cab0c6ef..ccabfad2e173c7 100644
--- a/ports/b64/windows-fix.patch
+++ b/ports/b64/windows-fix.patch
@@ -1,8 +1,13 @@
 diff --git a/include/b64/ccommon.h b/include/b64/ccommon.h
-index 2b614df..6c5b52a 100644
+index 2b614df..0e46141 100644
 --- a/include/b64/ccommon.h
 +++ b/include/b64/ccommon.h
-@@ -14,11 +14,21 @@ For details, see http://sourceforge.net/projects/libb64
+@@ -10,11 +10,12 @@ For details, see http://sourceforge.net/projects/libb64
+ 
+ #define BASE64_VER_MAJOR	2
+ #define BASE64_VER_MINOR	0
++#include "b64_config.h"
+ 
  #ifndef HAVE_SIZE_T
    #ifdef _WIN32
      #include <crtdefs.h>
@@ -11,20 +16,6 @@ index 2b614df..6c5b52a 100644
      #include <stdlib.h>
    #else
      typedef unsigned long size_t;
-   #endif
- #endif
- 
-+#ifdef _WIN32
-+  #ifdef LIBB64_EXPORTS
-+    #define LIBB64 __declspec(dllexport)
-+  #else
-+    #define LIBB64 __declspec(dllimport)
-+  #endif
-+#else
-+#define LIBB64
-+#endif
-+
- #endif /* BASE64_CCOMMON_H */
 diff --git a/include/b64/cdecode.h b/include/b64/cdecode.h
 index d6ff24c..4553efc 100644
 --- a/include/b64/cdecode.h

From 24f372efd68751077cd40cf88ff87a7246313ab9 Mon Sep 17 00:00:00 2001
From: Dusan Cvetkovic <9cvele3@gmail.com>
Date: Sat, 14 Aug 2021 15:33:55 +0200
Subject: [PATCH 19/19] update database versions

---
 versions/b-/b64.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/versions/b-/b64.json b/versions/b-/b64.json
index 3179cd1ecb589c..36e172140ed18c 100644
--- a/versions/b-/b64.json
+++ b/versions/b-/b64.json
@@ -1,7 +1,7 @@
 {
   "versions": [
     {
-      "git-tree": "bad275a9cff10041111040199a9d0a4622c9c919",
+      "git-tree": "9f1b6b36747fb6349483bf78531123d4b1ec5d7d",
       "version": "2.0.0.1",
       "port-version": 0
     }