3 files changed, 22 insertions, 14 deletions
diff --git a/devel/qt5/files/extrapatch-config.tests-unix-compile.test b/devel/qt5/files/extrapatch-config.tests-unix-compile.test
index 2046425ad53c..42917502119d 100644
--- a/devel/qt5/files/extrapatch-config.tests-unix-compile.test
+++ b/devel/qt5/files/extrapatch-config.tests-unix-compile.test
@@ -1,9 +1,9 @@
---- config.tests/unix/compile.test.orig
-+++ config.tests/unix/compile.test
-@@ -13,7 +13,7 @@
- shift 7
+--- config.tests/unix/compile.test.orig	2016-05-12 13:16:04.782542000 +0200
++++ config.tests/unix/compile.test	2016-05-12 13:16:17.510837000 +0200
+@@ -14,7 +14,7 @@
  LFLAGS="$SYSROOT_FLAG"
  INCLUDEPATH=""
+ CFLAGS="$SYSROOT_FLAG"
 -CXXFLAGS="$SYSROOT_FLAG"
 +CXXFLAGS="$CXXFLAGS $SYSROOT_FLAG"
  MAC_ARCH_CXXFLAGS=""
diff --git a/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro b/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro
new file mode 100644
index 000000000000..2995cf3fef3d
--- /dev/null
+++ b/devel/qt5/files/extrapatch-config.tests_unix_libdl_libdl.pro
@@ -0,0 +1,9 @@
+FreeBSD does not have -ldl.
+This has been fixed differently upstream in https://codereview.qt-project.org/#/c/159318/
+--- config.tests/unix/libdl/libdl.pro.orig	2016-04-23 14:20:03.489678000 +0200
++++ config.tests/unix/libdl/libdl.pro	2016-04-23 14:20:14.836383000 +0200
+@@ -1,3 +1,3 @@
+ SOURCES = libdl.cpp
+ CONFIG -= qt dylib
+-!qnx: LIBS += -ldl
++!qnx:!freebsd: LIBS += -ldl
diff --git a/devel/qt5/files/extrapatch-libtool b/devel/qt5/files/extrapatch-libtool
index fccea74b0530..8a9328edd73b 100644
--- a/devel/qt5/files/extrapatch-libtool
+++ b/devel/qt5/files/extrapatch-libtool
@@ -1,11 +1,10 @@
---- mkspecs/features/qt_module.prf.orig	2015-03-16 17:16:43.000000000 +0100
-+++ mkspecs/features/qt_module.prf	2015-05-01 09:47:31.767105000 +0200
-@@ -200,7 +200,7 @@
+--- mkspecs/features/qt_module.prf.orig	2016-02-24 21:20:22.414067000 +0100
++++ mkspecs/features/qt_module.prf	2016-02-24 21:20:35.884538000 +0100
+@@ -267,7 +267,6 @@
      QMAKE_PKGCONFIG_INSTALL_REPLACE += pclib_replace
- 
-     unix {
--        CONFIG += create_libtool explicitlib
-+        CONFIG += explicitlib
-         host_build: \
-             QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
-         else: \
+ }
+ !lib_bundle:unix {
+-    CONFIG += create_libtool
+     host_build: \
+         QMAKE_LIBTOOL_LIBDIR = $$[QT_HOST_LIBS]
+     else: \