11 files changed, 54 insertions, 9 deletions

diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk
index 7c9a6d099fcc..23ae49d365dd 100644
--- a/Mk/bsd.qt.mk
+++ b/Mk/bsd.qt.mk
@@ -321,7 +321,7 @@ _USE_QT5_ONLY=	3d buildtools canvas3d charts concurrent connectivity \
 				qdbus qdoc qdoc-data qev qml quick quickcontrols \
 				quickcontrols2 scxml sensors serialbus serialport \
 				sql-tds uiplugin uitools virtualkeyboard webchannel \
-				websockets widgets x11extras
+				websockets websockets-qml widgets x11extras
 
 3d_PORT=		graphics/${_QT_RELNAME}-3d
 3d_LIB=		libQt${_QT_LIBVER}3DCore.so
@@ -595,6 +595,9 @@ webchannel_LIB=	libQt${_QT_LIBVER}WebChannel.so
 websockets_PORT=	www/${_QT_RELNAME}-websockets
 websockets_LIB=	libQt${_QT_LIBVER}WebSockets.so
 
+websockets-qml_PORT=	www/${_QT_RELNAME}-websockets-qml
+websockets-qml_LIB=	${QT_QMLDIR}/QtWebSockets/libdeclarative_qmlwebsockets.so
+
 webkit_PORT=		www/${_QT_RELNAME}-webkit
 webkit_LIB=	libQt${_QT_LIBVER}WebKit.so
 
diff --git a/multimedia/shotcut/Makefile b/multimedia/shotcut/Makefile
index 4675e48c0f3d..94628c8865fc 100644
--- a/multimedia/shotcut/Makefile
+++ b/multimedia/shotcut/Makefile
@@ -3,7 +3,7 @@
 PORTNAME=	shotcut
 PORTVERSION=	${FULLVERSION:R}
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	multimedia
 
 MAINTAINER=	avilla@FreeBSD.org
diff --git a/sysutils/sysadm-client/Makefile b/sysutils/sysadm-client/Makefile
index 7d73a4f4373e..c1810dc8a1b5 100644
--- a/sysutils/sysadm-client/Makefile
+++ b/sysutils/sysadm-client/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	sysadm-client
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/sysutils/sysadm/Makefile b/sysutils/sysadm/Makefile
index 4b6e9742fd92..b7fa13aef79d 100644
--- a/sysutils/sysadm/Makefile
+++ b/sysutils/sysadm/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	sysadm
 PORTVERSION=	1.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	sysutils
 
diff --git a/www/Makefile b/www/Makefile
index 2ad11a62a903..83a80843a8ad 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1860,6 +1860,7 @@
     SUBDIR += qt5-webchannel
     SUBDIR += qt5-webkit
     SUBDIR += qt5-websockets
+    SUBDIR += qt5-websockets-qml
     SUBDIR += quickie
     SUBDIR += qupzilla-qt4
     SUBDIR += qupzilla-qt5
diff --git a/www/qt5-websockets-qml/Makefile b/www/qt5-websockets-qml/Makefile
new file mode 100644
index 000000000000..3a75f8e41811
--- /dev/null
+++ b/www/qt5-websockets-qml/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME=	websockets-qml
+DISTVERSION=	${QT5_VERSION}
+CATEGORIES=	www
+PKGNAMEPREFIX=	qt5-
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Qt implementation of WebSocket protocol (QML bindings)
+
+USE_QT5=	buildtools_build core network qml quick websockets
+QT_DIST=	websockets
+USES=		qmake
+USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
+
+.include <bsd.port.mk>
diff --git a/www/qt5-websockets-qml/files/patch-src_src.pro b/www/qt5-websockets-qml/files/patch-src_src.pro
new file mode 100644
index 000000000000..75d47d8de009
--- /dev/null
+++ b/www/qt5-websockets-qml/files/patch-src_src.pro
@@ -0,0 +1,12 @@
+We only care about the qml bindings in 'imports'. 
+The proper part of websockets is built via www/qt5-websockets.
+
+--- src/src.pro.orig	2017-06-16 04:42:03 UTC
++++ src/src.pro
+@@ -1,5 +1,4 @@
+ TEMPLATE = subdirs
+ CONFIG += ordered
+ 
+-SUBDIRS += websockets
+-qtHaveModule(quick): SUBDIRS += imports
++SUBDIRS += imports
diff --git a/www/qt5-websockets-qml/pkg-plist b/www/qt5-websockets-qml/pkg-plist
new file mode 100644
index 000000000000..b0d479958304
--- /dev/null
+++ b/www/qt5-websockets-qml/pkg-plist
@@ -0,0 +1,5 @@
+%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so
+%%DEBUG%%%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so.debug
+%%QT_QMLDIR%%/QtWebSockets/plugins.qmltypes
+%%QT_QMLDIR%%/QtWebSockets/qmldir
+%%QT_QMLDIR%%/Qt/WebSockets/qmldir
diff --git a/www/qt5-websockets/Makefile b/www/qt5-websockets/Makefile
index b92cc23a1e32..a36312c8613b 100644
--- a/www/qt5-websockets/Makefile
+++ b/www/qt5-websockets/Makefile
@@ -2,13 +2,14 @@
 
 PORTNAME=	websockets
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	qt5-
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt implementation of WebSocket protocol
 
-USE_QT5=	buildtools_build core network qml quick
+USE_QT5=	buildtools_build core network
 QT_DIST=	${PORTNAME}
 USES=		qmake
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
diff --git a/www/qt5-websockets/files/patch-src_src.pro b/www/qt5-websockets/files/patch-src_src.pro
new file mode 100644
index 000000000000..77e1e6486625
--- /dev/null
+++ b/www/qt5-websockets/files/patch-src_src.pro
@@ -0,0 +1,11 @@
+Disable the build of the qml part.
+
+Splitting them out allows us to use websockets in non-gui applications.
+
+--- src/src.pro.orig	2017-06-16 04:39:03 UTC
++++ src/src.pro
+@@ -2,4 +2,3 @@ TEMPLATE = subdirs
+ CONFIG += ordered
+ 
+ SUBDIRS += websockets
+-qtHaveModule(quick): SUBDIRS += imports
diff --git a/www/qt5-websockets/pkg-plist b/www/qt5-websockets/pkg-plist
index cd0517f99a05..ccf9af5d94dd 100644
--- a/www/qt5-websockets/pkg-plist
+++ b/www/qt5-websockets/pkg-plist
@@ -32,9 +32,4 @@
 %%DEBUG%%%%QT_LIBDIR%%/libQt5WebSockets.so.%%FULLVER%%.debug
 %%QT_MKSPECDIR%%/modules/qt_lib_websockets.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_websockets_private.pri
-%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so
-%%DEBUG%%%%QT_QMLDIR%%/QtWebSockets/libdeclarative_qmlwebsockets.so.debug
-%%QT_QMLDIR%%/QtWebSockets/plugins.qmltypes
-%%QT_QMLDIR%%/QtWebSockets/qmldir
-%%QT_QMLDIR%%/Qt/WebSockets/qmldir
 libdata/pkgconfig/Qt5WebSockets.pc