diff options
| author | hubertf <hubertf@pkgsrc.org> | 1999-11-12 04:50:00 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 1999-11-12 04:50:00 +0000 |
| commit | 92d63581717030ba175c416ab744052d922b638a (patch) | |
| tree | b5faa0969838e226d82643b2d70ee19e6f4e4f18 /x11/kdebase/patches/patch-aj | |
| parent | d6c4d4674dc36db76c5a81dad912523b6096b11d (diff) | |
| download | pkgsrc-92d63581717030ba175c416ab744052d922b638a.tar.gz | |
Fix patch fuzz insanity.
Diffstat (limited to 'x11/kdebase/patches/patch-aj')
| -rw-r--r-- | x11/kdebase/patches/patch-aj | 45 |
1 files changed, 31 insertions, 14 deletions
diff --git a/x11/kdebase/patches/patch-aj b/x11/kdebase/patches/patch-aj index e771da7273d..53c359cdf8b 100644 --- a/x11/kdebase/patches/patch-aj +++ b/x11/kdebase/patches/patch-aj @@ -1,15 +1,32 @@ -$NetBSD: patch-aj,v 1.4 1999/09/30 07:10:22 tron Exp $ +$NetBSD: patch-aj,v 1.5 1999/11/12 04:50:00 hubertf Exp $ -Yet another Solaris-only fix - ---- kdm/kdm-config.h.orig Wed Sep 29 22:34:24 1999 -+++ kdm/kdm-config.h Wed Sep 29 22:36:27 1999 -@@ -95,3 +95,8 @@ - #ifdef __cplusplus - } - #endif -+ -+ -+#ifdef SVR4 -+#define NeedVarargsPrototypes 1 -+#endif +--- ./kdm/kdmconfig.cpp Fri Apr 23 15:12:54 1999 ++++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdmconfig.cpp Fri Nov 12 05:10:32 1999 +@@ -134,10 +134,26 @@ + _shutdownButton = KNone; + _shutdown = new QString( kc->readEntry( "Shutdown")); + if( _shutdown->isNull()) ++#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")) { |