aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/moreutils/README2
-rw-r--r--misc/moreutils/moreutils.SlackBuild10
-rw-r--r--misc/moreutils/moreutils.info6
3 files changed, 10 insertions, 8 deletions
diff --git a/misc/moreutils/README b/misc/moreutils/README
index 1878e061c4b8c..793048affbe92 100644
--- a/misc/moreutils/README
+++ b/misc/moreutils/README
@@ -1,2 +1,4 @@
moreutils is a growing collection of the unix tools that nobody
thought to write long ago when unix was young.
+
+This package conflicts with system/parallel.
diff --git a/misc/moreutils/moreutils.SlackBuild b/misc/moreutils/moreutils.SlackBuild
index 664a56794384a..f1149a0a81b3f 100644
--- a/misc/moreutils/moreutils.SlackBuild
+++ b/misc/moreutils/moreutils.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for moreutils
-# Copyright 2015 Arkadiusz Drabczyk <arkadiusz@drabczyk.org>
+# Copyright 2015-2016 Arkadiusz Drabczyk <arkadiusz@drabczyk.org>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,13 +23,13 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=moreutils
-VERSION=${VERSION:-0.59}
+VERSION=${VERSION:-0.60}
BUILD=${BUILD:-1}
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
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-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"
diff --git a/misc/moreutils/moreutils.info b/misc/moreutils/moreutils.info
index 0ae901ce5523c..2fce21bf4d51d 100644
--- a/misc/moreutils/moreutils.info
+++ b/misc/moreutils/moreutils.info
@@ -1,8 +1,8 @@
PRGNAM="moreutils"
-VERSION="0.59"
+VERSION="0.60"
HOMEPAGE="https://joeyh.name/code/moreutils"
-DOWNLOAD="http://drabczyk.org/moreutils-0.59.tar.gz"
-MD5SUM="718900463335f8a9405493c5db5cf4bb"
+DOWNLOAD="http://drabczyk.org/moreutils-0.60.tar.gz"
+MD5SUM="69370e9dc5fda8580d03c2c2fd831b6b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="perl-IPC-Run"