- Update to version 1.0.1

- Remove upstream applied patches

12 files changed, 20 insertions, 88 deletions

diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 853e4870bd0..3234c1d6c6b 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kshutdown
-PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/kshutdown-kde4/distinfo b/sysutils/kshutdown-kde4/distinfo
index 3a53ab34854..fd5fca3d129 100644
--- a/sysutils/kshutdown-kde4/distinfo
+++ b/sysutils/kshutdown-kde4/distinfo
@@ -1,3 +1,3 @@
-MD5 (kshutdown-0.8.2.tar.bz2) = 6acd45acc5c0669b0973f0246e4bcca7
-SHA256 (kshutdown-0.8.2.tar.bz2) = ef28d566ca3d316a60cdbe110eb97bb84b236e70bfacde52bb8df0085fe95328
-SIZE (kshutdown-0.8.2.tar.bz2) = 646911
+MD5 (kshutdown-1.0.1.tar.bz2) = 6f65d969fcd08533e4ccdf6cdc5576f6
+SHA256 (kshutdown-1.0.1.tar.bz2) = b3e5a86a6fc6d4839550c6c09b183d7e5ea77a3a439bacc9a5e8882c2e2dd1ef
+SIZE (kshutdown-1.0.1.tar.bz2) = 657378
diff --git a/sysutils/kshutdown-kde4/files/patch-appobserver.h b/sysutils/kshutdown-kde4/files/patch-appobserver.h
deleted file mode 100644
index 4ba5362e680..00000000000
--- a/sysutils/kshutdown-kde4/files/patch-appobserver.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kshutdown/appobserver.h.orig	Mon Jan  9 18:30:18 2006
-+++ kshutdown/appobserver.h	Mon Jan  9 18:30:35 2006
-@@ -20,6 +20,8 @@
- #ifndef __APPOBSERVER_H__
- #define __APPOBSERVER_H__
- 
-+#include <sys/types.h>
-+
- #include <qhbox.h>
- 
- class QComboBox;
diff --git a/sysutils/kshutdown-kde4/files/patch-configuration.cpp b/sysutils/kshutdown-kde4/files/patch-configuration.cpp
deleted file mode 100644
index f1d918219dd..00000000000
--- a/sysutils/kshutdown-kde4/files/patch-configuration.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kshutdown/configuration.cpp.orig	Mon Jan  9 18:40:46 2006
-+++ kshutdown/configuration.cpp	Mon Jan  9 19:01:22 2006
-@@ -31,7 +31,11 @@
- 	// automation
- 	setCurrentGroup("Automation");
- 	i_cdTrayClose = addItemBool("cd_tray_close", cdTrayClose, false, "CDTrayClose");
-+#ifdef Q_OS_FREEBSD
-+	i_cdTrayCloseCommand = addItemString("cd_tray_close_command", cdTrayCloseCommand, "cdcontrol close", "CDTrayCloseCommand");
-+#else
- 	i_cdTrayCloseCommand = addItemString("cd_tray_close_command", cdTrayCloseCommand, "eject -t", "CDTrayCloseCommand");
-+#endif
- 
- 	// custom message
- 	setCurrentGroup("Custom Message");
diff --git a/sysutils/kshutdown-kde4/files/patch-mtipp.cpp b/sysutils/kshutdown-kde4/files/patch-mtipp.cpp
deleted file mode 100644
index 584a8027356..00000000000
--- a/sysutils/kshutdown-kde4/files/patch-mtipp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kshutdown/mtip.cpp.orig	Mon Jan  9 18:34:50 2006
-+++ kshutdown/mtip.cpp	Mon Jan  9 18:35:25 2006
-@@ -41,7 +41,7 @@
- {
- 	// valign and "center" ?
- 	QString leftCell = "<td align=\"center\" valign=\"center\">";
--	leftCell += _iconPath.isEmpty() ? "&nbsp;" : ("<img src=\"" + _iconPath + "\">");
-+	leftCell += _iconPath.isEmpty() ? QString::fromLatin1("&nbsp;") : ("<img src=\"" + _iconPath + "\">");
- 	leftCell += "</td>";
- 	setText(
- 		"<qt>" \
diff --git a/sysutils/kshutdown-kde4/pkg-plist b/sysutils/kshutdown-kde4/pkg-plist
index 384b7abce61..d48f29909d8 100644
--- a/sysutils/kshutdown-kde4/pkg-plist
+++ b/sysutils/kshutdown-kde4/pkg-plist
@@ -6,10 +6,12 @@ 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/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/xmms.desktop
@@ -26,9 +28,6 @@ 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/apps/kshutdown/sounds/one.ogg
-share/apps/kshutdown/sounds/three.ogg
-share/apps/kshutdown/sounds/two.ogg
 share/doc/HTML/de/kshutdown/common
 share/doc/HTML/de/kshutdown/index.cache.bz2
 share/doc/HTML/de/kshutdown/index.docbook
@@ -39,9 +38,13 @@ share/doc/HTML/en/kshutdown/index.docbook
 share/doc/HTML/en/kshutdown/mainwindow.png
 share/icons/hicolor/32x32/apps/kshutdown.png
 share/icons/hicolor/48x48/apps/kshutdown.png
+share/locale/ar/LC_MESSAGES/kshutdown.mo
+share/locale/bg/LC_MESSAGES/kshutdown.mo
 share/locale/cs/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/nl/LC_MESSAGES/kshutdown.mo
diff --git a/sysutils/kshutdown/Makefile b/sysutils/kshutdown/Makefile
index 853e4870bd0..3234c1d6c6b 100644
--- a/sysutils/kshutdown/Makefile
+++ b/sysutils/kshutdown/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	kshutdown
-PORTVERSION=	0.8.2
-PORTREVISION=	2
+PORTVERSION=	1.0.1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/kshutdown/distinfo b/sysutils/kshutdown/distinfo
index 3a53ab34854..fd5fca3d129 100644
--- a/sysutils/kshutdown/distinfo
+++ b/sysutils/kshutdown/distinfo
@@ -1,3 +1,3 @@
-MD5 (kshutdown-0.8.2.tar.bz2) = 6acd45acc5c0669b0973f0246e4bcca7
-SHA256 (kshutdown-0.8.2.tar.bz2) = ef28d566ca3d316a60cdbe110eb97bb84b236e70bfacde52bb8df0085fe95328
-SIZE (kshutdown-0.8.2.tar.bz2) = 646911
+MD5 (kshutdown-1.0.1.tar.bz2) = 6f65d969fcd08533e4ccdf6cdc5576f6
+SHA256 (kshutdown-1.0.1.tar.bz2) = b3e5a86a6fc6d4839550c6c09b183d7e5ea77a3a439bacc9a5e8882c2e2dd1ef
+SIZE (kshutdown-1.0.1.tar.bz2) = 657378
diff --git a/sysutils/kshutdown/files/patch-appobserver.h b/sysutils/kshutdown/files/patch-appobserver.h
deleted file mode 100644
index 4ba5362e680..00000000000
--- a/sysutils/kshutdown/files/patch-appobserver.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- kshutdown/appobserver.h.orig	Mon Jan  9 18:30:18 2006
-+++ kshutdown/appobserver.h	Mon Jan  9 18:30:35 2006
-@@ -20,6 +20,8 @@
- #ifndef __APPOBSERVER_H__
- #define __APPOBSERVER_H__
- 
-+#include <sys/types.h>
-+
- #include <qhbox.h>
- 
- class QComboBox;
diff --git a/sysutils/kshutdown/files/patch-configuration.cpp b/sysutils/kshutdown/files/patch-configuration.cpp
deleted file mode 100644
index f1d918219dd..00000000000
--- a/sysutils/kshutdown/files/patch-configuration.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kshutdown/configuration.cpp.orig	Mon Jan  9 18:40:46 2006
-+++ kshutdown/configuration.cpp	Mon Jan  9 19:01:22 2006
-@@ -31,7 +31,11 @@
- 	// automation
- 	setCurrentGroup("Automation");
- 	i_cdTrayClose = addItemBool("cd_tray_close", cdTrayClose, false, "CDTrayClose");
-+#ifdef Q_OS_FREEBSD
-+	i_cdTrayCloseCommand = addItemString("cd_tray_close_command", cdTrayCloseCommand, "cdcontrol close", "CDTrayCloseCommand");
-+#else
- 	i_cdTrayCloseCommand = addItemString("cd_tray_close_command", cdTrayCloseCommand, "eject -t", "CDTrayCloseCommand");
-+#endif
- 
- 	// custom message
- 	setCurrentGroup("Custom Message");
diff --git a/sysutils/kshutdown/files/patch-mtipp.cpp b/sysutils/kshutdown/files/patch-mtipp.cpp
deleted file mode 100644
index 584a8027356..00000000000
--- a/sysutils/kshutdown/files/patch-mtipp.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- kshutdown/mtip.cpp.orig	Mon Jan  9 18:34:50 2006
-+++ kshutdown/mtip.cpp	Mon Jan  9 18:35:25 2006
-@@ -41,7 +41,7 @@
- {
- 	// valign and "center" ?
- 	QString leftCell = "<td align=\"center\" valign=\"center\">";
--	leftCell += _iconPath.isEmpty() ? "&nbsp;" : ("<img src=\"" + _iconPath + "\">");
-+	leftCell += _iconPath.isEmpty() ? QString::fromLatin1("&nbsp;") : ("<img src=\"" + _iconPath + "\">");
- 	leftCell += "</td>";
- 	setText(
- 		"<qt>" \
diff --git a/sysutils/kshutdown/pkg-plist b/sysutils/kshutdown/pkg-plist
index 384b7abce61..d48f29909d8 100644
--- a/sysutils/kshutdown/pkg-plist
+++ b/sysutils/kshutdown/pkg-plist
@@ -6,10 +6,12 @@ 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/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/xmms.desktop
@@ -26,9 +28,6 @@ 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/apps/kshutdown/sounds/one.ogg
-share/apps/kshutdown/sounds/three.ogg
-share/apps/kshutdown/sounds/two.ogg
 share/doc/HTML/de/kshutdown/common
 share/doc/HTML/de/kshutdown/index.cache.bz2
 share/doc/HTML/de/kshutdown/index.docbook
@@ -39,9 +38,13 @@ share/doc/HTML/en/kshutdown/index.docbook
 share/doc/HTML/en/kshutdown/mainwindow.png
 share/icons/hicolor/32x32/apps/kshutdown.png
 share/icons/hicolor/48x48/apps/kshutdown.png
+share/locale/ar/LC_MESSAGES/kshutdown.mo
+share/locale/bg/LC_MESSAGES/kshutdown.mo
 share/locale/cs/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/nl/LC_MESSAGES/kshutdown.mo