From a14d5f8d2d7b72aadb988160cfa609c628d5d719 Mon Sep 17 00:00:00 2001 From: Tijl Coosemans Date: Sat, 19 Jul 2014 11:09:00 +0000 Subject: [PATCH] Remove libtool .la files from all Qt ports Approvedy by: kde (makc) --- Mk/bsd.qt.mk | 3 ++- databases/qt4-sql/Makefile | 1 + databases/qt4-sql/pkg-plist | 1 - databases/qt5-sql/Makefile | 1 + databases/qt5-sql/pkg-plist | 1 - devel/dbus-qt4/Makefile | 1 + devel/dbus-qt4/pkg-plist | 1 - devel/dbus-qt5/Makefile | 1 + devel/dbus-qt5/pkg-plist | 1 - devel/gnome-vfs/files/patch-ac | 11 +++++++++++ devel/qmake5/Makefile | 1 + devel/qt4-corelib/Makefile | 1 + devel/qt4-corelib/pkg-plist | 1 - devel/qt4-help/Makefile | 1 + devel/qt4-help/pkg-plist | 1 - devel/qt4-qt3support/Makefile | 1 + devel/qt4-qt3support/pkg-plist | 1 - devel/qt4-script/Makefile | 1 + devel/qt4-script/pkg-plist | 1 - devel/qt4-scripttools/Makefile | 1 + devel/qt4-scripttools/pkg-plist | 1 - devel/qt4-testlib/Makefile | 1 + devel/qt4-testlib/pkg-plist | 1 - devel/qt4/files/extrapatch-libtool | 11 +++++++++++ devel/qt5-buildtools/Makefile | 1 + devel/qt5-buildtools/pkg-plist | 1 - devel/qt5-concurrent/Makefile | 1 + devel/qt5-concurrent/pkg-plist | 1 - devel/qt5-core/Makefile | 2 +- devel/qt5-core/pkg-plist | 1 - devel/qt5-designer/Makefile | 2 +- devel/qt5-designer/pkg-plist | 2 -- devel/qt5-help/Makefile | 1 + devel/qt5-help/pkg-plist | 1 - devel/qt5-qmldevtools/Makefile | 1 + devel/qt5-qmldevtools/pkg-plist | 1 - devel/qt5-script/Makefile | 1 + devel/qt5-script/pkg-plist | 1 - devel/qt5-scripttools/Makefile | 1 + devel/qt5-scripttools/pkg-plist | 1 - devel/qt5-testlib/Makefile | 1 + devel/qt5-testlib/pkg-plist | 1 - devel/qt5-uitools/Makefile | 1 + devel/qt5-uitools/pkg-plist | 1 - devel/qt5/files/extrapatch-libtool | 11 +++++++++++ graphics/qt4-opengl/Makefile | 1 + graphics/qt4-opengl/pkg-plist | 1 - graphics/qt4-svg/Makefile | 1 + graphics/qt4-svg/pkg-plist | 1 - graphics/qt5-opengl/Makefile | 1 + graphics/qt5-opengl/pkg-plist | 1 - graphics/qt5-svg/Makefile | 1 + graphics/qt5-svg/pkg-plist | 1 - lang/qt5-qml/Makefile | 1 + lang/qt5-qml/pkg-plist | 1 - multimedia/qt4-multimedia/Makefile | 1 + multimedia/qt4-multimedia/pkg-plist | 1 - multimedia/qt5-multimedia/Makefile | 1 + multimedia/qt5-multimedia/pkg-plist | 3 --- net/qt4-network/Makefile | 1 + net/qt4-network/pkg-plist | 1 - net/qt5-network/Makefile | 1 + net/qt5-network/pkg-plist | 1 - print/qt5-printsupport/Makefile | 1 + print/qt5-printsupport/pkg-plist | 1 - textproc/clucene-qt4/Makefile | 1 + textproc/clucene-qt4/pkg-plist | 1 - textproc/clucene-qt5/Makefile | 1 + textproc/clucene-qt5/pkg-plist | 1 - textproc/qt4-xml/Makefile | 1 + textproc/qt4-xml/pkg-plist | 1 - textproc/qt4-xmlpatterns/Makefile | 1 + textproc/qt4-xmlpatterns/pkg-plist | 1 - textproc/qt5-xml/Makefile | 1 + textproc/qt5-xml/pkg-plist | 1 - textproc/qt5-xmlpatterns/Makefile | 1 + textproc/qt5-xmlpatterns/pkg-plist | 1 - www/webkit-qt4/Makefile | 4 ++-- www/webkit-qt4/pkg-plist | 1 - www/webkit-qt5/Makefile | 2 +- www/webkit-qt5/pkg-plist | 2 -- x11-toolkits/qt4-declarative/Makefile | 1 + x11-toolkits/qt4-declarative/pkg-plist | 1 - x11-toolkits/qt4-gui/Makefile | 1 + x11-toolkits/qt4-gui/pkg-plist | 1 - x11-toolkits/qt5-declarative/Makefile | 2 +- x11-toolkits/qt5-declarative/pkg-plist | 1 - x11-toolkits/qt5-gui/Makefile | 2 +- x11-toolkits/qt5-gui/pkg-plist | 2 -- x11-toolkits/qt5-quick/Makefile | 1 + x11-toolkits/qt5-quick/pkg-plist | 3 --- x11-toolkits/qt5-widgets/Makefile | 1 + x11-toolkits/qt5-widgets/pkg-plist | 1 - 93 files changed, 81 insertions(+), 59 deletions(-) create mode 100644 devel/gnome-vfs/files/patch-ac create mode 100644 devel/qt4/files/extrapatch-libtool create mode 100644 devel/qt5/files/extrapatch-libtool diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 6fc9b5b300e1..a60ac53b71f5 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -167,7 +167,8 @@ CONFIGURE_ARGS+=-verbose . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} EXTRA_PATCHES?= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-configure \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-config.tests-unix-compile.test \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool . if ${_QT_VERSION:M5*} EXTRA_PATCHES+= ${.CURDIR:H:H}/devel/qt5-core/files/extrapatch-src__corelib__tools__qdatetime.cpp . endif diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index b33e73028730..be5ccb12cfe0 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -3,6 +3,7 @@ PORTNAME= sql DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt4- diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist index 3f745d3b8eeb..2c3adda88eea 100644 --- a/databases/qt4-sql/pkg-plist +++ b/databases/qt4-sql/pkg-plist @@ -85,7 +85,6 @@ %%QT_INCDIR%%/QtSql/qsqlrelationaltablemodel.h %%QT_INCDIR%%/QtSql/qsqlresult.h %%QT_INCDIR%%/QtSql/qsqltablemodel.h -%%QT_LIBDIR%%/libQtSql.la %%QT_LIBDIR%%/libQtSql.prl %%QT_LIBDIR%%/libQtSql.so %%QT_LIBDIR%%/libQtSql.so.4 diff --git a/databases/qt5-sql/Makefile b/databases/qt5-sql/Makefile index 06f907b07ff0..e6eb5a6bd86c 100644 --- a/databases/qt5-sql/Makefile +++ b/databases/qt5-sql/Makefile @@ -2,6 +2,7 @@ PORTNAME= sql DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt5- diff --git a/databases/qt5-sql/pkg-plist b/databases/qt5-sql/pkg-plist index 3e8eb85cd55f..cc136ea74f4a 100644 --- a/databases/qt5-sql/pkg-plist +++ b/databases/qt5-sql/pkg-plist @@ -50,7 +50,6 @@ %%QT_INCDIR%%/QtSql/qtsqlversion.h %%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Sql/Qt5SqlConfigVersion.cmake -%%QT_LIBDIR%%/libQt5Sql.la %%QT_LIBDIR%%/libQt5Sql.prl %%QT_LIBDIR%%/libQt5Sql.so %%QT_LIBDIR%%/libQt5Sql.so.5 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 + } diff --git a/graphics/qt4-opengl/Makefile b/graphics/qt4-opengl/Makefile index 1f771e890a3a..fdf9768f1acb 100644 --- a/graphics/qt4-opengl/Makefile +++ b/graphics/qt4-opengl/Makefile @@ -3,6 +3,7 @@ PORTNAME= opengl DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- diff --git a/graphics/qt4-opengl/pkg-plist b/graphics/qt4-opengl/pkg-plist index 4ccb120f67e7..251a23fcc807 100644 --- a/graphics/qt4-opengl/pkg-plist +++ b/graphics/qt4-opengl/pkg-plist @@ -34,7 +34,6 @@ %%QT_INCDIR%%/QtOpenGL/qglpixelbuffer.h %%QT_INCDIR%%/QtOpenGL/qglscreen_qws.h %%QT_INCDIR%%/QtOpenGL/qglshaderprogram.h -%%QT_LIBDIR%%/libQtOpenGL.la %%QT_LIBDIR%%/libQtOpenGL.prl %%QT_LIBDIR%%/libQtOpenGL.so %%QT_LIBDIR%%/libQtOpenGL.so.4 diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index ccd5ace5fa81..5c3f4fb65992 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -3,6 +3,7 @@ PORTNAME= svg DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist index d69f1ebe6860..28802aed192a 100644 --- a/graphics/qt4-svg/pkg-plist +++ b/graphics/qt4-svg/pkg-plist @@ -12,7 +12,6 @@ %%QT_INCDIR%%/QtSvg/qsvggenerator.h %%QT_INCDIR%%/QtSvg/qsvgrenderer.h %%QT_INCDIR%%/QtSvg/qsvgwidget.h -%%QT_LIBDIR%%/libQtSvg.la %%QT_LIBDIR%%/libQtSvg.prl %%QT_LIBDIR%%/libQtSvg.so %%QT_LIBDIR%%/libQtSvg.so.4 diff --git a/graphics/qt5-opengl/Makefile b/graphics/qt5-opengl/Makefile index e8b6dee82c0e..99d07c6b6703 100644 --- a/graphics/qt5-opengl/Makefile +++ b/graphics/qt5-opengl/Makefile @@ -2,6 +2,7 @@ PORTNAME= opengl DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-opengl/pkg-plist b/graphics/qt5-opengl/pkg-plist index 6c850777e04f..857c10355cad 100644 --- a/graphics/qt5-opengl/pkg-plist +++ b/graphics/qt5-opengl/pkg-plist @@ -38,7 +38,6 @@ %%QT_INCDIR%%/QtOpenGL/qtopenglversion.h %%QT_LIBDIR%%/cmake/Qt5OpenGL/Qt5OpenGLConfig.cmake %%QT_LIBDIR%%/cmake/Qt5OpenGL/Qt5OpenGLConfigVersion.cmake -%%QT_LIBDIR%%/libQt5OpenGL.la %%QT_LIBDIR%%/libQt5OpenGL.prl %%QT_LIBDIR%%/libQt5OpenGL.so %%QT_LIBDIR%%/libQt5OpenGL.so.5 diff --git a/graphics/qt5-svg/Makefile b/graphics/qt5-svg/Makefile index 85deedeeb6a2..973e7f51a9eb 100644 --- a/graphics/qt5-svg/Makefile +++ b/graphics/qt5-svg/Makefile @@ -2,6 +2,7 @@ PORTNAME= svg DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-svg/pkg-plist b/graphics/qt5-svg/pkg-plist index 446fd0efa1c0..618f8fa616c1 100644 --- a/graphics/qt5-svg/pkg-plist +++ b/graphics/qt5-svg/pkg-plist @@ -22,7 +22,6 @@ %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QSvgPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Svg/Qt5SvgConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Svg/Qt5SvgConfigVersion.cmake -%%QT_LIBDIR%%/libQt5Svg.la %%QT_LIBDIR%%/libQt5Svg.prl %%QT_LIBDIR%%/libQt5Svg.so %%QT_LIBDIR%%/libQt5Svg.so.5 diff --git a/lang/qt5-qml/Makefile b/lang/qt5-qml/Makefile index 4db91f2eea4f..2a28a4528518 100644 --- a/lang/qt5-qml/Makefile +++ b/lang/qt5-qml/Makefile @@ -2,6 +2,7 @@ PORTNAME= qml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= lang PKGNAMEPREFIX= qt5- diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist index b19b4a94ef12..f1296b191583 100644 --- a/lang/qt5-qml/pkg-plist +++ b/lang/qt5-qml/pkg-plist @@ -250,7 +250,6 @@ %%QT_INCDIR%%/QtQml/qtqmlversion.h %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake -%%QT_LIBDIR%%/libQt5Qml.la %%QT_LIBDIR%%/libQt5Qml.prl %%QT_LIBDIR%%/libQt5Qml.so %%QT_LIBDIR%%/libQt5Qml.so.5 diff --git a/multimedia/qt4-multimedia/Makefile b/multimedia/qt4-multimedia/Makefile index 68b6274b70d1..debc230701ab 100644 --- a/multimedia/qt4-multimedia/Makefile +++ b/multimedia/qt4-multimedia/Makefile @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt4- diff --git a/multimedia/qt4-multimedia/pkg-plist b/multimedia/qt4-multimedia/pkg-plist index cec936145d5d..70c452185c71 100644 --- a/multimedia/qt4-multimedia/pkg-plist +++ b/multimedia/qt4-multimedia/pkg-plist @@ -36,7 +36,6 @@ %%QT_INCDIR%%/QtMultimedia/qaudiooutput.h %%QT_INCDIR%%/QtMultimedia/qvideoframe.h %%QT_INCDIR%%/QtMultimedia/qvideosurfaceformat.h -%%QT_LIBDIR%%/libQtMultimedia.la %%QT_LIBDIR%%/libQtMultimedia.prl %%QT_LIBDIR%%/libQtMultimedia.so %%QT_LIBDIR%%/libQtMultimedia.so.4 diff --git a/multimedia/qt5-multimedia/Makefile b/multimedia/qt5-multimedia/Makefile index e8a9f009e07b..5448fc58f58f 100644 --- a/multimedia/qt5-multimedia/Makefile +++ b/multimedia/qt5-multimedia/Makefile @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt5- diff --git a/multimedia/qt5-multimedia/pkg-plist b/multimedia/qt5-multimedia/pkg-plist index a4cce0d1e3dc..d34a1ab00e04 100644 --- a/multimedia/qt5-multimedia/pkg-plist +++ b/multimedia/qt5-multimedia/pkg-plist @@ -243,21 +243,18 @@ %%QT_LIBDIR%%/cmake/Qt5Multimedia/Qt5MultimediaConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfig.cmake %%QT_LIBDIR%%/cmake/Qt5MultimediaWidgets/Qt5MultimediaWidgetsConfigVersion.cmake -%%QT_LIBDIR%%/libQt5Multimedia.la %%QT_LIBDIR%%/libQt5Multimedia.prl %%QT_LIBDIR%%/libQt5Multimedia.so %%QT_LIBDIR%%/libQt5Multimedia.so.5 %%QT_LIBDIR%%/libQt5Multimedia.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5Multimedia.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5Multimedia.so.%%FULLVER%%.debug -%%QT_LIBDIR%%/libQt5MultimediaQuick_p.la %%QT_LIBDIR%%/libQt5MultimediaQuick_p.prl %%QT_LIBDIR%%/libQt5MultimediaQuick_p.so %%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.5 %%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5MultimediaQuick_p.so.%%FULLVER%%.debug -%%QT_LIBDIR%%/libQt5MultimediaWidgets.la %%QT_LIBDIR%%/libQt5MultimediaWidgets.prl %%QT_LIBDIR%%/libQt5MultimediaWidgets.so %%QT_LIBDIR%%/libQt5MultimediaWidgets.so.5 diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index 874544a28d75..6f298abc2ae1 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -3,6 +3,7 @@ PORTNAME= network DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt4- diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist index 35e4bb0938f2..e1c15c5201ce 100644 --- a/net/qt4-network/pkg-plist +++ b/net/qt4-network/pkg-plist @@ -108,7 +108,6 @@ %%QT_INCDIR%%/QtNetwork/qtcpsocket.h %%QT_INCDIR%%/QtNetwork/qudpsocket.h %%QT_INCDIR%%/QtNetwork/qurlinfo.h -%%QT_LIBDIR%%/libQtNetwork.la %%QT_LIBDIR%%/libQtNetwork.prl %%QT_LIBDIR%%/libQtNetwork.so %%QT_LIBDIR%%/libQtNetwork.so.4 diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile index 202dcbc7a3e1..69002bf25a8f 100644 --- a/net/qt5-network/Makefile +++ b/net/qt5-network/Makefile @@ -2,6 +2,7 @@ PORTNAME= network DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt5- diff --git a/net/qt5-network/pkg-plist b/net/qt5-network/pkg-plist index b9620cdde709..ad98b171d97d 100644 --- a/net/qt5-network/pkg-plist +++ b/net/qt5-network/pkg-plist @@ -139,7 +139,6 @@ %%QT_LIBDIR%%/cmake/Qt5Network/Qt5NetworkConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Network/Qt5NetworkConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5Network/Qt5Network_QGenericEnginePlugin.cmake -%%QT_LIBDIR%%/libQt5Network.la %%QT_LIBDIR%%/libQt5Network.prl %%QT_LIBDIR%%/libQt5Network.so %%QT_LIBDIR%%/libQt5Network.so.5 diff --git a/print/qt5-printsupport/Makefile b/print/qt5-printsupport/Makefile index 3bcde6896933..50f6c830a8f4 100644 --- a/print/qt5-printsupport/Makefile +++ b/print/qt5-printsupport/Makefile @@ -2,6 +2,7 @@ PORTNAME= printsupport DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= print PKGNAMEPREFIX= qt5- diff --git a/print/qt5-printsupport/pkg-plist b/print/qt5-printsupport/pkg-plist index 1e470c410f64..bc28a8ee8b28 100644 --- a/print/qt5-printsupport/pkg-plist +++ b/print/qt5-printsupport/pkg-plist @@ -34,7 +34,6 @@ %%QT_INCDIR%%/QtPrintSupport/qtprintsupportversion.h %%QT_LIBDIR%%/cmake/Qt5PrintSupport/Qt5PrintSupportConfig.cmake %%QT_LIBDIR%%/cmake/Qt5PrintSupport/Qt5PrintSupportConfigVersion.cmake -%%QT_LIBDIR%%/libQt5PrintSupport.la %%QT_LIBDIR%%/libQt5PrintSupport.prl %%QT_LIBDIR%%/libQt5PrintSupport.so %%QT_LIBDIR%%/libQt5PrintSupport.so.5 diff --git a/textproc/clucene-qt4/Makefile b/textproc/clucene-qt4/Makefile index cff5e5a3f878..13b8fe2dd1f2 100644 --- a/textproc/clucene-qt4/Makefile +++ b/textproc/clucene-qt4/Makefile @@ -3,6 +3,7 @@ PORTNAME= clucene DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/textproc/clucene-qt4/pkg-plist b/textproc/clucene-qt4/pkg-plist index f78fbf6f30b1..e48bbad56490 100644 --- a/textproc/clucene-qt4/pkg-plist +++ b/textproc/clucene-qt4/pkg-plist @@ -1,4 +1,3 @@ -%%QT_LIBDIR%%/libQtCLucene.la %%QT_LIBDIR%%/libQtCLucene.prl %%QT_LIBDIR%%/libQtCLucene.so %%QT_LIBDIR%%/libQtCLucene.so.4 diff --git a/textproc/clucene-qt5/Makefile b/textproc/clucene-qt5/Makefile index c9b895c8d9ed..a031df31fd7e 100644 --- a/textproc/clucene-qt5/Makefile +++ b/textproc/clucene-qt5/Makefile @@ -2,6 +2,7 @@ PORTNAME= clucene DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- diff --git a/textproc/clucene-qt5/pkg-plist b/textproc/clucene-qt5/pkg-plist index beccfb97957d..a7b284b98dde 100644 --- a/textproc/clucene-qt5/pkg-plist +++ b/textproc/clucene-qt5/pkg-plist @@ -20,7 +20,6 @@ %%QT_INCDIR%%/QtCLucene/QtCLuceneDepends %%QT_INCDIR%%/QtCLucene/QtCLuceneVersion %%QT_INCDIR%%/QtCLucene/qtcluceneversion.h -%%QT_LIBDIR%%/libQt5CLucene.la %%QT_LIBDIR%%/libQt5CLucene.prl %%QT_LIBDIR%%/libQt5CLucene.so %%QT_LIBDIR%%/libQt5CLucene.so.5 diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index 9039e335239e..d70e941022ea 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -3,6 +3,7 @@ PORTNAME= xml DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist index e75e0cc86ba3..5f0b40777983 100644 --- a/textproc/qt4-xml/pkg-plist +++ b/textproc/qt4-xml/pkg-plist @@ -48,7 +48,6 @@ %%QT_INCDIR%%/QtXml/qdom.h %%QT_INCDIR%%/QtXml/qxml.h %%QT_INCDIR%%/QtXml/qxmlstream.h -%%QT_LIBDIR%%/libQtXml.la %%QT_LIBDIR%%/libQtXml.prl %%QT_LIBDIR%%/libQtXml.so %%QT_LIBDIR%%/libQtXml.so.4 diff --git a/textproc/qt4-xmlpatterns/Makefile b/textproc/qt4-xmlpatterns/Makefile index e878a0f1d91e..11012253c4b7 100644 --- a/textproc/qt4-xmlpatterns/Makefile +++ b/textproc/qt4-xmlpatterns/Makefile @@ -3,6 +3,7 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- diff --git a/textproc/qt4-xmlpatterns/pkg-plist b/textproc/qt4-xmlpatterns/pkg-plist index 35883fdd9d5f..e581f0b1e7ec 100644 --- a/textproc/qt4-xmlpatterns/pkg-plist +++ b/textproc/qt4-xmlpatterns/pkg-plist @@ -44,7 +44,6 @@ %%QT_INCDIR%%/QtXmlPatterns/qxmlschema.h %%QT_INCDIR%%/QtXmlPatterns/qxmlschemavalidator.h %%QT_INCDIR%%/QtXmlPatterns/qxmlserializer.h -%%QT_LIBDIR%%/libQtXmlPatterns.la %%QT_LIBDIR%%/libQtXmlPatterns.prl %%QT_LIBDIR%%/libQtXmlPatterns.so %%QT_LIBDIR%%/libQtXmlPatterns.so.4 diff --git a/textproc/qt5-xml/Makefile b/textproc/qt5-xml/Makefile index 353289b12cf5..f1b9b4cb677d 100644 --- a/textproc/qt5-xml/Makefile +++ b/textproc/qt5-xml/Makefile @@ -2,6 +2,7 @@ PORTNAME= xml DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- diff --git a/textproc/qt5-xml/pkg-plist b/textproc/qt5-xml/pkg-plist index 31b045534782..4f688257ab3a 100644 --- a/textproc/qt5-xml/pkg-plist +++ b/textproc/qt5-xml/pkg-plist @@ -38,7 +38,6 @@ %%QT_INCDIR%%/QtXml/qxml.h %%QT_LIBDIR%%/cmake/Qt5Xml/Qt5XmlConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Xml/Qt5XmlConfigVersion.cmake -%%QT_LIBDIR%%/libQt5Xml.la %%QT_LIBDIR%%/libQt5Xml.prl %%QT_LIBDIR%%/libQt5Xml.so %%QT_LIBDIR%%/libQt5Xml.so.5 diff --git a/textproc/qt5-xmlpatterns/Makefile b/textproc/qt5-xmlpatterns/Makefile index b7e38388f15d..d5c5dea1e7c0 100644 --- a/textproc/qt5-xmlpatterns/Makefile +++ b/textproc/qt5-xmlpatterns/Makefile @@ -2,6 +2,7 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt5- diff --git a/textproc/qt5-xmlpatterns/pkg-plist b/textproc/qt5-xmlpatterns/pkg-plist index c893038e2fac..4e59ced0b826 100644 --- a/textproc/qt5-xmlpatterns/pkg-plist +++ b/textproc/qt5-xmlpatterns/pkg-plist @@ -402,7 +402,6 @@ %%QT_INCDIR%%/QtXmlPatterns/qxmlserializer.h %%QT_LIBDIR%%/cmake/Qt5XmlPatterns/Qt5XmlPatternsConfig.cmake %%QT_LIBDIR%%/cmake/Qt5XmlPatterns/Qt5XmlPatternsConfigVersion.cmake -%%QT_LIBDIR%%/libQt5XmlPatterns.la %%QT_LIBDIR%%/libQt5XmlPatterns.prl %%QT_LIBDIR%%/libQt5XmlPatterns.so %%QT_LIBDIR%%/libQt5XmlPatterns.so.5 diff --git a/www/webkit-qt4/Makefile b/www/webkit-qt4/Makefile index fb34e6aac9a9..9d96d8a615e8 100644 --- a/www/webkit-qt4/Makefile +++ b/www/webkit-qt4/Makefile @@ -3,6 +3,7 @@ PORTNAME= webkit DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= www PKGNAMEPREFIX= qt4- @@ -92,7 +93,6 @@ post-configure: ${WRKSRC}/lib/pkgconfig/QtWebKit.pc # QtWebKit is statically linked with jscore, remove the latest. ${REINPLACE_CMD} -e 's|-L../JavaScriptCore/release||; s|-ljscore||' \ - ${WRKSRC}/lib/pkgconfig/QtWebKit.pc \ - ${WRKSRC}/lib/libQtWebKit.la + ${WRKSRC}/lib/pkgconfig/QtWebKit.pc .include diff --git a/www/webkit-qt4/pkg-plist b/www/webkit-qt4/pkg-plist index 77a58d491079..19f403a99234 100644 --- a/www/webkit-qt4/pkg-plist +++ b/www/webkit-qt4/pkg-plist @@ -59,7 +59,6 @@ %%QT_IMPORTDIR%%/QtWebKit/libqmlwebkitplugin.so %%DEBUG%%%%QT_IMPORTDIR%%/QtWebKit/libqmlwebkitplugin.so.debug %%QT_IMPORTDIR%%/QtWebKit/qmldir -%%QT_LIBDIR%%/libQtWebKit.la %%QT_LIBDIR%%/libQtWebKit.prl %%QT_LIBDIR%%/libQtWebKit.so %%QT_LIBDIR%%/libQtWebKit.so.4 diff --git a/www/webkit-qt5/Makefile b/www/webkit-qt5/Makefile index 1b02ae73cbb1..64e30f992689 100644 --- a/www/webkit-qt5/Makefile +++ b/www/webkit-qt5/Makefile @@ -2,7 +2,7 @@ PORTNAME= webkit DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www PKGNAMEPREFIX= qt5- diff --git a/www/webkit-qt5/pkg-plist b/www/webkit-qt5/pkg-plist index 7135111e68fb..0dad1e97c890 100644 --- a/www/webkit-qt5/pkg-plist +++ b/www/webkit-qt5/pkg-plist @@ -84,14 +84,12 @@ %%QT_LIBDIR%%/cmake/Qt5WebKit/Qt5WebKitConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfig.cmake %%QT_LIBDIR%%/cmake/Qt5WebKitWidgets/Qt5WebKitWidgetsConfigVersion.cmake -%%QT_LIBDIR%%/libQt5WebKit.la %%QT_LIBDIR%%/libQt5WebKit.prl %%QT_LIBDIR%%/libQt5WebKit.so %%QT_LIBDIR%%/libQt5WebKit.so.5 %%QT_LIBDIR%%/libQt5WebKit.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5WebKit.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5WebKit.so.%%FULLVER%%.debug -%%QT_LIBDIR%%/libQt5WebKitWidgets.la %%QT_LIBDIR%%/libQt5WebKitWidgets.prl %%QT_LIBDIR%%/libQt5WebKitWidgets.so %%QT_LIBDIR%%/libQt5WebKitWidgets.so.5 diff --git a/x11-toolkits/qt4-declarative/Makefile b/x11-toolkits/qt4-declarative/Makefile index cabc2068d73c..c30d0270ff4e 100644 --- a/x11-toolkits/qt4-declarative/Makefile +++ b/x11-toolkits/qt4-declarative/Makefile @@ -2,6 +2,7 @@ PORTNAME= declarative DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/x11-toolkits/qt4-declarative/pkg-plist b/x11-toolkits/qt4-declarative/pkg-plist index c86d5e42d212..c3c195deeece 100644 --- a/x11-toolkits/qt4-declarative/pkg-plist +++ b/x11-toolkits/qt4-declarative/pkg-plist @@ -68,7 +68,6 @@ %%QT_INCDIR%%/QtDeclarative/qdeclarativepropertyvaluesource.h %%QT_INCDIR%%/QtDeclarative/qdeclarativescriptstring.h %%QT_INCDIR%%/QtDeclarative/qdeclarativeview.h -%%QT_LIBDIR%%/libQtDeclarative.la %%QT_LIBDIR%%/libQtDeclarative.prl %%QT_LIBDIR%%/libQtDeclarative.so %%QT_LIBDIR%%/libQtDeclarative.so.4 diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile index c1e9227b7828..2879935f6d22 100644 --- a/x11-toolkits/qt4-gui/Makefile +++ b/x11-toolkits/qt4-gui/Makefile @@ -3,6 +3,7 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4- diff --git a/x11-toolkits/qt4-gui/pkg-plist b/x11-toolkits/qt4-gui/pkg-plist index 98d0249e037e..ffa4d7e20930 100644 --- a/x11-toolkits/qt4-gui/pkg-plist +++ b/x11-toolkits/qt4-gui/pkg-plist @@ -1145,7 +1145,6 @@ %%QT_INCDIR%%/QtGui/qwsutils_qws.h %%QT_INCDIR%%/QtGui/qx11embed_x11.h %%QT_INCDIR%%/QtGui/qx11info_x11.h -%%QT_LIBDIR%%/libQtGui.la %%QT_LIBDIR%%/libQtGui.prl %%QT_LIBDIR%%/libQtGui.so %%QT_LIBDIR%%/libQtGui.so.4 diff --git a/x11-toolkits/qt5-declarative/Makefile b/x11-toolkits/qt5-declarative/Makefile index 9eaa60bc1837..5fe197d1add9 100644 --- a/x11-toolkits/qt5-declarative/Makefile +++ b/x11-toolkits/qt5-declarative/Makefile @@ -2,7 +2,7 @@ PORTNAME= declarative DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-declarative/pkg-plist b/x11-toolkits/qt5-declarative/pkg-plist index a0d51f356948..834aa25672c6 100644 --- a/x11-toolkits/qt5-declarative/pkg-plist +++ b/x11-toolkits/qt5-declarative/pkg-plist @@ -215,7 +215,6 @@ %%QT_INCDIR%%/QtDeclarative/qtdeclarativeversion.h %%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5DeclarativeConfig.cmake %%QT_LIBDIR%%/cmake/Qt5Declarative/Qt5DeclarativeConfigVersion.cmake -%%QT_LIBDIR%%/libQt5Declarative.la %%QT_LIBDIR%%/libQt5Declarative.prl %%QT_LIBDIR%%/libQt5Declarative.so %%QT_LIBDIR%%/libQt5Declarative.so.5 diff --git a/x11-toolkits/qt5-gui/Makefile b/x11-toolkits/qt5-gui/Makefile index 025b063a4dfe..1ca0a2186cc7 100644 --- a/x11-toolkits/qt5-gui/Makefile +++ b/x11-toolkits/qt5-gui/Makefile @@ -2,7 +2,7 @@ PORTNAME= gui DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits graphics PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-gui/pkg-plist b/x11-toolkits/qt5-gui/pkg-plist index 60504a85dd1b..35e3b76bd3fd 100644 --- a/x11-toolkits/qt5-gui/pkg-plist +++ b/x11-toolkits/qt5-gui/pkg-plist @@ -557,7 +557,6 @@ %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake %%QT_LIBDIR%%/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake -%%QT_LIBDIR%%/libQt5Gui.la %%QT_LIBDIR%%/libQt5Gui.prl %%QT_LIBDIR%%/libQt5Gui.so %%QT_LIBDIR%%/libQt5Gui.so.5 @@ -565,7 +564,6 @@ %%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5Gui.so.%%FULLVER%%.debug %%QT_LIBDIR%%/libQt5PlatformSupport.a -%%QT_LIBDIR%%/libQt5PlatformSupport.la %%QT_LIBDIR%%/libQt5PlatformSupport.prl %%QT_MKSPECDIR%%/modules/qt_lib_gui.pri %%QT_MKSPECDIR%%/modules/qt_lib_gui_private.pri diff --git a/x11-toolkits/qt5-quick/Makefile b/x11-toolkits/qt5-quick/Makefile index 7cf8c130bd1c..b4ef9a2247ac 100644 --- a/x11-toolkits/qt5-quick/Makefile +++ b/x11-toolkits/qt5-quick/Makefile @@ -2,6 +2,7 @@ PORTNAME= quick DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-quick/pkg-plist b/x11-toolkits/qt5-quick/pkg-plist index 037f15573c88..d6088273ef2b 100644 --- a/x11-toolkits/qt5-quick/pkg-plist +++ b/x11-toolkits/qt5-quick/pkg-plist @@ -248,21 +248,18 @@ %%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake %%QT_LIBDIR%%/cmake/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_AccessibleQuickFactory.cmake -%%QT_LIBDIR%%/libQt5Quick.la %%QT_LIBDIR%%/libQt5Quick.prl %%QT_LIBDIR%%/libQt5Quick.so %%QT_LIBDIR%%/libQt5Quick.so.5 %%QT_LIBDIR%%/libQt5Quick.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5Quick.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5Quick.so.%%FULLVER%%.debug -%%QT_LIBDIR%%/libQt5QuickParticles.la %%QT_LIBDIR%%/libQt5QuickParticles.prl %%QT_LIBDIR%%/libQt5QuickParticles.so %%QT_LIBDIR%%/libQt5QuickParticles.so.5 %%QT_LIBDIR%%/libQt5QuickParticles.so.%%SHORTVER%% %%QT_LIBDIR%%/libQt5QuickParticles.so.%%FULLVER%% %%DEBUG%%%%QT_LIBDIR%%/libQt5QuickParticles.so.%%FULLVER%%.debug -%%QT_LIBDIR%%/libQt5QuickTest.la %%QT_LIBDIR%%/libQt5QuickTest.prl %%QT_LIBDIR%%/libQt5QuickTest.so %%QT_LIBDIR%%/libQt5QuickTest.so.5 diff --git a/x11-toolkits/qt5-widgets/Makefile b/x11-toolkits/qt5-widgets/Makefile index 983145a7c900..fd07ab16cce2 100644 --- a/x11-toolkits/qt5-widgets/Makefile +++ b/x11-toolkits/qt5-widgets/Makefile @@ -2,6 +2,7 @@ PORTNAME= widgets DISTVERSION= ${QT5_VERSION} +PORTREVISION= 1 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- diff --git a/x11-toolkits/qt5-widgets/pkg-plist b/x11-toolkits/qt5-widgets/pkg-plist index dfae08d4db16..4f4f40cd7471 100644 --- a/x11-toolkits/qt5-widgets/pkg-plist +++ b/x11-toolkits/qt5-widgets/pkg-plist @@ -481,7 +481,6 @@ %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsConfigVersion.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5WidgetsMacros.cmake %%QT_LIBDIR%%/cmake/Qt5Widgets/Qt5Widgets_AccessibleFactory.cmake -%%QT_LIBDIR%%/libQt5Widgets.la %%QT_LIBDIR%%/libQt5Widgets.prl %%QT_LIBDIR%%/libQt5Widgets.so %%QT_LIBDIR%%/libQt5Widgets.so.5