Index: Mk/bsd.qt.mk =================================================================== --- Mk/bsd.qt.mk (revision 430609) +++ Mk/bsd.qt.mk (working copy) @@ -171,7 +171,9 @@ . if ${QT_DIST} == "base" || ${_QT_VERSION:M4*} . if ${_QT_VERSION:M4*} _EXTRA_PATCHES_QT4= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src-corelib-global-qglobal.h \ - ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-libtool \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h \ + ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_arch_qatomic_arm.h . else _EXTRA_PATCHES_QT5= ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-src_corelib_global_qcompilerdetection.h \ ${.CURDIR:H:H}/devel/${_QT_RELNAME}/files/extrapatch-mkspecs_features_qt__module.prf Index: accessibility/qt4-accessible/Makefile =================================================================== --- accessibility/qt4-accessible/Makefile (revision 430609) +++ accessibility/qt4-accessible/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= accessible DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= accessibility PKGNAMEPREFIX= qt4- Index: chinese/qt4-codecs-cn/Makefile =================================================================== --- chinese/qt4-codecs-cn/Makefile (revision 430609) +++ chinese/qt4-codecs-cn/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -cn Index: chinese/qt4-codecs-tw/Makefile =================================================================== --- chinese/qt4-codecs-tw/Makefile (revision 430609) +++ chinese/qt4-codecs-tw/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= chinese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tw Index: databases/qt4-mysql-plugin/Makefile =================================================================== --- databases/qt4-mysql-plugin/Makefile (revision 430609) +++ databases/qt4-mysql-plugin/Makefile (working copy) @@ -1,7 +1,7 @@ # Created by: Kay Lehmann # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Qt MySQL database plugin DB= mysql Index: databases/qt4-odbc-plugin/Makefile =================================================================== --- databases/qt4-odbc-plugin/Makefile (revision 430609) +++ databases/qt4-odbc-plugin/Makefile (working copy) @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 DB= odbc COMMENT= Qt Open Database Connectivity plugin Index: databases/qt4-pgsql-plugin/Makefile =================================================================== --- databases/qt4-pgsql-plugin/Makefile (revision 430609) +++ databases/qt4-pgsql-plugin/Makefile (working copy) @@ -1,7 +1,7 @@ # Created by: Lauri Watts # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Qt PostgreSQL database plugin DB= psql Index: databases/qt4-sql/Makefile =================================================================== --- databases/qt4-sql/Makefile (revision 430609) +++ databases/qt4-sql/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= sql DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= databases PKGNAMEPREFIX= qt4- Index: databases/qt4-sqlite-plugin/Makefile =================================================================== --- databases/qt4-sqlite-plugin/Makefile (revision 430609) +++ databases/qt4-sqlite-plugin/Makefile (working copy) @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 1 +PORTREVISION= 2 COMMENT= Qt SQLite 2 database plugin DB= sqlite2 Index: databases/qt4-sqlite3-plugin/Makefile =================================================================== --- databases/qt4-sqlite3-plugin/Makefile (revision 430609) +++ databases/qt4-sqlite3-plugin/Makefile (working copy) @@ -1,7 +1,7 @@ # Created by: Michael Nottebrock # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 3 COMMENT= Qt SQLite 3 database plugin DB= sqlite Index: devel/dbus-qt4/Makefile =================================================================== --- devel/dbus-qt4/Makefile (revision 430609) +++ devel/dbus-qt4/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= dbus DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h =================================================================== --- devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h (nonexistent) +++ devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h (working copy) @@ -0,0 +1,10 @@ +--- src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h.orig 2014-04-10 22:37:12.000000000 +0400 ++++ src/3rdparty/javascriptcore/JavaScriptCore/wtf/Platform.h 2014-12-20 07:17:24.000000000 +0300 +@@ -254,6 +254,7 @@ + #elif defined(__ARM_ARCH_6__) \ + || defined(__ARM_ARCH_6J__) \ + || defined(__ARM_ARCH_6K__) \ ++ || defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6T2__) \ Property changes on: devel/qt4/files/extrapatch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Platform.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h =================================================================== --- devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h (nonexistent) +++ devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h (working copy) @@ -0,0 +1,10 @@ +--- src/corelib/arch/qatomic_arm.h.orig 2016-04-20 19:50:29 UTC ++++ src/corelib/arch/qatomic_arm.h +@@ -57,6 +57,7 @@ QT_END_INCLUDE_HEADER + || defined(__ARM_ARCH_6T2__) \ + || defined(__ARM_ARCH_6Z__) \ + || defined(__ARM_ARCH_6K__) \ ++ || defined(__ARM_ARCH_6KZ__) \ + || defined(__ARM_ARCH_6ZK__) \ + || defined(__ARM_ARCH_6M__) \ + || (defined(__TARGET_ARCH_ARM) && (__TARGET_ARCH_ARM-0 >= 6)) Property changes on: devel/qt4/files/extrapatch-src_corelib_arch_qatomic_arm.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: devel/qt4-assistant-adp/Makefile =================================================================== --- devel/qt4-assistant-adp/Makefile (revision 430609) +++ devel/qt4-assistant-adp/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= assistant PORTVERSION= 4.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT PKGNAMEPREFIX= qt4- Index: devel/qt4-corelib/Makefile =================================================================== --- devel/qt4-corelib/Makefile (revision 430609) +++ devel/qt4-corelib/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= corelib DISTVERSION= ${QT4_VERSION} -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-help/Makefile =================================================================== --- devel/qt4-help/Makefile (revision 430609) +++ devel/qt4-help/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-help-tools/Makefile =================================================================== --- devel/qt4-help-tools/Makefile (revision 430609) +++ devel/qt4-help-tools/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= help DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -tools Index: devel/qt4-libqtassistantclient/Makefile =================================================================== --- devel/qt4-libqtassistantclient/Makefile (revision 430609) +++ devel/qt4-libqtassistantclient/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= libQtAssistantClient PORTVERSION= 4.6.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= QT PKGNAMEPREFIX= qt4- Index: devel/qt4-linguisttools/Makefile =================================================================== --- devel/qt4-linguisttools/Makefile (revision 430609) +++ devel/qt4-linguisttools/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= linguisttools DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-makeqpf/Makefile =================================================================== --- devel/qt4-makeqpf/Makefile (revision 430609) +++ devel/qt4-makeqpf/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= makeqpf DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-porting/Makefile =================================================================== --- devel/qt4-porting/Makefile (revision 430609) +++ devel/qt4-porting/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= porting DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-qdbusviewer/Makefile =================================================================== --- devel/qt4-qdbusviewer/Makefile (revision 430609) +++ devel/qt4-qdbusviewer/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= qdbusviewer DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-qdoc3/Makefile =================================================================== --- devel/qt4-qdoc3/Makefile (revision 430609) +++ devel/qt4-qdoc3/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= qdoc3 DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel textproc PKGNAMEPREFIX= qt4- Index: devel/qt4-qt3support/Makefile =================================================================== --- devel/qt4-qt3support/Makefile (revision 430609) +++ devel/qt4-qt3support/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= qt3support DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel x11-toolkits PKGNAMEPREFIX= qt4- Index: devel/qt4-qvfb/Makefile =================================================================== --- devel/qt4-qvfb/Makefile (revision 430609) +++ devel/qt4-qvfb/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= qvfb DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-script/Makefile =================================================================== --- devel/qt4-script/Makefile (revision 430609) +++ devel/qt4-script/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= script DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-testlib/Makefile =================================================================== --- devel/qt4-testlib/Makefile (revision 430609) +++ devel/qt4-testlib/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= testlib DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: devel/qt4-uic3/Makefile =================================================================== --- devel/qt4-uic3/Makefile (revision 430609) +++ devel/qt4-uic3/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= uic3 DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= devel PKGNAMEPREFIX= qt4- Index: graphics/qt4-iconengines/Makefile =================================================================== --- graphics/qt4-iconengines/Makefile (revision 430609) +++ graphics/qt4-iconengines/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= iconengines DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: graphics/qt4-imageformats/Makefile =================================================================== --- graphics/qt4-imageformats/Makefile (revision 430609) +++ graphics/qt4-imageformats/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= imageformats DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: graphics/qt4-opengl/Makefile =================================================================== --- graphics/qt4-opengl/Makefile (revision 430609) +++ graphics/qt4-opengl/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= opengl DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: graphics/qt4-pixeltool/Makefile =================================================================== --- graphics/qt4-pixeltool/Makefile (revision 430609) +++ graphics/qt4-pixeltool/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= pixeltool DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: graphics/qt4-svg/Makefile =================================================================== --- graphics/qt4-svg/Makefile (revision 430609) +++ graphics/qt4-svg/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= svg DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= graphics PKGNAMEPREFIX= qt4- Index: japanese/qt4-codecs-jp/Makefile =================================================================== --- japanese/qt4-codecs-jp/Makefile (revision 430609) +++ japanese/qt4-codecs-jp/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= japanese PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -jp Index: korean/qt4-codecs-kr/Makefile =================================================================== --- korean/qt4-codecs-kr/Makefile (revision 430609) +++ korean/qt4-codecs-kr/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= codecs DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= korean PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -kr Index: multimedia/qt4-multimedia/Makefile =================================================================== --- multimedia/qt4-multimedia/Makefile (revision 430609) +++ multimedia/qt4-multimedia/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= multimedia DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= multimedia PKGNAMEPREFIX= qt4- Index: net/qt4-network/Makefile =================================================================== --- net/qt4-network/Makefile (revision 430609) +++ net/qt4-network/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= network DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= net ipv6 PKGNAMEPREFIX= qt4- Index: textproc/clucene-qt4/Makefile =================================================================== --- textproc/clucene-qt4/Makefile (revision 430609) +++ textproc/clucene-qt4/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= clucene DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Index: textproc/qt4-xml/Makefile =================================================================== --- textproc/qt4-xml/Makefile (revision 430609) +++ textproc/qt4-xml/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= xml DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Index: textproc/qt4-xmlpatterns/Makefile =================================================================== --- textproc/qt4-xmlpatterns/Makefile (revision 430609) +++ textproc/qt4-xmlpatterns/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= xmlpatterns DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Index: textproc/qt4-xmlpatterns-tool/Makefile =================================================================== --- textproc/qt4-xmlpatterns-tool/Makefile (revision 430609) +++ textproc/qt4-xmlpatterns-tool/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= xmlpatterns-tool DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= textproc PKGNAMEPREFIX= qt4- Index: x11/qt4-graphicssystems-opengl/Makefile =================================================================== --- x11/qt4-graphicssystems-opengl/Makefile (revision 430609) +++ x11/qt4-graphicssystems-opengl/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= graphicssystems DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt4- PKGNAMESUFFIX= -opengl Index: x11/qt4-inputmethods/Makefile =================================================================== --- x11/qt4-inputmethods/Makefile (revision 430609) +++ x11/qt4-inputmethods/Makefile (working copy) @@ -3,6 +3,7 @@ PORTNAME= inputmethods DISTVERSION= ${QT4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 PKGNAMEPREFIX= qt4- Index: x11-themes/qt4-style-Kvantum/Makefile =================================================================== --- x11-themes/qt4-style-Kvantum/Makefile (revision 430609) +++ x11-themes/qt4-style-Kvantum/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= Kvantum PORTVERSION= 0.10.2 +PORTREVISION= 1 DISTVERSIONPREFIX= V CATEGORIES= x11-themes PKGNAMEPREFIX= qt4-style- Index: x11-themes/qt4-style-float/Makefile =================================================================== --- x11-themes/qt4-style-float/Makefile (revision 430609) +++ x11-themes/qt4-style-float/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= float PORTVERSION= 0.1a2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \ http://mirror.amdmi3.ru/distfiles/ Index: x11-themes/qt4-style-phase/Makefile =================================================================== --- x11-themes/qt4-style-phase/Makefile (revision 430609) +++ x11-themes/qt4-style-phase/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= phase PORTVERSION= 0.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://kde-look.org/CONTENT/content-files/ \ http://mirror.amdmi3.ru/distfiles/ Index: x11-themes/qt4-style-quantumstyle/Makefile =================================================================== --- x11-themes/qt4-style-quantumstyle/Makefile (revision 430609) +++ x11-themes/qt4-style-quantumstyle/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= quantumstyle DISTVERSION= rc6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-themes MASTER_SITES= http://saidlankri.free.fr/ \ http://mirror.amdmi3.ru/distfiles/ Index: x11-themes/qtcurve-qt4/Makefile =================================================================== --- x11-themes/qtcurve-qt4/Makefile (revision 430609) +++ x11-themes/qtcurve-qt4/Makefile (working copy) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= qtcurve -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= QtCurve widget style for Qt 4 Index: x11-toolkits/qt4-gui/Makefile =================================================================== --- x11-toolkits/qt4-gui/Makefile (revision 430609) +++ x11-toolkits/qt4-gui/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME= gui DISTVERSION= ${QT4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt4-