diff --git a/fonts/fontconfig/distinfo b/fonts/fontconfig/distinfo
index 339f02663..b41462afa 100644
--- a/fonts/fontconfig/distinfo
+++ b/fonts/fontconfig/distinfo
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = ae9a465321dcaee634faf016e2dd01e2f544af12
 SHA1 (patch-ab) = 5aabb4bd60319c83cbb22f784efe11bdc7308f92
 SHA1 (patch-ac) = 4a0b7b55aa4b5c106fd256c4ef81df2240224803
 SHA1 (patch-af) = d351265c894738284215f0bb38d47cc1c8f28ec7
-SHA1 (patch-ba) = e0ad71bfb333872fcef21d76db06312e7a325202
+SHA1 (patch-ba) = 5c2b336cb7ab9ec4583f51b8f12079d957ae494b
 SHA1 (patch-src_fcstat.c) = 9cb2d9b656bcb79d33be84a053e928ecf957dfd7
 SHA1 (patch-test_test-migration.c) = 16435e36de501523dd487005dec68c31c229112e
diff --git a/fonts/fontconfig/patches/patch-ba b/fonts/fontconfig/patches/patch-ba
index 5a07a7e3e..87a06dd7f 100644
--- a/fonts/fontconfig/patches/patch-ba
+++ b/fonts/fontconfig/patches/patch-ba
@@ -1,19 +1,61 @@
-$NetBSD: patch-ba,v 1.3 2013/10/30 23:53:10 wiz Exp $
-
-First chunk: part of the Solaris fix for test-migration.c, from
-Akira TAGOH (upstream)
-
-Second chunk: On NetBSD, it is not supported to load a library linked against
-libpthread into a program that wasn't (since the C library provides
-stubs for some pthread-functions, which might have already been called
-before libpthread is loaded, leading to problems).
-
-Since xdm (not linked against libpthread) might load fontconfig,
-fontconfig shouldn't be linked against libpthread.
-
---- configure.orig	2013-01-10 08:59:05.000000000 +0000
-+++ configure
-@@ -13908,7 +13908,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdef
+--- configure.orig	Fri Oct 11 04:28:48 2013
++++ configure	Sun Apr 20 09:21:19 2014
+@@ -5909,7 +5909,7 @@ else
+     lt_cv_sys_max_cmd_len=8192;
+     ;;
+ 
+-  netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++  minix* | netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+     # This has been around since 386BSD, at least.  Likely further.
+     if test -x /sbin/sysctl; then
+       lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
+@@ -6403,7 +6403,7 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-netbsd*)
++minix* | netbsd*)
+   if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+     lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
+   else
+@@ -9752,7 +9752,7 @@ _LT_EOF
+       fi
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ 	wlarc=
+@@ -10382,7 +10382,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >&6; }
+       link_all_deplibs=yes
+       ;;
+ 
+-    netbsd*)
++    minix* | netbsd*)
+       if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
+ 	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
+       else
+@@ -11414,6 +11414,18 @@ fi
+   dynamic_linker='GNU/Linux ld.so'
+   ;;
+ 
++minix*)
++  version_type=sunos
++  need_lib_prefix=no
++  need_version=no
++  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++  soname_spec='${libname}${release}${shared_ext}$major'
++  dynamic_linker='Minix ld.elf_so'
++  shlibpath_var=LD_LIBRARY_PATH
++  shlibpath_overrides_runpath=yes
++  hardcode_into_libs=yes
++  ;;
++
+ netbsd*)
+   version_type=sunos
+   need_lib_prefix=no
+@@ -13908,7 +13920,7 @@ $as_echo "#define HAVE_MMAP 1" >>confdefs.h
  fi
  rm -f conftest.mmap conftest.txt
  
@@ -22,7 +64,7 @@ fontconfig shouldn't be linked against libpthread.
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -15017,6 +15017,11 @@ case ${host_os} in
+@@ -15155,6 +15167,11 @@ case ${host_os} in
          darwin*)
          ax_pthread_flags="-pthread $ax_pthread_flags"
          ;;
@@ -34,4 +76,3 @@ fontconfig shouldn't be linked against libpthread.
  esac
  
  if test x"$ax_pthread_ok" = xno; then
-