[intl/gettext/fontconfig] update to native build system (#11776)

* [fontconfig] update fontconfig

* [libiconv] update to make

* [gettext] update to make

* [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig

* [fontconfig] make it work on windows

* Remove install of unofficial cmake config

* add function get_cmake_vars

* fine tuning.

* apply to make based ports.

* add log suffix on not windows platforms

* fix c&p error

* add previous LINK env

* setup env on windows and extract cpp flags correctly.

* update glib and libxml2

* fix windows regressions

* Apply suggestions from code review

* add windres wrapper to invoke RC.

* remove wrong fi

* fix libintl.

* try fixing uwp

* other things to update

* exiv2 fix

* libtool does not like -RTC1

* pass the /RTC<x> flag directly to the compiler

* trust cmake instead of adding extra flags

* fix expat

* fix iconv wrapper install

* change fontconfig intl linkage.

* add appcontainer back in which is required for UWP. Why is this not in the cmake flags?

* fix pkg-config in vcpkg_configure_make

* fix json-c pkg-config installation

* remove remnoved config

* comment out debug messages + bit of tuning

* finally fontconfig

* comment debug messages

* expat apply extra patches.

* Switch back to -E instead of -EP in cpp

* commit changes from fontconfig PR

* [expat] fix expat details

* Apply suggestions from code review

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>

* cleanup docs

* update osx pipeline so that fontconfig actually builds

* fix expat the lazy way by using a higher commit than release

* fix a barage of regressions due to the use of unofficial targets

* [expat] use a higher commit hash with a better stabilized cmake build

* forgot freexl regression

* more unofficial fixes

* fix downstream expat usage

* fix wxwidgets

* fix gcdm regression

* [vtk] fix the regression due to expat

* add uwp cl flags back in. Somehow those are not set by cmake

* add a few other configure options for full gettext build

* fix cmake regression

* fix a few regressions

* fix static gettext build

* fix gettext static

* fix libxml2 wrapper for cmake

* some more regressions fixes

* add conversion from somelib.lib to -lsomelib

* add a few option to libiconv.

* get logs from CI

* add missing ar-lib wrapper

* add missing ar-lib wrapper

* add fatal error to gettext

* remove uuid from the list of LIBS since it seems to not exist in CI?

* small but important regex correction

* fix regex and add debug message for libs

* remove error and only build libintl.

* add uuid dependency to fontconfig in qt5-base

* osx install gettext for autopoint

* fix io2d regression by saying the port is broken .....
(which it is; upstream needs to learn proper cmake)

* restore the old libxml2 wrapper with minor modifications

* fix xmlsec regression

* install wrapper correctly

* try actual fixing io2d

* improve iconv wrapper

* add latest changes from update_fontconfig PR

* Apply suggestions from code review

first set which don't need special attention

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* Apply suggestions from code review

one more simple change

Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

* [x264] set env AS

* fix bugs due to refactor

* use subpath everywhere

* apply changes from CR

* fix fontconfig build.

* only change libs in static builds

* remove unnecessary lines 41 & 44

* remove flag transformation

* reintroduce the flag / to - transformation for MSVC

* trying to figure out autopoint issue.
using wrong (windows) find.exe instead of msys

* add correct working_dir to subpath

* escape stupid env paths.

* fix typo

* add findutils
remove debug messages

* add error if libtool chokes

* add file to msys

* pass lt_cv_deplibs_check_method=pass_all on windows
(couldn't get file.exe to work so that libtool correctly ids the passed libs)

* add bzip2 to msys

* reenable libtool check. Lets see if CI agrees

* unbreak linux
try to figure out where uuid should be on windows.

* add -L flag and help libtool ?

* try to get ci to find uuid.

* try to use cygpath

* update controls

* cleanup merge mistakes

* correct merge issues

* determine cmake vars if not done before.

* move adding of -l earlier

* more merge cleanup

* fix uwp builds by not transforming libs

* fix patches in io2d

* fix xz download error

* apply code review changes manually

* fix the typos left behind in CR

Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>

84 files changed, 856 insertions, 3573 deletions

diff --git a/ports/cairo/CMakeLists.txt b/ports/cairo/CMakeLists.txt
index e333f304d..a68491fbd 100644
--- a/ports/cairo/CMakeLists.txt
+++ b/ports/cairo/CMakeLists.txt
@@ -182,7 +182,7 @@ find_package(Threads REQUIRED)
 find_package(ZLIB REQUIRED)
 find_package(PNG REQUIRED)
 find_package(Freetype REQUIRED)
-find_package(unofficial-fontconfig CONFIG REQUIRED)
+find_package(Fontconfig REQUIRED)
 find_package(unofficial-pixman CONFIG REQUIRED)
 
 # Cairo needs to be told which features of FreeType are availible
@@ -211,7 +211,7 @@ if (WITH_X11)
     target_compile_definitions(cairo PUBLIC -DCAIRO_HAS_XLIB_SURFACE=1)
 endif()
 target_include_directories(cairo PUBLIC ${FREETYPE_INCLUDE_DIRS})
-target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 unofficial::fontconfig::fontconfig)
+target_link_libraries(cairo PRIVATE ZLIB::ZLIB PNG::PNG Freetype::Freetype unofficial::pixman::pixman-1 Fontconfig::Fontconfig)
 
 if(WIN32)
     target_link_libraries(cairo PRIVATE gdi32 msimg32 user32)
@@ -297,7 +297,7 @@ include(CMakeFindDependencyMacro)
 find_dependency(ZLIB)
 find_dependency(PNG)
 find_dependency(Freetype)
-find_dependency(unofficial-fontconfig CONFIG)
+find_dependency(Fontconfig)
 find_dependency(unofficial-pixman CONFIG)
 if(WITH_GOBJECT)
     find_dependency(unofficial-glib CONFIG)
diff --git a/ports/cairo/CONTROL b/ports/cairo/CONTROL
index 6c26c77a2..06877af9b 100644
--- a/ports/cairo/CONTROL
+++ b/ports/cairo/CONTROL
@@ -1,6 +1,6 @@
 Source: cairo
 Version: 1.16.0
-Port-Version: 7
+Port-Version: 8
 Homepage: https://cairographics.org
 Description: Cairo is a 2D graphics library with support for multiple output devices. Currently supported output targets include the X Window System (via both Xlib and XCB), Quartz, Win32, image buffers, PostScript, PDF, and SVG file output. Experimental backends include OpenGL, BeOS, OS/2, and DirectFB.
 Build-Depends: zlib, libpng, pixman, freetype, fontconfig
diff --git a/ports/exiv2/CONTROL b/ports/exiv2/CONTROL
index 14be794c7..c9f5ecca4 100644
--- a/ports/exiv2/CONTROL
+++ b/ports/exiv2/CONTROL
@@ -1,6 +1,6 @@
 Source: exiv2
 Version: 0.27.3
-Port-Version: 2
+Port-Version: 3
 Build-Depends: zlib, libiconv, gettext
 Description: Image metadata library and tools
 Homepage: https://www.exiv2.org
diff --git a/ports/exiv2/vcpkg-cmake-wrapper.cmake b/ports/exiv2/vcpkg-cmake-wrapper.cmake
index 76e941f20..ab71ccdb7 100644
--- a/ports/exiv2/vcpkg-cmake-wrapper.cmake
+++ b/ports/exiv2/vcpkg-cmake-wrapper.cmake
@@ -1,11 +1,12 @@
 _find_package(${ARGS})

 

 if("@VCPKG_LIBRARY_LINKAGE@" STREQUAL "static")

-    find_package(unofficial-iconv CONFIG REQUIRED)

-    find_package(unofficial-gettext CONFIG REQUIRED)

+    find_package(Iconv REQUIRED)

+    find_package(Intl REQUIRED)

     if(TARGET exiv2lib)

         set_property(TARGET exiv2lib APPEND PROPERTY INTERFACE_LINK_LIBRARIES 

-            unofficial::iconv::libiconv 

-            unofficial::gettext::libintl)

+            Iconv::Iconv 

+            )

+        target_link_libraries(exiv2lib INTERFACE ${Intl_LIBRARIES})

     endif()

 endif()

diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt
deleted file mode 100644
index 61197ed92..000000000
--- a/ports/fontconfig/CMakeLists.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-cmake_minimum_required(VERSION 3.11)
-project(fontconfig C)
-
-add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -DHAVE_CONFIG_H)
-
-# find dependencies
-find_package(unofficial-iconv CONFIG REQUIRED)
-find_package(Freetype REQUIRED)
-find_package(expat CONFIG REQUIRED)
-
-add_library(fontconfig
-    src/fcatomic.c
-    src/fcblanks.c
-    src/fccache.c
-    src/fccfg.c
-    src/fccharset.c
-    src/fccompat.c
-    src/fcdbg.c
-    src/fcdefault.c
-    src/fcdir.c
-    src/fcformat.c
-    src/fcfreetype.c
-    src/fcfs.c
-    src/fcinit.c
-    src/fclang.c
-    src/fclist.c
-    src/fcmatch.c
-    src/fcmatrix.c
-    src/fcname.c
-    src/fcobjs.c
-    src/fcpat.c
-    src/fcrange.c
-    src/fcserialize.c
-    src/fcstat.c
-    src/fcstr.c
-    src/fcweight.c
-    src/fcxml.c
-    src/ftglue.c)
-
-if(WIN32)
-    set_target_properties(fontconfig PROPERTIES DEFINE_SYMBOL "FcPublic=__declspec(dllexport)")
-else()
-    set_target_properties(fontconfig PROPERTIES DEFINE_SYMBOL "FcPublic=__attribute__((visibility(\"default\")))")
-endif()
-
-target_include_directories(fontconfig PRIVATE .
-    ${FC_INCLUDE_DIR}/alias
-    ${EXPAT_INCLUDE_DIR})
-if(WIN32)
-    target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/win32)
-else()
-    target_include_directories(fontconfig PRIVATE ${FC_INCLUDE_DIR}/unix)
-endif()
-
-target_link_libraries(fontconfig PRIVATE unofficial::iconv::libiconv Freetype::Freetype expat::expat)
-
-install(TARGETS fontconfig
-    EXPORT fontconfig-targets
-    RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib
-    ARCHIVE DESTINATION lib)
-
-if(NOT FC_SKIP_HEADERS)
-    install(FILES
-        fontconfig/fontconfig.h
-        fontconfig/fcfreetype.h
-        fontconfig/fcprivate.h
-        DESTINATION include/fontconfig)
-endif()
-
-if(NOT FC_SKIP_TOOLS)
-    set(FC_DEFAULT_FONTS WINDOWSFONTDIR)
-    set(FC_FONTPATH)
-    set(FC_CACHEDIR WINDOWSTEMPDIR_FONTCONFIG_CACHE)
-    set(CONFIGDIR ./fonts/conf.d)
-    configure_file(fonts.conf.in ${CMAKE_SOURCE_DIR}/fonts.conf @ONLY)
-    install(FILES fonts.conf DESTINATION tools/fontconfig)
-    install(DIRECTORY conf.d DESTINATION tools/fontconfig FILES_MATCHING PATTERN "*.conf")
-endif()
-
-install(
-    EXPORT fontconfig-targets
-    NAMESPACE unofficial::fontconfig::
-    FILE unofficial-fontconfig-targets.cmake
-    DESTINATION share/unofficial-fontconfig
-)
-
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake "
-include(CMakeFindDependencyMacro)
-find_dependency(unofficial-iconv CONFIG)
-find_dependency(Freetype)
-find_dependency(expat CONFIG)
-
-include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-fontconfig-targets.cmake)
-")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-fontconfig-config.cmake DESTINATION share/unofficial-fontconfig)
diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL
index e541f560a..636b7499a 100644
--- a/ports/fontconfig/CONTROL
+++ b/ports/fontconfig/CONTROL
@@ -1,7 +1,5 @@
 Source: fontconfig
-Version: 2.12.4
-Port-Version: 13
+Version: 2.13.1
 Homepage: https://www.freedesktop.org/software/fontconfig/front.html
 Description: Library for configuring and customizing font access.
-Build-Depends: freetype, expat, libiconv, dirent
-Supports: !uwp
\ No newline at end of file
+Build-Depends: freetype, expat, libiconv, dirent, pthread, json-c, dirent, libuuid (!windows&!osx), gettext
\ No newline at end of file
diff --git a/ports/fontconfig/build.patch b/ports/fontconfig/build.patch
new file mode 100644
index 000000000..5b8c1b3a9
--- /dev/null
+++ b/ports/fontconfig/build.patch
@@ -0,0 +1,295 @@
+diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am
+index ff03fb2eb..769fc6005 100644
+--- a/conf.d/Makefile.am
++++ b/conf.d/Makefile.am
+@@ -95,9 +95,9 @@ install-data-hook:
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+ 	  cd $(DESTDIR)$(configdir);				\
+ 	  for i in $(CONF_LINKS); do				\
+-	    echo $(RM) $$i";" ln -s $(templatedir)/$$i .;	\
++	    echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .;	\
+ 	    $(RM) $$i;						\
+-	    ln -s $(templatedir)/$$i .;				\
++	    $(LN_S) $(DESTDIR)$(templatedir)/$$i .;				\
+ 	  done)
+ uninstall-local:
+ 	@(echo cd $(DESTDIR)$(configdir);			\
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 35e820d60..42bd7c5a2 100644
+--- a/src/Makefile.am	
++++ b/src/Makefile.am
+@@ -33,7 +33,7 @@ fontconfig_def_dependency = fontconfig.def
+ 
+ install-libtool-import-lib: libfontconfig.la
+ 	$(MKDIR_P) $(DESTDIR)$(libdir)
+-	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
++#	$(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a
+ 	$(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def
+ 
+ uninstall-libtool-import-lib:
+@@ -58,7 +58,8 @@ fontconfig.lib : libfontconfig.la
+ 	lib -name:libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@
+ 
+ install-ms-import-lib:
+-	$(INSTALL) fontconfig.lib $(DESTDIR)$(libdir)
++	$(MKDIR_P) $(DESTDIR)$(libdir)
++	$(INSTALL) .libs/fontconfig.lib $(DESTDIR)$(libdir)
+ 
+ uninstall-ms-import-lib:
+ 	$(RM) $(DESTDIR)$(libdir)/fontconfig.lib
+diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c
+index 87e302083..8b5012110 100644
+--- a/fc-cache/fc-cache.c
++++ b/fc-cache/fc-cache.c
+@@ -34,11 +34,20 @@
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <sys/types.h>
++#if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
++#endif
+ #include <errno.h>
++#if HAVE_FCNTL_H
+ #include <fcntl.h>
++#endif
+ #include <dirent.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c
+index 69611bcc3..e7b0efbaa 100644
+--- a/fc-cat/fc-cat.c
++++ b/fc-cat/fc-cat.c
+@@ -36,9 +36,16 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <sys/types.h>
++#if HAVE_SYS_STAT_H
+ #include <sys/stat.h>
++#endif
+ #include <errno.h>
+ #include <locale.h>
+ 
+diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c
+index 5c40a0f09..affaca09e 100644
+--- a/fc-conflist/fc-conflist.c
++++ b/fc-conflist/fc-conflist.c
+@@ -35,7 +35,12 @@
+ 
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c
+index 2039acd36..0e56b1c32 100644
+--- a/fc-list/fc-list.c
++++ b/fc-list/fc-list.c
+@@ -24,7 +24,12 @@
+ 
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c
+index dee61479d..da8d820aa 100644
+--- a/fc-match/fc-match.c
++++ b/fc-match/fc-match.c
+@@ -33,7 +33,12 @@
+ 
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c
+index 7989b816f..15b43e098 100644
+--- a/fc-pattern/fc-pattern.c
++++ b/fc-pattern/fc-pattern.c
+@@ -33,7 +33,12 @@
+ 
+ #include <fontconfig/fontconfig.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c
+index fbffb8415..58c251fe3 100644
+--- a/fc-query/fc-query.c
++++ b/fc-query/fc-query.c
+@@ -36,7 +36,12 @@
+ #include <fontconfig/fontconfig.h>
+ #include <fontconfig/fcfreetype.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c
+index 9302ac559..3a0ccf188 100644
+--- a/fc-scan/fc-scan.c
++++ b/fc-scan/fc-scan.c
+@@ -36,7 +36,12 @@
+ #include <fontconfig/fontconfig.h>
+ #include <fontconfig/fcfreetype.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/fc-validate/fc-validate.c b/fc-validate/fc-validate.c
+index 2ceee2024..8f702f190 100644
+--- a/fc-validate/fc-validate.c
++++ b/fc-validate/fc-validate.c
+@@ -36,7 +36,12 @@
+ #include <fontconfig/fontconfig.h>
+ #include <fontconfig/fcfreetype.h>
+ #include <stdio.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <stdlib.h>
+ #include <string.h>
+ #include <locale.h>
+diff --git a/src/fcatomic.c b/src/fcatomic.c
+index d12d32408..da7234934 100644
+--- a/src/fcatomic.c
++++ b/src/fcatomic.c
+@@ -50,7 +50,9 @@
+ #include "fcint.h"
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
+ #include <stdlib.h>
+ #include <time.h>
+ 
+diff --git a/src/fccache.c b/src/fccache.c
+index 2b604014e..50fb742c6 100644
+--- a/src/fccache.c
++++ b/src/fccache.c
+@@ -30,7 +30,9 @@
+ #include <limits.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#ifndef _MSC_VER
+ #include <sys/time.h>
++#endif
+ #include <assert.h>
+ #if defined(HAVE_MMAP) || defined(__CYGWIN__)
+ #  include <unistd.h>
+diff --git a/src/fcint.h b/src/fcint.h
+index de78cd8c9..4fb269ffa 100644
+--- a/src/fcint.h
++++ b/src/fcint.h
+@@ -40,7 +40,18 @@
+ #include <limits.h>
+ #include <float.h>
+ #include <math.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <direct.h>
++#include <io.h>
++#include <BaseTsd.h>
++#define ssize_t SSIZE_T
++#define F_OK 0
++#define W_OK 2
++typedef int mode_t;
++#endif
+ #include <stddef.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+diff --git a/test/test-migration.c b/test/test-migration.c
+index b7d96dcce..7eac59dcc 100644
+--- a/test/test-migration.c
++++ b/test/test-migration.c
+@@ -28,13 +28,16 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <sys/types.h>
+ #include <dirent.h>
+ #ifndef HAVE_STRUCT_DIRENT_D_TYPE
+-#include <sys/types.h>
+ #include <sys/stat.h>
+-#include <unistd.h>
+ #endif
+ #include <fontconfig/fontconfig.h>
+ 
+diff --git a/test/test-pthread.c b/test/test-pthread.c
+index fbf397d4c..38d7dea35 100644
+--- a/test/test-pthread.c
++++ b/test/test-pthread.c
+@@ -24,7 +24,12 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_UNISTD_H
+ #include <unistd.h>
++#endif
++#ifdef _MSC_VER
++#include <io.h>
++#endif
+ #include <pthread.h>
+ #include <fontconfig/fontconfig.h>
+ 
diff --git a/ports/fontconfig/build2.patch b/ports/fontconfig/build2.patch
new file mode 100644
index 000000000..13bacf15d
--- /dev/null
+++ b/ports/fontconfig/build2.patch
@@ -0,0 +1,35 @@
+diff --git a/Tools.mk b/Tools.mk
+index f0fa0ec50..24e5afd16 100644
+--- a/Tools.mk
++++ b/Tools.mk
+@@ -43,7 +43,7 @@ AM_CPPFLAGS = \
+ 	   $(WARN_CFLAGS)
+ 
+ $(TOOL): $(TSRC) $(ALIAS_FILES)
+-	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS)
++	$(AM_V_GEN) $(CC_FOR_BUILD) -o $(TOOL) $< $(AM_CPPFLAGS) $(LIBINTL)
+ 
+ $(TARG): $(TMPL) $(TSRC) $(DEPS)
+ 	$(AM_V_GEN) $(MAKE) $(TOOL) && \
+diff --git a/fc-case/fc-case.c b/fc-case/fc-case.c
+index 236bff5f0..6fb21c855 100644
+--- a/fc-case/fc-case.c
++++ b/fc-case/fc-case.c
+@@ -345,7 +345,7 @@ main (int argc, char **argv)
+ 	    break;
+ 	fputs (line, stdout);
+     }
+-    
++    fflush (stdout);
+     /*
+      * Dump these tables
+      */
+@@ -354,7 +354,7 @@ main (int argc, char **argv)
+     /*
+      * And flush out the rest of the input file
+      */
+-
++    fflush (stdout);
+     while (fgets (line, sizeof (line), stdin))
+ 	fputs (line, stdout);
+     
diff --git a/ports/fontconfig/fcobjtypehash.patch b/ports/fontconfig/fcobjtypehash.patch
deleted file mode 100644
index e0db68942..000000000
--- a/ports/fontconfig/fcobjtypehash.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/src/fcobjs.c b/src/fcobjs.c
-index 33bba8d..e6b0808 100644
---- a/src/fcobjs.c
-+++ b/src/fcobjs.c
-@@ -24,11 +24,13 @@
- 
- #include "fcint.h"
- 
-+#if 0
- static unsigned int
- FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len);
- 
- static const struct FcObjectTypeInfo *
- FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len);
-+#endif
- 
- #include "fcobjshash.h"
- 
diff --git a/ports/fontconfig/include/alias/fcalias.h b/ports/fontconfig/include/alias/fcalias.h
deleted file mode 100644
index e69de29bb..000000000
--- a/ports/fontconfig/include/alias/fcalias.h
+++ /dev/null
diff --git a/ports/fontconfig/include/alias/fcaliastail.h b/ports/fontconfig/include/alias/fcaliastail.h
deleted file mode 100644
index a9eae81f2..000000000
--- a/ports/fontconfig/include/alias/fcaliastail.h
+++ /dev/null
@@ -1 +0,0 @@
-/* intentionally empty */
diff --git a/ports/fontconfig/include/alias/fcftalias.h b/ports/fontconfig/include/alias/fcftalias.h
deleted file mode 100644
index e69de29bb..000000000
--- a/ports/fontconfig/include/alias/fcftalias.h
+++ /dev/null
diff --git a/ports/fontconfig/include/alias/fcftaliastail.h b/ports/fontconfig/include/alias/fcftaliastail.h
deleted file mode 100644
index a9eae81f2..000000000
--- a/ports/fontconfig/include/alias/fcftaliastail.h
+++ /dev/null
@@ -1 +0,0 @@
-/* intentionally empty */
diff --git a/ports/fontconfig/include/unix/config.h b/ports/fontconfig/include/unix/config.h
deleted file mode 100644
index 5b5da3792..000000000
--- a/ports/fontconfig/include/unix/config.h
+++ /dev/null
@@ -1,376 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-#define FC_CACHEDIR "./"
-
-/* The normal alignment of `double', in bytes. */
-#define ALIGNOF_DOUBLE 8
-
-/* The normal alignment of `void *', in bytes. */
-#if defined(_WIN64)
-#define ALIGNOF_VOID_P 8
-#else
-#define ALIGNOF_VOID_P 4
-#endif
-
-/* Use libxml2 instead of Expat */
-/* #undef ENABLE_LIBXML2 */
-
-/* Additional font directories */
-#define FC_ADD_FONTS "yes"
-
-/* Architecture prefix to use for cache file names */
-/* #undef FC_ARCHITECTURE */
-
-/* System font directory */
-#define FC_DEFAULT_FONTS ""
-
-/* The type of len parameter of the gperf hash/lookup function */
-#define FC_GPERF_SIZE_T size_t
-
-/* Define to nothing if C supports flexible array members, and to 1 if it does
-   not. That way, with a declaration like `struct s { int n; double
-   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
-   compilers. When computing the size of such an object, don't use 'sizeof
-   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
-   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
-   MSVC and with C++ compilers. */
-#define FLEXIBLE_ARRAY_MEMBER /**/
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fstatfs' function. */
-/* #undef HAVE_FSTATFS */
-
-/* Define to 1 if you have the `fstatvfs' function. */
-/* #undef HAVE_FSTATVFS */
-
-/* FT_Bitmap_Size structure includes y_ppem field */
-#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
-
-/* Define to 1 if you have the `FT_Get_BDF_Property' function. */
-#define HAVE_FT_GET_BDF_PROPERTY 1
-
-/* Define to 1 if you have the `FT_Get_Next_Char' function. */
-#define HAVE_FT_GET_NEXT_CHAR 1
-
-/* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */
-#define HAVE_FT_GET_PS_FONT_INFO 1
-
-/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */
-#define HAVE_FT_GET_X11_FONT_FORMAT 1
-
-/* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */
-#define HAVE_FT_HAS_PS_GLYPH_NAMES 1
-
-/* Define to 1 if you have the `FT_Select_Size' function. */
-#define HAVE_FT_SELECT_SIZE 1
-
-/* Define to 1 if you have the `getexecname' function. */
-/* #undef HAVE_GETEXECNAME */
-
-/* Define to 1 if you have the `getopt' function. */
-#define HAVE_GETOPT 1
-
-/* Define to 1 if you have the `getopt_long' function. */
-#define HAVE_GETOPT_LONG 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getprogname' function. */
-/* #undef HAVE_GETPROGNAME */
-
-/* Have Intel __sync_* atomic primitives */
-#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `link' function. */
-/* #undef HAVE_LINK */
-
-/* Define to 1 if you have the `lrand48' function. */
-/* #undef HAVE_LRAND48 */
-
-/* Define to 1 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkdtemp' function. */
-/* #undef HAVE_MKDTEMP */
-
-/* Define to 1 if you have the `mkostemp' function. */
-/* #undef HAVE_MKOSTEMP */
-
-/* Define to 1 if you have the `mkstemp' function. */
-#define HAVE_MKSTEMP 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the 'posix_fadvise' function. */
-/* #undef HAVE_POSIX_FADVISE */
-
-/* Have POSIX threads */
-#define HAVE_PTHREAD 1
-
-/* Have PTHREAD_PRIO_INHERIT. */
-/* #undef HAVE_PTHREAD_PRIO_INHERIT */
-
-/* Define to 1 if you have the `rand' function. */
-#define HAVE_RAND 1
-
-/* Define to 1 if you have the `random' function. */
-/* #undef HAVE_RANDOM */
-
-/* Define to 1 if you have the `random_r' function. */
-/* #undef HAVE_RANDOM_R */
-
-/* Define to 1 if you have the `rand_r' function. */
-/* #undef HAVE_RAND_R */
-
-/* Define to 1 if you have the `readlink' function. */
-/* #undef HAVE_READLINK */
-
-/* Define to 1 if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
-
-/* Have sched_yield */
-/* #undef HAVE_SCHED_YIELD */
-
-/* Have Solaris __machine_*_barrier and atomic_* operations */
-/* #undef HAVE_SOLARIS_ATOMIC_OPS */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if `d_type' is a member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
-
-/* Define to 1 if `f_flags' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FLAGS */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
-
-/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
-
-/* Define to 1 if `st_mtim' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_MTIM */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-/* #undef HAVE_SYS_MOUNT_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-/* #undef HAVE_SYS_STATFS_H */
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-/* #undef HAVE_SYS_STATVFS_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-/* #undef HAVE_SYS_VFS_H */
-
-/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1
-
-/* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Can use #warning in C files */
-#define HAVE_WARNING_CPP_DIRECTIVE 1
-
-/* Use xmlparse.h instead of expat.h */
-/* #undef HAVE_XMLPARSE_H */
-
-/* Define to 1 if you have the `XML_SetDoctypeDeclHandler' function. */
-#define HAVE_XML_SETDOCTYPEDECLHANDLER 1
-
-/* Define to 1 if you have the `_mktemp_s' function. */
-/* #undef HAVE__MKTEMP_S */
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "fontconfig"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "fontconfig"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fontconfig 2.12.3"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "fontconfig"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.12.3"
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `char', as computed by sizeof. */
-/* #undef SIZEOF_CHAR */
-
-/* The size of `int', as computed by sizeof. */
-/* #undef SIZEOF_INT */
-
-/* The size of `long', as computed by sizeof. */
-/* #undef SIZEOF_LONG */
-
-/* The size of `short', as computed by sizeof. */
-/* #undef SIZEOF_SHORT */
-
-/* The size of `void*', as computed by sizeof. */
-/* #undef SIZEOF_VOIDP */
-
-/* The size of `void *', as computed by sizeof. */
-#if defined(_WIN64)
-#define SIZEOF_VOIDP 8
-#define SIZEOF_VOID_P 8
-#else
-#define SIZEOF_VOIDP 4
-#define SIZEOF_VOID_P 4
-#endif
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Use iconv. */
-#define USE_ICONV 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Version number of package */
-#define VERSION "2.12.3"
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-#define FONTCONFIG_PATH "/etc/fonts"
-
-#include "config-fixups.h"
diff --git a/ports/fontconfig/include/win32/config.h b/ports/fontconfig/include/win32/config.h
deleted file mode 100644
index 0fbdead6e..000000000
--- a/ports/fontconfig/include/win32/config.h
+++ /dev/null
@@ -1,374 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
-
-#define FC_CACHEDIR "./"
-
-/* The normal alignment of `double', in bytes. */
-#define ALIGNOF_DOUBLE 8
-
-/* The normal alignment of `void *', in bytes. */
-#if defined(_WIN64)
-#define ALIGNOF_VOID_P 8
-#else
-#define ALIGNOF_VOID_P 4
-#endif
-
-/* Use libxml2 instead of Expat */
-/* #undef ENABLE_LIBXML2 */
-
-/* Additional font directories */
-#define FC_ADD_FONTS "yes"
-
-/* Architecture prefix to use for cache file names */
-/* #undef FC_ARCHITECTURE */
-
-/* System font directory */
-#define FC_DEFAULT_FONTS "WINDOWSFONTDIR"
-
-/* The type of len parameter of the gperf hash/lookup function */
-#define FC_GPERF_SIZE_T size_t
-
-/* Define to nothing if C supports flexible array members, and to 1 if it does
-   not. That way, with a declaration like `struct s { int n; double
-   d[FLEXIBLE_ARRAY_MEMBER]; };', the struct hack can be used with pre-C99
-   compilers. When computing the size of such an object, don't use 'sizeof
-   (struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
-   instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
-   MSVC and with C++ compilers. */
-#define FLEXIBLE_ARRAY_MEMBER /**/
-
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#define HAVE_DIRENT_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
-/* #undef HAVE_DOPRNT */
-
-/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
-
-/* Define to 1 if you have the `fstatfs' function. */
-/* #undef HAVE_FSTATFS */
-
-/* Define to 1 if you have the `fstatvfs' function. */
-/* #undef HAVE_FSTATVFS */
-
-/* FT_Bitmap_Size structure includes y_ppem field */
-#define HAVE_FT_BITMAP_SIZE_Y_PPEM 1
-
-/* Define to 1 if you have the `FT_Get_BDF_Property' function. */
-#define HAVE_FT_GET_BDF_PROPERTY 1
-
-/* Define to 1 if you have the `FT_Get_Next_Char' function. */
-#define HAVE_FT_GET_NEXT_CHAR 1
-
-/* Define to 1 if you have the `FT_Get_PS_Font_Info' function. */
-#define HAVE_FT_GET_PS_FONT_INFO 1
-
-/* Define to 1 if you have the `FT_Get_X11_Font_Format' function. */
-#define HAVE_FT_GET_X11_FONT_FORMAT 1
-
-/* Define to 1 if you have the `FT_Has_PS_Glyph_Names' function. */
-#define HAVE_FT_HAS_PS_GLYPH_NAMES 1
-
-/* Define to 1 if you have the `FT_Select_Size' function. */
-#define HAVE_FT_SELECT_SIZE 1
-
-/* Define to 1 if you have the `getexecname' function. */
-/* #undef HAVE_GETEXECNAME */
-
-/* Define to 1 if you have the `getopt' function. */
-#define HAVE_GETOPT 1
-
-/* Define to 1 if you have the `getopt_long' function. */
-#define HAVE_GETOPT_LONG 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define to 1 if you have the `getprogname' function. */
-/* #undef HAVE_GETPROGNAME */
-
-/* Have Intel __sync_* atomic primitives */
-#define HAVE_INTEL_ATOMIC_PRIMITIVES 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `link' function. */
-/* #undef HAVE_LINK */
-
-/* Define to 1 if you have the `lrand48' function. */
-/* #undef HAVE_LRAND48 */
-
-/* Define to 1 if you have the `lstat' function. */
-/* #undef HAVE_LSTAT */
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mkdtemp' function. */
-/* #undef HAVE_MKDTEMP */
-
-/* Define to 1 if you have the `mkostemp' function. */
-/* #undef HAVE_MKOSTEMP */
-
-/* Define to 1 if you have the `mkstemp' function. */
-/* #undef HAVE_MKSTEMP */
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_NDIR_H */
-
-/* Define to 1 if you have the 'posix_fadvise' function. */
-/* #undef HAVE_POSIX_FADVISE */
-
-/* Have POSIX threads */
-/* #undef HAVE_PTHREAD */
-
-/* Have PTHREAD_PRIO_INHERIT. */
-/* #undef HAVE_PTHREAD_PRIO_INHERIT */
-
-/* Define to 1 if you have the `rand' function. */
-#define HAVE_RAND 1
-
-/* Define to 1 if you have the `random' function. */
-/* #undef HAVE_RANDOM */
-
-/* Define to 1 if you have the `random_r' function. */
-/* #undef HAVE_RANDOM_R */
-
-/* Define to 1 if you have the `rand_r' function. */
-/* #undef HAVE_RAND_R */
-
-/* Define to 1 if you have the `readlink' function. */
-/* #undef HAVE_READLINK */
-
-/* Define to 1 if you have the <sched.h> header file. */
-/* #undef HAVE_SCHED_H */
-
-/* Have sched_yield */
-/* #undef HAVE_SCHED_YIELD */
-
-/* Have Solaris __machine_*_barrier and atomic_* operations */
-/* #undef HAVE_SOLARIS_ATOMIC_OPS */
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if `d_type' is a member of `struct dirent'. */
-/* #undef HAVE_STRUCT_DIRENT_D_TYPE */
-
-/* Define to 1 if `f_flags' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FLAGS */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statfs'. */
-/* #undef HAVE_STRUCT_STATFS_F_FSTYPENAME */
-
-/* Define to 1 if `f_basetype' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_BASETYPE */
-
-/* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */
-/* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */
-
-/* Define to 1 if `st_mtim' is a member of `struct stat'. */
-/* #undef HAVE_STRUCT_STAT_ST_MTIM */
-
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-/* #undef HAVE_SYS_DIR_H */
-
-/* Define to 1 if you have the <sys/mount.h> header file. */
-/* #undef HAVE_SYS_MOUNT_H */
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
-/* #undef HAVE_SYS_NDIR_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/statfs.h> header file. */
-/* #undef HAVE_SYS_STATFS_H */
-
-/* Define to 1 if you have the <sys/statvfs.h> header file. */
-/* #undef HAVE_SYS_STATVFS_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <sys/vfs.h> header file. */
-/* #undef HAVE_SYS_VFS_H */
-
-/* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1
-
-/* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */
-#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if you have the `vprintf' function. */
-#define HAVE_VPRINTF 1
-
-/* Can use #warning in C files */
-#define HAVE_WARNING_CPP_DIRECTIVE 1
-
-/* Use xmlparse.h instead of expat.h */
-/* #undef HAVE_XMLPARSE_H */
-
-/* Define to 1 if you have the `XML_SetDoctypeDeclHandler' function. */
-#define HAVE_XML_SETDOCTYPEDECLHANDLER 1
-
-/* Define to 1 if you have the `_mktemp_s' function. */
-#define HAVE__MKTEMP_S 1
-
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
-/* Name of package */
-#define PACKAGE "fontconfig"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "fontconfig"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "fontconfig 2.12.3"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "fontconfig"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "2.12.3"
-
-/* Define to necessary symbol if this constant uses a non-standard name on
-   your system. */
-/* #undef PTHREAD_CREATE_JOINABLE */
-
-/* The size of `char', as computed by sizeof. */
-/* #undef SIZEOF_CHAR */
-
-/* The size of `int', as computed by sizeof. */
-/* #undef SIZEOF_INT */
-
-/* The size of `long', as computed by sizeof. */
-/* #undef SIZEOF_LONG */
-
-/* The size of `short', as computed by sizeof. */
-/* #undef SIZEOF_SHORT */
-
-/* The size of `void*', as computed by sizeof. */
-/* #undef SIZEOF_VOIDP */
-
-/* The size of `void *', as computed by sizeof. */
-#if defined(_WIN64)
-#define SIZEOF_VOIDP 8
-#define SIZEOF_VOID_P 8
-#else
-#define SIZEOF_VOIDP 4
-#define SIZEOF_VOID_P 4
-#endif
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Use iconv. */
-#define USE_ICONV 1
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Version number of package */
-#define VERSION "2.12.3"
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
-   significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-#  define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* #  undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#define _FILE_OFFSET_BITS 64
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-#include "config-fixups.h"
diff --git a/ports/fontconfig/include/win32/unistd.h b/ports/fontconfig/include/win32/unistd.h
deleted file mode 100644
index 7d04abe29..000000000
--- a/ports/fontconfig/include/win32/unistd.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*  Minimal unistd.h, just to get fontconfig to compile */
-#ifndef UNISTD_H
-#define UNISTD_H
-
-#include <io.h>
-
-#ifndef R_OK
-#define R_OK 4
-#endif
-
-#ifndef W_OK
-#define W_OK 2
-#endif
-
-#ifndef F_OK
-#define F_OK 0
-#endif
-
-typedef int mode_t;
-
-#endif
\ No newline at end of file
diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake
index 5d9492f70..b4641e352 100644
--- a/ports/fontconfig/portfile.cmake
+++ b/ports/fontconfig/portfile.cmake
@@ -1,52 +1,95 @@
-vcpkg_fail_port_install(ON_TARGET "uwp")
+set(FONTCONFIG_VERSION 2.13.1)
 
-set(FONTCONFIG_VERSION 2.12.4)
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz"
-    FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz"
-    SHA512 2be3ee0e8e0e3b62571135a3cae06e456c289dd1ad40ef2a7c780406418ee5efce863a833eca5a8ef55bc737a0ea04ef562bba6fd27e174ae43e42131b52810d
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_gitlab(
+    GITLAB_URL https://gitlab.freedesktop.org
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-    REF ${FONTCONFIG_VERSION}
-    PATCHES fcobjtypehash.patch
+    REPO fontconfig/fontconfig
+    REF 844d8709a1f3ecab45015b24b72dd775c13b2421 #v2.13.1
+    SHA512 fed0cf46f5dca9cb1e03475d7a8d7efdab06c7180fe0c922fb30cadfa91e1efe1f6a6e36d2fdb742a479cb09c05b0aefb5da5658bf2e01a32b7ac88ee8ff0b58
+    HEAD_REF master # branch name
+    PATCHES remove_tests.patch
+            build.patch
+            build2.patch
 )
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+vcpkg_find_acquire_program(GPERF)
+get_filename_component(GPERF_PATH ${GPERF} DIRECTORY)
+vcpkg_add_to_path(${GPERF_PATH})
 
-vcpkg_configure_cmake(
+vcpkg_configure_make(
+    AUTOCONFIG
+    COPY_SOURCE
     SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
     OPTIONS
-        -DFC_INCLUDE_DIR=${CMAKE_CURRENT_LIST_DIR}/include
+        --disable-docs
+        ${OPTIONS}
+        ac_cv_type_pid_t=yes
+        --enable-iconv
+        "--with-libiconv=${CURRENT_INSTALLED_DIR}"
+        "--with-libiconv-includes=${CURRENT_INSTALLED_DIR}/include"
     OPTIONS_DEBUG
-        -DFC_SKIP_TOOLS=ON
-        -DFC_SKIP_HEADERS=ON
+        "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/debug/lib"
+        ${OPT_DBG}
+    OPTIONS_RELEASE
+        "--with-libiconv-lib=${CURRENT_INSTALLED_DIR}/lib"
+        ${OPT_REL}
+    ADD_BIN_TO_PATH
+    ADDITIONAL_MSYS_PACKAGES xz findutils gettext gettext-devel  # for autopoint
 )
 
-vcpkg_install_cmake()
+vcpkg_install_make(ADD_BIN_TO_PATH)
+vcpkg_copy_pdbs()
+vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES uuid)
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-fontconfig TARGET_PATH share/unofficial-fontconfig)
+# Fix paths in debug pc file.
+set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/fontconfig.pc")
+if(EXISTS "${_file}")
+    file(READ "${_file}" _contents)
+    string(REPLACE "/etc" "/../etc" _contents "${_contents}")
+    string(REPLACE "/var" "/../var" _contents "${_contents}")
+    file(WRITE "${_file}" "${_contents}")
+endif()
 
-vcpkg_copy_pdbs()
+# Make path to cache in fonts.conf relative
+set(_file "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
+if(EXISTS "${_file}")
+    file(READ "${_file}" _contents)
+    string(REPLACE "${CURRENT_INSTALLED_DIR}/var/cache/fontconfig" "./../../var/cache/fontconfig" _contents "${_contents}")
+    string(REPLACE "/var" "/../var" _contents "${_contents}")
+    file(WRITE "${_file}" "${_contents}")
+endif()
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var"
+                    "${CURRENT_PACKAGES_DIR}/debug/share"
+                    "${CURRENT_PACKAGES_DIR}/debug/etc")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
+    if(VCPKG_TARGET_IS_WINDOWS)
+        set(DEFINE_FC_PUBLIC "#define FcPublic __declspec(dllimport)")
+    else()
+        set(DEFINE_FC_PUBLIC "#define FcPublic __attribute__((visibility(\"default\")))")
+    endif()
     foreach(HEADER fcfreetype.h fontconfig.h)
-        if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
-            vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}
-               "#define FcPublic"
-               "#define FcPublic __declspec(dllimport)"
-            )
-        else()
-            vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}
-               "#define FcPublic"
-               "#define FcPublic __attribute__((visibility(\"default\")))"
-            )
-        endif()
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER}"
+            "#define FcPublic"
+            "${DEFINE_FC_PUBLIC}"
+        )
     endforeach()
 endif()
 
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+
+
+## Build the fontconfig cache
+if(NOT VCPKG_TARGET_IS_WINDOWS)
+    set(ENV{FONTCONFIG_PATH} "${CURRENT_PACKAGES_DIR}/etc/fonts")
+    set(ENV{FONTCONFIG_FILE} "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf")
+    vcpkg_execute_required_process(COMMAND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin/fc-cache${VCPKG_TARGET_EXECUTABLE_SUFFIX}" --verbose
+                                   WORKING_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin"
+                                   LOGNAME fc-cache-${TARGET_TRIPLET})
+endif()
 
+if(VCPKG_TARGET_IS_WINDOWS)
+    # Unnecessary make rule creating the fontconfig cache dir on windows. 
+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}LOCAL_APPDATA_FONTCONFIG_CACHE")
+endif()
\ No newline at end of file
diff --git a/ports/fontconfig/remove_tests.patch b/ports/fontconfig/remove_tests.patch
new file mode 100644
index 000000000..0f9e1b8fc
--- /dev/null
+++ b/ports/fontconfig/remove_tests.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index cc3024e68..e58f8688c 100644
+--- a/Makefile.am
++++ b/Makefile.am	
+@@ -24,7 +24,7 @@
+ SUBDIRS=fontconfig fc-case fc-lang src \
+ 	fc-cache fc-cat fc-conflist fc-list fc-match \
+ 	fc-pattern fc-query fc-scan fc-validate conf.d \
+-	its po po-conf test
++	its po po-conf
+ if ENABLE_DOCS
+ SUBDIRS += doc
+ endif
diff --git a/ports/freexl/CONTROL b/ports/freexl/CONTROL
index 1a887b193..3855a9cad 100644
--- a/ports/freexl/CONTROL
+++ b/ports/freexl/CONTROL
@@ -1,6 +1,6 @@
 Source: freexl
 Version: 1.0.4
-Port-Version: 10
+Port-Version: 11
 Homepage: https://www.gaia-gis.it/gaia-sins/freexl-sources
 Description: FreeXL is an open source library to extract valid data from within an Excel (.xls) spreadsheet
 Build-Depends: libiconv
diff --git a/ports/freexl/portfile.cmake b/ports/freexl/portfile.cmake
index 6a79451dd..6b4998b67 100644
--- a/ports/freexl/portfile.cmake
+++ b/ports/freexl/portfile.cmake
@@ -16,12 +16,12 @@ if (VCPKG_TARGET_IS_WINDOWS)
     )
     
     set(LIBS_ALL_DBG 
-      "\"${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib\" \
-      \"${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib\""
+      "\"${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib\" \
+      \"${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib\""
       )
     set(LIBS_ALL_REL 
-      "\"${CURRENT_INSTALLED_DIR}/lib/libiconv.lib\" \
-      \"${CURRENT_INSTALLED_DIR}/lib/libcharset.lib\""
+      "\"${CURRENT_INSTALLED_DIR}/lib/iconv.lib\" \
+      \"${CURRENT_INSTALLED_DIR}/lib/charset.lib\""
       )
     
     vcpkg_install_nmake(
diff --git a/ports/gdal/CONTROL b/ports/gdal/CONTROL
index 38a1e266a..89bf2d2af 100644
--- a/ports/gdal/CONTROL
+++ b/ports/gdal/CONTROL
@@ -1,6 +1,6 @@
 Source: gdal
 Version: 2.4.1
-Port-Version: 13
+Port-Version: 14
 Homepage: https://gdal.org/
 Description: The Geographic Data Abstraction Library for reading and writing geospatial raster and vector data.
 Build-Depends: proj4, libpng, geos, sqlite3, curl, expat, libpq, openjpeg, libwebp, libxml2, liblzma, netcdf-c, hdf5, zlib
diff --git a/ports/gdal/portfile.cmake b/ports/gdal/portfile.cmake
index e5775e781..8c3650629 100644
--- a/ports/gdal/portfile.cmake
+++ b/ports/gdal/portfile.cmake
@@ -149,8 +149,8 @@ if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
   file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libcrypto.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libssl.lib" OPENSSL_LIBRARY_DBG)
 
   # Setup libiconv libraries path
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib" ICONV_LIBRARY_REL)
-  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib" ICONV_LIBRARY_DBG)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/lib/charset.lib" ICONV_LIBRARY_REL)
+  file(TO_NATIVE_PATH "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib" ICONV_LIBRARY_DBG)
 
   if("mysql-libmysql" IN_LIST FEATURES OR "mysql-libmariadb" IN_LIST FEATURES)
       # Setup MySQL libraries + include path
diff --git a/ports/gdk-pixbuf/CMakeLists.txt b/ports/gdk-pixbuf/CMakeLists.txt
index cdc5c3fb8..0ff2a85e2 100644
--- a/ports/gdk-pixbuf/CMakeLists.txt
+++ b/ports/gdk-pixbuf/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(PNG REQUIRED)
 find_package(unofficial-glib CONFIG REQUIRED)
 find_path(GLIB_INCLUDE_DIR glib.h)
 
-find_package(unofficial-gettext CONFIG REQUIRED)
+find_package(Intl REQUIRED)
 find_path(LIBINTL_INCLUDE_DIR libintl.h)
     
 if(WIN32)
@@ -66,10 +66,10 @@ target_include_directories(gdk-pixbuf PRIVATE
     ${GLIB_INCLUDE_DIR} 
     ${PNG_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIRS}
-    ${LIBINTL_INCLUDE_DIR})
+    ${Intl_INCLUDE_DIR})
 
 set(LIBS 
-    unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject unofficial::gettext::libintl
+    unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject ${Intl_LIBRARIES}
     ${ZLIB_LIBRARIES} 
     ${PNG_LIBRARIES} 
 )
diff --git a/ports/gdk-pixbuf/CONTROL b/ports/gdk-pixbuf/CONTROL
index 229973bc8..c283d8e6e 100644
--- a/ports/gdk-pixbuf/CONTROL
+++ b/ports/gdk-pixbuf/CONTROL
@@ -1,5 +1,6 @@
 Source: gdk-pixbuf

 Version: 2.36.9-5

+Port-Version: 6

 Homepage: https://developer.gnome.org/gdk-pixbuf/

 Description: Image loading library.

 Build-Depends: gettext, zlib, libpng, glib

diff --git a/ports/gettext/0001-Fix-macro-definitions.patch b/ports/gettext/0001-Fix-macro-definitions.patch
deleted file mode 100644
index eeed3a0ce..000000000
--- a/ports/gettext/0001-Fix-macro-definitions.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/gettext-runtime/intl/xsize.h b/gettext-runtime/intl/xsize.h
-index c256665..7400ea1 100644
---- a/gettext-runtime/intl/xsize.h
-+++ b/gettext-runtime/intl/xsize.h
-@@ -27,6 +27,12 @@
- # include <stdint.h>
- #endif
- 
-+#if defined _WIN32
-+# define _GL_INLINE_HEADER_BEGIN
-+# define _GL_INLINE_HEADER_END
-+# define _GL_INLINE static inline
-+#endif
-+
- #ifndef _GL_INLINE_HEADER_BEGIN
-  #error "Please include config.h first."
- #endif
diff --git a/ports/gettext/0002-Fix-uwp-build.patch b/ports/gettext/0002-Fix-uwp-build.patch
index 154131544..ba98e2665 100644
--- a/ports/gettext/0002-Fix-uwp-build.patch
+++ b/ports/gettext/0002-Fix-uwp-build.patch
@@ -5,7 +5,7 @@ index aeb1c4e9..2ac531be 100644
 @@ -33,7 +33,13 @@ extern void _nl_locale_name_canonicalize (char *name);
  #endif
  
- #if defined _WIN32 || defined __WIN32__
+ #if defined _WIN32
 -# define WIN32_NATIVE
 +# if !defined(WINAPI_FAMILY)
 +#	define WIN32_NATIVE
@@ -22,10 +22,10 @@ index 670b8e6c..035a96bd 100644
 --- "a/gettext-runtime/intl/localcharset.c"
 +++ "b/gettext-runtime/intl/localcharset.c"
 @@ -36,6 +36,16 @@
- # define WINDOWS_NATIVE
+ # include <locale.h>
  #endif
  
-+#if defined _WIN32 || defined __WIN32__
++#if defined _WIN32
 +# if !defined(WINAPI_FAMILY)
 +#	define HAVE_ACP
 +# else
@@ -38,32 +38,32 @@ index 670b8e6c..035a96bd 100644
  #if defined __EMX__
  /* Assume EMX program runs on OS/2, even if compiled under DOS.  */
  # ifndef OS2
-@@ -361,7 +371,7 @@ STATIC
+@@ -830,7 +830,7 @@ STATIC
  const char *
  locale_charset (void)
  {
 -  const char *codeset;
 +  const char *codeset = NULL;
-   const char *aliases;
  
- #if !(defined WINDOWS_NATIVE || defined OS2)
-@@ -457,7 +467,7 @@ locale_charset (void)
+   /* This function must be multithread-safe.  To achieve this without using
+      thread-local storage, we use a simple strcpy or memcpy to fill this static
+@@ -912,7 +912,7 @@ locale_charset (void)
+     /* The canonical name cannot be determined.  */
+     codeset = "";
  
- # endif
- 
--#elif defined WINDOWS_NATIVE
-+#elif defined WINDOWS_NATIVE && defined HAVE_ACP
- 
-   static char buf[2 + 10 + 1];
+-# elif defined WINDOWS_NATIVE
++# elif defined WINDOWS_NATIVE && defined HAVE_ACP
  
+   char buf[2 + 10 + 1];
+   static char resultbuf[2 + 10 + 1];
 diff --git "a/gettext-runtime/intl/localename.c" "b/gettext-runtime/intl/localename.c"
 index 108dd6f1..ace3aa88 100644
 --- "a/gettext-runtime/intl/localename.c"
 +++ "b/gettext-runtime/intl/localename.c"
-@@ -54,7 +54,13 @@
+@@ -75,10 +75,16 @@
  #endif
  
- #if defined _WIN32 || defined __WIN32__
+ #if defined _WIN32 && !defined __CYGWIN__
 -# define WINDOWS_NATIVE
 +# if !defined(WINAPI_FAMILY)
 +#	define WINDOWS_NATIVE
@@ -72,6 +72,9 @@ index 108dd6f1..ace3aa88 100644
 +#		define WINDOWS_NATIVE
 +#   endif
 +# endif
+ # if !defined IN_LIBINTL
+ #  include "glthread/lock.h"
+ # endif
  #endif
  
  #if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
diff --git a/ports/gettext/0003-Fix-win-unicode-paths.patch b/ports/gettext/0003-Fix-win-unicode-paths.patch
index 540ac3d92..d8e52719f 100644
--- a/ports/gettext/0003-Fix-win-unicode-paths.patch
+++ b/ports/gettext/0003-Fix-win-unicode-paths.patch
@@ -2,7 +2,7 @@ diff --git "a/gettext-runtime/intl/loadmsgcat.c" "b/gettext-runtime/intl/loadmsg
 index 63351523..c078de3f 100644
 --- a/gettext-runtime/intl/loadmsgcat.c
 +++ b/gettext-runtime/intl/loadmsgcat.c
-@@ -477,6 +477,55 @@ char *alloca ();
+@@ -388,6 +388,55 @@ char *alloca ();
  # define munmap(addr, len)	__munmap (addr, len)
  #endif
  
diff --git a/ports/gettext/CMakeLists.txt b/ports/gettext/CMakeLists.txt
deleted file mode 100644
index 57d5a14e5..000000000
--- a/ports/gettext/CMakeLists.txt
+++ /dev/null
@@ -1,150 +0,0 @@
-cmake_minimum_required(VERSION 3.5)

-project(libintl C)

-

-find_package(unofficial-iconv REQUIRED)

-

-set(CMAKE_STATIC_LIBRARY_PREFIX)

-set(CMAKE_SHARED_LIBRARY_PREFIX)

-

-if(WIN32)

-    set(HAVE_POSIX_PRINTF 0)

-    set(HAVE_SNPRINTF 0)

-    set(HAVE_ASPRINTF 0)

-    set(HAVE_WPRINTF 0)

-    set(HAVE_NEWLOCALE 0)

-

-    configure_file(intl/libgnuintl.win32.h config/libgnuintl.h COPYONLY)

-    configure_file(config.win32.h config/config.h COPYONLY)

-else()

-    set(HAVE_POSIX_PRINTF 1)

-    set(HAVE_SNPRINTF 1)

-    set(HAVE_ASPRINTF 1)

-    set(HAVE_WPRINTF 1)

-    set(HAVE_NEWLOCALE 1)

-    add_definitions(-DHAVE_NEWLOCALE=1)

-    add_definitions(-DHAVE_NEWLOCALE=1)

-

-    set(CMAKE_THREAD_PREFER_PTHREAD TRUE)

-    set(THREADS_PREFER_PTHREAD_FLAG TRUE)

-    find_package(Threads REQUIRED)

-    if(NOT CMAKE_USE_PTHREADS_INIT)

-        message(FATAL_ERROR "Error: Only pthreads is currently supported.")

-    endif()

-

-    include(CheckFunctionExists)

-    include(CheckIncludeFiles)

-

-    if(APPLE)

-        set(HAVE_CFLOCALECOPYCURRENT 1)

-        set(HAVE_CFPREFERENCESCOPYAPPVALUE 1)

-    endif()

-    check_function_exists(dcgettext HAVE_DCGETTEXT)

-    check_include_files(features.h HAVE_FEATURES_H)

-    check_function_exists(gettext HAVE_GETTEXT)

-    check_include_files(mach-o/dyld.h HAVE_MACH_O_DYLD_H)

-    check_function_exists(mempcpy HAVE_MEMPCPY)

-    check_include_files(xlocale.h HAVE_XLOCALE_H)

-

-    configure_file(intl/libgnuintl.in.h config/libgnuintl.h @ONLY)

-    configure_file(config.unix.h.in config/config.h @ONLY)

-endif()

-

-if(NOT DISABLE_INSTALL_HEADERS)

-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config/libgnuintl.h" DESTINATION include RENAME libintl.h)

-endif()

-

-file(READ "${CMAKE_CURRENT_BINARY_DIR}/config/config.h" _contents)

-if(NOT WIN32)

-    string(REPLACE "/* #undef HAVE_STPCPY */" "#define HAVE_STPCPY 1" _contents "${_contents}")

-endif()

-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config/config.h" "${_contents}")

-

-FILE(GLOB SOURCES

-    "intl/bindtextdom.c"

-    "intl/dcgettext.c"

-    "intl/dcigettext.c"

-    "intl/dcngettext.c"

-    "intl/dgettext.c"

-    "intl/dngettext.c"

-    "intl/explodename.c"

-    "intl/finddomain.c"

-    "intl/gettext.c"

-    "intl/hash-string.c"

-    "intl/intl-compat.c"

-    "intl/l10nflist.c"

-    "intl/langprefs.c"

-    "intl/loadmsgcat.c"

-    "intl/localealias.c"

-    "intl/localename.c"

-    "intl/lock.c"

-    "intl/log.c"

-    "intl/ngettext.c"

-    "intl/osdep.c"

-    "intl/plural-exp.c"

-    "intl/plural.c"

-    "intl/printf.c"

-    "intl/relocatable.c"

-    "intl/textdomain.c"

-    "intl/version.c"

-)

-if(NOT WIN32)

-    list(APPEND SOURCES "intl/setlocale.c")

-endif()

-

-set(LOCALDIR "c:/gettext")

-

-add_definitions(-DLOCALEDIR=\"${LOCALDIR}\")

-add_definitions(-DLOCALE_ALIAS_PATH=\"${LOCALDIR}\")

-add_definitions(-DLIBDIR=\"${LOCALDIR}\")

-add_definitions(-DINSTALLDIR=\"${LOCALDIR}\")

-if(BUILD_SHARED_LIBS)

-  add_definitions(-DBUILDING_DLL)

-endif()

-add_definitions("-DBUILDING_LIBINTL -DIN_LIBINTL -DENABLE_RELOCATABLE=1 -DIN_LIBRARY")

-

-add_definitions("-DNO_XMALLOC -Dset_relocation_prefix=libintl_set_relocation_prefix -Drelocate=libintl_relocate -DDEPENDS_ON_LIBICONV=1 -DHAVE_CONFIG_H -DHAVE_ICONV -DHAVE_ICONV_H -DICONV_CONST=const -D_CRT_SECURE_NO_WARNINGS")

-

-add_library(libintl ${SOURCES})

-target_link_libraries(libintl PRIVATE unofficial::iconv::libcharset unofficial::iconv::libiconv)

-

-target_include_directories(libintl PUBLIC

-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/config>

-    $<INSTALL_INTERFACE:include>

-)

-

-if(APPLE)

-    find_library(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)

-    target_link_libraries(libintl PRIVATE ${COREFOUNDATION_LIBRARY})

-endif()

-if(NOT WIN32)

-    target_link_libraries(libintl PRIVATE Threads::Threads)

-endif()

-if (WIN32)

-    target_link_libraries(libintl PRIVATE kernel32.lib Advapi32.lib)

-endif()

-

-install(TARGETS libintl

-  EXPORT unofficial-gettext-targets

-  RUNTIME DESTINATION bin

-  LIBRARY DESTINATION lib

-  ARCHIVE DESTINATION lib

-)

-

-install(

-    EXPORT unofficial-gettext-targets

-    FILE unofficial-gettext-targets.cmake

-    NAMESPACE unofficial::gettext::

-    DESTINATION share/unofficial-gettext

-)

-

-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake" "

-include(CMakeFindDependencyMacro)

-find_dependency(unofficial-iconv)

-find_dependency(Threads)

-include(\${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-targets.cmake)

-")

-

-install(

-    FILES ${CMAKE_CURRENT_BINARY_DIR}/unofficial-gettext-config.cmake

-    DESTINATION share/unofficial-gettext

-)

diff --git a/ports/gettext/CONTROL b/ports/gettext/CONTROL
index 0918e1943..d5fd705c3 100644
--- a/ports/gettext/CONTROL
+++ b/ports/gettext/CONTROL
@@ -1,5 +1,5 @@
 Source: gettext
-Version: 0.19-15
+Version: 0.21
 Homepage: https://www.gnu.org/software/gettext/
 Description: The GNU gettext utilities are a set of tools that provides a framework to help other GNU packages produce multi-lingual messages. Provides libintl.
 Build-Depends: libiconv
diff --git a/ports/gettext/config.unix.h.in b/ports/gettext/config.unix.h.in
deleted file mode 100644
index 9f00a6fcd..000000000
--- a/ports/gettext/config.unix.h.in
+++ /dev/null
@@ -1,1009 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to the number of bits in type 'ptrdiff_t'. */
-#define BITSIZEOF_PTRDIFF_T sizeof(ptrdiff_t)
-
-/* Define to the number of bits in type 'sig_atomic_t'. */
-#define BITSIZEOF_SIG_ATOMIC_T 32
-
-/* Define to the number of bits in type 'size_t'. */
-#define BITSIZEOF_SIZE_T sizeof(size_t)
-
-/* Define to the number of bits in type 'wchar_t'. */
-#define BITSIZEOF_WCHAR_T 32
-
-/* Define to the number of bits in type 'wint_t'. */
-#define BITSIZEOF_WINT_T 32
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if mono is the preferred C# implementation. */
-/* #undef CSHARP_CHOICE_MONO */
-
-/* Define if pnet is the preferred C# implementation. */
-/* #undef CSHARP_CHOICE_PNET */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define to 1 if // is a file system root distinct from /. */
-/* #undef DOUBLE_SLASH_IS_DISTINCT_ROOT */
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#define ENABLE_NLS 1
-
-/* Define to 1 if the package shall run at any location in the file system. */
-#define ENABLE_RELOCATABLE 1
-
-/* Define to 1 if realpath() can malloc memory, always gives an absolute path,
-   and handles trailing slash correctly. */
-/* #undef FUNC_REALPATH_WORKS */
-
-/* Define if gettimeofday clobbers the localtime buffer. */
-/* #undef GETTIMEOFDAY_CLOBBERS_LOCALTIME */
-
-/* Define this to 'void' or 'struct timezone' to match the system's
-   declaration of the second argument to gettimeofday. */
-#define GETTIMEOFDAY_TIMEZONE void
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module canonicalize-lgpl shall be considered present. */
-#define GNULIB_CANONICALIZE_LGPL 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module fscanf shall be considered present. */
-#define GNULIB_FSCANF 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module fwriteerror shall be considered present. */
-#define GNULIB_FWRITEERROR 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module lock shall be considered present. */
-#define GNULIB_LOCK 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module scanf shall be considered present. */
-#define GNULIB_SCANF 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module sigpipe shall be considered present. */
-#define GNULIB_SIGPIPE 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module strerror shall be considered present. */
-#define GNULIB_STRERROR 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module unistr/u8-mbtoucr shall be considered present. */
-#define GNULIB_UNISTR_U8_MBTOUCR 1
-
-/* Define to a C preprocessor expression that evaluates to 1 or 0, depending
-   whether the gnulib module unistr/u8-uctomb shall be considered present. */
-#define GNULIB_UNISTR_U8_UCTOMB 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-#define HAVE_ALLOCA_H 1
-
-/* Define to 1 if you have the `argz_count' function. */
-/* #undef HAVE_ARGZ_COUNT */
-
-/* Define to 1 if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define to 1 if you have the `argz_next' function. */
-/* #undef HAVE_ARGZ_NEXT */
-
-/* Define to 1 if you have the `argz_stringify' function. */
-/* #undef HAVE_ARGZ_STRINGIFY */
-
-/* Define to 1 if you have the `asprintf' function. */
-#define HAVE_ASPRINTF 1
-
-/* Define to 1 if you have the `atexit' function. */
-#define HAVE_ATEXIT 1
-
-/* Define to 1 if you have the <bp-sym.h> header file. */
-/* #undef HAVE_BP_SYM_H */
-
-/* Define to 1 if the compiler understands __builtin_expect. */
-#define HAVE_BUILTIN_EXPECT 1
-
-/* Define to 1 if you have the `canonicalize_file_name' function. */
-/* #undef HAVE_CANONICALIZE_FILE_NAME */
-
-/* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-#cmakedefine HAVE_CFLOCALECOPYCURRENT 1
-
-/* Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-#cmakedefine HAVE_CFPREFERENCESCOPYAPPVALUE 1
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#cmakedefine HAVE_DCGETTEXT 1
-
-/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_CLEARERR_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_FEOF_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FERROR_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FFLUSH_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FGETS_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FPUTC_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FPUTS_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FREAD_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FWRITE_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_GETCHAR_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_GETC_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-   */
-#define HAVE_DECL_GETENV 1
-
-/* Define to 1 if you have the declaration of `iswblank', and to 0 if you
-   don't. */
-#define HAVE_DECL_ISWBLANK 1
-
-/* Define to 1 if you have the declaration of `mbrtowc', and to 0 if you
-   don't. */
-/* #undef HAVE_DECL_MBRTOWC */
-
-/* Define to 1 if you have the declaration of `mbsinit', and to 0 if you
-   don't. */
-/* #undef HAVE_DECL_MBSINIT */
-
-/* Define to 1 if you have the declaration of `program_invocation_name', and
-   to 0 if you don't. */
-#define HAVE_DECL_PROGRAM_INVOCATION_NAME 0
-
-/* Define to 1 if you have the declaration of `program_invocation_short_name',
-   and to 0 if you don't. */
-#define HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME 0
-
-/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_PUTCHAR_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_PUTC_UNLOCKED 1
-
-/* Define to 1 if you have the declaration of `setenv', and to 0 if you don't.
-   */
-#define HAVE_DECL_SETENV 1
-
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRERROR_R 1
-
-/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRNLEN 1
-
-/* Define to 1 if you have the declaration of `towlower', and to 0 if you
-   don't. */
-/* #undef HAVE_DECL_TOWLOWER */
-
-/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
-   don't. */
-#define HAVE_DECL_WCWIDTH 1
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNPRINTF 0
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNWPRINTF 0
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define if you have the declaration of environ. */
-/* #undef HAVE_ENVIRON_DECL */
-
-/* Define to 1 if you have the <features.h> header file. */
-#cmakedefine HAVE_FEATURES_H 1
-
-/* Define to 1 if you have the `fwprintf' function. */
-#define HAVE_FWPRINTF 1
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getegid' function. */
-#define HAVE_GETEGID 1
-
-/* Define to 1 if you have the `geteuid' function. */
-#define HAVE_GETEUID 1
-
-/* Define to 1 if you have the `getgid' function. */
-#define HAVE_GETGID 1
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#define HAVE_GETOPT_H 1
-
-/* Define to 1 if you have the `getopt_long_only' function. */
-#define HAVE_GETOPT_LONG_ONLY 1
-
-/* Define to 1 if you have the `getpagesize' function. */
-#define HAVE_GETPAGESIZE 1
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-#cmakedefine HAVE_GETTEXT 1
-
-/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
-
-/* Define to 1 if you have the `getuid' function. */
-#define HAVE_GETUID 1
-
-/* Define if you have the iconv() function and it works. */
-#define HAVE_ICONV 1
-
-/* Define to 1 if you have the <iconv.h> header file. */
-#define HAVE_ICONV_H 1
-
-/* Define to 1 if the compiler supports one of the keywords 'inline',
-   '__inline__', '__inline' and effectively inlines functions marked as such.
-   */
-#define HAVE_INLINE 1
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_INTMAX_T 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-#define HAVE_INTTYPES_H_WITH_UINTMAX 1
-
-/* Define to 1 if you have the `iswblank' function. */
-#define HAVE_ISWBLANK 1
-
-/* Define to 1 if you have the `iswcntrl' function. */
-#define HAVE_ISWCNTRL 1
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-#define HAVE_LANGINFO_CODESET 1
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-#define HAVE_LC_MESSAGES 1
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if the system has the type 'long long int'. */
-#define HAVE_LONG_LONG_INT 1
-
-/* Define to 1 if you have the `lstat' function. */
-#define HAVE_LSTAT 1
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-#cmakedefine HAVE_MACH_O_DYLD_H 1
-
-/* Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including
-   config.h and <sys/mman.h>. */
-#define HAVE_MAP_ANONYMOUS 1
-
-/* Define to 1 if you have the `mbrtowc' function. */
-#define HAVE_MBRTOWC 1
-
-/* Define to 1 if you have the `mbsinit' function. */
-#define HAVE_MBSINIT 1
-
-/* Define to 1 if you have the `mbslen' function. */
-/* #undef HAVE_MBSLEN */
-
-/* Define to 1 if <wchar.h> declares mbstate_t. */
-#define HAVE_MBSTATE_T 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mempcpy' function. */
-#cmakedefine HAVE_MEMPCPY 1
-
-/* Define to 1 if you have a working `mmap' system call. */
-#define HAVE_MMAP 1
-
-/* Define to 1 if you have the `mprotect' function. */
-#define HAVE_MPROTECT 1
-
-/* Define to 1 on MSVC platforms that have the "invalid parameter handler"
-   concept. */
-/* #undef HAVE_MSVC_INVALID_PARAMETER_HANDLER */
-
-/* Define to 1 if you have the `munmap' function. */
-#define HAVE_MUNMAP 1
-
-/* Define to 1 if you have the `newlocale' function. */
-#cmakedefine HAVE_NEWLOCALE 1
-
-/* Define if your printf() function supports format strings with positions. */
-#define HAVE_POSIX_PRINTF 1
-
-/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
-#define HAVE_PTHREAD_MUTEX_RECURSIVE 1
-
-/* Define if the POSIX multithreading library has read/write locks. */
-#define HAVE_PTHREAD_RWLOCK 1
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the `raise' function. */
-#define HAVE_RAISE 1
-
-/* Define to 1 if you have the `readlink' function. */
-#define HAVE_READLINK 1
-
-/* Define to 1 if you have the `readlinkat' function. */
-#define HAVE_READLINKAT 1
-
-/* Define to 1 if you have the `realpath' function. */
-#define HAVE_REALPATH 1
-
-/* Define to 1 if you have the <search.h> header file. */
-#define HAVE_SEARCH_H 1
-
-/* Define to 1 if you have the `setenv' function. */
-#define HAVE_SETENV 1
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
-/* #undef HAVE_SIGNED_SIG_ATOMIC_T */
-
-/* Define to 1 if 'wchar_t' is a signed integer type. */
-/* #undef HAVE_SIGNED_WCHAR_T */
-
-/* Define to 1 if 'wint_t' is a signed integer type. */
-/* #undef HAVE_SIGNED_WINT_T */
-
-/* Define to 1 if the system has the type `sigset_t'. */
-#define HAVE_SIGSET_T 1
-
-/* Define to 1 if you have the `snprintf' function. */
-#define HAVE_SNPRINTF 1
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `stpcpy' function. */
-#define HAVE_STPCPY 1
-
-/* Define to 1 if you have the `strcasecmp' function. */
-#define HAVE_STRCASECMP 1
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-#define HAVE_STRERROR_R 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strnlen' function. */
-#define HAVE_STRNLEN 1
-
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
-/* Define to 1 if you have the `symlink' function. */
-#define HAVE_SYMLINK 1
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-/* #undef HAVE_SYS_BITYPES_H */
-
-/* Define to 1 if you have the <sys/inttypes.h> header file. */
-/* #undef HAVE_SYS_INTTYPES_H */
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#define HAVE_SYS_MMAN_H 1
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/timeb.h> header file. */
-/* #undef HAVE_SYS_TIMEB_H */
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the `towlower' function. */
-#define HAVE_TOWLOWER 1
-
-/* Define to 1 if you have the `tsearch' function. */
-#define HAVE_TSEARCH 1
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_UINTMAX_T 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to 1 if the system has the type 'unsigned long long int'. */
-#define HAVE_UNSIGNED_LONG_LONG_INT 1
-
-/* Define to 1 if you have the `uselocale' function. */
-#define HAVE_USELOCALE 1
-
-/* Define to 1 or 0, depending whether the compiler supports simple visibility
-   declarations. */
-#define HAVE_VISIBILITY 1
-
-/* Define to 1 if you have the <wchar.h> header file. */
-#define HAVE_WCHAR_H 1
-
-/* Define if you have the 'wchar_t' type. */
-#define HAVE_WCHAR_T 1
-
-/* Define to 1 if you have the `wcrtomb' function. */
-#define HAVE_WCRTOMB 1
-
-/* Define to 1 if you have the `wcslen' function. */
-#define HAVE_WCSLEN 1
-
-/* Define to 1 if you have the `wcsnlen' function. */
-#define HAVE_WCSNLEN 1
-
-/* Define to 1 if you have the <wctype.h> header file. */
-#define HAVE_WCTYPE_H 1
-
-/* Define to 1 if you have the `wcwidth' function. */
-#define HAVE_WCWIDTH 1
-
-/* Define to 1 if you have the <winsock2.h> header file. */
-/* #undef HAVE_WINSOCK2_H */
-
-/* Define if you have the 'wint_t' type. */
-#define HAVE_WINT_T 1
-
-/* Define to 1 if O_NOATIME works. */
-#define HAVE_WORKING_O_NOATIME 0
-
-/* Define to 1 if O_NOFOLLOW works. */
-#define HAVE_WORKING_O_NOFOLLOW 1
-
-/* Define to 1 if you have the <xlocale.h> header file. */
-#cmakedefine HAVE_XLOCALE_H 1
-
-/* Define to 1 if the system has the type `_Bool'. */
-#define HAVE__BOOL 1
-
-/* Define to 1 if you have the `_ftime' function. */
-/* #undef HAVE__FTIME */
-
-/* Define to 1 if you have the `_NSGetExecutablePath' function. */
-/* #undef HAVE__NSGETEXECUTABLEPATH */
-
-/* Define to 1 if you have the `_set_invalid_parameter_handler' function. */
-/* #undef HAVE__SET_INVALID_PARAMETER_HANDLER */
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-/* #undef HAVE___FSETLOCKING */
-
-/* Define as const if the declaration of iconv() needs const. */
-#define ICONV_CONST 
-
-/* Define to a symbolic name denoting the flavor of iconv_open()
-   implementation. */
-/* #undef ICONV_FLAVOR */
-
-/* Define to the value of ${prefix}, as a string. */
-/* #define INSTALLPREFIX "/usr/local" */
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#define INTDIV0_RAISES_SIGFPE 0
-
-/* Define to 1 if 'lstat' dereferences a symlink specified with a trailing
-   slash. */
-/* #undef LSTAT_FOLLOWS_SLASHED_SYMLINK */
-
-/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
-#define MALLOC_0_IS_NONNULL 1
-
-/* Define to a substitute value for mmap()'s MAP_ANONYMOUS flag. */
-/* #undef MAP_ANONYMOUS */
-
-/* Define if the mbrtowc function has the NULL pwc argument bug. */
-/* #undef MBRTOWC_NULL_ARG1_BUG */
-
-/* Define if the mbrtowc function has the NULL string argument bug. */
-/* #undef MBRTOWC_NULL_ARG2_BUG */
-
-/* Define if the mbrtowc function does not return 0 for a NUL character. */
-/* #undef MBRTOWC_NUL_RETVAL_BUG */
-
-/* Define if the mbrtowc function returns a wrong return value. */
-/* #undef MBRTOWC_RETVAL_BUG */
-
-/* Name of package */
-#define PACKAGE "gettext-runtime"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "gettext-runtime"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "gettext-runtime 0.19"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "gettext-runtime"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.19"
-
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-/* #undef PRI_MACROS_BROKEN */
-
-/* Define if the pthread_in_use() detection is hard. */
-/* #undef PTHREAD_IN_USE_DETECTION_HARD */
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'ptrdiff_t'. */
-#define PTRDIFF_T_SUFFIX 
-
-/* Define to 1 if readlink fails to recognize a trailing slash. */
-/* #undef READLINK_TRAILING_SLASH_BUG */
-
-/* Define to 1 if stat needs help when passed a directory name with a trailing
-   slash */
-/* #undef REPLACE_FUNC_STAT_DIR */
-
-/* Define to 1 if stat needs help when passed a file name with a trailing
- slash */
-/* #undef REPLACE_FUNC_STAT_FILE */
-
-/* Define to 1 if strerror(0) does not return a message implying success. */
-/* #undef REPLACE_STRERROR_0 */
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'sig_atomic_t'. */
-#define SIG_ATOMIC_T_SUFFIX 
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#ifndef SIZE_MAX
-/* # undef SIZE_MAX */
-#endif
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'size_t'. */
-#define SIZE_T_SUFFIX ul
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */
-/* #undef STAT_MACROS_BROKEN */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if strerror_r returns char *. */
-/* #undef STRERROR_R_CHAR_P */
-
-/* Define to the prefix of C symbols at the assembler and linker level, either
-   an underscore or empty. */
-#define USER_LABEL_PREFIX
-
-/* Define if the POSIX multithreading library can be used. */
-#define USE_POSIX_THREADS 1
-
-/* Define if references to the POSIX multithreading library should be made
-   weak. */
-/* #undef USE_POSIX_THREADS_WEAK */
-
-/* Define if the GNU Pth multithreading library can be used. */
-/* #undef USE_PTH_THREADS */
-
-/* Define if references to the GNU Pth multithreading library should be made
-   weak. */
-/* #undef USE_PTH_THREADS_WEAK */
-
-/* Define if the old Solaris multithreading library can be used. */
-/* #undef USE_SOLARIS_THREADS */
-
-/* Define if references to the old Solaris multithreading library should be
-   made weak. */
-/* #undef USE_SOLARIS_THREADS_WEAK */
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable general extensions on OS X.  */
-#ifndef _DARWIN_C_SOURCE
-# define _DARWIN_C_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable X/Open extensions if necessary.  HP-UX 11.11 defines
-   mbstate_t only if _XOPEN_SOURCE is defined to 500, regardless of
-   whether compiling with -Ae or -D_HPUX_SOURCE=1.  */
-#ifndef _XOPEN_SOURCE
-/* # undef _XOPEN_SOURCE */
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Define to 1 if you want getc etc. to use unlocked I/O if available.
-   Unlocked I/O can improve performance in unithreaded apps, but it is not
-   safe for multithreaded apps. */
-#define USE_UNLOCKED_IO 1
-
-/* Define if the native Windows multithreading API can be used. */
-/* #undef USE_WINDOWS_THREADS */
-
-/* Version number of package */
-#define VERSION "0.19"
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'wchar_t'. */
-#define WCHAR_T_SUFFIX 
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'wint_t'. */
-#define WINT_T_SUFFIX 
-
-/* Define when --enable-shared is used on mingw or Cygwin. */
-/* #undef WOE32DLL */
-
-/* Enable large inode numbers on Mac OS X 10.5. */
-#define _DARWIN_USE_64_BIT_INODE 1
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define to 1 if Gnulib overrides 'struct stat' on Windows so that struct
-   stat.st_size becomes 64-bit. */
-/* #undef _GL_WINDOWS_64_BIT_ST_SIZE */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to 1 on Solaris. */
-/* #undef _LCONV_C99 */
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 1 to make NetBSD features available. MINIX 3 needs this. */
-/* #undef _NETBSD_SOURCE */
-
-/* The _Noreturn keyword of C11.  */
-#if ! (defined _Noreturn \
-       || (defined __STDC_VERSION__ && 201112 <= __STDC_VERSION__))
-# if (3 <= __GNUC__ || (__GNUC__ == 2 && 8 <= __GNUC_MINOR__) \
-      || 0x5110 <= __SUNPRO_C)
-#  define _Noreturn __attribute__ ((__noreturn__))
-# elif defined _MSC_VER && 1200 <= _MSC_VER
-#  define _Noreturn __declspec (noreturn)
-# else
-#  define _Noreturn
-# endif
-#endif
-
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for 'stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Define to rpl_ if the getopt replacement functions and variables should be
-   used. */
-#define __GETOPT_PREFIX rpl_
-
-/* Please see the Gnulib manual for how to use these macros.
-
-   Suppress extern inline with HP-UX cc, as it appears to be broken; see
-   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
-
-   Suppress extern inline with Sun C in standards-conformance mode, as it
-   mishandles inline functions that call each other.  E.g., for 'inline void f
-   (void) { } inline void g (void) { f (); }', c99 incorrectly complains
-   'reference to static identifier "f" in extern inline function'.
-   This bug was observed with Sun C 5.12 SunOS_i386 2011/11/16.
-
-   Suppress the use of extern inline on problematic Apple configurations.
-   OS X 10.8 and earlier mishandle it; see, e.g.,
-   <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
-   OS X 10.9 has a macro __header_inline indicating the bug is fixed for C and
-   for clang but remains for g++; see <http://trac.macports.org/ticket/41033>.
-   Perhaps Apple will fix this some day.  */
-#if (defined __APPLE__ \
-     && (defined __header_inline \
-         ? (defined __cplusplus && defined __GNUC_STDC_INLINE__ \
-            && ! defined __clang__) \
-         : ((! defined _DONT_USE_CTYPE_INLINE_ \
-             && (defined __GNUC__ || defined __cplusplus)) \
-            || (defined _FORTIFY_SOURCE && 0 < _FORTIFY_SOURCE \
-                && defined __GNUC__ && ! defined __cplusplus))))
-# define _GL_EXTERN_INLINE_APPLE_BUG
-#endif
-#if ((__GNUC__ \
-      ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : (199901L <= __STDC_VERSION__ \
-         && !defined __HP_cc \
-         && !(defined __SUNPRO_C && __STDC__))) \
-     && !defined _GL_EXTERN_INLINE_APPLE_BUG)
-# define _GL_INLINE inline
-# define _GL_EXTERN_INLINE extern inline
-# define _GL_EXTERN_INLINE_IN_USE
-#elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
-       && !defined _GL_EXTERN_INLINE_APPLE_BUG)
-# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
-   /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
-#  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
-# else
-#  define _GL_INLINE extern inline
-# endif
-# define _GL_EXTERN_INLINE extern
-# define _GL_EXTERN_INLINE_IN_USE
-#else
-# define _GL_INLINE static _GL_UNUSED
-# define _GL_EXTERN_INLINE static _GL_UNUSED
-#endif
-
-#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
-# if defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__
-#  define _GL_INLINE_HEADER_CONST_PRAGMA
-# else
-#  define _GL_INLINE_HEADER_CONST_PRAGMA \
-     _Pragma ("GCC diagnostic ignored \"-Wsuggest-attribute=const\"")
-# endif
-  /* Suppress GCC's bogus "no previous prototype for 'FOO'"
-     and "no previous declaration for 'FOO'"  diagnostics,
-     when FOO is an inline function in the header; see
-     <http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54113>.  */
-# define _GL_INLINE_HEADER_BEGIN \
-    _Pragma ("GCC diagnostic push") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-prototypes\"") \
-    _Pragma ("GCC diagnostic ignored \"-Wmissing-declarations\"") \
-    _GL_INLINE_HEADER_CONST_PRAGMA
-# define _GL_INLINE_HEADER_END \
-    _Pragma ("GCC diagnostic pop")
-#else
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
-#endif
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef gid_t */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Work around a bug in Apple GCC 4.0.1 build 5465: In C99 mode, it supports
-   the ISO C 99 semantics of 'extern inline' (unlike the GNU C semantics of
-   earlier versions), but does not display it by setting __GNUC_STDC_INLINE__.
-   __APPLE__ && __MACH__ test for Mac OS X.
-   __APPLE_CC__ tests for the Apple compiler and its version.
-   __STDC_VERSION__ tests for the C99 mode.  */
-#if defined __APPLE__ && defined __MACH__ && __APPLE_CC__ >= 5465 && !defined __cplusplus && __STDC_VERSION__ >= 199901L && !defined __GNUC_STDC_INLINE__
-# define __GNUC_STDC_INLINE__ 1
-#endif
-
-/* Define to a type if <wchar.h> does not define. */
-/* #undef mbstate_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef mode_t */
-
-/* Define to the type of st_nlink in struct stat, or a supertype. */
-/* #undef nlink_t */
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */
-
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-/* #undef ptrdiff_t */
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-#define restrict __restrict
-/* Work around a bug in Sun C++: it does not support _Restrict or
-   __restrict__, even though the corresponding Sun C compiler ends up with
-   "#define restrict _Restrict" or "#define restrict __restrict__" in the
-   previous line.  Perhaps some future version of Sun C++ will work with
-   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-# define __restrict__
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define as a signed type of the same size as size_t. */
-/* #undef ssize_t */
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-/* #undef uid_t */
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-/* #undef uintmax_t */
-
-/* Define as a marker that can be attached to declarations that might not
-    be used.  This helps to reduce warnings, such as from
-    GCC -Wunused-parameter.  */
-#if __GNUC__ >= 3 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 7)
-# define _GL_UNUSED __attribute__ ((__unused__))
-#else
-# define _GL_UNUSED
-#endif
-/* The name _UNUSED_PARAMETER_ is an earlier spelling, although the name
-   is a misnomer outside of parameter lists.  */
-#define _UNUSED_PARAMETER_ _GL_UNUSED
-
-/* The __pure__ attribute was added in gcc 2.96.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
-# define _GL_ATTRIBUTE_PURE __attribute__ ((__pure__))
-#else
-# define _GL_ATTRIBUTE_PURE /* empty */
-#endif
-
-/* The __const__ attribute was added in gcc 2.95.  */
-#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95)
-# define _GL_ATTRIBUTE_CONST __attribute__ ((__const__))
-#else
-# define _GL_ATTRIBUTE_CONST /* empty */
-#endif
-
-
-
-#define __libc_lock_t                   gl_lock_t
-#define __libc_lock_define              gl_lock_define
-#define __libc_lock_define_initialized  gl_lock_define_initialized
-#define __libc_lock_init                gl_lock_init
-#define __libc_lock_lock                gl_lock_lock
-#define __libc_lock_unlock              gl_lock_unlock
-#define __libc_lock_recursive_t                   gl_recursive_lock_t
-#define __libc_lock_define_recursive              gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive                gl_recursive_lock_init
-#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-#define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init_func     libintl_lock_init_func
-#define glthread_lock_lock_func     libintl_lock_lock_func
-#define glthread_lock_unlock_func   libintl_lock_unlock_func
-#define glthread_lock_destroy_func  libintl_lock_destroy_func
-#define glthread_rwlock_init_multithreaded     libintl_rwlock_init_multithreaded
-#define glthread_rwlock_init_func              libintl_rwlock_init_func
-#define glthread_rwlock_rdlock_multithreaded   libintl_rwlock_rdlock_multithreaded
-#define glthread_rwlock_rdlock_func            libintl_rwlock_rdlock_func
-#define glthread_rwlock_wrlock_multithreaded   libintl_rwlock_wrlock_multithreaded
-#define glthread_rwlock_wrlock_func            libintl_rwlock_wrlock_func
-#define glthread_rwlock_unlock_multithreaded   libintl_rwlock_unlock_multithreaded
-#define glthread_rwlock_unlock_func            libintl_rwlock_unlock_func
-#define glthread_rwlock_destroy_multithreaded  libintl_rwlock_destroy_multithreaded
-#define glthread_rwlock_destroy_func           libintl_rwlock_destroy_func
-#define glthread_recursive_lock_init_multithreaded     libintl_recursive_lock_init_multithreaded
-#define glthread_recursive_lock_init_func              libintl_recursive_lock_init_func
-#define glthread_recursive_lock_lock_multithreaded     libintl_recursive_lock_lock_multithreaded
-#define glthread_recursive_lock_lock_func              libintl_recursive_lock_lock_func
-#define glthread_recursive_lock_unlock_multithreaded   libintl_recursive_lock_unlock_multithreaded
-#define glthread_recursive_lock_unlock_func            libintl_recursive_lock_unlock_func
-#define glthread_recursive_lock_destroy_multithreaded  libintl_recursive_lock_destroy_multithreaded
-#define glthread_recursive_lock_destroy_func           libintl_recursive_lock_destroy_func
-#define glthread_once_func            libintl_once_func
-#define glthread_once_singlethreaded  libintl_once_singlethreaded
-#define glthread_once_multithreaded   libintl_once_multithreaded
-
-
-
-/* On Windows, variables that may be in a DLL must be marked specially.  */
-#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER
-# define DLL_VARIABLE __declspec (dllimport)
-#else
-# define DLL_VARIABLE
-#endif
-
-/* Extra OS/2 (emx+gcc) defines.  */
-#ifdef __EMX__
-# include "intl/os2compat.h"
-#endif
-
diff --git a/ports/gettext/config.win32.h b/ports/gettext/config.win32.h
deleted file mode 100644
index e8507894d..000000000
--- a/ports/gettext/config.win32.h
+++ /dev/null
@@ -1,675 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-#ifndef WIN32
-# define _GL_INLINE_HEADER_BEGIN
-# define _GL_INLINE_HEADER_END
-# define _GL_INLINE static inline
-#endif
-
-/* Disable function deprecated warnings */
-#define _CRT_NONSTDC_NO_WARNINGS
-
-/* Define to the number of bits in type 'ptrdiff_t'. */
-#define BITSIZEOF_PTRDIFF_T sizeof(ptrdiff_t)
-
-/* Define to the number of bits in type 'sig_atomic_t'. */
-#define BITSIZEOF_SIG_ATOMIC_T 32
-
-/* Define to the number of bits in type 'size_t'. */
-#define BITSIZEOF_SIZE_T sizeof(size_t)
-
-/* Define to the number of bits in type 'wchar_t'. */
-#define BITSIZEOF_WCHAR_T 16
-
-/* Define to the number of bits in type 'wint_t'. */
-#define BITSIZEOF_WINT_T 16
-
-/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
-   systems. This function is required for `alloca.c' support on those systems.
-   */
-/* #undef CRAY_STACKSEG_END */
-
-/* Define if mono is the preferred C# implementation. */
-/* #undef CSHARP_CHOICE_MONO */
-
-/* Define if pnet is the preferred C# implementation. */
-/* #undef CSHARP_CHOICE_PNET */
-
-/* Define to 1 if using `alloca.c'. */
-/* #undef C_ALLOCA */
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#define ENABLE_NLS 1
-
-/* Define to 1 if the package shall run at any location in the filesystem. */
-#define ENABLE_RELOCATABLE 1
-
-/* Define to 1 when using the gnulib module fwriteerror. */
-#define GNULIB_FWRITEERROR 1
-
-/* Define to 1 if you have `alloca', as a function or macro. */
-#define HAVE_ALLOCA 1
-
-/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
-   */
-/* #undef HAVE_ALLOCA_H */
-
-/* Define to 1 if you have the `argz_count' function. */
-/* #undef HAVE_ARGZ_COUNT */
-
-/* Define to 1 if you have the <argz.h> header file. */
-/* #undef HAVE_ARGZ_H */
-
-/* Define to 1 if you have the `argz_next' function. */
-/* #undef HAVE_ARGZ_NEXT */
-
-/* Define to 1 if you have the `argz_stringify' function. */
-/* #undef HAVE_ARGZ_STRINGIFY */
-
-/* Define to 1 if you have the `asprintf' function. */
-/* #undef HAVE_ASPRINTF */
-
-/* Define to 1 if you have the `atexit' function. */
-#define HAVE_ATEXIT 1
-
-/* Define to 1 if you have the <bp-sym.h> header file. */
-/* #undef HAVE_BP_SYM_H */
-
-/* Define to 1 if the compiler understands __builtin_expect. */
-/* #undef HAVE_BUILTIN_EXPECT */
-
-/* Define to 1 if you have the `canonicalize_file_name' function. */
-/* #undef HAVE_CANONICALIZE_FILE_NAME */
-
-/* Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the
-   CoreFoundation framework. */
-/* #undef HAVE_CFLOCALECOPYCURRENT */
-
-/* Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in
-   the CoreFoundation framework. */
-/* #undef HAVE_CFPREFERENCESCOPYAPPVALUE */
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-/* #undef HAVE_DCGETTEXT */
-
-/* Define to 1 if you have the declaration of `canonicalize_file_name', and to
-   0 if you don't. */
-#define HAVE_DECL_CANONICALIZE_FILE_NAME 0
-
-/* Define to 1 if you have the declaration of `clearerr_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_CLEARERR_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `feof_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_FEOF_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `ferror_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FERROR_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fflush_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FFLUSH_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fgets_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FGETS_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fputc_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FPUTC_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fputs_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FPUTS_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fread_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FREAD_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `fwrite_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_FWRITE_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `getchar_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_GETCHAR_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `getc_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_GETC_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `getenv', and to 0 if you don't.
-   */
-#define HAVE_DECL_GETENV 1
-
-/* Define to 1 if you have the declaration of `putchar_unlocked', and to 0 if
-   you don't. */
-#define HAVE_DECL_PUTCHAR_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `putc_unlocked', and to 0 if you
-   don't. */
-#define HAVE_DECL_PUTC_UNLOCKED 0
-
-/* Define to 1 if you have the declaration of `strdup', and to 0 if you don't.
-   */
-#define HAVE_DECL_STRDUP 1
-
-/* Define to 1 if you have the declaration of `strerror', and to 0 if you
-   don't. */
-/* #undef HAVE_DECL_STRERROR */
-
-/* Define to 1 if you have the declaration of `strerror_r', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRERROR_R 0
-
-/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
-   don't. */
-#define HAVE_DECL_STRNLEN 0
-
-/* Define to 1 if you have the declaration of `wcwidth', and to 0 if you
-   don't. */
-#define HAVE_DECL_WCWIDTH 0
-
-/* Define to 1 if you have the declaration of `_snprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNPRINTF 1
-
-/* Define to 1 if you have the declaration of `_snwprintf', and to 0 if you
-   don't. */
-#define HAVE_DECL__SNWPRINTF 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define if you have the declaration of environ. */
-#define HAVE_ENVIRON_DECL 1
-
-/* Define to 1 if you have the `fwprintf' function. */
-#define HAVE_FWPRINTF 1
-
-/* Define to 1 if you have the `getcwd' function. */
-#define HAVE_GETCWD 1
-
-/* Define to 1 if you have the `getegid' function. */
-/* #undef HAVE_GETEGID */
-
-/* Define to 1 if you have the `geteuid' function. */
-/* #undef HAVE_GETEUID */
-
-/* Define to 1 if you have the `getgid' function. */
-/* #undef HAVE_GETGID */
-
-/* Define to 1 if you have the <getopt.h> header file. */
-/* #undef HAVE_GETOPT_H */
-
-/* Define to 1 if you have the `getopt_long_only' function. */
-/* #undef HAVE_GETOPT_LONG_ONLY */
-
-/* Define to 1 if you have the `getpagesize' function. */
-/* #undef HAVE_GETPAGESIZE */
-
-/* Define if the GNU gettext() function is already present or preinstalled. */
-/* #undef HAVE_GETTEXT */
-
-/* Define to 1 if you have the `getuid' function. */
-/* #undef HAVE_GETUID */
-
-/* Define if you have the iconv() function and it works. */
-/* #undef HAVE_ICONV */
-
-/* Define to 1 if you have the <iconv.h> header file. */
-/* #undef HAVE_ICONV_H */
-
-/* Define if your compiler supports the #include_next directive. */
-/* #undef HAVE_INCLUDE_NEXT */
-
-/* Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_INTMAX_T 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and
-   declares uintmax_t. */
-/* #undef HAVE_INTTYPES_H_WITH_UINTMAX */
-
-/* Define to 1 if you have the `iswcntrl' function. */
-#define HAVE_ISWCNTRL 1
-
-/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
-/* #undef HAVE_LANGINFO_CODESET */
-
-/* Define if your <locale.h> file defines LC_MESSAGES. */
-/* #undef HAVE_LC_MESSAGES */
-
-/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
-
-/* Define to 1 if the system has the type `long long int'. */
-/* #undef HAVE_LONG_LONG_INT */
-
-/* Define to 1 if you have the <mach-o/dyld.h> header file. */
-/* #undef HAVE_MACH_O_DYLD_H */
-
-/* Define if the 'malloc' function is POSIX compliant. */
-/* #undef HAVE_MALLOC_POSIX */
-
-/* Define to 1 if mbrtowc and mbstate_t are properly declared. */
-/* #undef HAVE_MBRTOWC */
-
-/* Define to 1 if <wchar.h> declares mbstate_t. */
-#define HAVE_MBSTATE_T 1
-
-/* Define to 1 if you have the `memchr' function. */
-#define HAVE_MEMCHR 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `mempcpy' function. */
-#ifdef __GNUC__
-#define HAVE_MEMPCPY 1
-#endif
-
-/* Define to 1 if you have a working `mmap' system call. */
-/* #undef HAVE_MMAP */
-
-/* Define to 1 if you have the `munmap' function. */
-/* #undef HAVE_MUNMAP */
-
-/* Define if you have <langinfo.h> and it defines the NL_LOCALE_NAME macro if
-   _GNU_SOURCE is defined. */
-/* #undef HAVE_NL_LOCALE_NAME */
-
-/* Define if your printf() function supports format strings with positions. */
-/* #undef HAVE_POSIX_PRINTF */
-
-/* Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE. */
-/* #undef HAVE_PTHREAD_MUTEX_RECURSIVE */
-
-/* Define if the POSIX multithreading library has read/write locks. */
-/* #undef HAVE_PTHREAD_RWLOCK */
-
-/* Define to 1 if you have the `putenv' function. */
-#define HAVE_PUTENV 1
-
-/* Define to 1 if you have the `readlink' function. */
-/* #undef HAVE_READLINK */
-
-/* Define to 1 if you have the <search.h> header file. */
-#define HAVE_SEARCH_H 1
-
-/* Define to 1 if you have the `setenv' function. */
-/* #undef HAVE_SETENV */
-
-/* Define to 1 if you have the `setlocale' function. */
-#define HAVE_SETLOCALE 1
-
-/* Define to 1 if 'sig_atomic_t' is a signed integer type. */
-#define HAVE_SIGNED_SIG_ATOMIC_T 1
-
-/* Define to 1 if 'wchar_t' is a signed integer type. */
-/* #undef HAVE_SIGNED_WCHAR_T */
-
-/* Define to 1 if 'wint_t' is a signed integer type. */
-/* #undef HAVE_SIGNED_WINT_T */
-
-/* Define to 1 if you have the `snprintf' function. */
-/* #undef HAVE_SNPRINTF */
-
-/* Define to 1 if stdbool.h conforms to C99. */
-/* #undef HAVE_STDBOOL_H */
-
-/* Define to 1 if you have the <stddef.h> header file. */
-#define HAVE_STDDEF_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares
-   uintmax_t. */
-#define HAVE_STDINT_H_WITH_UINTMAX 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the `stpcpy' function. */
-/* #undef HAVE_STPCPY */
-
-/* Define to 1 if you have the `strcasecmp' function. */
-/* #undef HAVE_STRCASECMP */
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-/* Define to 1 if you have the `strerror_r' function. */
-/* #undef HAVE_STRERROR_R */
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the `strtol' function. */
-#define HAVE_STRTOL 1
-
-/* Define to 1 if you have the `strtoul' function. */
-#define HAVE_STRTOUL 1
-
-/* Define to 1 if you have the <sys/bitypes.h> header file. */
-/* #undef HAVE_SYS_BITYPES_H */
-
-/* Define to 1 if you have the <sys/inttypes.h> header file. */
-/* #undef HAVE_SYS_INTTYPES_H */
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-/* #undef HAVE_SYS_PARAM_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the `tsearch' function. */
-/* #undef HAVE_TSEARCH */
-
-/* Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>. */
-#define HAVE_UINTMAX_T 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define to 1 if the system has the type `unsigned long long int'. */
-/* #undef HAVE_UNSIGNED_LONG_LONG_INT */
-
-/* Define to 1 or 0, depending whether the compiler supports simple visibility
-   declarations. */
-#define HAVE_VISIBILITY 0
-
-/* Define to 1 if you have the <wchar.h> header file. */
-#define HAVE_WCHAR_H 1
-
-/* Define if you have the 'wchar_t' type. */
-#define HAVE_WCHAR_T 1
-
-/* Define to 1 if you have the `wcslen' function. */
-#define HAVE_WCSLEN 1
-
-/* Define to 1 if you have the <wctype.h> header file. */
-#define HAVE_WCTYPE_H 1
-
-/* Define to 1 if you have the `wcwidth' function. */
-/* #undef HAVE_WCWIDTH */
-
-/* Define if you have the 'wint_t' type. */
-#define HAVE_WINT_T 1
-
-/* Define to 1 if the system has the type `_Bool'. */
-/* #undef HAVE__BOOL */
-
-/* Define to 1 if you have the `_NSGetExecutablePath' function. */
-/* #undef HAVE__NSGETEXECUTABLEPATH */
-
-/* Define to 1 if you have the `__fsetlocking' function. */
-/* #undef HAVE___FSETLOCKING */
-
-/* Define as const if the declaration of iconv() needs const. */
-/* #undef ICONV_CONST */
-
-/* Define to a symbolic name denoting the flavor of iconv_open()
-   implementation. */
-/* #undef ICONV_FLAVOR */
-
-/* Define to the value of ${prefix}, as a string. */
-/* #define INSTALLPREFIX "/usr/local" */
-
-/* Define if integer division by zero raises signal SIGFPE. */
-#define INTDIV0_RAISES_SIGFPE 0
-
-/* If malloc(0) is != NULL, define this to 1. Otherwise define this to 0. */
-#define MALLOC_0_IS_NONNULL 1
-
-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
-#define NO_MINUS_C_MINUS_O 1
-
-/* Name of package */
-#define PACKAGE "gettext-runtime"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT ""
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME ""
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING ""
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION ""
-
-/* Define if <inttypes.h> exists and defines unusable PRI* macros. */
-/* #undef PRI_MACROS_BROKEN */
-
-/* Define if the pthread_in_use() detection is hard. */
-/* #undef PTHREAD_IN_USE_DETECTION_HARD */
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'ptrdiff_t'. */
-#define PTRDIFF_T_SUFFIX 
-
-/* Define this to 1 if strerror is broken. */
-/* #undef REPLACE_STRERROR */
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'sig_atomic_t'. */
-#define SIG_ATOMIC_T_SUFFIX 
-
-/* Define as the maximum value of type 'size_t', if the system doesn't define
-   it. */
-#if defined(_WIN32)
-#define SIZE_MAX (((1UL << 31) - 1) * 2 + 1)
-#endif
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'size_t'. */
-#define SIZE_T_SUFFIX u
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at runtime.
-	STACK_DIRECTION > 0 => grows toward higher addresses
-	STACK_DIRECTION < 0 => grows toward lower addresses
-	STACK_DIRECTION = 0 => direction of growth unknown */
-/* #undef STACK_DIRECTION */
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if strerror_r returns char *. */
-/* #undef STRERROR_R_CHAR_P */
-
-/* Define if the POSIX multithreading library can be used. */
-/* #undef USE_POSIX_THREADS */
-
-/* Define if references to the POSIX multithreading library should be made
-   weak. */
-/* #undef USE_POSIX_THREADS_WEAK */
-
-/* Define if the GNU Pth multithreading library can be used. */
-/* #undef USE_PTH_THREADS */
-
-/* Define if references to the GNU Pth multithreading library should be made
-   weak. */
-/* #undef USE_PTH_THREADS_WEAK */
-
-/* Define if the old Solaris multithreading library can be used. */
-/* #undef USE_SOLARIS_THREADS */
-
-/* Define if references to the old Solaris multithreading library should be
-   made weak. */
-/* #undef USE_SOLARIS_THREADS_WEAK */
-
-/* Define to 1 if you want getc etc. to use unlocked I/O if available.
-   Unlocked I/O can improve performance in unithreaded apps, but it is not
-   safe for multithreaded apps. */
-#define USE_UNLOCKED_IO 0
-
-/* Define if the Win32 multithreading API can be used. */
-#define USE_WIN32_THREADS 1
-
-/* Version number of package */
-#define VERSION "0.17"
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'wchar_t'. */
-#define WCHAR_T_SUFFIX 
-
-/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
-   'wint_t'. */
-#define WINT_T_SUFFIX 
-
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-
-/* Define to 1 if on MINIX. */
-/* #undef _MINIX */
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-/* #undef _POSIX_1_SOURCE */
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-/* #undef _POSIX_SOURCE */
-
-/* Enable extensions on AIX 3, Interix.  */
-#ifndef _ALL_SOURCE
-# define _ALL_SOURCE 1
-#endif
-/* Enable GNU extensions on systems that have them.  */
-#ifndef _GNU_SOURCE
-# define _GNU_SOURCE 1
-#endif
-/* Enable threading extensions on Solaris.  */
-#ifndef _POSIX_PTHREAD_SEMANTICS
-# define _POSIX_PTHREAD_SEMANTICS 1
-#endif
-/* Enable extensions on HP NonStop.  */
-#ifndef _TANDEM_SOURCE
-# define _TANDEM_SOURCE 1
-#endif
-/* Enable general extensions on Solaris.  */
-#ifndef __EXTENSIONS__
-# define __EXTENSIONS__ 1
-#endif
-
-
-/* Define to rpl_ if the getopt replacement functions and variables should be
-   used. */
-#define __GETOPT_PREFIX rpl_
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#define inline __inline
-#endif
-
-/* Define to a type if <wchar.h> does not define. */
-/* #undef mbstate_t */
-
-/* Define as the type of the result of subtracting two pointers, if the system
-   doesn't define it. */
-/* #undef ptrdiff_t */
-
-/* Define to a replacement function name for realpath(). */
-#define realpath rpl_realpath
-
-/* Define to the equivalent of the C99 'restrict' keyword, or to
-   nothing if this is not supported.  Do not define if restrict is
-   supported directly.  */
-#define restrict 
-/* Work around a bug in Sun C++: it does not support _Restrict, even
-   though the corresponding Sun C compiler does, which causes
-   "#define restrict _Restrict" in the previous line.  Perhaps some future
-   version of Sun C++ will work with _Restrict; if so, it'll probably
-   define __RESTRICT, just as Sun C does.  */
-#if defined __SUNPRO_CC && !defined __RESTRICT
-# define _Restrict
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define as a signed type of the same size as size_t. */
-#ifdef _WIN64
-#define ssize_t __int64
-#elif _WIN32
-#define ssize_t __int32
-#endif
-
-/* Define to rpl_strnlen if the replacement function should be used. */
-#define strnlen rpl_strnlen
-
-/* Define to unsigned long or unsigned long long if <stdint.h> and
-   <inttypes.h> don't define. */
-/* #undef uintmax_t */
-
-#define __libc_lock_t                   gl_lock_t
-#define __libc_lock_define              gl_lock_define
-#define __libc_lock_define_initialized  gl_lock_define_initialized
-#define __libc_lock_init                gl_lock_init
-#define __libc_lock_lock                gl_lock_lock
-#define __libc_lock_unlock              gl_lock_unlock
-#define __libc_lock_recursive_t                   gl_recursive_lock_t
-#define __libc_lock_define_recursive              gl_recursive_lock_define
-#define __libc_lock_define_initialized_recursive  gl_recursive_lock_define_initialized
-#define __libc_lock_init_recursive                gl_recursive_lock_init
-#define __libc_lock_lock_recursive                gl_recursive_lock_lock
-#define __libc_lock_unlock_recursive              gl_recursive_lock_unlock
-#if 0
-#define glthread_in_use  libintl_thread_in_use
-#define glthread_lock_init     libintl_lock_init
-#define glthread_lock_lock     libintl_lock_lock
-#define glthread_lock_unlock   libintl_lock_unlock
-#define glthread_lock_destroy  libintl_lock_destroy
-#define glthread_rwlock_init     libintl_rwlock_init
-#define glthread_rwlock_rdlock   libintl_rwlock_rdlock
-#define glthread_rwlock_wrlock   libintl_rwlock_wrlock
-#define glthread_rwlock_unlock   libintl_rwlock_unlock
-#define glthread_rwlock_destroy  libintl_rwlock_destroy
-#define glthread_recursive_lock_init     libintl_recursive_lock_init
-#define glthread_recursive_lock_lock     libintl_recursive_lock_lock
-#define glthread_recursive_lock_unlock   libintl_recursive_lock_unlock
-#define glthread_recursive_lock_destroy  libintl_recursive_lock_destroy
-#define glthread_once                 libintl_once
-#define glthread_once_call            libintl_once_call
-#define glthread_once_singlethreaded  libintl_once_singlethreaded
-#endif
-
-
-/* On Windows, variables that may be in a DLL must be marked specially.  */
-#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER
-# define DLL_VARIABLE __declspec (dllimport)
-#else
-# define DLL_VARIABLE
-#endif
-
-/* Extra OS/2 (emx+gcc) defines.  */
-#ifdef __EMX__
-# include "intl/os2compat.h"
-#endif
-
diff --git a/ports/gettext/libgnuintl.win32.h b/ports/gettext/libgnuintl.win32.h
deleted file mode 100644
index 440da4d59..000000000
--- a/ports/gettext/libgnuintl.win32.h
+++ /dev/null
@@ -1,423 +0,0 @@
-/* Message catalogs for internationalization.
-Copyright (C) 1995-1997, 2000-2007 Free Software Foundation, Inc.
-
-This program is free software; you can redistribute it and/or modify it
-under the terms of the GNU Library General Public License as published
-by the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Library General Public License for more details.
-
-You should have received a copy of the GNU Library General Public
-License along with this program; if not, write to the Free Software
-Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
-USA.  */
-
-#ifndef _LIBINTL_H
-#define _LIBINTL_H	1
-
-#if defined(_WIN32) && defined(libintl_EXPORTS)
-#define LIBINTL_DLL_EXPORTED __declspec(dllexport)
-#else
-#define LIBINTL_DLL_EXPORTED
-#endif
-
-#include <locale.h>
-
-/* The LC_MESSAGES locale category is the category used by the functions
-gettext() and dgettext().  It is specified in POSIX, but not in ANSI C.
-On systems that don't define it, use an arbitrary value instead.
-On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
-then includes <libintl.h> (i.e. this file!) and then only defines
-LC_MESSAGES.  To avoid a redefinition warning, don't define LC_MESSAGES
-in this case.  */
-#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
-# define LC_MESSAGES 1729
-#endif
-
-/* We define an additional symbol to signal that we use the GNU
-implementation of gettext.  */
-#define __USE_GNU_GETTEXT 1
-
-/* Provide information about the supported file formats.  Returns the
-maximum minor revision number supported for a given major revision.  */
-#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
-  ((major) == 0 || (major) == 1 ? 1 : -1)
-
-/* Resolve a platform specific conflict on DJGPP.  GNU gettext takes
-precedence over _conio_gettext.  */
-#ifdef __DJGPP__
-# undef gettext
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-	/* Version number: (major<<16) + (minor<<8) + subminor */
-#define LIBINTL_VERSION 0x001100
-	extern LIBINTL_DLL_EXPORTED int libintl_version;
-
-
-	/* We redirect the functions to those prefixed with "libintl_".  This is
-	necessary, because some systems define gettext/textdomain/... in the C
-	library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
-	If we used the unprefixed names, there would be cases where the
-	definition in the C library would override the one in the libintl.so
-	shared library.  Recall that on ELF systems, the symbols are looked
-	up in the following order:
-	1. in the executable,
-	2. in the shared libraries specified on the link command line, in order,
-	3. in the dependencies of the shared libraries specified on the link
-	command line,
-	4. in the dlopen()ed shared libraries, in the order in which they were
-	dlopen()ed.
-	The definition in the C library would override the one in libintl.so if
-	either
-	* -lc is given on the link command line and -lintl isn't, or
-	* -lc is given on the link command line before -lintl, or
-	* libintl.so is a dependency of a dlopen()ed shared library but not
-	linked to the executable at link time.
-	Since Solaris gettext() behaves differently than GNU gettext(), this
-	would be unacceptable.
-
-	The redirection happens by default through macros in C, so that &gettext
-	is independent of the compilation unit, but through inline functions in
-	C++, in order not to interfere with the name mangling of class fields or
-	class methods called 'gettext'.  */
-
-	/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
-	If he doesn't, we choose the method.  A third possible method is
-	_INTL_REDIRECT_ASM, supported only by GCC.  */
-#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
-# if __GNUC__ >= 2 && !(__APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
-#  define _INTL_REDIRECT_ASM
-# else
-#  ifdef __cplusplus
-#   define _INTL_REDIRECT_INLINE
-#  else
-#   define _INTL_REDIRECT_MACROS
-#  endif
-# endif
-#endif
-	/* Auxiliary macros.  */
-#ifdef _INTL_REDIRECT_ASM
-# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
-# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
-# define _INTL_STRINGIFY(prefix) #prefix
-#else
-# define _INTL_ASM(cname)
-#endif
-
-	/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
-	its n-th argument literally.  This enables GCC to warn for example about
-	printf (gettext ("foo %y")).  */
-#if __GNUC__ >= 3 && !(__APPLE_CC__ > 1 && defined __cplusplus)
-# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
-#else
-# define _INTL_MAY_RETURN_STRING_ARG(n)
-#endif
-
-	/* Look up MSGID in the current default message catalog for the current
-	LC_MESSAGES locale.  If not found, returns MSGID itself (the default
-	text).  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_gettext(const char *__msgid)
-		_INTL_MAY_RETURN_STRING_ARG(1);
-	static inline char *gettext(const char *__msgid)
-	{
-		return libintl_gettext(__msgid);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define gettext libintl_gettext
-#endif
-	extern LIBINTL_DLL_EXPORTED char *gettext(const char *__msgid)
-		_INTL_ASM(libintl_gettext)
-		_INTL_MAY_RETURN_STRING_ARG(1);
-#endif
-
-	/* Look up MSGID in the DOMAINNAME message catalog for the current
-	LC_MESSAGES locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_dgettext(const char *__domainname, const char *__msgid)
-		_INTL_MAY_RETURN_STRING_ARG(2);
-	static inline char *dgettext(const char *__domainname, const char *__msgid)
-	{
-		return libintl_dgettext(__domainname, __msgid);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dgettext libintl_dgettext
-#endif
-	extern LIBINTL_DLL_EXPORTED char *dgettext(const char *__domainname, const char *__msgid)
-		_INTL_ASM(libintl_dgettext)
-		_INTL_MAY_RETURN_STRING_ARG(2);
-#endif
-
-	/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
-	locale.  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_dcgettext(const char *__domainname, const char *__msgid,
-		int __category)
-		_INTL_MAY_RETURN_STRING_ARG(2);
-	static inline char *dcgettext(const char *__domainname, const char *__msgid,
-		int __category)
-	{
-		return libintl_dcgettext(__domainname, __msgid, __category);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcgettext libintl_dcgettext
-#endif
-	extern LIBINTL_DLL_EXPORTED char *dcgettext(const char *__domainname, const char *__msgid,
-		int __category)
-		_INTL_ASM(libintl_dcgettext)
-		_INTL_MAY_RETURN_STRING_ARG(2);
-#endif
-
-
-	/* Similar to `gettext' but select the plural form corresponding to the
-	number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_ngettext(const char *__msgid1, const char *__msgid2,
-		unsigned long int __n)
-		_INTL_MAY_RETURN_STRING_ARG(1) _INTL_MAY_RETURN_STRING_ARG(2);
-	static inline char *ngettext(const char *__msgid1, const char *__msgid2,
-		unsigned long int __n)
-	{
-		return libintl_ngettext(__msgid1, __msgid2, __n);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define ngettext libintl_ngettext
-#endif
-	extern LIBINTL_DLL_EXPORTED char *ngettext(const char *__msgid1, const char *__msgid2,
-		unsigned long int __n)
-		_INTL_ASM(libintl_ngettext)
-		_INTL_MAY_RETURN_STRING_ARG(1) _INTL_MAY_RETURN_STRING_ARG(2);
-#endif
-
-	/* Similar to `dgettext' but select the plural form corresponding to the
-	number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_dngettext(const char *__domainname, const char *__msgid1,
-		const char *__msgid2, unsigned long int __n)
-		_INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3);
-	static inline char *dngettext(const char *__domainname, const char *__msgid1,
-		const char *__msgid2, unsigned long int __n)
-	{
-		return libintl_dngettext(__domainname, __msgid1, __msgid2, __n);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dngettext libintl_dngettext
-#endif
-	extern LIBINTL_DLL_EXPORTED char *dngettext(const char *__domainname,
-		const char *__msgid1, const char *__msgid2,
-		unsigned long int __n)
-		_INTL_ASM(libintl_dngettext)
-		_INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3);
-#endif
-
-	/* Similar to `dcgettext' but select the plural form corresponding to the
-	number N.  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_dcngettext(const char *__domainname,
-		const char *__msgid1, const char *__msgid2,
-		unsigned long int __n, int __category)
-		_INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3);
-	static inline char *dcngettext(const char *__domainname,
-		const char *__msgid1, const char *__msgid2,
-		unsigned long int __n, int __category)
-	{
-		return libintl_dcngettext(__domainname, __msgid1, __msgid2, __n, __category);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define dcngettext libintl_dcngettext
-#endif
-	extern LIBINTL_DLL_EXPORTED char *dcngettext(const char *__domainname,
-		const char *__msgid1, const char *__msgid2,
-		unsigned long int __n, int __category)
-		_INTL_ASM(libintl_dcngettext)
-		_INTL_MAY_RETURN_STRING_ARG(2) _INTL_MAY_RETURN_STRING_ARG(3);
-#endif
-
-
-
-	/* Set the current default message catalog to DOMAINNAME.
-	If DOMAINNAME is null, return the current default.
-	If DOMAINNAME is "", reset to the default of "messages".  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_textdomain(const char *__domainname);
-	static inline char *textdomain(const char *__domainname)
-	{
-		return libintl_textdomain(__domainname);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define textdomain libintl_textdomain
-#endif
-	extern LIBINTL_DLL_EXPORTED char *textdomain(const char *__domainname)
-		_INTL_ASM(libintl_textdomain);
-#endif
-
-	/* Specify that the DOMAINNAME message catalog will be found
-	in DIRNAME rather than in the system locale data base.  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_bindtextdomain(const char *__domainname,
-		const char *__dirname);
-	static inline char *bindtextdomain(const char *__domainname,
-		const char *__dirname)
-	{
-		return libintl_bindtextdomain(__domainname, __dirname);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bindtextdomain libintl_bindtextdomain
-#endif
-	extern LIBINTL_DLL_EXPORTED char *bindtextdomain(const char *__domainname, const char *__dirname)
-		_INTL_ASM(libintl_bindtextdomain);
-#endif
-
-	/* Specify the character encoding in which the messages from the
-	DOMAINNAME message catalog will be returned.  */
-#ifdef _INTL_REDIRECT_INLINE
-	extern LIBINTL_DLL_EXPORTED char *libintl_bind_textdomain_codeset(const char *__domainname,
-		const char *__codeset);
-	static inline char *bind_textdomain_codeset(const char *__domainname,
-		const char *__codeset)
-	{
-		return libintl_bind_textdomain_codeset(__domainname, __codeset);
-	}
-#else
-#ifdef _INTL_REDIRECT_MACROS
-# define bind_textdomain_codeset libintl_bind_textdomain_codeset
-#endif
-	extern LIBINTL_DLL_EXPORTED char *bind_textdomain_codeset(const char *__domainname,
-		const char *__codeset)
-		_INTL_ASM(libintl_bind_textdomain_codeset);
-#endif
-
-
-
-	/* Support for format strings with positions in *printf(), following the
-	POSIX/XSI specification.
-	Note: These replacements for the *printf() functions are visible only
-	in source files that #include <libintl.h> or #include "gettext.h".
-	Packages that use *printf() in source files that don't refer to _()
-	or gettext() but for which the format string could be the return value
-	of _() or gettext() need to add this #include.  Oh well.  */
-
-#if !0
-
-#include <stdio.h>
-#include <stddef.h>
-
-	/* Get va_list.  */
-#if __STDC__ || defined __cplusplus || defined _MSC_VER
-# include <stdarg.h>
-#else
-# include <varargs.h>
-#endif
-
-#undef fprintf
-#define fprintf libintl_fprintf
-	extern LIBINTL_DLL_EXPORTED int fprintf(FILE *, const char *, ...);
-#undef vfprintf
-#define vfprintf libintl_vfprintf
-	extern LIBINTL_DLL_EXPORTED int vfprintf(FILE *, const char *, va_list);
-
-#undef printf
-#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
-	/* Don't break __attribute__((format(printf,M,N))).
-	This redefinition is only possible because the libc in NetBSD, Cygwin,
-	mingw does not have a function __printf__.  */
-# define libintl_printf __printf__
-#endif
-#define printf libintl_printf
-	extern LIBINTL_DLL_EXPORTED int printf(const char *, ...);
-#undef vprintf
-#define vprintf libintl_vprintf
-	extern LIBINTL_DLL_EXPORTED int vprintf(const char *, va_list);
-
-#undef sprintf
-#define sprintf libintl_sprintf
-	extern LIBINTL_DLL_EXPORTED int sprintf(char *, const char *, ...);
-#undef vsprintf
-#define vsprintf libintl_vsprintf
-	extern LIBINTL_DLL_EXPORTED int vsprintf(char *, const char *, va_list);
-
-#if 0
-
-#undef snprintf
-#define snprintf libintl_snprintf
-	extern LIBINTL_DLL_EXPORTED int snprintf(char *, size_t, const char *, ...);
-#undef vsnprintf
-#define vsnprintf libintl_vsnprintf
-	extern LIBINTL_DLL_EXPORTED int vsnprintf(char *, size_t, const char *, va_list);
-
-#endif
-
-#if 0
-
-#undef asprintf
-#define asprintf libintl_asprintf
-	extern LIBINTL_DLL_EXPORTED int asprintf(char **, const char *, ...);
-#undef vasprintf
-#define vasprintf libintl_vasprintf
-	extern LIBINTL_DLL_EXPORTED int vasprintf(char **, const char *, va_list);
-
-#endif
-
-#if 0
-
-#undef fwprintf
-#define fwprintf libintl_fwprintf
-	extern LIBINTL_DLL_EXPORTED int fwprintf(FILE *, const wchar_t *, ...);
-#undef vfwprintf
-#define vfwprintf libintl_vfwprintf
-	extern LIBINTL_DLL_EXPORTED int vfwprintf(FILE *, const wchar_t *, va_list);
-
-#undef wprintf
-#define wprintf libintl_wprintf
-	extern LIBINTL_DLL_EXPORTED int wprintf(const wchar_t *, ...);
-#undef vwprintf
-#define vwprintf libintl_vwprintf
-	extern LIBINTL_DLL_EXPORTED int vwprintf(const wchar_t *, va_list);
-
-#undef swprintf
-#define swprintf libintl_swprintf
-	extern LIBINTL_DLL_EXPORTED int swprintf(wchar_t *, size_t, const wchar_t *, ...);
-#undef vswprintf
-#define vswprintf libintl_vswprintf
-	extern LIBINTL_DLL_EXPORTED int vswprintf(wchar_t *, size_t, const wchar_t *, va_list);
-
-#endif
-
-#endif
-
-
-	/* Support for relocatable packages.  */
-
-	/* Sets the original and the current installation prefix of the package.
-	Relocation simply replaces a pathname starting with the original prefix
-	by the corresponding pathname with the current prefix instead.  Both
-	prefixes should be directory names without trailing slash (i.e. use ""
-	instead of "/").  */
-#define libintl_set_relocation_prefix libintl_set_relocation_prefix
-	extern LIBINTL_DLL_EXPORTED void
-		libintl_set_relocation_prefix(const char *orig_prefix,
-			const char *curr_prefix);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* libintl.h */
\ No newline at end of file
diff --git a/ports/gettext/portfile.cmake b/ports/gettext/portfile.cmake
index 988c2f439..449029e7c 100644
--- a/ports/gettext/portfile.cmake
+++ b/ports/gettext/portfile.cmake
@@ -3,7 +3,6 @@ if(VCPKG_TARGET_IS_LINUX)
     if (NOT EXISTS "/usr/include/libintl.h")
         message(FATAL_ERROR "Please use command \"sudo apt-get install gettext\" to install gettext on linux.")
     endif()
-    file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-gettext-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-gettext)
     return()
 else()
     set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
@@ -11,45 +10,73 @@ endif()
 
 #Based on https://github.com/winlibs/gettext
 
-set(GETTEXT_VERSION 0.19)
+set(GETTEXT_VERSION 0.21)
 
 vcpkg_download_distfile(ARCHIVE
     URLS "https://ftp.gnu.org/pub/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz" "https://www.mirrorservice.org/sites/ftp.gnu.org/gnu/gettext/gettext-${GETTEXT_VERSION}.tar.gz"
     FILENAME "gettext-${GETTEXT_VERSION}.tar.gz"
-    SHA512 a5db035c582ff49d45ee6eab9466b2bef918e413a882019c204a9d8903cb3770ddfecd32c971ea7c7b037c7b69476cf7c56dcabc8b498b94ab99f132516c9922
+    SHA512 bbe590c5dd3580c75bf30ff768da99a88eb8d466ec1ac9eea20be4cab4357ecf72448e6b81b47425e39d50fa6320ba426632914d7898dfebb4f159abc39c31d1
 )
+if(VCPKG_TARGET_IS_UWP)
+    set(PATCHES uwp_remove_localcharset.patch)
+endif()
 vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
     ARCHIVE ${ARCHIVE}
     REF ${GETTEXT_VERSION}
     PATCHES
-        0001-Fix-macro-definitions.patch
         0002-Fix-uwp-build.patch
         0003-Fix-win-unicode-paths.patch
+        ${PATCHES}
 )
+vcpkg_find_acquire_program(BISON)
+get_filename_component(BISON_PATH ${BISON} DIRECTORY)
+vcpkg_add_to_path(${BISON_PATH})
 
-file(COPY
-    ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt
-    ${CMAKE_CURRENT_LIST_DIR}/config.win32.h
-    ${CMAKE_CURRENT_LIST_DIR}/config.unix.h.in
-    DESTINATION ${SOURCE_PATH}/gettext-runtime
-)
-file(REMOVE ${SOURCE_PATH}/gettext-runtime/intl/libgnuintl.h ${SOURCE_PATH}/gettext-runtime/config.h)
-
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/libgnuintl.win32.h DESTINATION ${SOURCE_PATH}/gettext-runtime/intl)
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}/gettext-runtime
-    PREFER_NINJA
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-)
-
-vcpkg_install_cmake()
+if(VCPKG_TARGET_IS_WINDOWS)
+    # This is required. For some reason these do not get correctly identified for release builds. 
+    list(APPEND OPTIONS ac_cv_func_wcslen=yes
+                        ac_cv_func_memmove=yes
+                        #The following are required for a full gettext built.
+                        # Left here for future reference. 
+                        gl_cv_func_printf_directive_n=no #segfaults otherwise with popup window
+                        ac_cv_func_memset=yes #not detected in release builds 
+                        )
+endif()
+vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH}/gettext-runtime # Port should probably be renamed to gettext-runtime instead of only gettext. Removing the subdir here builds all of gettext
+                     DETERMINE_BUILD_TRIPLET
+                     USE_WRAPPERS
+                     ADD_BIN_TO_PATH    # So configure can check for working iconv
+                     OPTIONS --enable-relocatable #symbol duplication with glib-init.c?
+                             --enable-c++
+                             --disable-java
+                             ${OPTIONS}
+                    )
+                    
+if(VCPKG_TARGET_IS_UWP)
+    vcpkg_install_make(SUBPATH "/intl") # Could make a port intl or libintl or have features in Gettext
+else()
+    vcpkg_install_make(SUBPATH "/intl")
+endif()
 
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-gettext TARGET_PATH share/unofficial-gettext)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/gettext)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/gettext/COPYING ${CURRENT_PACKAGES_DIR}/share/gettext/copyright)
 
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin)
+
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+
+set(GNU_DLL_PATHS lib/ debug/lib/)
+set(GNU_DLL_NAME GNU.Gettext.dll) #C# dll?
+foreach(DLL_PATH IN LISTS GNU_DLL_PATHS)
+    if(EXISTS "${CURRENT_PACKAGES_DIR}/${DLL_PATH}${GNU_DLL_NAME}")
+       file(REMOVE "${CURRENT_PACKAGES_DIR}/${DLL_PATH}${GNU_DLL_NAME}")
+    endif()
+endforeach()
+
 vcpkg_copy_pdbs()
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/intl)
diff --git a/ports/gettext/unofficial-gettext-config.cmake b/ports/gettext/unofficial-gettext-config.cmake
deleted file mode 100644
index 3b872142a..000000000
--- a/ports/gettext/unofficial-gettext-config.cmake
+++ /dev/null
@@ -1 +0,0 @@
-add_library(unofficial::gettext::libintl INTERFACE IMPORTED)

diff --git a/ports/gettext/uwp_remove_localcharset.patch b/ports/gettext/uwp_remove_localcharset.patch
new file mode 100644
index 000000000..285f81cf1
--- /dev/null
+++ b/ports/gettext/uwp_remove_localcharset.patch
@@ -0,0 +1,79 @@
+diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
+index 7999d3456..b3ef40340 100644
+--- a/gettext-runtime/intl/Makefile.in
++++ b/gettext-runtime/intl/Makefile.in
+@@ -252,7 +252,7 @@ am__libgnuintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \
+ 	gettext.c finddomain.c hash-string.c loadmsgcat.c \
+ 	localealias.c textdomain.c l10nflist.c explodename.c \
+ 	dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
+-	plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \
++	plural-exp.c threadlib.c lock.c relocatable.c \
+ 	langprefs.c localename.c localename-table.c log.c printf.c \
+ 	setlocale.c setlocale-lock.c setlocale_null.c version.c \
+ 	xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \
+@@ -264,7 +264,7 @@ am__objects_2 = bindtextdom.lo dcgettext.lo dgettext.lo gettext.lo \
+ 	finddomain.lo hash-string.lo loadmsgcat.lo localealias.lo \
+ 	textdomain.lo l10nflist.lo explodename.lo dcigettext.lo \
+ 	dcngettext.lo dngettext.lo ngettext.lo plural.lo plural-exp.lo \
+-	localcharset.lo threadlib.lo lock.lo relocatable.lo \
++	threadlib.lo lock.lo relocatable.lo \
+ 	langprefs.lo localename.lo localename-table.lo log.lo \
+ 	printf.lo setlocale.lo setlocale-lock.lo setlocale_null.lo \
+ 	version.lo xsize.lo osdep.lo intl-compat.lo $(am__objects_1)
+@@ -282,7 +282,7 @@ am__libintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \
+ 	gettext.c finddomain.c hash-string.c loadmsgcat.c \
+ 	localealias.c textdomain.c l10nflist.c explodename.c \
+ 	dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
+-	plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \
++	plural-exp.c threadlib.c lock.c relocatable.c \
+ 	langprefs.c localename.c localename-table.c log.c printf.c \
+ 	setlocale.c setlocale-lock.c setlocale_null.c version.c \
+ 	xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \
+@@ -1387,7 +1387,7 @@ AUTOMAKE_OPTIONS = 1.10 gnu no-dependencies
+ 
+ # Miscellaneous files.
+ EXTRA_DIST = gmo.h gettextP.h hash-string.h loadinfo.h plural-exp.h \
+-	eval-plural.h localcharset.h lock.h windows-mutex.h \
++	eval-plural.h lock.h windows-mutex.h \
+ 	windows-rwlock.h windows-recmutex.h windows-once.h \
+ 	windows-initguard.h relocatable.h arg-nonnull.h attribute.h \
+ 	filename.h flexmember.h localename-table.in.h setlocale_null.h \
+@@ -1543,7 +1543,7 @@ LIBINTLSOURCES = bindtextdom.c dcgettext.c dgettext.c gettext.c \
+ 	finddomain.c hash-string.c loadmsgcat.c localealias.c \
+ 	textdomain.c l10nflist.c explodename.c dcigettext.c \
+ 	dcngettext.c dngettext.c ngettext.c plural.y plural-exp.c \
+-	localcharset.c threadlib.c lock.c relocatable.c langprefs.c \
++	threadlib.c lock.c relocatable.c langprefs.c \
+ 	localename.c localename-table.c log.c printf.c setlocale.c \
+ 	setlocale-lock.c setlocale_null.c version.c xsize.c osdep.c \
+ 	intl-compat.c $(am__append_2)
+@@ -2016,8 +2016,6 @@ plural.lo: $(srcdir)/plural.c
+ 	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural.c
+ plural-exp.lo: $(srcdir)/plural-exp.c
+ 	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural-exp.c
+-localcharset.lo: $(srcdir)/localcharset.c
+-	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/localcharset.c
+ threadlib.lo: $(srcdir)/threadlib.c
+ 	$(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/threadlib.c
+ lock.lo: $(srcdir)/lock.c
+@@ -2074,7 +2072,6 @@ dngettext.lo:        ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo
+ ngettext.lo:         ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h
+ plural.lo:           ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS)
+ plural-exp.lo:       ../config.h $(srcdir)/plural-exp.h
+-localcharset.lo:     ../config.h $(srcdir)/localcharset.h
+ threadlib.lo:        ../config.h
+ lock.lo:             ../config.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h
+ relocatable.lo:      ../config.h $(srcdir)/relocatable.h
+diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
+index 1a1627888..3e6582f17 100644
+--- a/gettext-runtime/intl/localcharset.c
++++ b/gettext-runtime/intl/localcharset.c
+@@ -1021,7 +1021,7 @@ locale_charset (void)
+ 

+ # else

+ 

+-#  error "Add code for other platforms here."

++//#  error "Add code for other platforms here."

+ 

+ # endif

+ 

diff --git a/ports/gettext/vcpkg-cmake-wrapper.cmake b/ports/gettext/vcpkg-cmake-wrapper.cmake
new file mode 100644
index 000000000..c231bfee6
--- /dev/null
+++ b/ports/gettext/vcpkg-cmake-wrapper.cmake
@@ -0,0 +1,10 @@
+_find_package(${ARGS})
+
+if(Intl_FOUND AND Intl_LIBRARIES)
+    include(SelectLibraryConfigurations)
+    find_library(Intl_LIBRARY_DEBUG NAMES intl libintl intl-8 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)
+    find_library(Intl_LIBRARY_RELEASE NAMES intl libintl intl-8 NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)
+    unset(Intl_LIBRARIES)
+    unset(Intl_LIBRARIES CACHE)
+    select_library_configurations(Intl)
+endif()
\ No newline at end of file
diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt
index 231542073..cc24a2f63 100644
--- a/ports/glib/CMakeLists.txt
+++ b/ports/glib/CMakeLists.txt
@@ -31,7 +31,7 @@ if(CMAKE_BUILD_TYPE STREQUAL Debug)
 endif()
 find_library(PCRE_LIBRARY NAMES pcre${PCRE_SUFFIX} pcre)
 # libiconv
-find_package(unofficial-iconv REQUIRED)
+find_package(Iconv REQUIRED)
 # libffi
 find_path(FFI_INCLUDE_DIR ffi.h)
 find_library(FFI_LIBRARY NAMES ffi libffi)
@@ -45,11 +45,7 @@ endif()
 
 if(WIN32 OR APPLE)
     # libintl(gettext)
-    find_path(LIBINTL_INCLUDE_DIR libintl.h)
-    find_library(LIBINTL_LIBRARY NAMES intl libintl)
-else()
-    set(LIBINTL_INCLUDE_DIR)
-    set(LIBINTL_LIBRARY)
+    find_package(Intl REQUIRED)
 endif()
 
 if(WIN32)
@@ -139,7 +135,7 @@ if(NOT WIN32)
 endif()
 add_library(glib ${GLIB_SOURCES})
 target_compile_definitions(glib PRIVATE GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR="")
-target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} unofficial::iconv::libiconv unofficial::iconv::libcharset ${LIBINTL_LIBRARY})
+target_link_libraries(glib PRIVATE ${PCRE_LIBRARY} Iconv::Iconv ${Intl_LIBRARIES})
 if(WIN32)
     target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE)
     target_link_libraries(glib PRIVATE ws2_32 winmm advapi32 ole32 shell32)
@@ -149,7 +145,7 @@ else()
     target_link_libraries(glib PRIVATE Threads::Threads ${CMAKE_DL_LIBS})
 endif()
 target_include_directories(glib PRIVATE ${PCRE_INCLUDE_DIR} ${ICONV_INCLUDE_DIR})
-target_include_directories(glib PUBLIC $<BUILD_INTERFACE:${LIBINTL_INCLUDE_DIR}> $<INSTALL_INTERFACE:include>)
+target_include_directories(glib PUBLIC $<BUILD_INTERFACE:${Intl_INCLUDE_DIRS}> $<INSTALL_INTERFACE:include>)
 list(APPEND GLIB_TARGETS glib)
 if(NOT GLIB_SKIP_HEADERS)
     install(FILES glib/glib.h glib/glib-object.h ${CMAKE_BINARY_DIR}/config/glib/glibconfig.h DESTINATION include)
@@ -165,8 +161,8 @@ endif()
 # gthread
 add_library(gthread gthread/gthread-impl.c)
 target_compile_definitions(gthread PRIVATE G_LOG_DOMAIN="GThread")
-target_link_libraries(gthread PRIVATE glib ${LIBINTL_LIBRARY})
-target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR})
+target_link_libraries(gthread PRIVATE glib ${Intl_LIBRARIES})
+target_include_directories(gthread PRIVATE ${Intl_INCLUDE_DIRS})
 list(APPEND GLIB_TARGETS gthread)
 
 # gobject
@@ -185,9 +181,9 @@ endif()
 # gmodule
 add_library(gmodule gmodule/gmodule.c)
 target_compile_definitions(gmodule PRIVATE G_LOG_DOMAIN="GModule")
-target_link_libraries(gmodule PRIVATE glib ${LIBINTL_LIBRARY})
+target_link_libraries(gmodule PRIVATE glib ${Intl_LIBRARIES})
 target_include_directories(gmodule PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gmodule>)
-target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR} PUBLIC $<INSTALL_INTERFACE:include>)
+target_include_directories(gmodule PRIVATE ${Intl_INCLUDE_DIRS} PUBLIC $<INSTALL_INTERFACE:include>)
 list(APPEND GLIB_TARGETS gmodule)
 if(NOT GLIB_SKIP_HEADERS)
     install(FILES gmodule/gmodule.h DESTINATION include)
@@ -254,7 +250,7 @@ if(NOT GLIB_SKIP_HEADERS)
 endif()
 add_library(gio ${GIO_SOURCES})
 target_compile_definitions(gio PRIVATE GIO_COMPILATION G_LOG_DOMAIN="GLib-GIO")
-target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${LIBINTL_LIBRARY})
+target_link_libraries(gio PRIVATE glib gmodule gobject ZLIB::ZLIB ${LIBRESOLV_LIBRARY} ${Intl_LIBRARIES})
 target_include_directories(gio PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/gio> $<INSTALL_INTERFACE:include/gio>)
 if(WIN32)
     target_link_libraries(gio PRIVATE ws2_32 shlwapi dnsapi iphlpapi advapi32 shell32)
@@ -280,9 +276,9 @@ endforeach()
 macro(add_glib_tool TOOL_NAME)
     add_executable(${TOOL_NAME} ${ARGN})
     if(WIN32)
-        target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY} shell32)
+        target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES} shell32)
     else()
-        target_link_libraries(${TOOL_NAME} glib ${LIBINTL_LIBRARY})
+        target_link_libraries(${TOOL_NAME} glib ${Intl_LIBRARIES})
     endif()
     target_compile_definitions(${TOOL_NAME} PRIVATE GLIB_COMPILATION)
     list(APPEND GLIB_TOOLS ${TOOL_NAME})
@@ -290,7 +286,7 @@ endmacro()
 
 macro(add_gio_tool TOOL_NAME)
     add_executable(${TOOL_NAME} ${ARGN})
-    target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${LIBINTL_LIBRARY})
+    target_link_libraries(${TOOL_NAME} PRIVATE glib gio gobject gmodule ${Intl_LIBRARIES})
     target_include_directories(${TOOL_NAME} PRIVATE gmodule gio)
     target_compile_definitions(${TOOL_NAME} PRIVATE GIO_COMPILATION)
     list(APPEND GLIB_TOOLS ${TOOL_NAME})
@@ -359,7 +355,7 @@ message(STATUS "  " ${PCRE_LIBRARY})
 message(STATUS "  " ${ICONV_LIBRARY})
 message(STATUS "  " ${CHARSET_LIBRARY})
 message(STATUS "  " ${FFI_LIBRARY})
-message(STATUS "  " ${LIBINTL_LIBRARY})
+message(STATUS "  " ${Intl_LIBRARIES})
 
 set(prefix ${CMAKE_INSTALL_PREFIX})
 set(exec_prefix ${CMAKE_INSTALL_PREFIX})
diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL
index 14c896e59..8d74d5613 100644
--- a/ports/glib/CONTROL
+++ b/ports/glib/CONTROL
@@ -1,5 +1,6 @@
 Source: glib
-Version: 2.52.3-14-7
+Version: 2.52.3
+Port-Version: 23
 Homepage: https://developer.gnome.org/glib/
 Description: Portable, general-purpose utility library.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv
diff --git a/ports/glib/cmake/unofficial-glib-config.in.cmake b/ports/glib/cmake/unofficial-glib-config.in.cmake
index ea87ea0b2..6edc8348b 100644
--- a/ports/glib/cmake/unofficial-glib-config.in.cmake
+++ b/ports/glib/cmake/unofficial-glib-config.in.cmake
@@ -1,5 +1,5 @@
 include(CMakeFindDependencyMacro)

-find_dependency(unofficial-iconv)

+find_dependency(Iconv)

 if(NOT WIN32)

     find_dependency(Threads)

 endif()

diff --git a/ports/glibmm/CMakeLists.txt b/ports/glibmm/CMakeLists.txt
index 10839260a..15f7bff12 100644
--- a/ports/glibmm/CMakeLists.txt
+++ b/ports/glibmm/CMakeLists.txt
@@ -26,12 +26,9 @@ link_libraries(
     ${FFI_LIBRARY}

 )

 

-if(APPLE)

-  find_library(LIBINTL_LIBRARY NAMES intl)

-endif()

-

-find_package(unofficial-iconv REQUIRED)

-link_libraries(${LIBINTL_LIBRARY} unofficial::iconv::libiconv)

+find_package(Intl REQUIRED)

+find_package(Iconv REQUIRED)

+link_libraries(${Intl_LIBRARIES} Iconv::Iconv)

 

 if(APPLE)

   find_library(COREFOUNDATION_LIBRARY CoreFoundation)

diff --git a/ports/glibmm/CONTROL b/ports/glibmm/CONTROL
index aefaf7b83..59836db6f 100644
--- a/ports/glibmm/CONTROL
+++ b/ports/glibmm/CONTROL
@@ -1,5 +1,6 @@
 Source: glibmm
-Version: 2.52.1-11
+Version: 2.52.1
+Port-Version: 12
 Description: This is glibmm, a C++ API for parts of glib that are useful for C++.
 Homepage: https://www.gtkmm.org.
 Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp
diff --git a/ports/gmime/CMakeLists.txt b/ports/gmime/CMakeLists.txt
index 51ea75cd3..cefc0f226 100644
--- a/ports/gmime/CMakeLists.txt
+++ b/ports/gmime/CMakeLists.txt
@@ -7,7 +7,7 @@ set(GMIME_LIB_SUFFIX 3.0)
 
 find_package(zlib REQUIRED)
 find_package(unofficial-glib CONFIG REQUIRED)
-find_package(unofficial-iconv REQUIRED)
+find_package(Iconv REQUIRED)
 
 find_library(IDN_LIBRARY NAMES libidn2)
 
@@ -45,7 +45,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 )
 
 target_include_directories(${PROJECT_NAME} PRIVATE . ./util)
-target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::iconv::libiconv ZLIB::ZLIB ${IDN_LIBRARY})
+target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv ZLIB::ZLIB ${IDN_LIBRARY})
 target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::glib::gobject unofficial::glib::gio unofficial::glib::glib)
 target_link_libraries(${PROJECT_NAME} PRIVATE Ws2_32.lib)
 
diff --git a/ports/gmime/CONTROL b/ports/gmime/CONTROL
index 70200731c..301f303e3 100644
--- a/ports/gmime/CONTROL
+++ b/ports/gmime/CONTROL
@@ -1,5 +1,6 @@
 Source: gmime
 Version: 3.2.6
+Port-Version: 1
 Build-Depends: zlib, glib, libiconv, libidn2
 Homepage: https://developer.gnome.org/gmime/
 Description: GMime is a C/C++ library which may be used for the creation and parsing of messages using the Multipurpose Internet Mail Extension (MIME).
diff --git a/ports/harfbuzz/glib-cmake.patch b/ports/harfbuzz/glib-cmake.patch
index 519627ac7..f98217120 100644
--- a/ports/harfbuzz/glib-cmake.patch
+++ b/ports/harfbuzz/glib-cmake.patch
@@ -16,7 +16,7 @@ index 9b21bef2c..ae741ef63 100644
 -
 -  include_directories(${GLIBCONFIG_INCLUDE_DIR} ${GLIB_INCLUDE_DIR})
 +  find_package(Threads REQUIRED)
-+  find_package(unofficial-iconv REQUIRED)
++  find_package(Iconv REQUIRED)
 +  find_package(unofficial-glib CONFIG REQUIRED)
 
    list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-glib.h)
@@ -24,7 +24,7 @@ index 9b21bef2c..ae741ef63 100644
 -  list(APPEND THIRD_PARTY_LIBS ${GLIB_LIBRARIES})
 -
 -  mark_as_advanced(GLIB_LIBRARIES GLIBCONFIG_INCLUDE_DIR GLIB_INCLUDE_DIR)
-+  list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib)
++  list(APPEND THIRD_PARTY_LIBS unofficial::glib::glib Iconv::Iconv)
  endif ()
 
  if (HB_HAVE_ICU)
diff --git a/ports/io2d/CONTROL b/ports/io2d/CONTROL
index 5848cb754..59ff0c23c 100644
--- a/ports/io2d/CONTROL
+++ b/ports/io2d/CONTROL
@@ -1,4 +1,5 @@
 Source: io2d
 Version: 2020-09-14
+Port-Version: 1
 Description: a lightweight, cross platform drawing library
 Build-Depends: cairo (!osx), cairo[x11] (linux), graphicsmagick (!osx)
diff --git a/ports/io2d/Fix-FindCairo.patch b/ports/io2d/Fix-FindCairo.patch
deleted file mode 100644
index e3caa2f7f..000000000
--- a/ports/io2d/Fix-FindCairo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
-index d0e9176..2ac638c 100644
---- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
-+++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
-@@ -24,7 +24,9 @@ target_include_directories(io2d_cairo PUBLIC
- 
- target_compile_features(io2d_cairo PUBLIC cxx_std_17)
- 
--target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick)
-+find_package(unofficial-cairo CONFIG REQUIRED)
-+
-+target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick)
- 
- install(
- 	TARGETS io2d_cairo EXPORT io2d_targets
diff --git a/ports/io2d/cmake.dep.patch b/ports/io2d/cmake.dep.patch
new file mode 100644
index 000000000..baad36341
--- /dev/null
+++ b/ports/io2d/cmake.dep.patch
@@ -0,0 +1,62 @@
+diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
+index 5ebeb6afa..702864667 100644
+--- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
++++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
+@@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.8)
+ 
+ project(io2d CXX)
+ 
+-find_package(Cairo REQUIRED)
+-find_package(GraphicsMagick REQUIRED)
++find_package(unofficial-Cairo REQUIRED)
++find_package(unofficial-GraphicsMagick REQUIRED)
+ 
+ add_library(io2d_cairo
+ 	cairo_renderer-graphicsmagickinit.cpp
+@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC
+ 
+ target_compile_features(io2d_cairo PUBLIC cxx_std_17)
+ 
+-target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick)
++target_link_libraries(io2d_cairo PUBLIC io2d_core unofficial::cairo::cairo unofficial::graphicsmagick::graphicsmagick)
+ 
+ install(
+ 	TARGETS io2d_cairo EXPORT io2d_targets
+diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
+index abb150113..75d8c654d 100644
+--- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
++++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt
+@@ -27,15 +27,24 @@ if(MSVC)
+ 	target_compile_definitions(io2d_cairo_win32 PUBLIC -DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS)
+ 
+ 	find_library(PIXMAN_LIB pixman-1)
+-	find_library(FREETYPE_LIB freetype)
+-	find_library(FONTCONFIG_LIB fontconfig)
+-	find_library(BZ_LIB bz2)
+-	find_library(JPEG_LIB jpeg)
+-	find_library(TIFF_LIB tiff)
+-	find_library(EXPAT_LIB expat)
+-	find_library(LZMA_LIB lzma)
+-	find_library(ICONV_LIB libiconv)
+-	find_library(CHARSET_LIB libcharset)
++    find_package(FreeType REQUIRED)
++	set(FREETYPE_LIB ${FREETYPE_LIBRARIES}) # I dont use targets here since this means I have to correct the config.cmake too
++    find_package(Fontconfig REQUIRED)
++	set(FONTCONFIG_LIB ${Fontconfig_LIBRARIES})
++    find_package(BZip2 REQUIRED)
++	set(BZ_LIB ${BZIP2_LIBRARIES})
++    find_package(JPEG REQUIRED)
++	set(JPEG_LIB ${JPEG_LIBRARIES})
++    find_package(TIFF REQUIRED)
++	set(TIFF_LIB ${TIFF_LIBRARIES})
++    find_package(EXPAT REQUIRED)
++	set(EXPAT_LIB ${EXPAT_LIBRARIES})
++    find_package(LibLZMA REQUIRED)
++	set(LZMA_LIB ${LIBLZMA_LIBRARIES})
++    find_package(Iconv REQUIRED)
++    if(NOT Iconv_IS_BUILT_IN)
++        set(ICONV_LIB ${Iconv_LIBRARIES})
++	endif()
+ 
+ 	target_link_libraries(io2d_cairo_win32 PUBLIC ${PIXMAN_LIB} ${FREETYPE_LIB} ${FONTCONFIG_LIB} ${BZ_LIB} ${JPEG_LIB} ${TIFF_LIB} ${EXPAT_LIB} ${LZMA_LIB} ${ICONV_LIB} ${CHARSET_LIB})
+ endif()
diff --git a/ports/io2d/fix-expat.patch b/ports/io2d/fix-expat.patch
deleted file mode 100644
index 25d38bb10..000000000
--- a/ports/io2d/fix-expat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt

-index abb1501..412f3d4 100644

---- a/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt

-+++ b/P0267_RefImpl/P0267_RefImpl/cairo/win32/CMakeLists.txt

-@@ -32,7 +32,7 @@ if(MSVC)

- 	find_library(BZ_LIB bz2)

- 	find_library(JPEG_LIB jpeg)

- 	find_library(TIFF_LIB tiff)

--	find_library(EXPAT_LIB expat)

-+	find_library(EXPAT_LIB libexpat)

- 	find_library(LZMA_LIB lzma)

- 	find_library(ICONV_LIB libiconv)

- 	find_library(CHARSET_LIB libcharset)

diff --git a/ports/io2d/fix-linux-build.patch b/ports/io2d/fix-linux-build.patch
deleted file mode 100644
index be038fab4..000000000
--- a/ports/io2d/fix-linux-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
-index 5ebeb6a..d0e9176 100644
---- a/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
-+++ b/P0267_RefImpl/P0267_RefImpl/cairo/CMakeLists.txt
-@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.8)
- project(io2d CXX)
- 
- find_package(Cairo REQUIRED)
--find_package(GraphicsMagick REQUIRED)
-+find_package(unofficial-graphicsmagick REQUIRED)
- 
- add_library(io2d_cairo
- 	cairo_renderer-graphicsmagickinit.cpp
-@@ -24,7 +24,7 @@ target_include_directories(io2d_cairo PUBLIC
- 
- target_compile_features(io2d_cairo PUBLIC cxx_std_17)
- 
--target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo GraphicsMagick::GraphicsMagick)
-+target_link_libraries(io2d_cairo PUBLIC io2d_core Cairo::Cairo unofficial::graphicsmagick::graphicsmagick)
- 
- install(
- 	TARGETS io2d_cairo EXPORT io2d_targets
diff --git a/ports/io2d/portfile.cmake b/ports/io2d/portfile.cmake
index ad36dd70e..d47fc97c8 100644
--- a/ports/io2d/portfile.cmake
+++ b/ports/io2d/portfile.cmake
@@ -7,9 +7,7 @@ vcpkg_from_github(
     SHA512 f8e5a708f6cbda913a0492a843e1502b8d3cc615a6abda50e850be944e1484ec9087b787c54cc25d513172a7d5ab789be41a761c97df94266df4d1bcf14db17c
     HEAD_REF master
     PATCHES
-        fix-linux-build.patch
-        Fix-FindCairo.patch
-        fix-expat.patch
+        cmake.dep.patch
 )
 
 if (VCPKG_TARGET_IS_OSX)
diff --git a/ports/libcroco/CMakeLists.txt b/ports/libcroco/CMakeLists.txt
index ff11792ff..f8e8a7105 100644
--- a/ports/libcroco/CMakeLists.txt
+++ b/ports/libcroco/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.11)
 project(libcroco C)
 
-find_package(unofficial-iconv REQUIRED)
-find_package(unofficial-gettext CONFIG REQUIRED)
+find_package(Iconv REQUIRED)
+find_package(Intl REQUIRED)
 find_package(unofficial-glib CONFIG REQUIRED)
 find_package(LibXml2 REQUIRED)
 if(NOT WIN32)
@@ -76,7 +76,7 @@ target_link_libraries(croco-0.6 PRIVATE
     unofficial::glib::glib
     unofficial::glib::gmodule
     unofficial::glib::gobject
-    ${LIBXML2_LIBRARIES}
+    ${LIBXML2_LIBRARIES} ${Intl_LIBRARIES} Iconv::Iconv
 )
 
 install(TARGETS croco-0.6
@@ -127,8 +127,8 @@ install(
 
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/unofficial-libcroco-config.cmake "
 include(CMakeFindDependencyMacro)
-find_dependency(unofficial-gettext)
-find_dependency(unofficial-iconv CONFIG)
+find_dependency(Intl)
+find_dependency(Iconv)
 find_dependency(unofficial-glib CONFIG)
 find_dependency(LibXml2)
 if(NOT WIN32)
diff --git a/ports/libcroco/CONTROL b/ports/libcroco/CONTROL
index 8badbeccc..bb1ea8fd2 100644
--- a/ports/libcroco/CONTROL
+++ b/ports/libcroco/CONTROL
@@ -1,4 +1,5 @@
 Source: libcroco

-Version: 0.6.13-1

+Version: 0.6.13

+Port-Version: 2

 Description: A standalone css2 parsing and manipulation library

 Build-Depends: glib, libxml2

diff --git a/ports/libiconv/CMakeLists.txt b/ports/libiconv/CMakeLists.txt
deleted file mode 100644
index 43d55c0c3..000000000
--- a/ports/libiconv/CMakeLists.txt
+++ /dev/null
@@ -1,107 +0,0 @@
-cmake_minimum_required(VERSION 3.0.0)
-project(libiconv C)
-
-if(BUILD_SHARED_LIBS)
-  set(LIBICONV_DYNAMIC "1 /*LIBICONV_DYNAMIC*/")
-else()
-  set(LIBICONV_DYNAMIC "0 /*LIBICONV_DYNAMIC*/")
-endif()
-
-set(CMAKE_STATIC_LIBRARY_PREFIX)
-set(CMAKE_SHARED_LIBRARY_PREFIX)
-
-if(WIN32)
-  set(HAVE_WCHAR_T "1 /*HAVE_WCHAR_T*/")
-  set(USE_MBSTATE_T "0 /*USE_MBSTATE_T*/")
-  set(BROKEN_WCHAR_H "0 /*BROKEN_WCHAR_H*/")
-  set(HAVE_VISIBILITY "0 /*HAVE_VISIBILITY*/")
-  set(ICONV_CONST "")
-
-  configure_file(config.h.in config.h)
-  file(READ "${CMAKE_CURRENT_BINARY_DIR}/config.h" _contents)
-  string(REPLACE "#undef HAVE_WORKING_O_NOFOLLOW" "#define HAVE_WORKING_O_NOFOLLOW 0" _contents "${_contents}")
-  string(REPLACE "#undef HAVE_MBRTOWC" "#define HAVE_MBRTOWC 1" _contents "${_contents}")
-  string(REPLACE "#undef HAVE_MBSINIT" "#define HAVE_MBSINIT 1" _contents "${_contents}")
-  string(REPLACE "#undef HAVE_WCRTOMB" "#define HAVE_WCRTOMB 1" _contents "${_contents}")
-  string(REPLACE "#undef ICONV_CONST" "#define ICONV_CONST ${ICONV_CONST}" _contents "${_contents}")
-  string(REPLACE "#undef EILSEQ" "" _contents "${_contents}")
-  string(REPLACE "#undef WORDS_LITTLEENDIAN" "#define WORDS_LITTLEENDIAN 1" _contents "${_contents}")
-  string(REPLACE "#undef ENABLE_RELOCATABLE" "#define ENABLE_RELOCATABLE 1" _contents "${_contents}")
-  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/config.h" "${_contents}")
-
-  configure_file(libcharset/include/localcharset.h.build.in localcharset.h)
-  configure_file(libcharset/include/libcharset.h.in libcharset.h)
-  configure_file(include/iconv.h.build.in iconv.h)
-
-  if(MSVC)
-    add_compile_options(/wd4018)
-  endif()
-
-  add_definitions(
-    -D_CRT_SECURE_NO_WARNINGS
-    -DLIBDIR=${LIBDIR}
-    -DINSTALLDIR=${INSTALLDIR}
-    -DNO_XMALLOC=1
-    -DENABLE_RELOCATABLE=1
-    -DIN_LIBRARY=1
-  )
-  if(BUILD_SHARED_LIBS)
-    add_definitions(
-      -DBUILDING_LIBCHARSET=1
-      -DBUILDING_LIBICONV=1
-      -DBUILDING_DLL=1)
-  endif()
-else()
-  if(BUILD_SHARED_LIBS)
-    set(STATIC_SHARED --enable-shared --disable-static)
-  else()
-    set(STATIC_SHARED --disable-shared --enable-static)
-  endif()
-
-  file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/autoconf)
-
-  execute_process(
-    COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/configure --enable-relocatable ${STATIC_SHARED} --without-libiconv-prefix --without-libintl-prefix
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/autoconf
-  )
-
-  configure_file(${CMAKE_CURRENT_BINARY_DIR}/autoconf/lib/config.h config.h @ONLY)
-  configure_file(${CMAKE_CURRENT_BINARY_DIR}/autoconf/include/iconv.h iconv.h @ONLY)
-  configure_file(${CMAKE_CURRENT_BINARY_DIR}/autoconf/libcharset/include/localcharset.h localcharset.h @ONLY)
-endif()
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
-
-add_library(libcharset libcharset/lib/localcharset.c libcharset/lib/relocatable-stub.c)
-target_include_directories(libcharset PUBLIC $<INSTALL_INTERFACE:include>)
-
-add_library(libiconv lib/iconv.c lib/relocatable.c)
-if(WIN32)
-  target_compile_definitions(libiconv PRIVATE
-                                          -Dset_relocation_prefix=libiconv_set_relocation_prefix
-                                          -Drelocate=libiconv_relocate -Drelocate2=libiconv_relocate2
-  )
-endif()
-target_link_libraries(libiconv PRIVATE libcharset)
-target_include_directories(libiconv PUBLIC $<INSTALL_INTERFACE:include>)
-
-install(TARGETS libcharset libiconv EXPORT unofficial-iconv-targets
-  RUNTIME DESTINATION bin
-  LIBRARY DESTINATION lib
-  ARCHIVE DESTINATION lib
-)
-
-if(NOT DISABLE_INSTALL_HEADERS)
-  install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/iconv.h
-    ${CMAKE_CURRENT_BINARY_DIR}/localcharset.h
-    DESTINATION include
-  )
-endif()
-
-install(
-    EXPORT unofficial-iconv-targets
-    FILE unofficial-iconv-config.cmake
-    NAMESPACE unofficial::iconv::
-    DESTINATION share/unofficial-iconv
-)
diff --git a/ports/libiconv/CONTROL b/ports/libiconv/CONTROL
index e95414202..329b3ebc1 100644
--- a/ports/libiconv/CONTROL
+++ b/ports/libiconv/CONTROL
@@ -1,5 +1,5 @@
 Source: libiconv
 Version: 1.16
-Port-Version: 5
+Port-Version: 6
 Homepage: https://www.gnu.org/software/libiconv/
 Description: GNU Unicode text conversion
diff --git a/ports/libiconv/portfile.cmake b/ports/libiconv/portfile.cmake
index 934e2f7b0..62fb8e42d 100644
--- a/ports/libiconv/portfile.cmake
+++ b/ports/libiconv/portfile.cmake
@@ -1,7 +1,7 @@
 if(NOT VCPKG_TARGET_IS_WINDOWS)
     set(VCPKG_POLICY_EMPTY_PACKAGE enabled)
-    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv)
-    file(COPY ${CMAKE_CURRENT_LIST_DIR}/unofficial-iconv-config.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/unofficial-iconv)
+    file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/Iconv)
+    file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv)
     return()
 endif()
 
@@ -21,24 +21,25 @@ vcpkg_extract_source_archive_ex(
         0003-Add-export.patch
 )
 
-#Since libiconv uses automake, make and configure, we use a custom CMake file
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS -DINSTALLDIR=\"\" -DLIBDIR=\"\"
-    OPTIONS_DEBUG -DDISABLE_INSTALL_HEADERS=ON
-)
-
-vcpkg_install_cmake()
-
-vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-iconv TARGET_PATH share/unofficial-iconv)
+vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH}
+                     DETERMINE_BUILD_TRIPLET
+                     USE_WRAPPERS
+                     OPTIONS
+                        --enable-relocatable
+                        --enable-extra-encodings
+                        --without-libiconv-prefix 
+                        --without-libintl-prefix
+                        ${OPTIONS}
+                    )
+vcpkg_install_make()
 
 vcpkg_copy_pdbs()
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/bin)
+vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/bin)
 
-file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/Iconv)
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/iconv)
 
 file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
-set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
+set(VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS enabled)
\ No newline at end of file
diff --git a/ports/libiconv/unofficial-iconv-config.cmake b/ports/libiconv/unofficial-iconv-config.cmake
deleted file mode 100644
index 94d65d2ff..000000000
--- a/ports/libiconv/unofficial-iconv-config.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-if (NOT TARGET unofficial::iconv::libiconv)

-    add_library(unofficial::iconv::libcharset INTERFACE IMPORTED)

-    add_library(unofficial::iconv::libiconv INTERFACE IMPORTED)

-    if(APPLE)

-        set_property(TARGET unofficial::iconv::libcharset PROPERTY INTERFACE_LINK_LIBRARIES "charset;unofficial::iconv::libiconv")

-        set_property(TARGET unofficial::iconv::libiconv PROPERTY INTERFACE_LINK_LIBRARIES "iconv")

-    endif()

-endif()

diff --git a/ports/libiconv/vcpkg-cmake-wrapper.cmake b/ports/libiconv/vcpkg-cmake-wrapper.cmake
index 472dd8082..db39413da 100644
--- a/ports/libiconv/vcpkg-cmake-wrapper.cmake
+++ b/ports/libiconv/vcpkg-cmake-wrapper.cmake
@@ -1,10 +1,15 @@
 include(SelectLibraryConfigurations)

 

 _find_package(${ARGS})

-if(Iconv_FOUND)

+if(Iconv_FOUND AND NOT Iconv_IS_BUILT_IN)

     find_library(CHARSET_LIBRARY_DEBUG NAMES charsetd libcharsetd charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/debug" NO_DEFAULT_PATH)

     find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}" NO_DEFAULT_PATH)

     find_library(CHARSET_LIBRARY_RELEASE NAMES charset libcharset NAMES_PER_DIR PATH_SUFFIXES lib)

     select_library_configurations(CHARSET)

-    list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES})

+    if(CHARSET_LIBRARIES)

+        list(APPEND Iconv_LIBRARIES ${CHARSET_LIBRARIES})

+        if(TARGET Iconv::Iconv)

+            target_link_libraries(Iconv::Iconv INTERFACE ${CHARSET_LIBRARIES})

+        endif()

+    endif()

 endif()

diff --git a/ports/libidn2/CMakeLists.txt b/ports/libidn2/CMakeLists.txt
index d7a5d771e..cd87848f3 100644
--- a/ports/libidn2/CMakeLists.txt
+++ b/ports/libidn2/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.8)
 
 project(libidn2 C)
 
-find_package(unofficial-iconv REQUIRED)
+find_package(Iconv REQUIRED)
 
 if(MSVC)
     add_definitions(-D_CRT_SECURE_NO_DEPRECATE)
@@ -91,7 +91,7 @@ set(GL_SRC gl/rawmemchr.c
 add_library(libidn2 ${LIB_SRC} ${UNISTR_SRC} ${GL_SRC})
 
 target_include_directories(libidn2 PRIVATE . ./unistring ./gl)
-target_link_libraries(libidn2 PRIVATE unofficial::iconv::libiconv unofficial::iconv::libcharset)
+target_link_libraries(libidn2 PRIVATE Iconv::Iconv)
 
 install(TARGETS libidn2
         RUNTIME DESTINATION bin
diff --git a/ports/libidn2/CONTROL b/ports/libidn2/CONTROL
index f5fa6b075..fb29df032 100644
--- a/ports/libidn2/CONTROL
+++ b/ports/libidn2/CONTROL
@@ -1,6 +1,6 @@
 Source: libidn2
 Version: 2.3.0
-Port-Version: 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/libspatialite/CONTROL b/ports/libspatialite/CONTROL
index 364bd887c..38b4041f1 100644
--- a/ports/libspatialite/CONTROL
+++ b/ports/libspatialite/CONTROL
@@ -1,6 +1,6 @@
 Source: libspatialite
 Version: 4.3.0a
-Port-Version: 5
+Port-Version: 6
 Homepage: https://www.gaia-gis.it/gaia-sins/libspatialite-sources
 Description: SpatiaLite is an open source library intended to extend the SQLite core to support fully fledged Spatial SQL capabilities.
 Build-Depends: libxml2, sqlite3, geos, proj4, zlib, freexl, libiconv
diff --git a/ports/libspatialite/portfile.cmake b/ports/libspatialite/portfile.cmake
index b5c818ae0..9f1f3d6bd 100644
--- a/ports/libspatialite/portfile.cmake
+++ b/ports/libspatialite/portfile.cmake
@@ -37,8 +37,8 @@ if (VCPKG_TARGET_IS_WINDOWS)
     endif()
 
     set(LIBS_ALL_DBG
-        "${CURRENT_INSTALLED_DIR}/debug/lib/libiconv.lib \
-        ${CURRENT_INSTALLED_DIR}/debug/lib/libcharset.lib \
+        "${CURRENT_INSTALLED_DIR}/debug/lib/iconv.lib \
+        ${CURRENT_INSTALLED_DIR}/debug/lib/charset.lib \
         ${CURRENT_INSTALLED_DIR}/debug/lib/sqlite3.lib \
         ${CURRENT_INSTALLED_DIR}/debug/lib/freexl.lib \
         ${CURRENT_INSTALLED_DIR}/debug/lib/zlibd.lib \
@@ -47,8 +47,8 @@ if (VCPKG_TARGET_IS_WINDOWS)
         ${CURRENT_INSTALLED_DIR}/debug/lib/proj_d.lib"
        )
     set(LIBS_ALL_REL
-        "${CURRENT_INSTALLED_DIR}/lib/libiconv.lib \
-        ${CURRENT_INSTALLED_DIR}/lib/libcharset.lib \
+        "${CURRENT_INSTALLED_DIR}/lib/iconv.lib \
+        ${CURRENT_INSTALLED_DIR}/lib/charset.lib \
         ${CURRENT_INSTALLED_DIR}/lib/sqlite3.lib \
         ${CURRENT_INSTALLED_DIR}/lib/freexl.lib \
         ${CURRENT_INSTALLED_DIR}/lib/zlib.lib \
diff --git a/ports/libtorrent/CONTROL b/ports/libtorrent/CONTROL
index 47ef41845..707cf8a43 100644
--- a/ports/libtorrent/CONTROL
+++ b/ports/libtorrent/CONTROL
@@ -1,6 +1,6 @@
 Source: libtorrent
 Version: 1.2.10
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/arvidn/libtorrent
 Description: An efficient feature complete C++ BitTorrent implementation
 Build-Depends: openssl, boost-system, boost-date-time, boost-chrono, boost-random, boost-asio, boost-crc, boost-config, boost-iterator, boost-scope-exit, boost-multiprecision, boost-pool, boost-variant
diff --git a/ports/libtorrent/fix_find_iconv.patch b/ports/libtorrent/fix_find_iconv.patch
deleted file mode 100644
index 2c22c15e0..000000000
--- a/ports/libtorrent/fix_find_iconv.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9efd451fb..d85b31fd4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -643,24 +643,19 @@ target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME mutabl
- target_optional_compile_definitions(torrent-rasterbar PUBLIC FEATURE NAME streaming DEFAULT ON
- 	DESCRIPTION "Enables support for piece deadline" DISABLED TORRENT_DISABLE_STREAMING)
- 
--find_public_dependency(Iconv)
--if(MSVC)
--	set(iconv_package_type OPTIONAL)
--else()
--	set(iconv_package_type RECOMMENDED)
--endif()
-+find_public_dependency(unofficial-iconv REQUIRED)
- 
--set_package_properties(Iconv
-+set_package_properties(unofficial-iconv
- 	PROPERTIES
- 		URL "https://www.gnu.org/software/libiconv/"
--		DESCRIPTION "GNU encoding conversion library"
--		TYPE ${iconv_package_type}
-+		DESCRIPTION "GNU encoding conversion library (unofficial vcpkg CMake port)"
-+		TYPE REQUIRED
- 		PURPOSE "Convert strings between various encodings"
- )
- 
--if(Iconv_FOUND)
-+if(unofficial-iconv_FOUND)
- 	target_compile_definitions(torrent-rasterbar PUBLIC TORRENT_USE_ICONV)
--	target_link_libraries(torrent-rasterbar PRIVATE Iconv::Iconv)
-+	target_link_libraries(torrent-rasterbar PRIVATE unofficial::iconv::libiconv unofficial::iconv::libcharset)
- endif()
- 
- find_public_dependency(OpenSSL)
diff --git a/ports/libtorrent/portfile.cmake b/ports/libtorrent/portfile.cmake
index 54d40d63d..e548b9b44 100644
--- a/ports/libtorrent/portfile.cmake
+++ b/ports/libtorrent/portfile.cmake
@@ -6,9 +6,7 @@ if(VCPKG_TARGET_IS_WINDOWS)
         message(FATAL_ERROR "The python feature is currently broken on Windows")
     endif()
 
-    if("iconv" IN_LIST FEATURES)
-        set(ICONV_PATCH "fix_find_iconv.patch")
-    else()
+    if(NOT "iconv" IN_LIST FEATURES)
         # prevent picking up libiconv if it happens to already be installed
         set(ICONV_PATCH "no_use_iconv.patch")
     endif()
diff --git a/ports/libxml2/CMakeLists.txt b/ports/libxml2/CMakeLists.txt
index a7118bec9..323f64c34 100644
--- a/ports/libxml2/CMakeLists.txt
+++ b/ports/libxml2/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX)
 
 find_package(ZLIB REQUIRED)
 find_package(LibLZMA REQUIRED)
-find_package(unofficial-iconv REQUIRED)
+find_package(Iconv REQUIRED)
 
 file(GLOB SOURCES *.c)
 list(FILTER SOURCES EXCLUDE REGEX "/(run|test|trio)[^/]*$")
@@ -109,7 +109,7 @@ if(INSTALL_HEADERS)
 endif()
 target_include_directories(libxml2 PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/include include ${LIBLZMA_INCLUDE_DIRS})
 target_link_libraries(libxml2 PRIVATE
-    unofficial::iconv::libcharset unofficial::iconv::libiconv
+    Iconv::Iconv
     ZLIB::ZLIB
     ${LIBLZMA_LIBRARIES}
 )
diff --git a/ports/libxml2/vcpkg-cmake-wrapper.cmake b/ports/libxml2/vcpkg-cmake-wrapper.cmake
index 94ef45803..405b94670 100644
--- a/ports/libxml2/vcpkg-cmake-wrapper.cmake
+++ b/ports/libxml2/vcpkg-cmake-wrapper.cmake
@@ -14,10 +14,17 @@ if(LibXml2_FOUND)
     list(APPEND LIBXML2_LIBRARIES ${LIBLZMA_LIBRARIES} ${ZLIB_LIBRARIES})

     if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

         list(APPEND LIBXML2_LIBRARIES m)

-    else()

-        list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES} ${CHARSET_LIBRARIES})

+    endif()

+    if(ICONV_LIBRARIES)

+        list(APPEND LIBXML2_LIBRARIES ${ICONV_LIBRARIES})

+        if(TARGET LibXml2::LibXml2)

+           target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES} )

+        endif()

+    endif()

+    if(CHARSET_LIBRARIES)

+        list(APPEND LIBXML2_LIBRARIES ${CHARSET_LIBRARIES})

         if(TARGET LibXml2::LibXml2)

-           target_link_libraries(LibXml2::LibXml2 INTERFACE ${ICONV_LIBRARIES} ${CHARSET_LIBRARIES})

+           target_link_libraries(LibXml2::LibXml2 INTERFACE ${CHARSET_LIBRARIES})

         endif()

     endif()

     if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

diff --git a/ports/libxmlpp/CMakeLists.txt b/ports/libxmlpp/CMakeLists.txt
index bbaae7cda..0ff2f23fe 100644
--- a/ports/libxmlpp/CMakeLists.txt
+++ b/ports/libxmlpp/CMakeLists.txt
@@ -21,8 +21,8 @@ if(APPLE)
   find_library(LIBINTL_LIBRARY NAMES intl)

 endif()

 

-find_package(unofficial-iconv REQUIRED)

-link_libraries(${LIBINTL_LIBRARY} unofficial::iconv::libiconv)

+find_package(Iconv REQUIRED)

+link_libraries(${LIBINTL_LIBRARY} Iconv::Iconv)

 

 if(APPLE)

   find_library(COREFOUNDATION_LIBRARY CoreFoundation)

diff --git a/ports/libxmlpp/CONTROL b/ports/libxmlpp/CONTROL
index 247704f9f..b737bde3c 100644
--- a/ports/libxmlpp/CONTROL
+++ b/ports/libxmlpp/CONTROL
@@ -1,4 +1,5 @@
 Source: libxmlpp

-Version: 2.40.1-5

+Version: 2.40.1

+Port-Version: 6

 Description: a C++ wrapper for the libxml XML parser library.

 Build-Depends: libxml2, glibmm

diff --git a/ports/libxslt/0001-Fix-makefile.patch b/ports/libxslt/0001-Fix-makefile.patch
index 8648a3fe5..4d835e103 100644
--- a/ports/libxslt/0001-Fix-makefile.patch
+++ b/ports/libxslt/0001-Fix-makefile.patch
@@ -12,7 +12,7 @@ index 23a02d2..b13dd26 100644
  LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
 -LIBS = wsock32.lib
 +# The libraries are needed for static builds (the makefile builds all tools and dlls)
-+LIBS = wsock32.lib libiconv.lib libcharset.lib
++LIBS = wsock32.lib iconv.lib charset.lib
 +!if "$(DEBUG)" == "1"
 +LIBS = $(LIBS) zlibd.lib
 +!else
diff --git a/ports/libxslt/0002-Fix-lzma.patch b/ports/libxslt/0002-Fix-lzma.patch
index 8c0e287ae..fb52844ca 100644
--- a/ports/libxslt/0002-Fix-lzma.patch
+++ b/ports/libxslt/0002-Fix-lzma.patch
@@ -4,7 +4,7 @@ index 0d1953d..0e538ef 100644
 +++ b/win32/Makefile.msvc
 @@ -62,9 +62,9 @@ LDFLAGS = $(LDFLAGS) /LIBPATH:$(BINDIR) /LIBPATH:$(LIBPREFIX)
  # The libraries are needed for static builds (the makefile builds all tools and dlls)
- LIBS = wsock32.lib libiconv.lib libcharset.lib
+ LIBS = wsock32.lib iconv.lib charset.lib
  !if "$(DEBUG)" == "1"
 -LIBS = $(LIBS) zlibd.lib
 +LIBS = $(LIBS) zlibd.lib lzmad.lib
diff --git a/ports/libxslt/CONTROL b/ports/libxslt/CONTROL
index 1e00a1e65..27f8c16f4 100644
--- a/ports/libxslt/CONTROL
+++ b/ports/libxslt/CONTROL
@@ -1,6 +1,6 @@
 Source: libxslt
-Version: 1.1.33-7
-Port-Version: 2
+Version: 1.1.33
+Port-Version: 8
 Homepage: https://github.com/GNOME/libxslt
 Description: Libxslt is a XSLT library implemented in C for XSLT 1.0 and most of EXSLT
 Build-Depends: libxml2, liblzma
diff --git a/ports/osg/CONTROL b/ports/osg/CONTROL
index a63ea9b47..241d89f52 100644
--- a/ports/osg/CONTROL
+++ b/ports/osg/CONTROL
@@ -1,6 +1,6 @@
 Source: osg
 Version: 3.6.5
-Port-Version: 2
+Port-Version: 3
 Homepage: https://github.com/openscenegraph/OpenSceneGraph
 Description:  The OpenSceneGraph is an open source high performance 3D graphics toolkit.
 Build-Depends: zlib, fontconfig, boost-asio (!windows), boost-core (!windows), boost-logic (!windows), boost-lexical-cast (!windows), boost-smart-ptr (!windows), boost-tuple (!windows), boost-bind (!windows), freeglut (windows), expat (windows), openimageio (osx)
diff --git a/ports/osg/fix-example-application.patch b/ports/osg/fix-example-application.patch
index 4745f8b41..3b4da587d 100644
--- a/ports/osg/fix-example-application.patch
+++ b/ports/osg/fix-example-application.patch
@@ -8,9 +8,9 @@ index df859d0..123313a 100644
      SET(TARGET_EXTERNAL_LIBRARIES ${TARGET_EXTERNAL_LIBRARIES} ws2_32)
 +    
 +    find_package(EXPAT REQUIRED)
-+    find_package(unofficial-iconv CONFIG REQUIRED)
++    find_package(Iconv CONFIG REQUIRED)
 +    
-+    list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset)
++    list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv)
  ELSE()
     CHECK_LIBRARY_EXISTS("nsl" "gethostbyname" "" LIB_NSL_HAS_GETHOSTBYNAME)
     IF(LIB_NSL_HAS_GETHOSTBYNAME)
@@ -24,9 +24,9 @@ index 071ab26..bf8d85f 100644
  
 +IF (WIN32)
 +    find_package(EXPAT REQUIRED)
-+    find_package(unofficial-iconv CONFIG REQUIRED)
++    find_package(Iconv CONFIG REQUIRED)
 +    
-+    list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT unofficial::iconv::libiconv unofficial::iconv::libcharset)
++    list(APPEND TARGET_EXTERNAL_LIBRARIES EXPAT::EXPAT Iconv::Iconv)
 +ENDIF()
 +
  SET(TARGET_SRC osgstaticviewer.cpp )
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 969290a7b..10a7d5429 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,5 +1,6 @@
 Source: qt5-base

 Version: 5.15.1

+Port-Version: 1

 Homepage: https://www.qt.io/

 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.

 Build-Depends: zlib, zstd, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)

diff --git a/ports/qt5-base/portfile.cmake b/ports/qt5-base/portfile.cmake
index 31c059bba..0e7929a08 100644
--- a/ports/qt5-base/portfile.cmake
+++ b/ports/qt5-base/portfile.cmake
@@ -244,14 +244,14 @@ elseif(VCPKG_TARGET_IS_LINUX)
             "SQLITE_LIBS=${SQLITE_RELEASE} -ldl -lpthread"
             "HARFBUZZ_LIBS=${HARFBUZZ_RELEASE} ${FREETYPE_RELEASE_ALL} ${GLIB_RELEASE} -lpthread"
             "OPENSSL_LIBS=${SSL_RELEASE} ${EAY_RELEASE} -ldl -lpthread"
-            "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE}"
+            "FONTCONFIG_LIBS=${FONTCONFIG_RELEASE} ${FREETYPE_RELEASE} ${EXPAT_RELEASE} -luuid"
         )
     list(APPEND DEBUG_OPTIONS
             "PSQL_LIBS=${PSQL_DEBUG} ${PSQL_PORT_DEBUG} ${PSQL_TYPES_DEBUG} ${PSQL_COMMON_DEBUG} ${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread"
             "SQLITE_LIBS=${SQLITE_DEBUG} -ldl -lpthread"
             "HARFBUZZ_LIBS=${HARFBUZZ_DEBUG} ${FREETYPE_DEBUG_ALL} ${GLIB_DEBUG} -lpthread"
             "OPENSSL_LIBS=${SSL_DEBUG} ${EAY_DEBUG} -ldl -lpthread"
-            "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG}"
+            "FONTCONFIG_LIBS=${FONTCONFIG_DEBUG} ${FREETYPE_DEBUG} ${EXPAT_DEBUG} -luuid"
         )
 elseif(VCPKG_TARGET_IS_OSX)
     list(APPEND CORE_OPTIONS -fontconfig)
diff --git a/ports/spatialite-tools/CONTROL b/ports/spatialite-tools/CONTROL
index 7ef2a3284..fbbad4d41 100644
--- a/ports/spatialite-tools/CONTROL
+++ b/ports/spatialite-tools/CONTROL
@@ -1,6 +1,6 @@
 Source: spatialite-tools
 Version: 4.3.0
-Port-Version: 4
+Port-Version: 5
 Homepage: https://www.gaia-gis.it/fossil/spatialite-tools/index
 Description: Contains spatialite.exe and other command line tools to work with SpatiaLite databases (import, export, SQL queries)
 Build-Depends: sqlite3, libspatialite, geos, readosm, proj4, zlib, libiconv, expat
diff --git a/ports/spatialite-tools/portfile.cmake b/ports/spatialite-tools/portfile.cmake
index eacba0c36..540e29b18 100644
--- a/ports/spatialite-tools/portfile.cmake
+++ b/ports/spatialite-tools/portfile.cmake
@@ -26,8 +26,8 @@ if(VCPKG_CRT_LINKAGE STREQUAL dynamic)
     set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib")
     set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib")
     set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib")
-    set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib")
-    set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib")
+    set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib")
+    set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib")
     set(EXPAT_LIBS_REL "${LDIR}/lib/libexpat.lib")
     set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatd.lib")  
 else()
@@ -39,8 +39,8 @@ else()
     set(LIBXML2_LIBS_DBG "${LDIR}/debug/lib/libxml2.lib ${LDIR}/debug/lib/lzmad.lib ws2_32.lib")
     set(SPATIALITE_LIBS_REL "${LDIR}/lib/spatialite.lib ${LDIR}/lib/freexl.lib")
     set(SPATIALITE_LIBS_DBG "${LDIR}/debug/lib/spatialite.lib ${LDIR}/debug/lib/freexl.lib")
-    set(ICONV_LIBS_REL "${LDIR}/lib/libiconv.lib ${LDIR}/lib/libcharset.lib")
-    set(ICONV_LIBS_DBG "${LDIR}/debug/lib/libiconv.lib ${LDIR}/debug/lib/libcharset.lib ")
+    set(ICONV_LIBS_REL "${LDIR}/lib/iconv.lib ${LDIR}/lib/charset.lib")
+    set(ICONV_LIBS_DBG "${LDIR}/debug/lib/iconv.lib ${LDIR}/debug/lib/charset.lib ")
     set(EXPAT_LIBS_REL "${LDIR}/lib/libexpatMD.lib")
     set(EXPAT_LIBS_DBG "${LDIR}/debug/lib/libexpatdMD.lib") 
 endif()
diff --git a/ports/tesseract/CONTROL b/ports/tesseract/CONTROL
index 7f646fdaf..0524821bf 100644
--- a/ports/tesseract/CONTROL
+++ b/ports/tesseract/CONTROL
@@ -1,6 +1,6 @@
 Source: tesseract
 Version: 4.1.1
-Port-Version: 1
+Port-Version: 2
 Homepage: https://github.com/tesseract-ocr/tesseract
 Description: An OCR Engine that was developed at HP Labs between 1985 and 1995... and now at Google.
 Build-Depends: leptonica
diff --git a/ports/tesseract/fix-text2image.patch b/ports/tesseract/fix-text2image.patch
index 8a9c6caf4..e9623f4ac 100644
--- a/ports/tesseract/fix-text2image.patch
+++ b/ports/tesseract/fix-text2image.patch
@@ -35,8 +35,8 @@ index 8fd96a9..186341e 100644
 -pkg_check_modules(FontConfig REQUIRED fontconfig)

 +find_package(unofficial-cairo CONFIG REQUIRED)

 +find_package(unofficial-glib CONFIG REQUIRED)

-+find_package(unofficial-gettext CONFIG REQUIRED)

-+find_package(unofficial-fontconfig CONFIG REQUIRED)

++find_package(Intl CONFIG REQUIRED)

++find_package(Fontconfig REQUIRED)

 +find_package(Freetype REQUIRED)

 +if(UNIX OR BUILD_SHARED_LIBS)

 +    find_package(harfbuzz CONFIG REQUIRED)

@@ -76,8 +76,8 @@ index 8fd96a9..186341e 100644
 +    Freetype::Freetype

 +    unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject

 +    unofficial::cairo::cairo unofficial::cairo::cairo-gobject

-+    unofficial::gettext::libintl

-+    unofficial::fontconfig::fontconfig

++    ${Intl_LIBRARIES}

++    Fontconfig::Fontconfig

 +)

 +else()

 +    target_link_libraries       (text2image

@@ -89,8 +89,8 @@ index 8fd96a9..186341e 100644
 +    Freetype::Freetype

 +    unofficial::glib::gio unofficial::glib::glib unofficial::glib::gmodule unofficial::glib::gobject

 +    unofficial::cairo::cairo unofficial::cairo::cairo-gobject

-+    unofficial::gettext::libintl

-+    unofficial::fontconfig::fontconfig

++    ${Intl_LIBRARIES}

++    Fontconfig::Fontconfig

 + )

  endif()

  if (CPPAN_BUILD)

diff --git a/ports/xmlsec/CMakeLists.txt b/ports/xmlsec/CMakeLists.txt
index 4805839fe..54f044751 100644
--- a/ports/xmlsec/CMakeLists.txt
+++ b/ports/xmlsec/CMakeLists.txt
@@ -8,7 +8,7 @@ set(CMAKE_STATIC_LIBRARY_PREFIX)
 
 find_package(LibXml2 REQUIRED)
 find_package(OpenSSL REQUIRED)
-find_package(unofficial-iconv REQUIRED)
+find_package(Iconv REQUIRED)
 
 FILE(GLOB SOURCESXMLSEC
 	src/*.c
@@ -139,9 +139,12 @@ if(INSTALL_HEADERS_TOOLS)
 	endif()
 
 	target_link_libraries(xmlsec PRIVATE
-		${LIBXML2_LIBRARIES} OpenSSL::SSL libxmlsec libxmlsec-openssl unofficial::iconv::libiconv
+		${LIBXML2_LIBRARIES} OpenSSL::SSL libxmlsec libxmlsec-openssl
 	)
-
+    if(NOT Iconv_IS_BUILT_IN)
+        target_link_libraries(xmlsec PRIVATE Iconv::Iconv)
+    endif()
+    
 	target_compile_definitions(xmlsec PRIVATE
 		-DXMLSEC_CRYPTO_OPENSSL
 	)
diff --git a/ports/xmlsec/CONTROL b/ports/xmlsec/CONTROL
index 1f3750e53..e4437a14d 100644
--- a/ports/xmlsec/CONTROL
+++ b/ports/xmlsec/CONTROL
@@ -1,5 +1,6 @@
 Source: xmlsec
 Version: 1.2.30
+Port-Version: 1
 Homepage: https://www.aleksey.com/xmlsec/
 Description: XML Security Library is a C library based on LibXML2. The library supports major XML security standards.
 Build-Depends: libxml2, openssl
diff --git a/scripts/cmake/vcpkg_acquire_msys.cmake b/scripts/cmake/vcpkg_acquire_msys.cmake
index b502eab6a..49271eeb6 100644
--- a/scripts/cmake/vcpkg_acquire_msys.cmake
+++ b/scripts/cmake/vcpkg_acquire_msys.cmake
@@ -183,7 +183,27 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
   msys_package(
     URL "https://repo.msys2.org/msys/x86_64/libtool-2.4.6-9-x86_64.pkg.tar.xz"
     SHA512 b309799e5a9d248ef66eaf11a0bd21bf4e8b9bd5c677c627ec83fa760ce9f0b54ddf1b62cbb436e641fbbde71e3b61cb71ff541d866f8ca7717a3a0dbeb00ebf
-    DEPS grep sed coreutils
+    DEPS grep sed coreutils file 
+  )
+  msys_package(
+    URL "https://repo.msys2.org/msys/x86_64/file-5.39-1-x86_64.pkg.tar.zst"
+    SHA512 be51dd0f6143a2f34f2a3e7d412866eb12511f25daaf3a5478240537733a67d7797a3a55a8893e5638589c06bca5af20aed5ded7db0bf19fbf52b30fae08cadd
+    DEPS gcc-libs zlib libbz2
+  )
+  msys_package(
+    URL "https://repo.msys2.org/msys/x86_64/zlib-1.2.11-1-x86_64.pkg.tar.xz"
+    SHA512 b607da40d3388b440f2a09e154f21966cd55ad77e02d47805f78a9dee5de40226225bf0b8335fdfd4b83f25ead3098e9cb974d4f202f28827f8468e30e3b790d
+    DEPS gcc-libs
+  )
+  msys_package(
+    URL "https://repo.msys2.org/msys/x86_64/bzip2-1.0.8-2-x86_64.pkg.tar.xz"
+    SHA512 336f5b59eb9cf4e93b537a212509d84f72cd9b8a97bf8ac0596eff298f3c0979bdea6c605244d5913670b9d20b017e5ee327f1e606f546a88e177a03c589a636
+    DEPS gcc-libs
+  )
+  msys_package(
+    URL "https://repo.msys2.org/msys/x86_64/libbz2-1.0.8-2-x86_64.pkg.tar.xz"
+    SHA512 d128bd1792d0f5750e6a63a24db86a791e7ee457db8c0bef68d217099be4a6eef27c85caf6ad09b0bcd5b3cdac6fc0a2b9842cc58d381a4035505906cc4803ec
+    DEPS gcc-libs
   )
   msys_package(
     URL "https://repo.msys2.org/msys/x86_64/coreutils-8.32-1-x86_64.pkg.tar.xz"
@@ -229,6 +249,15 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
     URL "https://repo.msys2.org/msys/x86_64/gmp-6.2.0-1-x86_64.pkg.tar.xz"
     SHA512 1389a443e775bb255d905665dd577bef7ed71d51a8c24d118097f8119c08c4dfe67505e88ddd1e9a3764dd1d50ed8b84fa34abefa797d257e90586f0cbf54de8
   )
+  msys_package( 
+    URL "https://repo.msys2.org/msys/x86_64/xz-5.2.5-1-x86_64.pkg.tar.xz" # this seems to require immediate updating on version bumps. 
+    SHA512 99d092c3398277e47586cead103b41e023e9432911fb7bdeafb967b826f6a57d32e58afc94c8230dad5b5ec2aef4f10d61362a6d9e410a6645cf23f076736bba
+    DEPS liblzma libiconv gettext
+  )
+  msys_package(
+    URL "https://repo.msys2.org/msys/x86_64/liblzma-5.2.5-1-x86_64.pkg.tar.xz"
+    SHA512 8d5c04354fdc7309e73abce679a4369c0be3dc342de51cef9d2a932b7df6a961c8cb1f7e373b1b8b2be40343a95fbd57ac29ebef63d4a2074be1d865e28ca6ad
+  )
   msys_package(
     URL "https://repo.msys2.org/msys/x86_64/libreadline-8.0.004-1-x86_64.pkg.tar.xz"
     SHA512 42760bddedccc8d93507c1e3a7a81595dc6392b5e4319d24a85275eb04c30eb79078e4247eb2cdd00ff3884d932639130c89bf1b559310a17fa4858062491f97
@@ -269,6 +298,11 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
     SHA512 7306dec7859edc27d70a24ab4b396728481484a426c5aa2f7e9fed2635b3b25548b05b7d37a161a86a8edaa5922948bee8c99b1e8a078606e69ca48a433fe321
     DEPS libintl msys2-runtime
   )
+msys_package(
+    URL "https://repo.msys2.org/msys/x86_64/gettext-devel-0.19.8.1-1-x86_64.pkg.tar.xz"
+    SHA512 648f74c23e4f92145cdd0d45ff5285c2df34e855a9e75e5463dd6646967f8cf34a18ce357c6f498a4680e6d7b84e2d1697ba9deee84da8ea6bb14bbdb594ee22
+    DEPS gettext
+  )
   msys_package(
     URL "https://repo.msys2.org/msys/x86_64/gettext-0.19.8.1-1-x86_64.pkg.tar.xz"
     SHA512 c8c42d084c297746548963f7ec7a7df46241886f3e637e779811ee4a8fee6058f892082bb2658f6777cbffba2de4bcdfd68e846ba63c6a6552c9efb0c8c1de50
@@ -285,6 +319,11 @@ function(vcpkg_acquire_msys PATH_TO_ROOT_OUT)
     DEPS gcc-libs
   )
   msys_package(
+    URL "https://repo.msys2.org/msys/x86_64/findutils-4.7.0-1-x86_64.pkg.tar.xz"
+    SHA512 fd09a24562b196ff252f4b5de86ed977280306a8c628792930812f146fcf7355f9d87434bbabe25e6cc17d8bd028f6bc68fc02e5bea83137a49cf5cc6f509e10
+    DEPS libintl libiconv
+  )
+  msys_package(
     URL "https://repo.msys2.org/msys/x86_64/libintl-0.19.8.1-1-x86_64.pkg.tar.xz"
     SHA512 4e54c252b828c862f376d8f5a2410ee623a43d70cbb07d0b8ac20c25096f59fb3ae8dcd011d1792bec76f0b0b9411d0e184ee23707995761dc50eb76f9fc6b92
     DEPS libiconv
diff --git a/scripts/cmake/vcpkg_build_make.cmake b/scripts/cmake/vcpkg_build_make.cmake
index fb9daa358..a6adebc43 100644
--- a/scripts/cmake/vcpkg_build_make.cmake
+++ b/scripts/cmake/vcpkg_build_make.cmake
@@ -42,7 +42,12 @@
 ## * [freexl](https://github.com/Microsoft/vcpkg/blob/master/ports/freexl/portfile.cmake)

 ## * [libosip2](https://github.com/Microsoft/vcpkg/blob/master/ports/libosip2/portfile.cmake)

 function(vcpkg_build_make)

+    if(NOT _VCPKG_CMAKE_VARS_FILE)

+        # vcpkg_build_make called without using vcpkg_configure_make before

+        vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE)

+    endif()

     include("${_VCPKG_CMAKE_VARS_FILE}")

+

     # parse parameters such that semicolons in options arguments to COMMAND don't get erased

     cmake_parse_arguments(PARSE_ARGV 0 _bc "ADD_BIN_TO_PATH;ENABLE_INSTALL;DISABLE_PARALLEL" "LOGFILE_ROOT;BUILD_TARGET;SUBPATH" "")

 

@@ -117,6 +122,7 @@ function(vcpkg_build_make)
             message(STATUS "Building ${TARGET_TRIPLET}${SHORT_BUILDTYPE}")

 

             _vcpkg_extract_cpp_flags_and_set_cflags_and_cxxflags(${CMAKE_BUILDTYPE})

+

             if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")

                 set(LINKER_FLAGS_${CMAKE_BUILDTYPE} "${VCPKG_DETECTED_STATIC_LINKERFLAGS_${CMAKE_BUILDTYPE}}")

             else() # dynamic

@@ -173,6 +179,11 @@ function(vcpkg_build_make)
                 )

             endif()

 

+            file(READ "${CURRENT_BUILDTREES_DIR}/${_bc_LOGFILE_ROOT}-${TARGET_TRIPLET}${SHORT_BUILDTYPE}-out.log" LOGDATA) 

+            if(LOGDATA MATCHES "Warning: linker path does not have real file for library")

+                message(FATAL_ERROR "libtool could not find a file being linked against!")

+            endif()

+

             if (_bc_ENABLE_INSTALL)

                 message(STATUS "Installing ${TARGET_TRIPLET}${SHORT_BUILDTYPE}")

                 if(MAKE_BASH)

diff --git a/scripts/cmake/vcpkg_configure_make.cmake b/scripts/cmake/vcpkg_configure_make.cmake
index d3cba3bf2..0d80e148c 100644
--- a/scripts/cmake/vcpkg_configure_make.cmake
+++ b/scripts/cmake/vcpkg_configure_make.cmake
@@ -206,7 +206,7 @@ function(vcpkg_configure_make)
     cmake_parse_arguments(PARSE_ARGV 0 _csc

         "AUTOCONFIG;SKIP_CONFIGURE;COPY_SOURCE;DISABLE_VERBOSE_FLAGS;NO_ADDITIONAL_PATHS;ADD_BIN_TO_PATH;USE_WRAPPERS;DETERMINE_BUILD_TRIPLET"

         "SOURCE_PATH;PROJECT_SUBPATH;PRERUN_SHELL;BUILD_TRIPLET"

-        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT"

+        "OPTIONS;OPTIONS_DEBUG;OPTIONS_RELEASE;CONFIGURE_ENVIRONMENT_VARIABLES;CONFIG_DEPENDENT_ENVIRONMENT;ADDITIONAL_MSYS_PACKAGES"

     )

     vcpkg_internal_get_cmake_vars(OUTPUT_FILE _VCPKG_CMAKE_VARS_FILE)

     set(_VCPKG_CMAKE_VARS_FILE "${_VCPKG_CMAKE_VARS_FILE}" PARENT_SCOPE)

@@ -265,7 +265,7 @@ function(vcpkg_configure_make)
     # Pre-processing windows configure requirements

     if (CMAKE_HOST_WIN32)

         list(APPEND MSYS_REQUIRE_PACKAGES binutils libtool autoconf automake-wrapper automake1.16 m4)

-        vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES})

+        vcpkg_acquire_msys(MSYS_ROOT PACKAGES ${MSYS_REQUIRE_PACKAGES} ${_csc_ADDITIONAL_MSYS_PACKAGES})

         if (_csc_AUTOCONFIG AND NOT _csc_BUILD_TRIPLET OR _csc_DETERMINE_BUILD_TRIPLET)

             _vcpkg_determine_autotools_host_cpu(BUILD_ARCH) # VCPKG_HOST => machine you are building on => --build=

             _vcpkg_determine_autotools_target_cpu(TARGET_ARCH)

@@ -388,6 +388,7 @@ function(vcpkg_configure_make)
         # Variables not correctly detected by configure. In release builds.

         list(APPEND _csc_OPTIONS gl_cv_double_slash_root=yes

                                  ac_cv_func_memmove=yes)

+        #list(APPEND _csc_OPTIONS lt_cv_deplibs_check_method=pass_all) # Just ignore libtool checks 

         if(VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64")

             list(APPEND _csc_OPTIONS gl_cv_host_cpu_c_abi=no)

         endif()

@@ -478,20 +479,34 @@ function(vcpkg_configure_make)
     convert_to_list(VCPKG_DETECTED_CMAKE_C_STANDARD_LIBRARIES C_LIBS_LIST)

     convert_to_list(VCPKG_DETECTED_CMAKE_CXX_STANDARD_LIBRARIES CXX_LIBS_LIST)

     set(ALL_LIBS_LIST ${C_LIBS_LIST} ${CXX_LIBS_LIST})

-

     list(REMOVE_DUPLICATES ALL_LIBS_LIST)

     list(TRANSFORM ALL_LIBS_LIST STRIP)

-    list(TRANSFORM ALL_LIBS_LIST REPLACE "(.lib|.a|.so)$" "")

-    if(VCPKG_TARGET_IS_WINDOWS)

-        list(REMOVE_ITEM ALL_LIBS_LIST "uuid")

+

+    #Do lib list transformation from name.lib to -lname if necessary

+    set(_VCPKG_TRANSFORM_LIBS TRUE)

+    if(VCPKG_TARGET_IS_UWP)

+        set(_VCPKG_TRANSFORM_LIBS FALSE)

+        # Avoid libtool choke: "Warning: linker path does not have real file for library -lWindowsApp."

+        # The problem with the choke is that libtool always falls back to built a static library even if a dynamic was requested. 

+        # Note: Env LIBPATH;LIB are on the search path for libtool by default on windows. 

+        # It even does unix/dos-short/unix transformation with the path to get rid of spaces. 

+    endif()

+    set(_lprefix)

+    if(_VCPKG_TRANSFORM_LIBS)

+        set(_lprefix "-l")

+        list(TRANSFORM ALL_LIBS_LIST REPLACE "(.dll.lib|.lib|.a|.so)$" "")

+        if(VCPKG_TARGET_IS_WINDOWS)

+            list(REMOVE_ITEM ALL_LIBS_LIST "uuid")

+        endif()

     endif()

-    list(JOIN ALL_LIBS_LIST " -l" ALL_LIBS_STRING)

+    list(JOIN ALL_LIBS_LIST " ${_lprefix}" ALL_LIBS_STRING)

 

     if(ALL_LIBS_STRING)

+        set(ALL_LIBS_STRING "${_lprefix}${ALL_LIBS_STRING}")

         if(DEFINED ENV{LIBS})

-            set(ENV{LIBS} "$ENV{LIBS} -l${ALL_LIBS_STRING}")

+            set(ENV{LIBS} "$ENV{LIBS} ${ALL_LIBS_STRING}")

         else()

-            set(ENV{LIBS} "-l${ALL_LIBS_STRING}")

+            set(ENV{LIBS} "${ALL_LIBS_STRING}")

         endif()

     endif()

     debug_message(STATUS "ENV{LIBS}:$ENV{LIBS}")