system/mrxvt: Updated for version 0.5.3

6 files changed, 93 insertions, 38 deletions

diff --git a/system/mrxvt/doinst.sh b/system/mrxvt/doinst.sh
index 5c2cb485e8..bdee9c86f1 100644
--- a/system/mrxvt/doinst.sh
+++ b/system/mrxvt/doinst.sh
@@ -1,10 +1,11 @@
+
 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
@@ -16,7 +17,3 @@ config etc/mrxvt/submenus.menu.new
 config etc/mrxvt/mrxvtrc.new
 config etc/mrxvt/mrxvtrc.sample.new
 
-if [ -x usr/bin/update-desktop-database ]; then
-  ./usr/bin/update-desktop-database ./usr/share/applications >/dev/null 2>&1
-fi
-
diff --git a/system/mrxvt/mrxvt.SlackBuild b/system/mrxvt/mrxvt.SlackBuild
index 3c5ef314a8..a897194f66 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
diff --git a/system/mrxvt/mrxvt.info b/system/mrxvt/mrxvt.info
index 98d70cff33..e94091248a 100644
--- a/system/mrxvt/mrxvt.info
+++ b/system/mrxvt/mrxvt.info
@@ -1,8 +1,8 @@
 PRGNAM="mrxvt"
-VERSION="0.5.2"
+VERSION="0.5.3"
 HOMEPAGE="http://materm.sourceforge.net/wiki/Main/HomePage"
-DOWNLOAD="http://dl.sourceforge.net/sourceforge/materm/mrxvt-0.5.2.tar.gz"
-MD5SUM="ed87b7dd9f4fb482de0f14f085085027"
+DOWNLOAD="http://downloads.sourceforge.net/materm/mrxvt-0.5.3.tar.gz"
+MD5SUM="0dac39bef63a4a69eab35c027e8c5bdf"
 MAINTAINER="Paul Wisehart"
 EMAIL="wise@lupulin.net"
-APPROVED="robw810"
+APPROVED="rworkman"
diff --git a/system/mrxvt/no-scroll-with-buffer-mrxvt-0.5.3.patch b/system/mrxvt/no-scroll-with-buffer-mrxvt-0.5.3.patch
new file mode 100644
index 0000000000..08b926a2a9
--- /dev/null
+++ b/system/mrxvt/no-scroll-with-buffer-mrxvt-0.5.3.patch
@@ -0,0 +1,60 @@
+Index: src/rxvtlib.h
+===================================================================
+--- src/rxvtlib.h	(revision 244)
++++ src/rxvtlib.h	(working copy)
+@@ -280,7 +280,7 @@
+ #define Opt_forceTransparent	    ((1LU<<16) | IS_OPTION1)
+ #define Opt_mc_hack		    ((1LU<<17) | IS_OPTION1)
+ #define Opt_tripleclickwords	    ((1LU<<18) | IS_OPTION1)
+-#define Opt_scrollWithBuffer	    ((1LU<<19) | IS_OPTION1)
++/* #define Opt_scrollWithBuffer	    ((1LU<<19) | IS_OPTION1) */
+ #define Opt_mouseWheelScrollPage    ((1LU<<21) | IS_OPTION1)
+ #define Opt_pointerBlank	    ((1LU<<22) | IS_OPTION1)
+ #define Opt_cursorBlink		    ((1LU<<23) | IS_OPTION1)
+Index: src/xdefaults.c
+===================================================================
+--- src/xdefaults.c	(revision 244)
++++ src/xdefaults.c	(working copy)
+@@ -203,8 +203,6 @@
+ 	    "scroll-on-tty-output inhibit" ),
+     BOOL( "scrollTtyKeypress", "sk", Opt_scrollTtyKeypress,
+ 	    "scroll-on-keypress" ),
+-    BOOL( "scrollWithBuffer", "sw", Opt_scrollWithBuffer,
+-	    "scroll-with-buffer" ),
+ 
+     STRG(Rs_opacity, "opacity", "o", "%",
+ 	"transluscent window (true transparent) opaque degree", 0),
+Index: src/screen.c
+===================================================================
+--- src/screen.c	(revision 244)
++++ src/screen.c	(working copy)
+@@ -938,10 +938,6 @@
+ 	    PVTS(r, page)->nscrolled = SVLINES;
+ 	else
+ 	    PVTS(r, page)->nscrolled = (uint16_t)nscrolled;
+-	if (ISSET_OPTION(r, Opt_scrollWithBuffer) &&
+-	    VSTART != 0 &&
+-	    VSTART != SVLINES)
+-	    rxvt_scr_page(r, page, UP, count);
+     }
+     else if (!spec)
+ 	row1 += SVLINES;
+Index: doc/mrxvt.1
+===================================================================
+--- doc/mrxvt.1	(revision 244)
++++ doc/mrxvt.1	(working copy)
+@@ -329,14 +329,6 @@
+ Draw floating scrollbar (i.e. without a trough).
+ .Op Cm scrollbarFloating
+ .
+-.BO sw
+-Scroll synchronusly with buffer. Normally
+-.Nm
+-does not keep the screen completely up to date while scrolling. This allows
+-.Nm
+-to run faster when network latencies are very high and is typically useful when running across a very large internet or many gateways.
+-.Op Cm scrollWithBuffer
+-.
+ .El
+ .Ed
+ .\" {{{2 color
diff --git a/system/mrxvt/no_debug_x.patch b/system/mrxvt/no_debug_x.patch
deleted file mode 100644
index ca2f9789c9..0000000000
--- a/system/mrxvt/no_debug_x.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/init.c
-===================================================================
---- src/init.c	(revision 195)
-+++ src/init.c	(working copy)
-@@ -41,7 +41,7 @@
- # define DEBUG_X
- #else
- # define DEBUG_LEVEL	0
--# define DEBUG_X
-+# undef DEBUG_X
- #endif
- 
- #if DEBUG_LEVEL
diff --git a/system/mrxvt/slack-desc b/system/mrxvt/slack-desc
index 7a932c0ede..722cccb0e2 100644
--- a/system/mrxvt/slack-desc
+++ b/system/mrxvt/slack-desc
@@ -1,4 +1,12 @@
-mrxvt: mrxvt terminal emulator
+# 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------------------------------------------------------|
+mrxvt: mrxvt (mrxvt terminal emulator)
 mrxvt:
 mrxvt: Mrxvt (previously named materm) is a lightweight, powerful
 mrxvt: multi-tabbed terminal emulator for the X window system. mrxvt is