4 files changed, 29 insertions, 19 deletions
diff --git a/misc/siege/README b/misc/siege/README
index 07231fc145ab7..5ec3a5fccfccf 100644
--- a/misc/siege/README
+++ b/misc/siege/README
@@ -1,6 +1,6 @@
-Siege is an http regression testing and benchmarking utility. It was designed
+Siege is an http regression testing and benchmarking utility.  It was designed
 to let web developers measure the performance of their code under duress,
-to see how it will stand up to load on the internet. Siege supports basic
-authentication, cookies, HTTP and HTTPS protocols. It allows the user hit a
-web server with a configurable number of concurrent simulated users. Those
+to see how it will stand up to load on the internet.  Siege supports basic
+authentication, cookies, HTTP and HTTPS protocols.  It allows the user to hit
+a web server with a configurable number of concurrent simulated users.  Those
 users place the webserver "under siege."
diff --git a/misc/siege/siege.SlackBuild b/misc/siege/siege.SlackBuild
index 229e8e1e9141e..6368c4872e92f 100644
--- a/misc/siege/siege.SlackBuild
+++ b/misc/siege/siege.SlackBuild
@@ -4,8 +4,12 @@
 
 # Written by Menno Duursma <druiloor@zonnet.nl>
 
+# This program is free software. It comes without any warranty.
+# Granted WTFPL, Version 2, as published by Sam Hocevar. See
+# http://sam.zoy.org/wtfpl/COPYING for more details.
+
 PRGNAM=siege
-VERSION=${VERSION:-2.67}
+VERSION=${VERSION:-2.69}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -17,10 +21,13 @@ 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" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e # Exit on most errors
@@ -29,7 +36,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -42,9 +49,11 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib$LIBDIRSUFFIX \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -54,21 +63,19 @@ make install-strip DESTDIR=$PKG
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a [A-Z][A-Z]* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat  $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.$TAG
-
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 # Include .siegerc and url.txt examples
 cp -a doc/{urls.txt,siegerc} $PKG/usr/doc/$PRGNAM-$VERSION
-
 # Test webpages
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/html
 cp -a html/{README,basic.php,cache-control.php,cookie-test.php,etag.php,login.php} \
   $PKG/usr/doc/$PRGNAM-$VERSION/html
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog $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 -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/misc/siege/siege.info b/misc/siege/siege.info
index 587428badb253..dad42f8dc6a63 100644
--- a/misc/siege/siege.info
+++ b/misc/siege/siege.info
@@ -1,8 +1,10 @@
 PRGNAM="siege"
-VERSION="2.67"
+VERSION="2.69"
 HOMEPAGE="http://www.joedog.org/index/siege-home"
-DOWNLOAD="ftp://ftp.joedog.org/pub/siege/siege-2.67.tar.gz"
+DOWNLOAD="ftp://ftp.joedog.org/pub/siege/siege-2.69.tar.gz"
 MD5SUM="ea7b07b4323c2ae13a070e85fad18bbe"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Menno Duursma"
 EMAIL="druiloor@zonnet.nl"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/misc/siege/slack-desc b/misc/siege/slack-desc
index 8f9fd7fb2fed1..5edb1fd3cfb43 100644
--- a/misc/siege/slack-desc
+++ b/misc/siege/slack-desc
@@ -4,6 +4,7 @@
 # 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------------------------------------------------------|
 siege: SIEGE (http server benchmark)
 siege:
@@ -12,7 +13,7 @@ siege: It was designed to let web developers measure the performance
 siege: of their code under duress, to see how it will stand up to
 siege: load on the internet.
 siege:
-siege: Jeffrey Fulmer is the primary author and maintainer of siege
+siege: Jeffrey Fulmer is the primary author and maintainer of siege.
 siege:
 siege:
 siege: