From f079753e6d81da269e371173d7c1c69f4ad1fc88 Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Mon, 20 Dec 2010 20:53:53 -0600
Subject: system/plan9port: Misc fixes; poke consolekit in xinitrc

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 system/plan9port/plan9port.SlackBuild | 17 ++++++++++++-----
 system/plan9port/xinitrc.rio          |  6 +++++-
 2 files changed, 17 insertions(+), 6 deletions(-)

(limited to 'system/plan9port')

diff --git a/system/plan9port/plan9port.SlackBuild b/system/plan9port/plan9port.SlackBuild
index 9cbfdcf4ec..10dc397616 100644
--- a/system/plan9port/plan9port.SlackBuild
+++ b/system/plan9port/plan9port.SlackBuild
@@ -23,10 +23,17 @@
 
 PRGNAM=plan9port
 VERSION=20100825
-ARCH=${ARCH:-i586}  # There's no use of cflags.
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) ARCH=i486 ;;
+    arm*) ARCH=arm ;;
+       *) ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -72,14 +79,14 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
 install -D -m 0755 $CWD/profile.d/$PRGNAM.sh $PKG/etc/profile.d/$PRGNAM.sh
 install -m 0755 $CWD/profile.d/$PRGNAM.csh $PKG/etc/profile.d/$PRGNAM.csh
 
+# Add the window manager 'rio' to xwmconfig's list.
+install -D -m 0755 $CWD/xinitrc.rio $PKG/etc/X11/xinit/xinitrc.rio
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cd $PKG/opt/plan9
 mv CHANGES install.txt LICENSE README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-# Add the window manager 'rio' to xwmconfig's list.
-install -D -m 0755 $CWD/xinitrc.rio $PKG/etc/X11/xinit/xinitrc.rio
-
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
diff --git a/system/plan9port/xinitrc.rio b/system/plan9port/xinitrc.rio
index 5fa29b3f38..e4dfba95a3 100644
--- a/system/plan9port/xinitrc.rio
+++ b/system/plan9port/xinitrc.rio
@@ -12,4 +12,8 @@ sysmodmap=/etc/X11/xinit/.Xmodmap
 [ -f $usermodmap ] && xmodmap $usermodmap
 
 # Start the window manager:
-exec rio
+if [ -z "$DESKTOP_SESSION" -a -x /usr/bin/ck-launch-session ]; then
+  exec ck-launch-session rio
+else
+  exec rio
+fi
-- 
cgit v1.2.3