From 8b4459a893baf36b609e74315be8bd6281998462 Mon Sep 17 00:00:00 2001
From: CJ Johnson
Date: Thu, 13 May 2010 00:42:26 +0200
Subject: system/worker: Updated for version 2.13.1

---
 system/worker/worker.SlackBuild | 38 ++++++++++++++++++++++++--------------
 system/worker/worker.info       |  2 ++
 2 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'system/worker')

diff --git a/system/worker/worker.SlackBuild b/system/worker/worker.SlackBuild
index 84d5b13435..58c69fe88a 100644
--- a/system/worker/worker.SlackBuild
+++ b/system/worker/worker.SlackBuild
@@ -2,7 +2,7 @@
 #
 # This script creates a Slackware package from the worker source
 
-# Copyright 2006  Robby Workman  (http://rlworkman.net) 
+# Copyright 2006,2009  Robby Workman, Northport, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -30,6 +30,7 @@ VERSION=2.13.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -37,20 +38,26 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
-cd $TMP || exit 1
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+cd $TMP
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+rw,go+r-w,a-s .
 
@@ -58,29 +65,32 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  || exit 1
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
 ( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
-# Compress man pages
 gzip -9 $PKG/usr/man/man?/*
 gzip -9 $PKG/usr/man/fr/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS README_LARGEFILES \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS README_LARGEFILES \
+    $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
 
 cd $PKG
-/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -c n -l y $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/worker/worker.info b/system/worker/worker.info
index f95f89f825..f1e787b23d 100644
--- a/system/worker/worker.info
+++ b/system/worker/worker.info
@@ -3,6 +3,8 @@ VERSION="2.13.1"
 HOMEPAGE="http://www.boomerangsworld.de/worker/"
 DOWNLOAD="http://www.boomerangsworld.de/cms/worker/downloads/worker-2.13.1.tar.bz2"
 MD5SUM="cfc315939dbc0dbe770be756cbd4cf01"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="CJ Johnson"
 EMAIL="clavius@gmail.com"
 APPROVED="rworkman,Erik Hanson"
-- 
cgit v1.2.3