From bd70163b09ff59331bceba9506c7cc51962571f1 Mon Sep 17 00:00:00 2001
From: Marcin Cieslak <saper@saper.info>
Date: Fri, 7 Sep 2012 23:04:44 +0200
Subject: [PATCH] FreeBSD: Fix dtlogin failsafe session

We need to have /usr/local as the proper
X11 prefix to start mwm and xterm
---
 cde/programs/dtlogin/config/Xfailsafe.src | 4 ++++
 cde/programs/dtlogin/session.c            | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/cde/programs/dtlogin/config/Xfailsafe.src b/cde/programs/dtlogin/config/Xfailsafe.src
index b0c60ca63..45f46957b 100644
--- a/cde/programs/dtlogin/config/Xfailsafe.src
+++ b/cde/programs/dtlogin/config/Xfailsafe.src
@@ -44,6 +44,7 @@ XCOMM  emulator.
    $XDIR/xterm -C -ls
 #else
 
+
 XCOMM
 XCOMM  Global variables
 XCOMM
@@ -56,6 +57,9 @@ XCOMM
 #if defined(linux)
    XDIR=/usr/bin
 #endif
+#if defined(__FreeBSD__)
+   XDIR=/usr/local/bin
+#endif
 
 $XDIR/xsetroot -default &
 
diff --git a/cde/programs/dtlogin/session.c b/cde/programs/dtlogin/session.c
index 57e73948e..41cf26d68 100644
--- a/cde/programs/dtlogin/session.c
+++ b/cde/programs/dtlogin/session.c
@@ -1652,6 +1652,8 @@ StartClient( struct verify_info *verify, struct display *d, int *pidp )
             failsafeArgv[i++] = "/usr/X/bin/xterm";
 #elif defined(__hpux)
 	    failsafeArgv[i++] = "/usr/bin/X11/hpterm";
+#elif defined(CSRG_BASED)
+	    failsafeArgv[i++] = "/usr/local/bin/xterm";
 #else
 	    failsafeArgv[i++] = "/usr/bin/X11/xterm";
 #endif