summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/yajl/yajl.SlackBuild32
-rw-r--r--libraries/yajl/yajl.info4
2 files changed, 26 insertions, 10 deletions
diff --git a/libraries/yajl/yajl.SlackBuild b/libraries/yajl/yajl.SlackBuild
index b1fa769949..4442e53a88 100644
--- a/libraries/yajl/yajl.SlackBuild
+++ b/libraries/yajl/yajl.SlackBuild
@@ -4,6 +4,24 @@
# Written by Eugene Wissner <belka.ew@gmail.com>
# Updated by Marcin Herda <mherda@slackword.net>
+# Updated by Johannes Schoepfer <slackbuilds@schoepfer.info>
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=yajl
VERSION=${VERSION:-2.1.0}
@@ -47,10 +65,10 @@ tar xvf $CWD/lloyd-$PRGNAM-$VERSION-0-ga0ecdde.tar.gz
cd lloyd-$PRGNAM-66cb08c
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
mkdir build
cd build
@@ -64,13 +82,11 @@ cd build
make DESTDIR=$PKG install
cd -
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+find $PKG -print0 | xargs -0 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/$PRGNAM-$VERSION
-cp -a \
- BUILDING COPYING ChangeLog README TODO \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a BUILDING COPYING ChangeLog README TODO $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/libraries/yajl/yajl.info b/libraries/yajl/yajl.info
index a74cb04abf..930e4b6515 100644
--- a/libraries/yajl/yajl.info
+++ b/libraries/yajl/yajl.info
@@ -6,5 +6,5 @@ MD5SUM="8df8a92a2799bc949577e8e7a9f43670"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES=""
-MAINTAINER="Marcin Herda"
-EMAIL="mherda@slackword.net"
+MAINTAINER="Johannes Schoepfer"
+EMAIL="slackbuilds@schoepfer.info"