krfb: update to 19.08.3 qt5/kf5 version

4 files changed, 158 insertions, 32 deletions

diff --git a/net/krfb/Makefile b/net/krfb/Makefile
index 9b4c975c257..4255c824583 100644
--- a/net/krfb/Makefile
+++ b/net/krfb/Makefile
@@ -1,18 +1,24 @@
-# $NetBSD: Makefile,v 1.27 2019/08/22 12:23:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.28 2019/11/30 19:35:11 markd Exp $
 
-DISTNAME=	krfb-${_KDE_VERSION}
-PKGREVISION=	15
+DISTNAME=	krfb-${KAPPSVER}
 CATEGORIES=	net
+
+HOMEPAGE=	https://kde.org/applications/system/krfb/
 COMMENT=	KDE desktop sharing
+LICENSE=	gnu-lgpl-v2 AND gnu-gpl-v2 AND gnu-fdl-v1.2
 
-LDFLAGS.SunOS+=	-lsocket -lnsl
+.include "../../meta-pkgs/kde/applications.mk"
 
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+BUILD_DEPENDS+=	kdoctools>=5.19.0:../../devel/kdoctools
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+USE_TOOLS+=	msgmerge pkg-config
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../net/kdnssd/buildlink3.mk"
+.include "../../net/libvncserver/buildlink3.mk"
+.include "../../security/kwallet/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
-
+.include "../../x11/kxmlgui/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/xcb-util-image/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/krfb/PLIST b/net/krfb/PLIST
index cdf5cadb4f6..4f9cadc8099 100644
--- a/net/krfb/PLIST
+++ b/net/krfb/PLIST
@@ -1,19 +1,122 @@
-@comment $NetBSD: PLIST,v 1.2 2016/01/10 19:18:03 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/11/30 19:35:11 markd Exp $
 bin/krfb
-lib/kde4/krfb_framebuffer_qt.so
-lib/kde4/krfb_framebuffer_x11.so
-lib/libkrfbprivate.so.${KDELIBSVER}
-share/applications/kde4/krfb.desktop
-share/doc/kde/HTML/en/krfb/common
-share/doc/kde/HTML/en/krfb/configuration_network.png
-share/doc/kde/HTML/en/krfb/configuration_security.png
-share/doc/kde/HTML/en/krfb/connection.png
-share/doc/kde/HTML/en/krfb/email_invitation.png
-share/doc/kde/HTML/en/krfb/index.cache.bz2
-share/doc/kde/HTML/en/krfb/index.docbook
-share/doc/kde/HTML/en/krfb/personal_invitation.png
-share/doc/kde/HTML/en/krfb/screenshot.png
-share/kde/apps/krfb/krfb.notifyrc
-share/kde4/services/krfb_framebuffer_qt.desktop
-share/kde4/services/krfb_framebuffer_x11.desktop
-share/kde4/servicetypes/krfb-framebuffer.desktop
+lib/libkrfbprivate.so.5
+lib/libkrfbprivate.so.5.0
+qt5/plugins/krfb/krfb_events_x11.so
+qt5/plugins/krfb/krfb_framebuffer_qt.so
+qt5/plugins/krfb/krfb_framebuffer_xcb.so
+share/applications/org.kde.krfb.desktop
+share/doc/HTML/ca/krfb/index.cache.bz2
+share/doc/HTML/ca/krfb/index.docbook
+share/doc/HTML/de/krfb/configuration_network.png
+share/doc/HTML/de/krfb/configuration_security.png
+share/doc/HTML/de/krfb/connection.png
+share/doc/HTML/de/krfb/email_invitation.png
+share/doc/HTML/de/krfb/index.cache.bz2
+share/doc/HTML/de/krfb/index.docbook
+share/doc/HTML/de/krfb/personal_invitation.png
+share/doc/HTML/de/krfb/screenshot.png
+share/doc/HTML/en/krfb/configuration_network.png
+share/doc/HTML/en/krfb/configuration_security.png
+share/doc/HTML/en/krfb/connection.png
+share/doc/HTML/en/krfb/index.cache.bz2
+share/doc/HTML/en/krfb/index.docbook
+share/doc/HTML/en/krfb/screenshot.png
+share/doc/HTML/es/krfb/index.cache.bz2
+share/doc/HTML/es/krfb/index.docbook
+share/doc/HTML/et/krfb/index.cache.bz2
+share/doc/HTML/et/krfb/index.docbook
+share/doc/HTML/fr/krfb/configuration_network.png
+share/doc/HTML/fr/krfb/configuration_security.png
+share/doc/HTML/fr/krfb/connection.png
+share/doc/HTML/fr/krfb/email_invitation.png
+share/doc/HTML/fr/krfb/index.cache.bz2
+share/doc/HTML/fr/krfb/index.docbook
+share/doc/HTML/fr/krfb/personal_invitation.png
+share/doc/HTML/fr/krfb/screenshot.png
+share/doc/HTML/it/krfb/index.cache.bz2
+share/doc/HTML/it/krfb/index.docbook
+share/doc/HTML/nl/krfb/index.cache.bz2
+share/doc/HTML/nl/krfb/index.docbook
+share/doc/HTML/pl/krfb/index.cache.bz2
+share/doc/HTML/pl/krfb/index.docbook
+share/doc/HTML/pt/krfb/index.cache.bz2
+share/doc/HTML/pt/krfb/index.docbook
+share/doc/HTML/pt_BR/krfb/index.cache.bz2
+share/doc/HTML/pt_BR/krfb/index.docbook
+share/doc/HTML/ru/krfb/index.cache.bz2
+share/doc/HTML/ru/krfb/index.docbook
+share/doc/HTML/sr/krfb/index.cache.bz2
+share/doc/HTML/sr/krfb/index.docbook
+share/doc/HTML/sv/krfb/configuration_access.png
+share/doc/HTML/sv/krfb/configuration_network.png
+share/doc/HTML/sv/krfb/configuration_session.png
+share/doc/HTML/sv/krfb/connection.png
+share/doc/HTML/sv/krfb/email_invitation.png
+share/doc/HTML/sv/krfb/index.cache.bz2
+share/doc/HTML/sv/krfb/index.docbook
+share/doc/HTML/sv/krfb/invitation_management.png
+share/doc/HTML/sv/krfb/personal_invitation.png
+share/doc/HTML/sv/krfb/screenshot.png
+share/doc/HTML/uk/krfb/index.cache.bz2
+share/doc/HTML/uk/krfb/index.docbook
+share/icons/hicolor/48x48/apps/krfb.png
+share/icons/hicolor/scalable/apps/krfb.svgz
+share/krfb/krfb.notifyrc
+share/kservicetypes5/krfb-events.desktop
+share/kservicetypes5/krfb-framebuffer.desktop
+share/locale/ar/LC_MESSAGES/krfb.mo
+share/locale/bg/LC_MESSAGES/krfb.mo
+share/locale/bs/LC_MESSAGES/krfb.mo
+share/locale/ca/LC_MESSAGES/krfb.mo
+share/locale/ca@valencia/LC_MESSAGES/krfb.mo
+share/locale/cs/LC_MESSAGES/krfb.mo
+share/locale/da/LC_MESSAGES/krfb.mo
+share/locale/de/LC_MESSAGES/krfb.mo
+share/locale/el/LC_MESSAGES/krfb.mo
+share/locale/en_GB/LC_MESSAGES/krfb.mo
+share/locale/eo/LC_MESSAGES/krfb.mo
+share/locale/es/LC_MESSAGES/krfb.mo
+share/locale/et/LC_MESSAGES/krfb.mo
+share/locale/eu/LC_MESSAGES/krfb.mo
+share/locale/fa/LC_MESSAGES/krfb.mo
+share/locale/fi/LC_MESSAGES/krfb.mo
+share/locale/fr/LC_MESSAGES/krfb.mo
+share/locale/ga/LC_MESSAGES/krfb.mo
+share/locale/gl/LC_MESSAGES/krfb.mo
+share/locale/he/LC_MESSAGES/krfb.mo
+share/locale/hi/LC_MESSAGES/krfb.mo
+share/locale/hr/LC_MESSAGES/krfb.mo
+share/locale/hu/LC_MESSAGES/krfb.mo
+share/locale/ia/LC_MESSAGES/krfb.mo
+share/locale/id/LC_MESSAGES/krfb.mo
+share/locale/is/LC_MESSAGES/krfb.mo
+share/locale/it/LC_MESSAGES/krfb.mo
+share/locale/ja/LC_MESSAGES/krfb.mo
+share/locale/kk/LC_MESSAGES/krfb.mo
+share/locale/km/LC_MESSAGES/krfb.mo
+share/locale/ko/LC_MESSAGES/krfb.mo
+share/locale/lt/LC_MESSAGES/krfb.mo
+share/locale/lv/LC_MESSAGES/krfb.mo
+share/locale/ml/LC_MESSAGES/krfb.mo
+share/locale/mr/LC_MESSAGES/krfb.mo
+share/locale/nb/LC_MESSAGES/krfb.mo
+share/locale/nds/LC_MESSAGES/krfb.mo
+share/locale/nl/LC_MESSAGES/krfb.mo
+share/locale/nn/LC_MESSAGES/krfb.mo
+share/locale/pa/LC_MESSAGES/krfb.mo
+share/locale/pl/LC_MESSAGES/krfb.mo
+share/locale/pt/LC_MESSAGES/krfb.mo
+share/locale/pt_BR/LC_MESSAGES/krfb.mo
+share/locale/ro/LC_MESSAGES/krfb.mo
+share/locale/ru/LC_MESSAGES/krfb.mo
+share/locale/sk/LC_MESSAGES/krfb.mo
+share/locale/sl/LC_MESSAGES/krfb.mo
+share/locale/sr/LC_MESSAGES/krfb.mo
+share/locale/sv/LC_MESSAGES/krfb.mo
+share/locale/tr/LC_MESSAGES/krfb.mo
+share/locale/ug/LC_MESSAGES/krfb.mo
+share/locale/uk/LC_MESSAGES/krfb.mo
+share/locale/zh_CN/LC_MESSAGES/krfb.mo
+share/locale/zh_TW/LC_MESSAGES/krfb.mo
+share/metainfo/org.kde.krfb.appdata.xml
diff --git a/net/krfb/distinfo b/net/krfb/distinfo
index 315b7c0da40..eafc9e51cee 100644
--- a/net/krfb/distinfo
+++ b/net/krfb/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2015/11/04 00:35:07 agc Exp $
+$NetBSD: distinfo,v 1.7 2019/11/30 19:35:11 markd Exp $
 
-SHA1 (krfb-4.14.3.tar.xz) = 2e81134a2bfc99a6c4c79cfb3f37c46d09b320fc
-RMD160 (krfb-4.14.3.tar.xz) = fb78e07275daebedcc8b4ad4789cbcf924914458
-SHA512 (krfb-4.14.3.tar.xz) = 255a5d4ed364c071af7b2d23c707fd99cb68e6b45c6bb1a07558fad5b726cd7846f98751cbf71ae83df1dbc41e06a2dfd074f897660e732393bf95d1b217f7bb
-Size (krfb-4.14.3.tar.xz) = 474604 bytes
+SHA1 (krfb-19.08.3.tar.xz) = 4c43a59403abc6de7593a1ab956a9ef82d6a751f
+RMD160 (krfb-19.08.3.tar.xz) = 36fe2f0eaf2d6ec47ead403b212df2eb5d2ae89c
+SHA512 (krfb-19.08.3.tar.xz) = 4c2012c0fe8363854bc93f7c86918e4d151bc8eb7505327615688ff8631a1c77a2acbdabe23bc56a072b5ccd3df5fe7a864ba0402ecc6171b4862118c814d40c
+Size (krfb-19.08.3.tar.xz) = 1278072 bytes
+SHA1 (patch-cmake_modules_FindLibVNCServer.cmake) = b9033a21495ccdaf1e9cf382af9c43b98486c3e7
diff --git a/net/krfb/patches/patch-cmake_modules_FindLibVNCServer.cmake b/net/krfb/patches/patch-cmake_modules_FindLibVNCServer.cmake
new file mode 100644
index 00000000000..9fd498eb465
--- /dev/null
+++ b/net/krfb/patches/patch-cmake_modules_FindLibVNCServer.cmake
@@ -0,0 +1,16 @@
+$NetBSD: patch-cmake_modules_FindLibVNCServer.cmake,v 1.1 2019/11/30 19:35:11 markd Exp $
+
+Skip test - pkgsrc supplied version works.
+
+--- cmake/modules/FindLibVNCServer.cmake.orig	2019-11-01 21:57:16.000000000 +0000
++++ cmake/modules/FindLibVNCServer.cmake
+@@ -25,7 +25,8 @@ FIND_LIBRARY(LIBVNCCLIENT_LIBRARIES NAME
+ 
+ IF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
+    SET(CMAKE_REQUIRED_INCLUDES "${LIBVNCSERVER_INCLUDE_DIR}" "${CMAKE_REQUIRED_INCLUDES}")
+-   CHECK_STRUCT_HAS_MEMBER("struct _rfbClient" GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
++#   CHECK_STRUCT_HAS_MEMBER("struct _rfbClient" GotXCutText rfb/rfbclient.h LIBVNCSERVER_FOUND)
++   SET(LIBVNCSERVER_FOUND TRUE)
+ ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
+ 
+ IF (LIBVNCSERVER_FOUND)