Merge from vendor branch FREEBSD:
[pkgsrcv2.git] / x11 / kdebase / patches / patch-aj
1 $NetBSD: patch-aj,v 1.5 1999/11/12 04:50:00 hubertf Exp $
2
3 A bit different patch pulled into KDE2  jdolecek        1999/12/12
4 --- ./kdm/kdmconfig.cpp Fri Apr 23 15:12:54 1999
5 +++ /usr/pkgsrc/x11/kdebase/work.i386.unpatched/kdebase-1.1.2/kdm/kdmconfig.cpp Fri Nov 12 05:10:32 1999
6 @@ -134,10 +134,26 @@
7                 _shutdownButton = KNone;
8            _shutdown         = new QString( kc->readEntry(  "Shutdown"));
9            if( _shutdown->isNull())
10 +#ifdef    __NetBSD__
11 +               *_shutdown = "/sbin/shutdown -h now";
12 +#else /* !__NetBSD__ */
13 +#ifdef    __SVR4
14 +               *_shutdown = "/usr/sbin/halt";
15 +#else /* !__SVR4 */
16                 *_shutdown = "/sbin/halt";
17 +#endif /* __SVR4 */
18 +#endif /* __NetBSD__ */
19            _restart          = new QString( kc->readEntry(   "Restart"));
20            if( _restart->isNull())
21 -               *_restart = "/sbin/reboot";
22 +#ifdef    __NetBSD__
23 +               *_restart = "/sbin/shutdown -r now";
24 +#else /* !__NetBSD__ */
25 +#ifdef    __SVR4
26 +               *_restart = "/usr/sbin/reboot";
27 +#else /* !__SVR4 */
28 +               *_restart = "/sbin/reboot";
29 +#endif /* __SVR4 */
30 +#endif /* __NetBSD__ */
31       } else
32            _shutdownButton   = KNone;
33       if( kc->hasKey( "GUIStyle")) {