diff options
| -rw-r--r-- | system/mrxvt/mrxvt.SlackBuild | 61 | ||||
| -rw-r--r-- | system/mrxvt/mrxvt.info | 12 | ||||
| -rw-r--r-- | system/mrxvt/no-scroll-with-buffer-mrxvt-0.5.3.patch | 60 | ||||
| -rw-r--r-- | system/mrxvt/slack-desc | 2 |
4 files changed, 37 insertions, 98 deletions
diff --git a/system/mrxvt/mrxvt.SlackBuild b/system/mrxvt/mrxvt.SlackBuild index a897194f66..ce90d682f3 100644 --- a/system/mrxvt/mrxvt.SlackBuild +++ b/system/mrxvt/mrxvt.SlackBuild @@ -1,31 +1,20 @@ #!/bin/sh -### mrxvt.SlackBuild ### - -# Slackware build script for mrxvt 0.5.2 -# Copyright (C) 2006 paul wisehart wise@lupulin.net -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# Slackware build script for mrxvt +# Written by Paul Wisehart wise@lupulin.net set -e -PKGNAME=mrxvt -VERSION=0.5.3 +PKGNAM=mrxvt +VERSION=0.5.4 ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -CWD=$(pwd) + +CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PKGNAME +PKG=$TMP/package-$PKGNAM OUTPUT=${OUTPUT:-/tmp} # Number of lines to save in scroll buffer @@ -35,27 +24,32 @@ SAVELINES=${SAVELINES:-500} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" fi + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PKGNAME-$VERSION -tar xvf $CWD/$PKGNAME-$VERSION.tar.gz -cd $PKGNAME-$VERSION +rm -rf $PKGNAM-$VERSION +tar xvf $CWD/$PKGNAM-$VERSION.tar.gz +cd $PKGNAM-$VERSION chown -R root:root . chmod -R a-s,u+rw,go+r-w . -patch -p0 < $CWD/no-scroll-with-buffer-mrxvt-0.5.3.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ --localstatedir=/var \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ --with-save-lines=$SAVELINES \ --enable-xft \ @@ -69,17 +63,20 @@ 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 "shared object" | 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 ) -mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION 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 + $PKG/usr/doc/$PKGNAM-$VERSION +mv $PKG/usr/share/doc/$PKGNAM/* $PKG/usr/doc/$PKGNAM-$VERSION/ +rmdir $PKG/usr/share/doc/$PKGNAM +cat $CWD/$PKGNAM.SlackBuild > $PKG/usr/doc/$PKGNAM-$VERSION/$PKGNAM.SlackBuild + +( cd $PKG/usr/doc/$PKGNAM-$VERSION for i in *.bz2 ; do bunzip2 $i ; done @@ -106,4 +103,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/mrxvt/mrxvt.info b/system/mrxvt/mrxvt.info index e94091248a..ce937159af 100644 --- a/system/mrxvt/mrxvt.info +++ b/system/mrxvt/mrxvt.info @@ -1,8 +1,10 @@ PRGNAM="mrxvt" -VERSION="0.5.3" -HOMEPAGE="http://materm.sourceforge.net/wiki/Main/HomePage" -DOWNLOAD="http://downloads.sourceforge.net/materm/mrxvt-0.5.3.tar.gz" -MD5SUM="0dac39bef63a4a69eab35c027e8c5bdf" +VERSION="0.5.4" +HOMEPAGE="http://materm.sourceforge.net/" +DOWNLOAD="http://downloads.sourceforge.net/project/materm/mrxvt%20source/0.5.4/mrxvt-0.5.4.tar.gz" +MD5SUM="0232c8868484751dcb931a28f0756f69" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Paul Wisehart" EMAIL="wise@lupulin.net" -APPROVED="rworkman" +APPROVED="dsomero" 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 deleted file mode 100644 index 08b926a2a9..0000000000 --- a/system/mrxvt/no-scroll-with-buffer-mrxvt-0.5.3.patch +++ /dev/null @@ -1,60 +0,0 @@ -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/slack-desc b/system/mrxvt/slack-desc index 722cccb0e2..d50f1656bd 100644 --- a/system/mrxvt/slack-desc +++ b/system/mrxvt/slack-desc @@ -16,4 +16,4 @@ mrxvt: gnome-terminal and konsole) but aims to be fast, lightweight and mrxvt: independent of standard toolkits or desktop environments mrxvt: (e.g. Gnome / KDE). mrxvt: -mrxvt: +mrxvt: |