sysutils/kshutdown: update to KF5 based 4.99-beta

9 files changed, 41 insertions, 56 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index ebc042452e6e..4e9a0e345f2e 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -579,7 +579,7 @@
     SUBDIR += knutclient-kde4
     SUBDIR += kops
     SUBDIR += krename
-    SUBDIR += kshutdown-kde4
+    SUBDIR += kshutdown
     SUBDIR += ksysguardd-kde4
     SUBDIR += ksystemlog
     SUBDIR += ksystemlog-kde4
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
deleted file mode 100644
index 59289f09fa79..000000000000
--- a/sysutils/kshutdown-kde4/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-# $FreeBSD$
-
-PORTNAME=	kshutdown
-DISTVERSION=	4.2
-PORTREVISION=	2
-CATEGORIES=	sysutils kde
-MASTER_SITES=	SF/${PORTNAME}/KShutdown/${DISTVERSION}/
-DISTNAME=	${PORTNAME}-source-${DISTVERSION}
-
-MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Advanced shutdown utility for KDE
-
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-DEPRECATED=	KDE4 is EOL upstream
-EXPIRATION_DATE=	2018-12-31
-
-USES=		alias cmake compiler:c++0x gettext kde:4 qt:4 zip
-USE_QT=		corelib dbus gui moc_build qmake_build rcc_build svg uic_build
-USE_KDE=	automoc4 kdelibs workspace
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
-
-# Make sure, we're building the KDE4 version.
-CMAKE_ARGS=	-DKS_KF5:BOOL=FALSE \
-		-DKS_PURE_QT:BOOL=FALSE
-
-.include <bsd.port.mk>
diff --git a/sysutils/kshutdown-kde4/distinfo b/sysutils/kshutdown-kde4/distinfo
deleted file mode 100644
index f5c0683d3837..000000000000
--- a/sysutils/kshutdown-kde4/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1518255984
-SHA256 (kshutdown-source-4.2.zip) = 48e537b593fd2470c0cfeca7c2c48ac3221fdb48b0fb89bfb898e4faf531ee46
-SIZE (kshutdown-source-4.2.zip) = 463140
diff --git a/sysutils/kshutdown-kde4/files/patch-src_triggers_processmonitor.cpp b/sysutils/kshutdown-kde4/files/patch-src_triggers_processmonitor.cpp
deleted file mode 100644
index 993bf9d221bd..000000000000
--- a/sysutils/kshutdown-kde4/files/patch-src_triggers_processmonitor.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/triggers/processmonitor.cpp.orig	2018-03-09 21:45:20 UTC
-+++ src/triggers/processmonitor.cpp
-@@ -20,6 +20,7 @@
- #include "../config.h"
- #include "../utils.h"
- 
-+#include <errno.h>
- #include <QHBoxLayout>
- #include <QPushButton>
- 
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
new file mode 100644
index 000000000000..f1c9b2bcf9d2
--- /dev/null
+++ b/sysutils/kshutdown/Makefile
@@ -0,0 +1,25 @@
+# $FreeBSD$
+
+PORTNAME=	kshutdown
+DISTVERSION=	4.99-beta
+CATEGORIES=	sysutils kde
+MASTER_SITES=	SF/${PORTNAME}/KShutdown/4.99%20Beta/
+DISTNAME=	${PORTNAME}-source-${DISTVERSION}
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	Advanced shutdown utility for KDE
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+USES=		alias cmake compiler:c++0x gettext kde:5 qt:5 zip
+USE_KDE=	auth codecs config configwidgets coreaddons crash dbusaddons ecm globalaccel i18n idletime notifications notifyconfig widgetsaddons xmlgui
+USE_QT=		core dbus gui widgets xml \
+		buildtools_build qmake_build
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
+
+CMAKE_ON=	KS_KF5
+CMAKE_OFF=	KS_PURE_QT
+
+.include <bsd.port.mk>
diff --git a/sysutils/kshutdown/distinfo b/sysutils/kshutdown/distinfo
new file mode 100644
index 000000000000..4320bd03abc6
--- /dev/null
+++ b/sysutils/kshutdown/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1545827956
+SHA256 (kshutdown-source-4.99-beta.zip) = 8299774b6f00b517a0e6bbee92401bbcccc26de1654940170389a19aa28ac320
+SIZE (kshutdown-source-4.99-beta.zip) = 455309
diff --git a/sysutils/kshutdown/files/patch-src_triggers_processmonitor.cpp b/sysutils/kshutdown/files/patch-src_triggers_processmonitor.cpp
new file mode 100644
index 000000000000..f750aad874a6
--- /dev/null
+++ b/sysutils/kshutdown/files/patch-src_triggers_processmonitor.cpp
@@ -0,0 +1,10 @@
+--- src/triggers/processmonitor.cpp.orig	2018-12-26 12:42:28 UTC
++++ src/triggers/processmonitor.cpp
+@@ -28,6 +28,7 @@
+ 	#include <csignal> // for ::kill
+ #endif // !Q_OS_WIN32
+ 
++#include <errno.h>
+ // public
+ 
+ Process::Process(QObject *parent, const QString &command)
diff --git a/sysutils/kshutdown-kde4/pkg-descr b/sysutils/kshutdown/pkg-descr
index f39fd09d2984..f39fd09d2984 100644
--- a/sysutils/kshutdown-kde4/pkg-descr
+++ b/sysutils/kshutdown/pkg-descr
diff --git a/sysutils/kshutdown-kde4/pkg-plist b/sysutils/kshutdown/pkg-plist
index 5f0b0e940cc8..e8a9c089d548 100644
--- a/sysutils/kshutdown-kde4/pkg-plist
+++ b/sysutils/kshutdown/pkg-plist
@@ -1,23 +1,12 @@
 bin/kshutdown
-share/applications/kde4/kshutdown.desktop
-share/apps/kshutdown/extras/multimedia/.directory
-share/apps/kshutdown/extras/multimedia/amarok.desktop
-share/apps/kshutdown/extras/multimedia/juk.desktop
-share/apps/kshutdown/extras/multimedia/kaffeine.desktop
-share/apps/kshutdown/extras/multimedia/kscd.desktop
-share/apps/kshutdown/extras/multimedia/mplayer.desktop
-share/apps/kshutdown/extras/multimedia/tvtime.desktop
-share/apps/kshutdown/extras/multimedia/vlc.desktop
-share/apps/kshutdown/extras/multimedia/xmms.desktop
-share/apps/kshutdown/extras/system/.directory
-share/apps/kshutdown/extras/system/kppp.desktop
-share/apps/kshutdown/kshutdown.notifyrc
+share/applications/kshutdown.desktop
 share/icons/hicolor/128x128/apps/kshutdown.png
 share/icons/hicolor/16x16/apps/kshutdown.png
 share/icons/hicolor/22x22/apps/kshutdown.png
 share/icons/hicolor/32x32/apps/kshutdown.png
 share/icons/hicolor/48x48/apps/kshutdown.png
 share/icons/hicolor/64x64/apps/kshutdown.png
+share/knotifications5/kshutdown.notifyrc
 share/locale/ar/LC_MESSAGES/kshutdown.mo
 share/locale/bg/LC_MESSAGES/kshutdown.mo
 share/locale/cs/LC_MESSAGES/kshutdown.mo