1 files changed, 17 insertions, 14 deletions
diff --git a/system/mrxvt/mrxvt.SlackBuild b/system/mrxvt/mrxvt.SlackBuild
index 3c5ef314a838..a897194f669e 100644
--- a/system/mrxvt/mrxvt.SlackBuild
+++ b/system/mrxvt/mrxvt.SlackBuild
@@ -15,20 +15,23 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
+
+set -e
+
 PKGNAME=mrxvt
-VERSION=0.5.2
+VERSION=0.5.3
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)		
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PKGNAME
-OUTPUT=${OUTPUT:-/tmp}	# Final location of package
+OUTPUT=${OUTPUT:-/tmp}
 
 # Number of lines to save in scroll buffer
 # The default if not specified in configure is 100, but I can't
 # imagine this being enough for any real usage of a terminal emulator
-SAVELINES=500
+SAVELINES=${SAVELINES:-500}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -38,14 +41,14 @@ fi
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PKGNAME-$VERSION
-tar -xvzf $CWD/$PKGNAME-$VERSION.tar.gz || exit 1
-cd $PKGNAME-$VERSION || exit 1
+tar xvf $CWD/$PKGNAME-$VERSION.tar.gz
+cd $PKGNAME-$VERSION
 chown -R root:root .
-chmod -R a-s,u+w,go+r-w .
+chmod -R a-s,u+rw,go+r-w .
 
-cat $CWD/no_debug_x.patch | patch -p0 --verbose || exit 1
+patch -p0 < $CWD/no-scroll-with-buffer-mrxvt-0.5.3.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -53,17 +56,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --mandir=/usr/man \
   --with-save-lines=$SAVELINES \
   --enable-xft \
   --enable-xim \
   --enable-text-shadow \
   --enable-utempter \
   --enable-menubar \
-  --disable-debug \
-  || exit 1
+  --disable-debug
 
-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
@@ -75,12 +78,12 @@ cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
   $PKG/usr/doc/$PKGNAME-$VERSION
 mv $PKG/usr/share/doc/$PKGNAME/* $PKG/usr/doc/$PKGNAME-$VERSION/
 rmdir $PKG/usr/share/doc/$PKGNAME
+cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
 ( cd $PKG/usr/doc/$PKGNAME-$VERSION
   for i in *.bz2 ; do
     bunzip2 $i ;
   done
 )
-cat $CWD/$PKGNAME.SlackBuild > $PKG/usr/doc/$PKGNAME-$VERSION/$PKGNAME.SlackBuild
 
 # Add an mrxvt.desktop entry
 mkdir -p $PKG/usr/share/applications
@@ -88,7 +91,7 @@ cat $CWD/mrxvt.desktop > $PKG/usr/share/applications/mrxvt.desktop
 
 ( 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
 )
 
 # Let's not clobber existing config files