desktop/ratpoison: Updated for version 1.4.1

5 files changed, 17 insertions, 9 deletions

diff --git a/desktop/ratpoison/README b/desktop/ratpoison/README
index a34d5753a8fd8..dfff74a345cf2 100644
--- a/desktop/ratpoison/README
+++ b/desktop/ratpoison/README
@@ -1,4 +1,3 @@
 ratpoison is a light tiling window manager for X. It shares many similarities
 with screen, which has already made wonders for the CLI world. It allows
 perfect harmony between CLI and X11 apps.
-
diff --git a/desktop/ratpoison/ratpoison.SlackBuild b/desktop/ratpoison/ratpoison.SlackBuild
index 9737bd2096356..0d0439438e8e5 100644
--- a/desktop/ratpoison/ratpoison.SlackBuild
+++ b/desktop/ratpoison/ratpoison.SlackBuild
@@ -29,7 +29,7 @@ VERSION=1.4.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -38,7 +38,7 @@ OUTPUT=${OUTPUT:-/tmp}
 # The default is xterm if it's not specified in ./configure, so
 # we'll leave it that way here.  You can specify rxvt or something
 # else if you wish
-XTERM=xterm
+XTERM=${XTERM:-xterm}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -68,7 +68,7 @@ make install-strip DESTDIR=$PKG || exit 1
 
 ( 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
 )
 
 gzip -9 $PKG/usr/info/*.info
diff --git a/desktop/ratpoison/ratpoison.info b/desktop/ratpoison/ratpoison.info
index 79200793c9876..17ae1931909c2 100644
--- a/desktop/ratpoison/ratpoison.info
+++ b/desktop/ratpoison/ratpoison.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://savannah.nongnu.org/download/ratpoison/ratpoison-1.4.1.tar.gz"
 MD5SUM="fcbdcc84cfad9b18518074f676eba270"
 MAINTAINER="Martin Lefebvre"
 EMAIL="dadexter@gmail.com"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/desktop/ratpoison/slack-desc b/desktop/ratpoison/slack-desc
index 2dcc112c08077..88a52ac179a2a 100644
--- a/desktop/ratpoison/slack-desc
+++ b/desktop/ratpoison/slack-desc
@@ -1,4 +1,12 @@
-ratpoison: ratpoison is a light tiling window manager for X.
+# 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------------------------------------------------------|
+ratpoison: ratpoison (a light tiling window manager for X)
 ratpoison: 
 ratpoison: It shares many similarities with screen, which has already
 ratpoison: made wonders for the CLI world. It allows perfect harmony between
@@ -8,3 +16,4 @@ ratpoison: http://www.nongnu.org/ratpoison/
 ratpoison: 
 ratpoison: 
 ratpoison: 
+ratpoison: 
diff --git a/desktop/ratpoison/xinitrc.ratpoison b/desktop/ratpoison/xinitrc.ratpoison
index 1d0e957e9a34b..fb4393a7fa0f1 100644
--- a/desktop/ratpoison/xinitrc.ratpoison
+++ b/desktop/ratpoison/xinitrc.ratpoison
@@ -3,8 +3,8 @@
 
 userresources=$HOME/.Xresources
 usermodmap=$HOME/.Xmodmap
-sysresources=/usr/X11R6/lib/X11/xinit/.Xresources
-sysmodmap=/usr/X11R6/lib/X11/xinit/.Xmodmap
+sysresources=/usr/lib/X11/xinit/.Xresources
+sysmodmap=/usr/lib/X11/xinit/.Xmodmap
 
 # merge in defaults and keymaps
 
@@ -26,4 +26,4 @@ fi
 
 # start some nice programs
 
-exec /usr/bin/ratpoison
+exec ratpoison