DTRT WRT reboot/halt on all supported OSs

3 files changed, 41 insertions, 15 deletions

diff --git a/x11/kdebase/files/patch-sum b/x11/kdebase/files/patch-sum
index 88c6c473470..5bb6b769926 100644
--- a/x11/kdebase/files/patch-sum
+++ b/x11/kdebase/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.11 1999/10/22 18:31:51 jlam Exp $
+$NetBSD: patch-sum,v 1.12 1999/10/23 02:06:06 hubertf Exp $
 
 MD5 (patch-aa) = 523a9ad05771909d8140a80026b63eee
 MD5 (patch-ab) = 8fd3d2def74bfcffd97ee0b4707dacd0
@@ -10,8 +10,8 @@ MD5 (patch-ag) = c9e121403e4f2de2a25e7f1ea8a8ecf4
 MD5 (patch-ah) = 109a2d63b2f3ff0d05e2b50251bc1ec5
 MD5 (patch-ai) = 78a7190a72184b24e39cdde019c7e805
 MD5 (patch-aj) = e686e55b0986037baff35b543cec6bbb
-MD5 (patch-ak) = 073c4980228c29843856cbb3b3883334
-MD5 (patch-al) = 148498220dac0b3d280ac213b5925352
+MD5 (patch-ak) = 967b3e4883a7f17d4dfa9b4d83d3ad44
+MD5 (patch-al) = 90700f9f18c954509b5adad4cfa2a203
 MD5 (patch-am) = 1b7b201d060759a5ae1878fad7252dce
 MD5 (patch-an) = 4cb12dc4a80c1e8f66f619139511e924
 MD5 (patch-ap) = 747c8fc023114a90e8826feb5a73ad16
diff --git a/x11/kdebase/patches/patch-ak b/x11/kdebase/patches/patch-ak
index ded52b6a745..78445e48b1c 100644
--- a/x11/kdebase/patches/patch-ak
+++ b/x11/kdebase/patches/patch-ak
@@ -1,15 +1,26 @@
-$NetBSD: patch-ak,v 1.1 1998/11/10 22:23:02 tron Exp $
+$NetBSD: patch-ak,v 1.2 1999/10/23 02:06:07 hubertf Exp $
 
---- kdm/kdmshutdown.h.orig	Thu Nov 20 14:08:11 1997
-+++ kdm/kdmshutdown.h	Tue Nov 10 21:41:48 1998
-@@ -36,8 +36,8 @@
+--- kdm/kdmshutdown.h.orig	Fri Sep  4 17:33:00 1998
++++ kdm/kdmshutdown.h	Mon Oct 11 17:17:14 1999
+@@ -49,9 +49,21 @@
+ class KDMShutdown : public FDialog {
       Q_OBJECT
  public:
-      KDMShutdown( int mode, QWidget* _parent=0, const char* _name=0,
--		  const char* _shutdown = "/sbin/halt", 
--		  const char* _restart  = "/sbin/reboot");
++#ifdef    __NetBSD__
++     KDMShutdown( int mode, QWidget* _parent=0, const char* _name=0,
 +		  const char* _shutdown = "/sbin/shutdown -h now", 
 +		  const char* _restart  = "/sbin/shutdown -r now");
++#else /* !__NetBSD__ */
++#ifdef    __SVR4
++     KDMShutdown( int mode, QWidget* _parent=0, const char* _name=0,
++		  const char* _shutdown = "/usr/sbin/halt", 
++		  const char* _restart  = "/usr/sbin/reboot");
++#else /* !__SVR4 */
+      KDMShutdown( int mode, QWidget* _parent=0, const char* _name=0,
+ 		  const char* _shutdown = "/sbin/halt", 
+ 		  const char* _restart  = "/sbin/reboot");
++#endif /* __SVR4 */
++#endif /* __NetBSD__ */
  private slots:
       void rb_clicked(int);
       void pw_entered();
diff --git a/x11/kdebase/patches/patch-al b/x11/kdebase/patches/patch-al
index b119ade58aa..a6d5c373101 100644
--- a/x11/kdebase/patches/patch-al
+++ b/x11/kdebase/patches/patch-al
@@ -1,17 +1,32 @@
-$NetBSD: patch-al,v 1.1 1998/11/10 22:23:02 tron Exp $
+$NetBSD: patch-al,v 1.2 1999/10/23 02:06:07 hubertf Exp $
 
---- kdm/kdmconfig.cpp.orig	Thu Mar 26 17:37:16 1998
-+++ kdm/kdmconfig.cpp	Tue Nov 10 22:46:06 1998
-@@ -119,10 +119,10 @@
+--- kdm/kdmconfig.cpp.orig	Fri Apr 23 15:12:54 1999
++++ kdm/kdmconfig.cpp	Mon Oct 11 17:22:02 1999
+@@ -134,10 +134,26 @@
                 _shutdownButton = KNone;
            _shutdown         = new QString( kc->readEntry(  "Shutdown"));
            if( _shutdown->isNull())
--               *_shutdown = "/sbin/halt";
++#ifdef    __NetBSD__
 +               *_shutdown = "/sbin/shutdown -h now";
++#else /* !__NetBSD__ */
++#ifdef    __SVR4
++               *_shutdown = "/usr/sbin/halt";
++#else /* !__SVR4 */
+                *_shutdown = "/sbin/halt";
++#endif /* __SVR4 */
++#endif /* __NetBSD__ */
            _restart          = new QString( kc->readEntry(   "Restart"));
            if( _restart->isNull())
 -               *_restart = "/sbin/reboot";
++#ifdef    __NetBSD__
 +               *_restart = "/sbin/shutdown -r now";
++#else /* !__NetBSD__ */
++#ifdef    __SVR4
++               *_shutdown = "/usr/sbin/reboot";
++#else /* !__SVR4 */
++               *_shutdown = "/sbin/reboot";
++#endif /* __SVR4 */
++#endif /* __NetBSD__ */
       } else
            _shutdownButton   = KNone;
       if( kc->hasKey( "GUIStyle")) {