From e8003b0b6109eca1a7b007a8437e67103fb0e8ed Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Tue, 21 Mar 2017 13:54:55 -0400
Subject: system/mrxvt: Allow VERSION override, i486=>i586, .desktop.

Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
---
 system/mrxvt/mrxvt.SlackBuild | 32 ++++++++++++++++----------------
 system/mrxvt/mrxvt.desktop    |  2 --
 2 files changed, 16 insertions(+), 18 deletions(-)

(limited to 'system/mrxvt')

diff --git a/system/mrxvt/mrxvt.SlackBuild b/system/mrxvt/mrxvt.SlackBuild
index 768b98f468..367caa4a3b 100644
--- a/system/mrxvt/mrxvt.SlackBuild
+++ b/system/mrxvt/mrxvt.SlackBuild
@@ -5,14 +5,14 @@
 # Written by Paul Wisehart wise@lupulin.net
 
 
-PKGNAM=mrxvt
-VERSION=0.5.4
+PRGNAM=mrxvt
+VERSION=${VERSION:-0.5.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -20,7 +20,7 @@ fi
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAM
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 # Number of lines to save in scroll buffer
@@ -28,8 +28,8 @@ OUTPUT=${OUTPUT:-/tmp}
 # imagine this being enough for any real usage of a terminal emulator
 SAVELINES=${SAVELINES:-500}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -47,9 +47,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.gz
-cd $PKGNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -79,14 +79,14 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README TODO \
-  $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
+  $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/$PRGNAM/* $PKG/usr/doc/$PRGNAM-$VERSION/
+rmdir $PKG/usr/share/doc/$PRGNAM
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-( cd $PKG/usr/doc/$PKGNAM-$VERSION
+( cd $PKG/usr/doc/$PRGNAM-$VERSION
   for i in *.bz2 ; do
     bunzip2 $i ;
   done
@@ -113,4 +113,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/$PKGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/mrxvt/mrxvt.desktop b/system/mrxvt/mrxvt.desktop
index 89a0548d0c..b20cfd458c 100644
--- a/system/mrxvt/mrxvt.desktop
+++ b/system/mrxvt/mrxvt.desktop
@@ -1,8 +1,6 @@
 [Desktop Entry]
-Encoding=UTF-8
 Version=1.0
 Name=mrxvt
-Comment=Terminal Emulator
 GenericName=Terminal Emulator
 Exec=mrxvt
 Icon=/usr/share/pixmaps/mrxvt.png
-- 
cgit v1.2.3