summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/jq/README4
-rw-r--r--system/jq/jq.SlackBuild13
-rw-r--r--system/jq/jq.info8
3 files changed, 13 insertions, 12 deletions
diff --git a/system/jq/README b/system/jq/README
index 02ab67cff1..26780b8960 100644
--- a/system/jq/README
+++ b/system/jq/README
@@ -1,5 +1,5 @@
jq is a lightweight and flexible command-line JSON processor.
-jq is like sed for JSON data - you can use it to slice and filter
-and map and transform structured data with the same ease that
+jq is like sed for JSON data - you can use it to slice and filter
+and map and transform structured data with the same ease that
sed, awk, grep and friends let you play with text.
diff --git a/system/jq/jq.SlackBuild b/system/jq/jq.SlackBuild
index 8c538bf3a2..e832ccaa0e 100644
--- a/system/jq/jq.SlackBuild
+++ b/system/jq/jq.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for jq
-# Copyright 2015 Gary Herreman <gary@garyrh.com>
+# Copyright 2015, 2018 Gary Herreman <gary@garyrh.com>
# 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=jq
-VERSION=${VERSION:-1.4}
+VERSION=${VERSION:-1.6}
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"
@@ -78,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
--mandir=/usr/man
make
+make check
make install DESTDIR=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
@@ -91,7 +92,7 @@ mv $PKG/usr/share/doc $PKG/usr
mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
rmdir $PKG/usr/share
-cp -a docs/ $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog KEYS NEWS docs/ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/system/jq/jq.info b/system/jq/jq.info
index 4452268496..f4717b714f 100644
--- a/system/jq/jq.info
+++ b/system/jq/jq.info
@@ -1,10 +1,10 @@
PRGNAM="jq"
-VERSION="1.4"
+VERSION="1.6"
HOMEPAGE="https://stedolan.github.io/jq/"
-DOWNLOAD="https://github.com/stedolan/jq/releases/download/jq-1.4/jq-1.4.tar.gz"
-MD5SUM="e3c75a4f805bb5342c9f4b3603fb248f"
+DOWNLOAD="https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz"
+MD5SUM="f5f70ad5dc46d95e0128dc94c25c4d5d"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="oniguruma"
MAINTAINER="Gary Herreman"
EMAIL="gary@garyrh.com"