Remove libtool .la files from all Qt ports

Approvedy by:	kde (makc)

40 files changed, 52 insertions, 21 deletions

diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index 3f0513c1795e..34dfa5755eb5 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	dbus
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist
index 0e66f956a2d2..e82318257d86 100644
--- a/devel/dbus-qt4/pkg-plist
+++ b/devel/dbus-qt4/pkg-plist
@@ -67,7 +67,6 @@
 %%QT_INCDIR%%/QtDBus/qdbusservicewatcher.h
 %%QT_INCDIR%%/QtDBus/qdbusunixfiledescriptor.h
 %%QT_INCDIR%%/QtDBus/qdbusvirtualobject.h
-%%QT_LIBDIR%%/libQtDBus.la
 %%QT_LIBDIR%%/libQtDBus.prl
 %%QT_LIBDIR%%/libQtDBus.so
 %%QT_LIBDIR%%/libQtDBus.so.4
diff --git a/devel/dbus-qt5/Makefile b/devel/dbus-qt5/Makefile
index 505cadaee2c0..03bb69df455a 100644
--- a/devel/dbus-qt5/Makefile
+++ b/devel/dbus-qt5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	dbus
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/dbus-qt5/pkg-plist b/devel/dbus-qt5/pkg-plist
index f9d7f71e996b..090c0bf670a5 100644
--- a/devel/dbus-qt5/pkg-plist
+++ b/devel/dbus-qt5/pkg-plist
@@ -65,7 +65,6 @@
 %%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigExtras.cmake
 %%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusConfigVersion.cmake
 %%QT_LIBDIR%%/cmake/Qt5DBus/Qt5DBusMacros.cmake
-%%QT_LIBDIR%%/libQt5DBus.la
 %%QT_LIBDIR%%/libQt5DBus.prl
 %%QT_LIBDIR%%/libQt5DBus.so
 %%QT_LIBDIR%%/libQt5DBus.so.5
diff --git a/devel/gnome-vfs/files/patch-ac b/devel/gnome-vfs/files/patch-ac
new file mode 100644
index 000000000000..a85a1f283b62
--- /dev/null
+++ b/devel/gnome-vfs/files/patch-ac
@@ -0,0 +1,11 @@
+--- modules/Makefile.in.orig	Mon Oct  3 11:55:14 2005
++++ modules/Makefile.in	Mon Oct  3 11:55:55 2005
+@@ -465,7 +465,7 @@
+ @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
+ @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
+ @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
+-module_flags = -export_dynamic -avoid-version -module -no-undefined
++module_flags = -export_dynamic -avoid-version -module -no-undefined
+ modulesdir = $(libdir)/gnome-vfs-2.0/modules
+ modules_LTLIBRARIES = \
+ 	$(CDDA_LTLIBS)				\
diff --git a/devel/qmake5/Makefile b/devel/qmake5/Makefile
index 6d0513340078..8d71a95e48e4 100644
--- a/devel/qmake5/Makefile
+++ b/devel/qmake5/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qmake
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index fd1dcade9161..5333f28a753d 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	corelib
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist
index e7d7977c4225..b0a5a4ddb862 100644
--- a/devel/qt4-corelib/pkg-plist
+++ b/devel/qt4-corelib/pkg-plist
@@ -624,7 +624,6 @@
 %%QT_INCDIR%%/QtCore/qvector.h
 %%QT_INCDIR%%/QtCore/qwaitcondition.h
 %%QT_INCDIR%%/QtCore/qxmlstream.h
-%%QT_LIBDIR%%/libQtCore.la
 %%QT_LIBDIR%%/libQtCore.prl
 %%QT_LIBDIR%%/libQtCore.so
 %%QT_LIBDIR%%/libQtCore.so.4
diff --git a/devel/qt4-help/Makefile b/devel/qt4-help/Makefile
index 656b85e8f174..d11f40196c83 100644
--- a/devel/qt4-help/Makefile
+++ b/devel/qt4-help/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	help
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-help/pkg-plist b/devel/qt4-help/pkg-plist
index 7a41a2d7053b..14ca9439375e 100644
--- a/devel/qt4-help/pkg-plist
+++ b/devel/qt4-help/pkg-plist
@@ -28,7 +28,6 @@
 %%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
 %%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
 %%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
-%%QT_LIBDIR%%/libQtHelp.la
 %%QT_LIBDIR%%/libQtHelp.prl
 %%QT_LIBDIR%%/libQtHelp.so
 %%QT_LIBDIR%%/libQtHelp.so.4
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index 8a1c62109668..ea02cb76c353 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	qt3support
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel x11-toolkits
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-qt3support/pkg-plist b/devel/qt4-qt3support/pkg-plist
index fc4cb7ad2867..148767ea5de4 100644
--- a/devel/qt4-qt3support/pkg-plist
+++ b/devel/qt4-qt3support/pkg-plist
@@ -401,7 +401,6 @@
 %%QT_INCDIR%%/Qt3Support/q3widgetstack.h
 %%QT_INCDIR%%/Qt3Support/q3wizard.h
 %%QT_INCDIR%%/Qt3Support/qiconset.h
-%%QT_LIBDIR%%/libQt3Support.la
 %%QT_LIBDIR%%/libQt3Support.prl
 %%QT_LIBDIR%%/libQt3Support.so
 %%QT_LIBDIR%%/libQt3Support.so.4
diff --git a/devel/qt4-script/Makefile b/devel/qt4-script/Makefile
index 7b22871d4291..7cfe6b04c2f7 100644
--- a/devel/qt4-script/Makefile
+++ b/devel/qt4-script/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	script
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-script/pkg-plist b/devel/qt4-script/pkg-plist
index 096ddebfcc80..b438218eb610 100644
--- a/devel/qt4-script/pkg-plist
+++ b/devel/qt4-script/pkg-plist
@@ -42,7 +42,6 @@
 %%QT_INCDIR%%/QtScript/qscriptstring.h
 %%QT_INCDIR%%/QtScript/qscriptvalue.h
 %%QT_INCDIR%%/QtScript/qscriptvalueiterator.h
-%%QT_LIBDIR%%/libQtScript.la
 %%QT_LIBDIR%%/libQtScript.prl
 %%QT_LIBDIR%%/libQtScript.so
 %%QT_LIBDIR%%/libQtScript.so.4
diff --git a/devel/qt4-scripttools/Makefile b/devel/qt4-scripttools/Makefile
index 693a3338dec5..40db106b71df 100644
--- a/devel/qt4-scripttools/Makefile
+++ b/devel/qt4-scripttools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	scripttools
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-scripttools/pkg-plist b/devel/qt4-scripttools/pkg-plist
index 8707fa3649b2..ac995d5f89ad 100644
--- a/devel/qt4-scripttools/pkg-plist
+++ b/devel/qt4-scripttools/pkg-plist
@@ -3,7 +3,6 @@
 %%QT_INCDIR%%/QtScriptTools/QScriptEngineDebugger
 %%QT_INCDIR%%/QtScriptTools/QtScriptTools
 %%QT_INCDIR%%/QtScriptTools/qscriptenginedebugger.h
-%%QT_LIBDIR%%/libQtScriptTools.la
 %%QT_LIBDIR%%/libQtScriptTools.prl
 %%QT_LIBDIR%%/libQtScriptTools.so
 %%QT_LIBDIR%%/libQtScriptTools.so.4
diff --git a/devel/qt4-testlib/Makefile b/devel/qt4-testlib/Makefile
index 0bc7758e1f03..55a27d64cdc3 100644
--- a/devel/qt4-testlib/Makefile
+++ b/devel/qt4-testlib/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	testlib
 DISTVERSION=	${QT4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt4-
 
diff --git a/devel/qt4-testlib/pkg-plist b/devel/qt4-testlib/pkg-plist
index 9b9c421649d8..3b38d3470d6d 100644
--- a/devel/qt4-testlib/pkg-plist
+++ b/devel/qt4-testlib/pkg-plist
@@ -76,7 +76,6 @@
 %%QT_INCDIR%%/QtTest/qtesttouch.h
 %%QT_INCDIR%%/QtTest/qtestxmlstreamer.h
 %%QT_INCDIR%%/QtTest/qtestxunitstreamer.h
-%%QT_LIBDIR%%/libQtTest.la
 %%QT_LIBDIR%%/libQtTest.prl
 %%QT_LIBDIR%%/libQtTest.so
 %%QT_LIBDIR%%/libQtTest.so.4
diff --git a/devel/qt4/files/extrapatch-libtool b/devel/qt4/files/extrapatch-libtool
new file mode 100644
index 000000000000..8110e96a8fa8
--- /dev/null
+++ b/devel/qt4/files/extrapatch-libtool
@@ -0,0 +1,11 @@
+--- src/qbase.pri.orig	2014-06-30 14:22:00.000000000 +0200
++++ src/qbase.pri	2014-06-30 14:22:11.000000000 +0200
+@@ -151,7 +151,7 @@
+ }
+ 
+ unix:!symbian {
+-   CONFIG += create_libtool explicitlib
++   CONFIG += explicitlib
+    QMAKE_LIBTOOL_LIBDIR = $$[QT_INSTALL_LIBS]
+    QMAKE_PRL_LIBDIR = $$[QT_INSTALL_LIBS]
+    QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace
diff --git a/devel/qt5-buildtools/Makefile b/devel/qt5-buildtools/Makefile
index 3eca86a53a6f..b3bc10a56197 100644
--- a/devel/qt5-buildtools/Makefile
+++ b/devel/qt5-buildtools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	buildtools
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-buildtools/pkg-plist b/devel/qt5-buildtools/pkg-plist
index 095feedfde07..b54f82dee4d7 100644
--- a/devel/qt5-buildtools/pkg-plist
+++ b/devel/qt5-buildtools/pkg-plist
@@ -1,5 +1,4 @@
 %%QT_LIBDIR%%/libQt5Bootstrap.a
-%%QT_LIBDIR%%/libQt5Bootstrap.la
 %%QT_LIBDIR%%/libQt5Bootstrap.prl
 %%QT_BINDIR%%/moc
 %%QT_BINDIR%%/rcc
diff --git a/devel/qt5-concurrent/Makefile b/devel/qt5-concurrent/Makefile
index fc5f9fc4e925..5d8697422cfc 100644
--- a/devel/qt5-concurrent/Makefile
+++ b/devel/qt5-concurrent/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	concurrent
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-concurrent/pkg-plist b/devel/qt5-concurrent/pkg-plist
index d36294a905e6..e3423b173dc5 100644
--- a/devel/qt5-concurrent/pkg-plist
+++ b/devel/qt5-concurrent/pkg-plist
@@ -22,7 +22,6 @@
 %%QT_INCDIR%%/QtConcurrent/qtconcurrentversion.h
 %%QT_LIBDIR%%/cmake/Qt5Concurrent/Qt5ConcurrentConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Concurrent/Qt5ConcurrentConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5Concurrent.la
 %%QT_LIBDIR%%/libQt5Concurrent.prl
 %%QT_LIBDIR%%/libQt5Concurrent.so
 %%QT_LIBDIR%%/libQt5Concurrent.so.5
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index 2a8f4da65413..9dcd959bfad5 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	core
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-core/pkg-plist b/devel/qt5-core/pkg-plist
index b8cf32ae63ab..0a97a97eb5b2 100644
--- a/devel/qt5-core/pkg-plist
+++ b/devel/qt5-core/pkg-plist
@@ -667,7 +667,6 @@
 %%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigExtrasMkspecDir.cmake
 %%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreConfigVersion.cmake
 %%QT_LIBDIR%%/cmake/Qt5Core/Qt5CoreMacros.cmake
-%%QT_LIBDIR%%/libQt5Core.la
 %%QT_LIBDIR%%/libQt5Core.prl
 %%QT_LIBDIR%%/libQt5Core.so
 %%QT_LIBDIR%%/libQt5Core.so.5
diff --git a/devel/qt5-designer/Makefile b/devel/qt5-designer/Makefile
index d89b6944dfdb..0b1c790e864b 100644
--- a/devel/qt5-designer/Makefile
+++ b/devel/qt5-designer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	designer
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-designer/pkg-plist b/devel/qt5-designer/pkg-plist
index ec38cce93aaf..b151817f92f3 100644
--- a/devel/qt5-designer/pkg-plist
+++ b/devel/qt5-designer/pkg-plist
@@ -176,14 +176,12 @@
 %%QT_INCDIR%%/QtDesignerComponents/qtdesignercomponentsversion.h
 %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Designer/Qt5DesignerConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5Designer.la
 %%QT_LIBDIR%%/libQt5Designer.prl
 %%QT_LIBDIR%%/libQt5Designer.so
 %%QT_LIBDIR%%/libQt5Designer.so.5
 %%QT_LIBDIR%%/libQt5Designer.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5Designer.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5Designer.so.%%FULLVER%%.debug
-%%QT_LIBDIR%%/libQt5DesignerComponents.la
 %%QT_LIBDIR%%/libQt5DesignerComponents.prl
 %%QT_LIBDIR%%/libQt5DesignerComponents.so
 %%QT_LIBDIR%%/libQt5DesignerComponents.so.5
diff --git a/devel/qt5-help/Makefile b/devel/qt5-help/Makefile
index b850eb7d91ea..2748f3911492 100644
--- a/devel/qt5-help/Makefile
+++ b/devel/qt5-help/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	help
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-help/pkg-plist b/devel/qt5-help/pkg-plist
index bc956ba3b31e..6cd03908a878 100644
--- a/devel/qt5-help/pkg-plist
+++ b/devel/qt5-help/pkg-plist
@@ -37,7 +37,6 @@
 %%QT_INCDIR%%/QtHelp/qthelpversion.h
 %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Help/Qt5HelpConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5Help.la
 %%QT_LIBDIR%%/libQt5Help.prl
 %%QT_LIBDIR%%/libQt5Help.so
 %%QT_LIBDIR%%/libQt5Help.so.5
diff --git a/devel/qt5-qmldevtools/Makefile b/devel/qt5-qmldevtools/Makefile
index bc58cdb113a5..f35f18d25e5f 100644
--- a/devel/qt5-qmldevtools/Makefile
+++ b/devel/qt5-qmldevtools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	qmldevtools
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-qmldevtools/pkg-plist b/devel/qt5-qmldevtools/pkg-plist
index ec5f13554273..918dea2acfd1 100644
--- a/devel/qt5-qmldevtools/pkg-plist
+++ b/devel/qt5-qmldevtools/pkg-plist
@@ -13,7 +13,6 @@
 %%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsVersion
 %%QT_INCDIR%%/QtQmlDevTools/qtqmldevtoolsversion.h
 %%QT_LIBDIR%%/libQt5QmlDevTools.a
-%%QT_LIBDIR%%/libQt5QmlDevTools.la
 %%QT_LIBDIR%%/libQt5QmlDevTools.prl
 %%QT_MKSPECDIR%%/modules/qt_lib_qmldevtools_private.pri
 libdata/pkgconfig/Qt5QmlDevTools.pc
diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile
index d07a4e8f0934..e51352a31f5a 100644
--- a/devel/qt5-script/Makefile
+++ b/devel/qt5-script/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	script
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-script/pkg-plist b/devel/qt5-script/pkg-plist
index f62f1250e12b..35407a865044 100644
--- a/devel/qt5-script/pkg-plist
+++ b/devel/qt5-script/pkg-plist
@@ -58,7 +58,6 @@
 %%QT_INCDIR%%/QtScript/qtscriptversion.h
 %%QT_LIBDIR%%/cmake/Qt5Script/Qt5ScriptConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Script/Qt5ScriptConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5Script.la
 %%QT_LIBDIR%%/libQt5Script.prl
 %%QT_LIBDIR%%/libQt5Script.so
 %%QT_LIBDIR%%/libQt5Script.so.5
diff --git a/devel/qt5-scripttools/Makefile b/devel/qt5-scripttools/Makefile
index 5d5a3f96aa2a..607d5dcaac88 100644
--- a/devel/qt5-scripttools/Makefile
+++ b/devel/qt5-scripttools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	scripttools
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-scripttools/pkg-plist b/devel/qt5-scripttools/pkg-plist
index e97d87cfd76a..d7d7921dec85 100644
--- a/devel/qt5-scripttools/pkg-plist
+++ b/devel/qt5-scripttools/pkg-plist
@@ -90,7 +90,6 @@
 %%QT_INCDIR%%/QtScriptTools/qtscripttoolsversion.h
 %%QT_LIBDIR%%/cmake/Qt5ScriptTools/Qt5ScriptToolsConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5ScriptTools/Qt5ScriptToolsConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5ScriptTools.la
 %%QT_LIBDIR%%/libQt5ScriptTools.prl
 %%QT_LIBDIR%%/libQt5ScriptTools.so
 %%QT_LIBDIR%%/libQt5ScriptTools.so.5
diff --git a/devel/qt5-testlib/Makefile b/devel/qt5-testlib/Makefile
index 466983665a55..4013af6ddcd5 100644
--- a/devel/qt5-testlib/Makefile
+++ b/devel/qt5-testlib/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	testlib
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-testlib/pkg-plist b/devel/qt5-testlib/pkg-plist
index 59d8da830f1e..97a54bfcd5e5 100644
--- a/devel/qt5-testlib/pkg-plist
+++ b/devel/qt5-testlib/pkg-plist
@@ -60,7 +60,6 @@
 %%QT_INCDIR%%/QtTest/qttestversion.h
 %%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Test/Qt5TestConfigVersion.cmake
-%%QT_LIBDIR%%/libQt5Test.la
 %%QT_LIBDIR%%/libQt5Test.prl
 %%QT_LIBDIR%%/libQt5Test.so
 %%QT_LIBDIR%%/libQt5Test.so.5
diff --git a/devel/qt5-uitools/Makefile b/devel/qt5-uitools/Makefile
index b6dd218a61d5..43b2c155a7f7 100644
--- a/devel/qt5-uitools/Makefile
+++ b/devel/qt5-uitools/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	uitools
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMEPREFIX=	qt5-
 
diff --git a/devel/qt5-uitools/pkg-plist b/devel/qt5-uitools/pkg-plist
index 0ace6c3311a6..27f3975fe7f9 100644
--- a/devel/qt5-uitools/pkg-plist
+++ b/devel/qt5-uitools/pkg-plist
@@ -8,7 +8,6 @@
 %%QT_LIBDIR%%/cmake/Qt5UiTools/Qt5UiToolsConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5UiTools/Qt5UiToolsConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5UiTools.a
-%%QT_LIBDIR%%/libQt5UiTools.la
 %%QT_LIBDIR%%/libQt5UiTools.prl
 %%QT_MKSPECDIR%%/modules/qt_lib_uitools.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_uitools_private.pri
diff --git a/devel/qt5/files/extrapatch-libtool b/devel/qt5/files/extrapatch-libtool
new file mode 100644
index 000000000000..cee41072aabf
--- /dev/null
+++ b/devel/qt5/files/extrapatch-libtool
@@ -0,0 +1,11 @@
+--- mkspecs/features/qt_module.prf.orig
++++ mkspecs/features/qt_module.prf
+@@ -156,7 +156,7 @@
+ }
+ 
+ unix {
+-   CONFIG += create_libtool explicitlib
++   CONFIG += explicitlib
+    QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace
+    QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace
+ }