8 files changed, 54 insertions, 47 deletions
diff --git a/desktop/slim/Makefile-i486.diff.gz b/desktop/slim/Makefile-i486.diff.gz
index 446d7ca770d32..fa06c9aee2376 100644
--- a/desktop/slim/Makefile-i486.diff.gz
+++ b/desktop/slim/Makefile-i486.diff.gz
diff --git a/desktop/slim/Makefile-i686.diff.gz b/desktop/slim/Makefile-i686.diff.gz
index 6b7e07d225121..238188e2d5292 100644
--- a/desktop/slim/Makefile-i686.diff.gz
+++ b/desktop/slim/Makefile-i686.diff.gz
diff --git a/desktop/slim/README b/desktop/slim/README
index a42be264819f9..afb4b3e531266 100644
--- a/desktop/slim/README
+++ b/desktop/slim/README
@@ -5,8 +5,17 @@ that looks good, but still do not want Gnome or KDE.
 This package also includes a BSD-style rc.d script to start slim;
 you will need to make /etc/rc.d/rc.slim executable:
    chmod 755 /etc/rc.d/rc.slim
+
 Also, you will need to add something like this to /etc/rc.d/rc.local:
   if [ -x /etc/rc.d/rc.slim ]; then
     /etc/rc.d/rc.slim start
   fi
-   
+
+Note that your system should use runlevel 3 for this to work.
+I (rworkman) did a bit of tinkering to try and make slim work properly
+from runlevel 4 (starting it from rc.4) a few versions ago, but I was
+not successful, and it wasn't worth the effort to continue.
+
+Finally, if you have PAM installed and wish to build slim with support
+for it, have a look inside the build script for instructions; otherwise,
+it will work as is.
diff --git a/desktop/slim/doinst.sh b/desktop/slim/doinst.sh
index de76815af0cf3..49a1fd7229488 100644
--- a/desktop/slim/doinst.sh
+++ b/desktop/slim/doinst.sh
@@ -2,16 +2,24 @@
 
 config() {
   NEW="$1"
-  OLD="`dirname $NEW`/`basename $NEW .new`"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
   # If there's no config file by that name, mv it over:
   if [ ! -r $OLD ]; then
     mv $NEW $OLD
-  elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
     # toss the redundant copy
     rm $NEW
   fi
   # Otherwise, we leave the .new copy for the admin to consider...
 }
 
-config /etc/slim.conf.new
-config /etc/rc.d/rc.slim.new
+# Keep same perms on rc.slim.new:
+if [ -e etc/rc.d/rc.slim ]; then
+  cp -a etc/rc.d/rc.slim etc/rc.d/rc.slim.new.incoming
+  cat etc/rc.d/rc.slim.new > etc/rc.d/rc.slim.new.incoming
+  mv etc/rc.d/rc.slim.new.incoming etc/rc.d/rc.slim.new
+fi
+
+config etc/rc.d/rc.slim.new
+config etc/slim.conf.new
+
diff --git a/desktop/slim/slack-desc b/desktop/slim/slack-desc
index ecabea73d2540..9bd4adfb9d08e 100644
--- a/desktop/slim/slack-desc
+++ b/desktop/slim/slack-desc
@@ -1,4 +1,12 @@
-slim: slim - graphical login manager similar to xdm/kdm/gdm
+# 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------------------------------------------------------|
+slim: slim (graphical login manager similar to xdm/kdm/gdm)
 slim: 
 slim: Slim is a lightweight login manager based on GNUstep's Login.app
 slim: It makes a great replacement for XDM for those who want something
@@ -7,3 +15,5 @@ slim:
 slim: This package also includes a BSD-style rc.d script to start slim.
 slim: 
 slim: 
+slim: 
+slim: 
diff --git a/desktop/slim/slim.SlackBuild b/desktop/slim/slim.SlackBuild
index bef2bb73bc74b..4c9e2879f4a34 100644
--- a/desktop/slim/slim.SlackBuild
+++ b/desktop/slim/slim.SlackBuild
@@ -22,23 +22,27 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
 PRGNAM=slim
-VERSION=1.2.6
+VERSION=1.3.0
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+# Since PAM is not included on a stock Slackware system, default to NO.
+# If you (shudder) have PAM installed, then run the build script like this:
+# PAM=YES ./slim.SlackBuild
+PAM=${PAM:-NO}
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
 cd $PRGNAM-$VERSION || exit 1
 chown -R root:root .
 chmod -R a-s,u+w,go+r-w .
@@ -51,24 +55,26 @@ elif [ "$ARCH" = "i686" ]; then
   zcat $CWD/Makefile-i686.diff.gz | patch -p0 || exit 1
 fi
 
-make || exit 1
+if [ "$PAM" = "YES" ]; then
+  make USE_PAM=1
+else
+  make || exit 1
+fi
+
 make install DESTDIR=$PKG || exit 1
 
 ( 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
 
-mkdir -p $PKG/etc/X11/xinit
-install -m 0755 $CWD/xinitrc.slim $PKG/etc/X11/xinit/xinitrc.slim
-
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a COPYING ChangeLog INSTALL README THEMES TODO xinitrc.sample \
   $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/slim/slim.info b/desktop/slim/slim.info
index 374b17ea471c0..696f2eac95808 100644
--- a/desktop/slim/slim.info
+++ b/desktop/slim/slim.info
@@ -1,8 +1,8 @@
 PRGNAM="slim"
-VERSION="1.2.6"
+VERSION="1.3.0"
 HOMEPAGE="http://slim.berlios.de"
-DOWNLOAD="http://download.berlios.de/slim/slim-1.2.6.tar.gz"
-MD5SUM="1bf891f046014a03236c21ce6cbe455b"
+DOWNLOAD="http://download.berlios.de/slim/slim-1.3.0.tar.gz"
+MD5SUM="1c1a87f3cbd3c334c874585e42701961"
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
-APPROVED="BP{k}"
+APPROVED="rworkman"
diff --git a/desktop/slim/xinitrc.slim b/desktop/slim/xinitrc.slim
deleted file mode 100644
index 9e8df8d7bf6e6..0000000000000
--- a/desktop/slim/xinitrc.slim
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#
-# This xinitrc is designed to be used when logging in with SLiM. Sessions
-# listed here should be the same ones that are in /etc/slim.conf. If you
-# wish to add a session, add a section below, and add it to the sessions
-# line in /etc/slim.conf
-# 
-# by Martin Lefebvre (Modified by SlackBuilds.org project)
-
-case $1 in
-xfce4)
-	exec startxfce4
-	;;
-icewm)
-	exec icewm-session
-	;;
-wmaker)
-	exec wmaker
-	;;
-blackbox)
-	exec blackbox
-	;;
-*)
-	exec twm
-	;;
-esac