krdc: update to 19.08.3 qt5/kf5 version

net/krdc/Makefile

@@ -1,17 +1,25 @@
-# $NetBSD: Makefile,v 1.30 2019/08/22 12:23:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.31 2019/11/30 19:28:45 markd Exp $
 
-DISTNAME=	krdc-15.12.0
-PKGREVISION=	17
+DISTNAME=	krdc-${KAPPSVER}
 CATEGORIES=	net
+
+HOMEPAGE=	https://kde.org/applications/internet/krdc/
 COMMENT=	KDE remote desktop client
-MASTER_SITES=	${MASTER_SITE_KDE:=applications/15.12.0/src/}
+LICENSE=	gnu-lgpl-v2 AND gnu-gpl-v2 AND gnu-fdl-v1.2
+
+.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 "../../devel/kcmutils/buildlink3.mk"
+.include "../../devel/knotifyconfig/buildlink3.mk"
+.include "../../net/freerdp2/buildlink3.mk"
+.include "../../net/kdnssd/buildlink3.mk"
 .include "../../net/libvncserver/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
+.include "../../security/libssh/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
+.include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

net/krdc/PLIST

@@ -1,40 +1,142 @@
-@comment $NetBSD: PLIST,v 1.2 2016/01/10 19:18:48 markd Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/11/30 19:28:45 markd Exp $
 bin/krdc
 include/krdc/hostpreferences.h
 include/krdc/remoteview.h
 include/krdc/remoteviewfactory.h
-lib/kde4/kcm_krdc_rdpplugin.so
-lib/kde4/kcm_krdc_vncplugin.so
-lib/kde4/krdc_rdpplugin.so
-lib/kde4/krdc_testplugin.so
-lib/kde4/krdc_vncplugin.so
+include/krdccore_export.h
 lib/libkrdccore.so
-lib/libkrdccore.so.4
-lib/libkrdccore.so.${KDELIBSVER}
-share/applications/kde4/krdc.desktop
-share/doc/kde/HTML/en/krdc/address_input.png
-share/doc/kde/HTML/en/krdc/bookmarks_menu.png
-share/doc/kde/HTML/en/krdc/common
-share/doc/kde/HTML/en/krdc/general_preferences.png
-share/doc/kde/HTML/en/krdc/index.cache.bz2
-share/doc/kde/HTML/en/krdc/index.docbook
-share/doc/kde/HTML/en/krdc/krdc_mainwindow.png
-share/doc/kde/HTML/en/krdc/password_entry.png
-share/doc/kde/HTML/en/krdc/rdp_preferences.png
-share/doc/kde/HTML/en/krdc/view-fullscreen.png
-share/doc/kde/HTML/en/krdc/view-restore.png
-share/doc/kde/HTML/en/krdc/vnc_host_configuration.png
-share/doc/kde/HTML/en/krdc/vnc_preferences.png
-share/kde/apps/krdc/krdcui.rc
-share/kde/apps/krdc/pics/pointcursor.png
-share/kde/apps/krdc/pics/pointcursormask.png
-share/kde/config.kcfg/krdc.kcfg
-share/kde4/services/ServiceMenus/smb2rdc.desktop
-share/kde4/services/krdc_rdp.desktop
-share/kde4/services/krdc_rdp_config.desktop
-share/kde4/services/krdc_test.desktop
-share/kde4/services/krdc_vnc.desktop
-share/kde4/services/krdc_vnc_config.desktop
-share/kde4/services/rdp.protocol
-share/kde4/services/vnc.protocol
-share/kde4/servicetypes/krdc_plugin.desktop
+lib/libkrdccore.so.${PKGVERSION}
+lib/libkrdccore.so.5
+qt5/plugins/krdc/kcms/libkcm_krdc_rdpplugin.so
+qt5/plugins/krdc/kcms/libkcm_krdc_vncplugin.so
+qt5/plugins/krdc/libkrdc_rdpplugin.so
+qt5/plugins/krdc/libkrdc_testplugin.so
+qt5/plugins/krdc/libkrdc_vncplugin.so
+share/applications/org.kde.krdc.desktop
+share/config.kcfg/krdc.kcfg
+share/doc/HTML/ca/krdc/index.cache.bz2
+share/doc/HTML/ca/krdc/index.docbook
+share/doc/HTML/ca/krdc/view-fullscreen.png
+share/doc/HTML/ca/krdc/view-restore.png
+share/doc/HTML/de/krdc/address_input.png
+share/doc/HTML/de/krdc/bookmarks_menu.png
+share/doc/HTML/de/krdc/general_preferences.png
+share/doc/HTML/de/krdc/index.cache.bz2
+share/doc/HTML/de/krdc/index.docbook
+share/doc/HTML/de/krdc/krdc_mainwindow.png
+share/doc/HTML/de/krdc/password_entry.png
+share/doc/HTML/de/krdc/rdp_preferences.png
+share/doc/HTML/de/krdc/vnc_host_configuration.png
+share/doc/HTML/de/krdc/vnc_preferences.png
+share/doc/HTML/en/krdc/address_input.png
+share/doc/HTML/en/krdc/bookmarks_menu.png
+share/doc/HTML/en/krdc/general_preferences.png
+share/doc/HTML/en/krdc/index.cache.bz2
+share/doc/HTML/en/krdc/index.docbook
+share/doc/HTML/en/krdc/krdc_mainwindow.png
+share/doc/HTML/en/krdc/password_entry.png
+share/doc/HTML/en/krdc/rdp_preferences.png
+share/doc/HTML/en/krdc/view-fullscreen.png
+share/doc/HTML/en/krdc/view-restore.png
+share/doc/HTML/en/krdc/vnc_host_configuration.png
+share/doc/HTML/en/krdc/vnc_preferences.png
+share/doc/HTML/es/krdc/index.cache.bz2
+share/doc/HTML/es/krdc/index.docbook
+share/doc/HTML/et/krdc/index.cache.bz2
+share/doc/HTML/et/krdc/index.docbook
+share/doc/HTML/fr/krdc/address_input.png
+share/doc/HTML/fr/krdc/bookmarks_menu.png
+share/doc/HTML/fr/krdc/general_preferences.png
+share/doc/HTML/fr/krdc/index.cache.bz2
+share/doc/HTML/fr/krdc/index.docbook
+share/doc/HTML/fr/krdc/krdc_mainwindow.png
+share/doc/HTML/fr/krdc/rdp_preferences.png
+share/doc/HTML/fr/krdc/vnc_host_configuration.png
+share/doc/HTML/fr/krdc/vnc_preferences.png
+share/doc/HTML/it/krdc/index.cache.bz2
+share/doc/HTML/it/krdc/index.docbook
+share/doc/HTML/nl/krdc/index.cache.bz2
+share/doc/HTML/nl/krdc/index.docbook
+share/doc/HTML/pl/krdc/bookmarks_menu.png
+share/doc/HTML/pl/krdc/general_preferences.png
+share/doc/HTML/pl/krdc/index.cache.bz2
+share/doc/HTML/pl/krdc/index.docbook
+share/doc/HTML/pl/krdc/krdc_mainwindow.png
+share/doc/HTML/pl/krdc/rdp_preferences.png
+share/doc/HTML/pl/krdc/view-fullscreen.png
+share/doc/HTML/pl/krdc/view-restore.png
+share/doc/HTML/pl/krdc/vnc_host_configuration.png
+share/doc/HTML/pl/krdc/vnc_preferences.png
+share/doc/HTML/pt/krdc/index.cache.bz2
+share/doc/HTML/pt/krdc/index.docbook
+share/doc/HTML/pt_BR/krdc/index.cache.bz2
+share/doc/HTML/pt_BR/krdc/index.docbook
+share/doc/HTML/ru/krdc/index.cache.bz2
+share/doc/HTML/ru/krdc/index.docbook
+share/doc/HTML/sr/krdc/index.cache.bz2
+share/doc/HTML/sr/krdc/index.docbook
+share/doc/HTML/sv/krdc/index.cache.bz2
+share/doc/HTML/sv/krdc/index.docbook
+share/doc/HTML/uk/krdc/index.cache.bz2
+share/doc/HTML/uk/krdc/index.docbook
+share/krdc/pics/pointcursor.png
+share/krdc/pics/pointcursormask.png
+share/kservices5/ServiceMenus/smb2rdc.desktop
+share/kservices5/krdc_rdp_config.desktop
+share/kservices5/krdc_vnc_config.desktop
+share/kservices5/rdp.protocol
+share/kservices5/vnc.protocol
+share/kxmlgui5/krdc/krdcui.rc
+share/locale/ar/LC_MESSAGES/krdc.mo
+share/locale/bg/LC_MESSAGES/krdc.mo
+share/locale/bs/LC_MESSAGES/krdc.mo
+share/locale/ca/LC_MESSAGES/krdc.mo
+share/locale/ca@valencia/LC_MESSAGES/krdc.mo
+share/locale/cs/LC_MESSAGES/krdc.mo
+share/locale/da/LC_MESSAGES/krdc.mo
+share/locale/de/LC_MESSAGES/krdc.mo
+share/locale/el/LC_MESSAGES/krdc.mo
+share/locale/en_GB/LC_MESSAGES/krdc.mo
+share/locale/eo/LC_MESSAGES/krdc.mo
+share/locale/es/LC_MESSAGES/krdc.mo
+share/locale/et/LC_MESSAGES/krdc.mo
+share/locale/eu/LC_MESSAGES/krdc.mo
+share/locale/fa/LC_MESSAGES/krdc.mo
+share/locale/fi/LC_MESSAGES/krdc.mo
+share/locale/fr/LC_MESSAGES/krdc.mo
+share/locale/ga/LC_MESSAGES/krdc.mo
+share/locale/gl/LC_MESSAGES/krdc.mo
+share/locale/he/LC_MESSAGES/krdc.mo
+share/locale/hi/LC_MESSAGES/krdc.mo
+share/locale/hr/LC_MESSAGES/krdc.mo
+share/locale/hu/LC_MESSAGES/krdc.mo
+share/locale/ia/LC_MESSAGES/krdc.mo
+share/locale/is/LC_MESSAGES/krdc.mo
+share/locale/it/LC_MESSAGES/krdc.mo
+share/locale/ja/LC_MESSAGES/krdc.mo
+share/locale/kk/LC_MESSAGES/krdc.mo
+share/locale/km/LC_MESSAGES/krdc.mo
+share/locale/ko/LC_MESSAGES/krdc.mo
+share/locale/lt/LC_MESSAGES/krdc.mo
+share/locale/lv/LC_MESSAGES/krdc.mo
+share/locale/mr/LC_MESSAGES/krdc.mo
+share/locale/nb/LC_MESSAGES/krdc.mo
+share/locale/nds/LC_MESSAGES/krdc.mo
+share/locale/nl/LC_MESSAGES/krdc.mo
+share/locale/nn/LC_MESSAGES/krdc.mo
+share/locale/pa/LC_MESSAGES/krdc.mo
+share/locale/pl/LC_MESSAGES/krdc.mo
+share/locale/pt/LC_MESSAGES/krdc.mo
+share/locale/pt_BR/LC_MESSAGES/krdc.mo
+share/locale/ro/LC_MESSAGES/krdc.mo
+share/locale/ru/LC_MESSAGES/krdc.mo
+share/locale/sk/LC_MESSAGES/krdc.mo
+share/locale/sl/LC_MESSAGES/krdc.mo
+share/locale/sr/LC_MESSAGES/krdc.mo
+share/locale/sv/LC_MESSAGES/krdc.mo
+share/locale/tr/LC_MESSAGES/krdc.mo
+share/locale/ug/LC_MESSAGES/krdc.mo
+share/locale/uk/LC_MESSAGES/krdc.mo
+share/locale/zh_CN/LC_MESSAGES/krdc.mo
+share/locale/zh_TW/LC_MESSAGES/krdc.mo
+share/metainfo/org.kde.krdc.appdata.xml

net/krdc/distinfo

@@ -1,6 +1,10 @@
-$NetBSD: distinfo,v 1.5 2016/01/10 19:18:48 markd Exp $
+$NetBSD: distinfo,v 1.6 2019/11/30 19:28:45 markd Exp $
 
-SHA1 (krdc-15.12.0.tar.xz) = dd12210a06d73019a4ce8a9a049923e5fbf31221
-RMD160 (krdc-15.12.0.tar.xz) = 67112b67babb953f72ae082020cbd1fcf3477d6a
-SHA512 (krdc-15.12.0.tar.xz) = 40bd3e9605f7989e15f637d52c870ba37f908860b12c3858f61019c6b89d8133d1f0cf5214587654eceb4aff09df2b73a0224b8fcdcd42f7f77577e0e297865a
-Size (krdc-15.12.0.tar.xz) = 399116 bytes
+SHA1 (krdc-19.08.3.tar.xz) = 3d606b797f5677db0fd875563bb4746f9b8f4184
+RMD160 (krdc-19.08.3.tar.xz) = e6a9fbce2e97a89e08ef50c2f962d800e92a1233
+SHA512 (krdc-19.08.3.tar.xz) = 19623548e1ade229cd198361b540c893de8b510099c8819d66034f358b29b13cd7f82a948121187d1a445770f9549a5e59b72394a1f7ace0e0673ed4bca8e1c2
+Size (krdc-19.08.3.tar.xz) = 1423272 bytes
+SHA1 (patch-CMakeLists.txt) = 3debefb9ad426245aec169eb0d8934dbdb6752ae
+SHA1 (patch-cmake_modules_FindLibVNCServer.cmake) = efc3f6a70f77bcbb2bde951b3108e91a91552613
+SHA1 (patch-rdp_rdpview.cpp) = ae33d0996fa41bb5c9d3605c70f8f49b0d8ae343
+SHA1 (patch-rdp_rdpviewfactory.cpp) = cde8b0fef1e06cbc66fb6242022cc96229935856

net/krdc/patches/patch-CMakeLists.txt

@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2019/11/30 19:28:45 markd Exp $
+
+pkgsrc renames it xfreerdp2
+
+--- CMakeLists.txt.orig	2019-11-30 10:51:05.350928530 +0000
++++ CMakeLists.txt
+@@ -81,7 +81,7 @@ set_package_properties("libssh" PROPERTI
+ )
+
+ # Needs porting
+-find_program(FREERDP_EXECUTABLE xfreerdp)
++find_program(FREERDP_EXECUTABLE xfreerdp2)
+ if(FREERDP_EXECUTABLE)
+     set(FREERDP_FOUND true) # mark the package found
+     set(FREERDP_EXECUTABLE_FOUND true)

net/krdc/patches/patch-cmake_modules_FindLibVNCServer.cmake

@@ -0,0 +1,16 @@
+$NetBSD: patch-cmake_modules_FindLibVNCServer.cmake,v 1.1 2019/11/30 19:28:45 markd Exp $
+
+Skip test - pkgsrc supplied version works.
+
+--- cmake/modules/FindLibVNCServer.cmake.orig	2019-11-01 21:57:11.000000000 +0000
++++ cmake/modules/FindLibVNCServer.cmake
+@@ -33,7 +33,8 @@ int main()
+     return 0;
+ }
+     ")
+-    CHECK_CXX_SOURCE_COMPILES("${_TEST_SOURCE_CODE}" LIBVNCSERVER_FOUND)
++#    CHECK_CXX_SOURCE_COMPILES("${_TEST_SOURCE_CODE}" LIBVNCSERVER_FOUND)
++   SET(LIBVNCSERVER_FOUND TRUE)
+ ENDIF (LIBVNCSERVER_INCLUDE_DIR AND LIBVNCSERVER_LIBRARIES)
+ 
+ IF (LIBVNCSERVER_FOUND)

net/krdc/patches/patch-rdp_rdpview.cpp

@@ -0,0 +1,33 @@
+$NetBSD: patch-rdp_rdpview.cpp,v 1.1 2019/11/30 19:28:45 markd Exp $
+
+pkgsrc renames it xfreerdp2
+
+--- rdp/rdpview.cpp.orig	2019-11-01 21:57:11.000000000 +0000
++++ rdp/rdpview.cpp
+@@ -151,7 +151,7 @@ bool RdpView::start()
+
+     // Check the version of FreeRDP so we can use pre-1.1 switches if needed
+     QProcess *xfreeRDPVersionCheck = new QProcess(this);
+-    xfreeRDPVersionCheck->start(QStringLiteral("xfreerdp"), QStringList(QStringLiteral("--version")));
++    xfreeRDPVersionCheck->start(QStringLiteral("xfreerdp2"), QStringList(QStringLiteral("--version")));
+     xfreeRDPVersionCheck->waitForFinished();
+     QString versionOutput = QString::fromUtf8(xfreeRDPVersionCheck->readAllStandardOutput().constData());
+     xfreeRDPVersionCheck->deleteLater();
+@@ -367,7 +367,7 @@ bool RdpView::start()
+         m_process->start(QStringLiteral("wlfreerdp"), arguments);
+     }
+     else {
+-        m_process->start(QStringLiteral("xfreerdp"), arguments);
++        m_process->start(QStringLiteral("xfreerdp2"), arguments);
+     }
+
+     return true;
+@@ -442,7 +442,7 @@ void RdpView::processError(QProcess::Pro
+                 break;
+             case KWindowSystem::Platform::X11:
+             case KWindowSystem::Platform::Unknown:
+-                executable = QStringLiteral("xfreerdp");
++                executable = QStringLiteral("xfreerdp2");
+             }
+             connectionError(i18n("Could not start \"%1\"; make sure %1 is properly installed.", executable),
+                             i18n("RDP Failure"));

net/krdc/patches/patch-rdp_rdpviewfactory.cpp

@@ -0,0 +1,15 @@
+$NetBSD: patch-rdp_rdpviewfactory.cpp,v 1.1 2019/11/30 19:28:45 markd Exp $
+
+pkgsrc renames it xfreerdp2
+
+--- rdp/rdpviewfactory.cpp.orig	2019-11-01 21:57:11.000000000 +0000
++++ rdp/rdpviewfactory.cpp
+@@ -83,7 +83,7 @@ QString RdpViewFactory::connectToolTipTe
+
+ void RdpViewFactory::checkFreerdpAvailability()
+ {
+-    if (QStandardPaths::findExecutable(QStringLiteral("xfreerdp")).isEmpty()) {
++    if (QStandardPaths::findExecutable(QStringLiteral("xfreerdp2")).isEmpty()) {
+         m_connectToolTipString += QLatin1Char('\n') + i18n("The application \"xfreerdp\" cannot be found on your system; make sure it is properly installed "
+                                               "if you need RDP support.");
+     }