system/xjobs: Updated for version 20100203

4 files changed, 41 insertions, 25 deletions

diff --git a/system/xjobs/slack-desc b/system/xjobs/slack-desc
index 467a4617e0..2b351513be 100644
--- a/system/xjobs/slack-desc
+++ b/system/xjobs/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+     |-----handy-ruler---------------------------------------------------------|
 xjobs: xjobs (execute jobs in parallel)
 xjobs: 
 xjobs: xjobs reads job descriptions line by line and executes them in
diff --git a/system/xjobs/xjobs-mandir.patch b/system/xjobs/xjobs-mandir.patch
deleted file mode 100644
index 31e9735f70..0000000000
--- a/system/xjobs/xjobs-mandir.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- Makefile.in.orig	2008-12-17 04:49:58.026458458 -0600
-+++ Makefile.in	2008-12-17 04:50:51.320458794 -0600
-@@ -42,8 +42,9 @@
- 
- install: $(TARGET)
- 	-$(INSTALL) -d $(DESTDIR)$(bindir)
-+	$(INSTALL) -d $(DESTDIR)$(mandir)
- 	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
--	$(INSTALL) xjobs.1 $(mandir)
-+	$(INSTALL) xjobs.1 $(DESTDIR)$(mandir)
- 
- lint:
- 	lint $(CFLAGS) $(SOURCES)
diff --git a/system/xjobs/xjobs.SlackBuild b/system/xjobs/xjobs.SlackBuild
index 32066e3851..570a0466c1 100644
--- a/system/xjobs/xjobs.SlackBuild
+++ b/system/xjobs/xjobs.SlackBuild
@@ -1,10 +1,29 @@
-#!/bin/sh -eu
-
+#!/bin/sh
+#
 # Slackware build script for xjobs
-# Written by Erik Hanson  erik@slackbuilds.org
+#
+# Copyright 2009-2010  Erik W. Hanson, Minneapolis, MN, USA
+# All rights reserved.
+#
+# 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=xjobs
-VERSION=20080824
+VERSION=20100203
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,6 +37,8 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 rm -rf $PKG
@@ -29,15 +50,13 @@ cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-# Fix: mandir -> destdir/mandir
-patch -p0 < $CWD/xjobs-mandir.patch
-
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --sysconfdir=/etc \
   --localstatedir=/var/lib \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -52,4 +71,4 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xjobs/xjobs.info b/system/xjobs/xjobs.info
index 03ecf7293f..b1201a2372 100644
--- a/system/xjobs/xjobs.info
+++ b/system/xjobs/xjobs.info
@@ -1,8 +1,10 @@
 PRGNAM="xjobs"
-VERSION="20080824"
+VERSION="20100203"
 HOMEPAGE="http://www.maier-komor.de/xjobs.html"
-DOWNLOAD="http://www.maier-komor.de/xjobs/xjobs-20080824.tgz"
-MD5SUM="4baae50f09752a357a692e76c1f3f53a"
+DOWNLOAD="http://www.maier-komor.de/xjobs/xjobs-20100203.tgz"
+MD5SUM="364ff256ec497f3b69c675edf6dbb7c8"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="dsomero"