system/rmw: Updated for version 0.98.3.9beta.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

4 files changed, 14 insertions, 39 deletions

diff --git a/system/rmw/README b/system/rmw/README
index 4609893e17cfe..228bc135a70a0 100644
--- a/system/rmw/README
+++ b/system/rmw/README
@@ -1,5 +1,5 @@
-rmw (Remove to Waste) is a bash script which functions as a command 
-line recycle bin/trash can utility.  Optionally, it can ReMove files 
-to Desktop trash and has been tested on GNOME, KDE, and Xfce.  It 
-features quick and easy restoration from the command line, duplication 
-protection, and can purge files after x amount of days.
+rmw (Remove to Waste) is a bash script which functions as a command
+line recycle bin/trash can utility. Optionally, it can ReMove files to
+Desktop trash and has been tested on GNOME, KDE, and Xfce. It features
+quick and easy restoration from the command line, duplication protection,
+and can purge files after x amount of days.
diff --git a/system/rmw/rmw.SlackBuild b/system/rmw/rmw.SlackBuild
index 65acfcccff988..906114f0c479c 100644
--- a/system/rmw/rmw.SlackBuild
+++ b/system/rmw/rmw.SlackBuild
@@ -5,40 +5,18 @@
 # Written by (Andy Alt) (andyqwerty@users.sourceforge.net)
 
 PRGNAM=rmw
-VERSION=${VERSION:-0.98.3.7beta}
+VERSION=${VERSION:-0.98.3.9beta} 
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
-       *) ARCH=$( uname -m ) ;;
-  esac
-fi
+ARCH=noarch	# only bash script here
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-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"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -53,13 +31,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --build=$ARCH-slackware-linux
+  --docdir=/usr/doc/$PRGNAM-$VERSION
 
 make
 make install DESTDIR=$PKG
diff --git a/system/rmw/rmw.info b/system/rmw/rmw.info
index 525047c7d1f44..381e46589158a 100644
--- a/system/rmw/rmw.info
+++ b/system/rmw/rmw.info
@@ -1,10 +1,10 @@
 PRGNAM="rmw"
-VERSION="0.98.3.7beta"
+VERSION="0.98.3.9beta"
 HOMEPAGE="http://rmw.sf.net/"
-DOWNLOAD="http://downloads.sourceforge.net/rmw/rmw-0.98.3.7beta.tar.gz"
-MD5SUM="e546efa801f45f0d939b7436a1873dba"
+DOWNLOAD="http://downloads.sourceforge.net/rmw/rmw-0.98.3.9beta.tar.gz"
+MD5SUM="bdc92882663aa49c3386050df8563ac6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Andy Alt"
 EMAIL="andyqwerty@users.sourceforge.net"
-APPROVED="rworkman"
+APPROVED="Niels Horn"
diff --git a/system/rmw/slack-desc b/system/rmw/slack-desc
index a3479c0c449ab..1f13a565b8578 100644
--- a/system/rmw/slack-desc
+++ b/system/rmw/slack-desc
@@ -5,7 +5,7 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-   |-----handy-ruler-----------------------------------------------|
+   |-----handy-ruler------------------------------------------------------|
 rmw: rmw (command line trash can/recycle bin)
 rmw:
 rmw: rmw (ReMove to Waste) is a bash script which functions