summaryrefslogtreecommitdiffstats
path: root/misc/moreutils
diff options
context:
space:
mode:
Diffstat (limited to 'misc/moreutils')
-rw-r--r--misc/moreutils/README9
-rw-r--r--misc/moreutils/moreutils.SlackBuild14
-rw-r--r--misc/moreutils/moreutils.info6
3 files changed, 14 insertions, 15 deletions
diff --git a/misc/moreutils/README b/misc/moreutils/README
index 3a234765a3..8bfc060a49 100644
--- a/misc/moreutils/README
+++ b/misc/moreutils/README
@@ -1,10 +1,13 @@
moreutils is a growing collection of the unix tools that nobody
thought to write long ago when unix was young.
-perl-IPC-Run is an optional dependency, if it's missing chronic will
+perl-IPC-Run is an optional dependency. If it's missing, chronic will
not be installed.
-This package conflicts with system/parallel so moreutils version of
-parallel is not installed by default. To install it:
+The 'parallel' command in moreutils conflicts with Slackware's
+parallel package, so the moreutils version of parallel is not
+installed by default. To install it:
PARALLEL=yes ./moreutils.SlackBuild
+
+Note that this will break the sbopkg 'sqg' command!
diff --git a/misc/moreutils/moreutils.SlackBuild b/misc/moreutils/moreutils.SlackBuild
index e31c5d7ef2..106f3970af 100644
--- a/misc/moreutils/moreutils.SlackBuild
+++ b/misc/moreutils/moreutils.SlackBuild
@@ -25,7 +25,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=moreutils
-VERSION=${VERSION:-0.65}
+VERSION=${VERSION:-0.69}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -38,9 +38,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -52,16 +49,12 @@ OUTPUT=${OUTPUT:-/tmp}
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -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
@@ -70,7 +63,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.xz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
@@ -101,6 +94,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/misc/moreutils/moreutils.info b/misc/moreutils/moreutils.info
index dfd3966298..2adbcf565d 100644
--- a/misc/moreutils/moreutils.info
+++ b/misc/moreutils/moreutils.info
@@ -1,8 +1,8 @@
PRGNAM="moreutils"
-VERSION="0.65"
+VERSION="0.69"
HOMEPAGE="https://joeyh.name/code/moreutils"
-DOWNLOAD="http://distfiles.gentoo.org/distfiles/moreutils-0.65.tar.gz"
-MD5SUM="a412e3d175778e0a638f7471f63df1c7"
+DOWNLOAD="http://deb.debian.org/debian/pool/main/m/moreutils/moreutils_0.69.orig.tar.xz"
+MD5SUM="2a2b101efa55149c44fd761a3070395b"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""