summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author T3slider <t3slider@gmail.com>2016-12-03 23:03:30 +0000
committer David Spencer <idlemoor@slackbuilds.org>2016-12-04 19:28:52 +0000
commit165c2c548f797fd1a607990d9f7000d4fb2e1f85 (patch)
treefc5064ca57e9ba674d1a62b4236ee668f7e990c3
parent6ac62b133cee3f5d065528038a04745c3ba23d60 (diff)
downloadslackbuilds-165c2c548f797fd1a607990d9f7000d4fb2e1f85.tar.gz
slackbuilds-165c2c548f797fd1a607990d9f7000d4fb2e1f85.tar.xz
office/wyrd: Fixed download.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
-rw-r--r--office/wyrd/wyrd.SlackBuild38
-rw-r--r--office/wyrd/wyrd.info2
2 files changed, 20 insertions, 20 deletions
diff --git a/office/wyrd/wyrd.SlackBuild b/office/wyrd/wyrd.SlackBuild
index aaccbdcabd..2830a632f8 100644
--- a/office/wyrd/wyrd.SlackBuild
+++ b/office/wyrd/wyrd.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for Wyrd
-# Written by T3slider <t3slider@gmail.com>
+# Copyright 2016 T3slider <t3slider@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -11,16 +11,16 @@
# 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.
+# 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=wyrd
VERSION=${VERSION:-1.4.6}
@@ -29,7 +29,7 @@ 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"
@@ -64,10 +64,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
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 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -86,7 +86,7 @@ make install DESTDIR=$PKG
# Don't clobber the config file
mv $PKG/etc/wyrdrc $PKG/etc/wyrdrc.new
-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
find $PKG/usr/man -type f -exec gzip -9 {} \;
diff --git a/office/wyrd/wyrd.info b/office/wyrd/wyrd.info
index 20a6f15714..eb3b4780ac 100644
--- a/office/wyrd/wyrd.info
+++ b/office/wyrd/wyrd.info
@@ -1,7 +1,7 @@
PRGNAM="wyrd"
VERSION="1.4.6"
HOMEPAGE="http://pessimization.com/software/wyrd/"
-DOWNLOAD="http://pessimization.com/software/wyrd/wyrd-1.4.6.tar.gz"
+DOWNLOAD="http://sourceforge.net/projects/slackbuildsdirectlinks/files/wyrd/wyrd-1.4.6.tar.gz"
MD5SUM="2fc561482fdac4daac0cb6735d934ebe"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""