7 files changed, 165 insertions, 37 deletions
diff --git a/desktop/openbox/README b/desktop/openbox/README
index f5f771984674..345bf31ea455 100644
--- a/desktop/openbox/README
+++ b/desktop/openbox/README
@@ -4,3 +4,19 @@ and to work properly.  Openbox is fully functional as a stand-alone
 working environment, or can be used as a drop-in replacement for
 the default window manager in the GNOME or KDE desktop environments.
 
+To use Openbox in KDE or GNOME please specify this in the script or 
+when running the script by setting KXINIT or GXINIT to "YES", 
+respectively.  For example, to add an option to use Openbox in KDE 
+you can run:
+
+KXINIT=YES ./openbox.SlackBuild
+
+If you do not make the package with this support and you want to run 
+Openbox in KDE or GNOME, then you should copy the respective xinitrc 
+script from /usr/doc/openbox to /etc/X11/xinit/.  You will also need 
+to copy openbox-kde-session or openbox-gnome-session to /usr/bin/.  
+To be used, all the scripts will need to be executable.
+
+If you do not plan on using a session manager with Openbox you can 
+build a smaller binary by disabling session management support.  To 
+do this simply configure with '--disable-session-management'.
diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild
index 231553917f3a..cb76a523df4d 100644
--- a/desktop/openbox/openbox.SlackBuild
+++ b/desktop/openbox/openbox.SlackBuild
@@ -2,17 +2,32 @@
 
 # Slackware build script for Openbox 
 
-# Written by Chess Griffin <chess at chessgriffin dot com>
-
-PRGNAM=openbox		
-VERSION=3.3.1	
-ARCH=${ARCH:-i486}	
-BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}	
-CWD=`pwd`		
+# Written by Chess Griffin <chess@chessgriffin.com>
+# Modifications for KDE and GNOME xinitrc scripts 
+#  by Phillip Warner <pc_warner@yahoo.com>
+
+PRGNAM=openbox
+VERSION=3.4.6.1
+ARCH=${ARCH:-i486}
+BUILD=${BUILD:-2}
+TAG=${TAG:-_SBo}
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	
+OUTPUT=${OUTPUT:-/tmp}
+
+# Set these to "YES" if you want your package to include a xinitrc file 
+# for running Openbox in KDE or GNOME, respectively.
+# Otherwise, you can add the xinitrc files manually to /etc/X11/xinit and 
+# the openbox-kde-session and openbox-gnome-session files to /usr/bin.
+# The files can be found under /usr/doc/openbox
+# Don't forget to make them executable if you copy them from /usr/doc!
+#
+# This can be specified on the command line when calling the build script:
+#   KXINIT=YES ./openbox.SlackBuild
+KXINIT=${KXINIT:-NO}
+GXINIT=${GXINIT:-NO}
 
 DOCS="ABOUT-NLS AUTHORS CHANGELOG COMPLIANCE COPYING README"
 
@@ -22,12 +37,14 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -37,30 +54,49 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-startup-notification \
-  || exit 1
+  --mandir=/usr/man \
+  --enable-startup-notification
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
-if [ -d $PKG/usr/man ]; then
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
-  for i in `find . -type l` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
 )
-fi
 
 # Add xinitrc.openbox so that openbox will show up as an option in xwmconfig
 install -D -m 0755 $CWD/xinitrc.openbox $PKG/etc/X11/xinit/xinitrc.openbox
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+# Optionally install xinitrc scripts for running Openbox in KDE or GNOME
+# Move the scripts from /usr/bin if the xinitrc scripts are not installed.
+if [ "$KXINIT" == "YES" ]; then
+	install -D -m 0755 $CWD/xinitrc.kde-openbox $PKG/etc/X11/xinit/xinitrc.kde-openbox
+else
+	cat $PKG/usr/bin/openbox-kde-session > $PKG/usr/share/doc/$PRGNAM/openbox-kde-session
+	rm -vf $PKG/usr/bin/openbox-kde-session
+fi
+if [ "$GXINIT" == "YES" ]; then
+	install -D -m 0755 $CWD/xinitrc.gnome-openbox $PKG/etc/X11/xinit/xinitrc.gnome-openbox
+else
+	cat $PKG/usr/bin/openbox-gnome-session > $PKG/usr/share/doc/$PRGNAM/openbox-gnome-session
+	rm -vf $PKG/usr/bin/openbox-gnome-session
+fi
+
+mkdir -p $PKG/usr/doc
+mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
+rmdir $PKG/usr/share/doc
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
+for i in $CWD/xinitrc.*openbox ; do
+	cat $i > $PKG/usr/doc/$PRGNAM-$VERSION/$(basename $i) ;
+done
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+( cd $PKG/usr/doc ; ln -s $PRGNAM-$VERSION $PRGNAM )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/openbox/openbox.info b/desktop/openbox/openbox.info
index eedc791580e3..0ba093ce19d1 100644
--- a/desktop/openbox/openbox.info
+++ b/desktop/openbox/openbox.info
@@ -1,8 +1,8 @@
 PRGNAM="openbox"
-VERSION="3.3.1"
+VERSION="3.4.6.1"
 HOMEPAGE="http://icculus.org/openbox/"
-DOWNLOAD="http://icculus.org/openbox/releases/openbox-3.3.1.tar.gz"
-MD5SUM="6dc25d5fbff5d6277593b89974f950d8"
+DOWNLOAD="http://icculus.org/openbox/releases/openbox-3.4.6.1.tar.gz"
+MD5SUM="0000c3a72d9fb956128cee7fd27ff19f"
 MAINTAINER="Chess Griffin"
 EMAIL="chess@chessgriffin.com"
-APPROVED="BP{k},robw810"
+APPROVED="rworkman"
diff --git a/desktop/openbox/slack-desc b/desktop/openbox/slack-desc
index e71b1d1bc786..4948303e810c 100644
--- a/desktop/openbox/slack-desc
+++ b/desktop/openbox/slack-desc
@@ -1,4 +1,12 @@
-openbox: Openbox window manager.
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+       |-----handy-ruler-----------------------------------------------------|
+openbox: openbox (Openbox window manager)
 openbox:  
 openbox: Openbox is a standards compliant, fast, light-weight, extensible
 openbox: window manager.  Openbox was written first to comply with standards
@@ -6,6 +14,6 @@ openbox: and to work properly.  Openbox is fully functional as a stand-alone
 openbox: working environment, or can be used as a drop-in replacement for
 openbox: the default window manager in the GNOME or KDE desktop environments.
 openbox:
-openbox: Homepage:  http://www.icculus.org/openbox
+openbox: Homepage: http://www.icculus.org/openbox
 openbox: 
 openbox: 
diff --git a/desktop/openbox/xinitrc.gnome-openbox b/desktop/openbox/xinitrc.gnome-openbox
new file mode 100644
index 000000000000..3b64b77e1a23
--- /dev/null
+++ b/desktop/openbox/xinitrc.gnome-openbox
@@ -0,0 +1,34 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    /usr/bin/xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    /usr/bin/xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    /usr/bin/xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    /usr/bin/xmodmap $usermodmap
+fi
+
+# Create default user directory & populate it if not already existent
+if [ ! -d $HOME/.config/openbox ]; then
+  mkdir -p $HOME/.config/openbox
+  cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+  cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
+fi
+
+exec openbox-gnome-session
diff --git a/desktop/openbox/xinitrc.kde-openbox b/desktop/openbox/xinitrc.kde-openbox
new file mode 100644
index 000000000000..69dc360e0040
--- /dev/null
+++ b/desktop/openbox/xinitrc.kde-openbox
@@ -0,0 +1,35 @@
+#!/bin/sh
+# $Xorg: xinitrc.cpp,v 1.3 2000/08/17 19:54:30 cpqbld Exp $
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+
+if [ -f $sysresources ]; then
+    /usr/bin/xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    /usr/bin/xmodmap $sysmodmap
+fi
+
+if [ -f $userresources ]; then
+    /usr/bin/xrdb -merge $userresources
+fi
+
+if [ -f $usermodmap ]; then
+    /usr/bin/xmodmap $usermodmap
+fi
+
+# Create default user directory & populate it if not already existent
+if [ ! -d $HOME/.config/openbox ]; then
+  mkdir -p $HOME/.config/openbox
+  cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+  cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
+fi
+
+exec openbox-kde-session
+
diff --git a/desktop/openbox/xinitrc.openbox b/desktop/openbox/xinitrc.openbox
index b12c4169bec6..572ae8f8c085 100644
--- a/desktop/openbox/xinitrc.openbox
+++ b/desktop/openbox/xinitrc.openbox
@@ -3,33 +3,32 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/usr/X11R6/lib/X11/xinit/.Xresources
-sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 
 if [ -f $sysresources ]; then
-    /usr/X11R6/bin/xrdb -merge $sysresources
+    /usr/bin/xrdb -merge $sysresources
 fi
 
 if [ -f $sysmodmap ]; then
-    /usr/X11R6/bin/xmodmap $sysmodmap
+    /usr/bin/xmodmap $sysmodmap
 fi
 
 if [ -f $userresources ]; then
-    /usr/X11R6/bin/xrdb -merge $userresources
+    /usr/bin/xrdb -merge $userresources
 fi
 
 if [ -f $usermodmap ]; then
-    /usr/X11R6/bin/xmodmap $usermodmap
+    /usr/bin/xmodmap $usermodmap
 fi
 
 # Create default user directory & populate it if not already existent
 if [ ! -d $HOME/.config/openbox ]; then
   mkdir -p $HOME/.config/openbox
-  for FILE in menu.xml rc.xml;
-  do cat /etc/xdg/openbox/$FILE > $HOME/.config/openbox/$FILE;
-  done
+  cat /etc/xdg/openbox/menu.xml > $HOME/.config/openbox/menu.xml
+  cat /etc/xdg/openbox/rc.xml > $HOME/.config/openbox/rc.xml
 fi
 
-exec openbox 
+exec openbox-session