5 files changed, 30 insertions, 69 deletions

diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 1dc15237288b..47ab0cc17263 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -5,20 +5,23 @@
 # $FreeBSD$
 
 PORTNAME=	kshutdown
-PORTVERSION=	1.0.4
-PORTREVISION=	3
+DISTVERSION=	2.0beta11
 CATEGORIES=	sysutils kde
-MASTER_SITES=	SF/${PORTNAME}/KShutdown/${PORTVERSION}%20for%20KDE%203
+MASTER_SITES=	SF/${PORTNAME}/KShutdown/2.0%20Beta%2011/
+DISTNAME=	${PORTNAME}-source-${DISTVERSION}
 
-MAINTAINER=	markus@FreeBSD.org
+MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Advanced shutdown utility for KDE
 
-USE_BZIP2=	yes
-USE_KDELIBS_VER=3
-USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool
+USE_ZIP=	yes
+USE_CMAKE=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	moc_build qmake_build rcc_build uic_build
+USE_KDE4=	automoc4 kdehier kdeprefix workspace
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
+MAKE_JOBS_SAFE=	yes
+LATEST_LINK=	${PORTNAME}-kde4
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 .include <bsd.port.mk>
diff --git a/sysutils/kshutdown-kde4/distinfo b/sysutils/kshutdown-kde4/distinfo
index c9ea5ffef0e8..c32aac01098e 100644
--- a/sysutils/kshutdown-kde4/distinfo
+++ b/sysutils/kshutdown-kde4/distinfo
@@ -1,3 +1,2 @@
-MD5 (kshutdown-1.0.4.tar.bz2) = 1effdd6b97e702f604c113f8de5a19e4
-SHA256 (kshutdown-1.0.4.tar.bz2) = b9154327ebbb4cd6e9b0b2957bc68c34926fc9e7bf20be9b69d418e8ce7a05c8
-SIZE (kshutdown-1.0.4.tar.bz2) = 657371
+SHA256 (kshutdown-source-2.0beta11.zip) = 3b604fb1879794eb2500d8760b097b0143df4eabaaa75c833e40bade2a34714f
+SIZE (kshutdown-source-2.0beta11.zip) = 358126
diff --git a/sysutils/kshutdown-kde4/files/patch-kshutdown_actions.h b/sysutils/kshutdown-kde4/files/patch-kshutdown_actions.h
deleted file mode 100644
index 269d9b2d76b8..000000000000
--- a/sysutils/kshutdown-kde4/files/patch-kshutdown_actions.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- actions.h.orig	2009-01-24 18:36:05.000000000 +1300
-+++ kshutdown/actions.h	2009-01-24 18:35:58.000000000 +1300
-@@ -28,7 +28,7 @@
- // TODO: 2.0: logout command for GNOME (gnome-session-save --kill?)
- 	DEFAULT_LOGOUT_COMMAND(""),
- 	DEFAULT_REBOOT_COMMAND("/sbin/reboot"),
--	DEFAULT_SHUT_DOWN_COMMAND("/sbin/poweroff");
-+	DEFAULT_SHUT_DOWN_COMMAND("/sbin/halt -p");
- 
- #define ks_actions Action::getInstance()
- 
diff --git a/sysutils/kshutdown-kde4/files/patch-kshutdown_systemconfig.cpp b/sysutils/kshutdown-kde4/files/patch-kshutdown_systemconfig.cpp
deleted file mode 100644
index 5650cfb1e54a..000000000000
--- a/sysutils/kshutdown-kde4/files/patch-kshutdown_systemconfig.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- systemconfig.cpp.orig	2009-01-24 18:36:05.000000000 +1300
-+++ kshutdown/systemconfig.cpp	2009-01-24 18:34:34.000000000 +1300
-@@ -90,7 +90,7 @@
- 
- 	_shutdownAllowItem = add(Info, i18n("Tip: Click here if you have problem with the \"/sbin/shutdown\" command."));
- 
--	checkFile("/sbin/poweroff");
-+	checkFile("/sbin/halt");
- 	checkFile("/sbin/reboot");
- 	checkFile("/sbin/shutdown");
- 	checkKDM();
diff --git a/sysutils/kshutdown-kde4/pkg-plist b/sysutils/kshutdown-kde4/pkg-plist
index d48f29909d8c..fd28716344f0 100644
--- a/sysutils/kshutdown-kde4/pkg-plist
+++ b/sysutils/kshutdown-kde4/pkg-plist
@@ -1,67 +1,48 @@
 bin/kshutdown
-lib/kde3/kshutdownlockout_panelapplet.a
-lib/kde3/kshutdownlockout_panelapplet.la
-lib/kde3/kshutdownlockout_panelapplet.so
-share/applications/kshutdown.desktop
-share/apps/kconf_update/kshutdown.upd
-share/apps/kicker/applets/kshutdownlockout.desktop
-share/apps/kshutdown/eventsrc
-share/apps/kshutdown/extras/hibernate.desktop
+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/kdetv.desktop
 share/apps/kshutdown/extras/multimedia/kscd.desktop
-share/apps/kshutdown/extras/multimedia/noatun.desktop
+share/apps/kshutdown/extras/multimedia/mplayer.desktop
+share/apps/kshutdown/extras/multimedia/tvtime.desktop
 share/apps/kshutdown/extras/multimedia/xmms.desktop
-share/apps/kshutdown/extras/shutdown/.directory
-share/apps/kshutdown/extras/shutdown/cancelshutdown.desktop
-share/apps/kshutdown/extras/shutdown/fsck.desktop
 share/apps/kshutdown/extras/system/.directory
-share/apps/kshutdown/extras/system/adsl-stop.desktop
-share/apps/kshutdown/extras/system/kdeeject.desktop
 share/apps/kshutdown/extras/system/kppp.desktop
-share/apps/kshutdown/karamba/kshutdown-48x48.png
-share/apps/kshutdown/karamba/kshutdown-classic-notext.theme
-share/apps/kshutdown/karamba/kshutdown-classic-text.theme
-share/apps/kshutdown/sounds/1m.ogg
-share/apps/kshutdown/sounds/5m.ogg
-share/apps/kshutdown/sounds/COPYRIGHT
-share/doc/HTML/de/kshutdown/common
-share/doc/HTML/de/kshutdown/index.cache.bz2
-share/doc/HTML/de/kshutdown/index.docbook
-share/doc/HTML/de/kshutdown/mainwindow.png
-share/doc/HTML/en/kshutdown/common
-share/doc/HTML/en/kshutdown/index.cache.bz2
-share/doc/HTML/en/kshutdown/index.docbook
-share/doc/HTML/en/kshutdown/mainwindow.png
+share/apps/kshutdown/kshutdown.notifyrc
+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/icons/hicolor/scalable/apps/kshutdown.svgz
 share/locale/ar/LC_MESSAGES/kshutdown.mo
 share/locale/bg/LC_MESSAGES/kshutdown.mo
 share/locale/cs/LC_MESSAGES/kshutdown.mo
+share/locale/da/LC_MESSAGES/kshutdown.mo
 share/locale/de/LC_MESSAGES/kshutdown.mo
 share/locale/el/LC_MESSAGES/kshutdown.mo
 share/locale/es/LC_MESSAGES/kshutdown.mo
 share/locale/fr/LC_MESSAGES/kshutdown.mo
 share/locale/hu/LC_MESSAGES/kshutdown.mo
 share/locale/it/LC_MESSAGES/kshutdown.mo
+share/locale/nb/LC_MESSAGES/kshutdown.mo
 share/locale/nl/LC_MESSAGES/kshutdown.mo
 share/locale/pl/LC_MESSAGES/kshutdown.mo
 share/locale/pt_BR/LC_MESSAGES/kshutdown.mo
 share/locale/ru/LC_MESSAGES/kshutdown.mo
 share/locale/sk/LC_MESSAGES/kshutdown.mo
+share/locale/sr/LC_MESSAGES/kshutdown.mo
+share/locale/sr@ijekavian/LC_MESSAGES/kshutdown.mo
+share/locale/sr@ijekavianlatin/LC_MESSAGES/kshutdown.mo
+share/locale/sr@latin/LC_MESSAGES/kshutdown.mo
 share/locale/sv/LC_MESSAGES/kshutdown.mo
 share/locale/tr/LC_MESSAGES/kshutdown.mo
 share/locale/zh_CN/LC_MESSAGES/kshutdown.mo
-@dirrm share/doc/HTML/en/kshutdown
-@dirrm share/doc/HTML/de/kshutdown
-@dirrm share/apps/kshutdown/sounds
-@dirrm share/apps/kshutdown/karamba
 @dirrm share/apps/kshutdown/extras/system
-@dirrm share/apps/kshutdown/extras/shutdown
 @dirrm share/apps/kshutdown/extras/multimedia
 @dirrm share/apps/kshutdown/extras
 @dirrm share/apps/kshutdown
-@dirrmtry share/apps/kconf_update