qt5: update to 5.10.0

2+ years worth of bug fixes and feature enhancements

4 files changed, 21 insertions, 19 deletions

diff --git a/x11/qt5-qtwebsockets/Makefile b/x11/qt5-qtwebsockets/Makefile
index 09353d852c4..1aa08b936c7 100644
--- a/x11/qt5-qtwebsockets/Makefile
+++ b/x11/qt5-qtwebsockets/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/17 19:30:48 markd Exp $
 
-DISTNAME=	qtwebsockets-opensource-src-${QTVERSION}
-PKGNAME=	qt5-websockets-${QTVERSION}
-PKGREVISION=	10
+DISTNAME=	qtwebsockets-everywhere-src-${QTVERSION}
+PKGNAME=	qt5-qtwebsockets-${QTVERSION}
 COMMENT=	Qt5 module for websockets
 
 MAKE_ENV+=		QTDIR=${QTDIR}
@@ -17,6 +16,5 @@ post-install:
 	ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
-
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/qt5-qtwebsockets/PLIST b/x11/qt5-qtwebsockets/PLIST
index 39c50262425..3703f504788 100644
--- a/x11/qt5-qtwebsockets/PLIST
+++ b/x11/qt5-qtwebsockets/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/05/03 07:32:54 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/01/17 19:30:48 markd Exp $
 lib/pkgconfig/Qt5WebSockets.pc
 qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qdefaultmaskgenerator_p.h
 qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qsslserver_p.h
@@ -13,6 +13,7 @@ qt5/include/QtWebSockets/${PKGVERSION}/QtWebSockets/private/qwebsocketserver_p.h
 qt5/include/QtWebSockets/QMaskGenerator
 qt5/include/QtWebSockets/QWebSocket
 qt5/include/QtWebSockets/QWebSocketCorsAuthenticator
+qt5/include/QtWebSockets/QWebSocketProtocol
 qt5/include/QtWebSockets/QWebSocketServer
 qt5/include/QtWebSockets/QtWebSockets
 qt5/include/QtWebSockets/QtWebSocketsDepends
@@ -26,12 +27,15 @@ qt5/include/QtWebSockets/qwebsockets_global.h
 qt5/include/QtWebSockets/qwebsocketserver.h
 qt5/lib/cmake/Qt5WebSockets/Qt5WebSocketsConfig.cmake
 qt5/lib/cmake/Qt5WebSockets/Qt5WebSocketsConfigVersion.cmake
-qt5/lib/libQt5WebSockets.la
 qt5/lib/libQt5WebSockets.prl
+qt5/lib/libQt5WebSockets.so
+qt5/lib/libQt5WebSockets.so.${PKGVERSION}
+qt5/lib/libQt5WebSockets.so.5
+qt5/lib/libQt5WebSockets.so.5.10
 qt5/lib/pkgconfig/Qt5WebSockets.pc
 qt5/mkspecs/modules/qt_lib_websockets.pri
 qt5/mkspecs/modules/qt_lib_websockets_private.pri
 qt5/qml/Qt/WebSockets/qmldir
-qt5/qml/QtWebSockets/libdeclarative_qmlwebsockets.la
+qt5/qml/QtWebSockets/libdeclarative_qmlwebsockets.so
 qt5/qml/QtWebSockets/plugins.qmltypes
 qt5/qml/QtWebSockets/qmldir
diff --git a/x11/qt5-qtwebsockets/buildlink3.mk b/x11/qt5-qtwebsockets/buildlink3.mk
index 6be09b47d53..4bc245f8a3e 100644
--- a/x11/qt5-qtwebsockets/buildlink3.mk
+++ b/x11/qt5-qtwebsockets/buildlink3.mk
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.12 2017/11/30 16:45:13 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.13 2018/01/17 19:30:48 markd Exp $
 
-BUILDLINK_TREE+=	qt5-websockets
+BUILDLINK_TREE+=	qt5-qtwebsockets
 
 .if !defined(QT5_WEBSOCKETS_BUILDLINK3_MK)
 QT5_WEBSOCKETS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-websockets+=	qt5-websockets>=5.5.1
-BUILDLINK_ABI_DEPENDS.qt5-websockets+=	qt5-websockets>=5.5.1nb10
-BUILDLINK_PKGSRCDIR.qt5-websockets?=	../../x11/qt5-qtwebsockets
+BUILDLINK_API_DEPENDS.qt5-qtwebsockets+=	qt5-qtwebsockets>=5.9.1
+BUILDLINK_ABI_DEPENDS.qt5-qtwebsockets+=	qt5-qtwebsockets>=5.9.1
+BUILDLINK_PKGSRCDIR.qt5-qtwebsockets?=		../../x11/qt5-qtwebsockets
 
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"
 .endif	# QT5_WEBSOCKETS_BUILDLINK3_MK
 
-BUILDLINK_TREE+=	-qt5-websockets
+BUILDLINK_TREE+=	-qt5-qtwebsockets
diff --git a/x11/qt5-qtwebsockets/distinfo b/x11/qt5-qtwebsockets/distinfo
index 9a2fe657012..7b2f0afc9d3 100644
--- a/x11/qt5-qtwebsockets/distinfo
+++ b/x11/qt5-qtwebsockets/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/10/26 19:04:01 adam Exp $
+$NetBSD: distinfo,v 1.3 2018/01/17 19:30:48 markd Exp $
 
-SHA1 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 76f40fa6b8c075651c3abe2293a33fdc70f8944b
-RMD160 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 83dcc5d07dca6c1cccfaed13cd16fde940ad0b94
-SHA512 (qtwebsockets-opensource-src-5.5.1.tar.xz) = 1172269ed99eb0ef73935bb7adfb353cf7ea17240d1370cefbdb648f84151d79d8e3738258444eef15356ef733beae4912507835edbb34028d0960406dc6257f
-Size (qtwebsockets-opensource-src-5.5.1.tar.xz) = 170440 bytes
+SHA1 (qtwebsockets-everywhere-src-5.10.0.tar.xz) = 74c77ab4382d40ac0142d88713b2072e9c014d47
+RMD160 (qtwebsockets-everywhere-src-5.10.0.tar.xz) = e3674dcf35d0165ce0537f328fc3f950c71844d2
+SHA512 (qtwebsockets-everywhere-src-5.10.0.tar.xz) = 553251de549c2c49664bfdddd57e4af378b9ff8e98b11b4a2dd422c96066fcce2dc5304aae4007ce863340a1efa8019f73db1ca5d458694b8cfb7b0837cbf95e
+Size (qtwebsockets-everywhere-src-5.10.0.tar.xz) = 220592 bytes