From: Pascal Stumpf <Pascal.Stumpf@cubes.de>
Date: Mon, 22 Jul 2013 21:39:13 +0000 (+0200)
Subject: Adapt dtlogin/config/_common.ksh.src for OpenBSD:
X-Git-Tag: 2.2.1~46
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=aa470d2e3adede4d625a843a14ab663587645c1a;p=oweals%2Fcde.git

Adapt dtlogin/config/_common.ksh.src for OpenBSD:

* ps(1) is totally different on BSD and Linux.  The OSF commandline works fine.
* fontpath is in /usr/X11R6 on OpenBSD.
---

diff --git a/cde/programs/dtlogin/config/_common.ksh.src b/cde/programs/dtlogin/config/_common.ksh.src
index 6386d133..37cc227d 100644
--- a/cde/programs/dtlogin/config/_common.ksh.src
+++ b/cde/programs/dtlogin/config/_common.ksh.src
@@ -32,11 +32,11 @@
   HASH
   HASH Determine Xsession parent
   HASH
-#if defined (__osf__)
+#if defined (__osf__) || defined(__OpenBSD__)
   pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $5}')
 #elif defined(USL) && (OSMAJORVERSION > 1)
   pexec=$(LC_TIME=C ps -p $PPID | awk 'NR==2 {print $6}')
-#elif defined(linux) || defined(CSRG_BASED) && !defined(__FreeBSD__)
+#elif defined(linux)
   pexec=$(LC_TIME=C /bin/ps -p $PPID 2>/dev/null | awk 'NR==2 {print $4}')
 #elif defined(__FreeBSD__)
   pexec=$(LC_TIME=C /bin/ps -o comm= -p $PPID 2>/dev/null)
@@ -499,7 +499,11 @@ SetKeyboardMap()
 #ifdef cpp_Xsetup
     if [ "$DTXSERVERLOCATION" != "remote" ]; then
       fontpath=
+#if defined(__FreeBSD__)
       FONTLIB=/usr/local/lib/X11/fonts
+#elif defined(__OpenBSD__)
+      FONTLIB=/usr/X11R6/lib/X11/fonts
+#endif
       for i in misc 75dpi 100dpi Speedo Type1 PJE
       do
 	 if [ -f $FONTLIB/$i/fonts.dir ];  then