summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorRobby Workman <rworkman@slackbuilds.org>2010-12-20 20:53:53 -0600
committerRobby Workman <rworkman@slackbuilds.org>2010-12-20 20:53:53 -0600
commitf079753e6d81da269e371173d7c1c69f4ad1fc88 (patch)
tree9605ef84aeedfb5b798db3fc23883eab9502b383 /system
parente7f1bae337eb692042f5488c4d5977884cd5862c (diff)
downloadslackbuilds-f079753e6d81da269e371173d7c1c69f4ad1fc88.tar.gz
system/plan9port: Misc fixes; poke consolekit in xinitrc
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/plan9port/plan9port.SlackBuild17
-rw-r--r--system/plan9port/xinitrc.rio6
2 files changed, 17 insertions, 6 deletions
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