1 files changed, 19 insertions, 18 deletions
diff --git a/network/hydra/hydra.SlackBuild b/network/hydra/hydra.SlackBuild
index c3e8d04b68..56690b31b7 100644
--- a/network/hydra/hydra.SlackBuild
+++ b/network/hydra/hydra.SlackBuild
@@ -4,14 +4,13 @@
 # Updated by Kent Fritz <fritz.kent@gmail.com>
 
 PRGNAM=hydra
-VERSION=${VERSION:-8.1}
+VERSION=${VERSION:-8.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-XHYDRA=${XHYDRA:-1}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -22,8 +21,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"
@@ -36,28 +35,31 @@ else
   LIBDIRSUFFIX=""
 fi
 
-if [ "$XHYDRA" = "1" ]; then
-    CONFIG_OPTS=""
-    MAKE_OPTS=""
-else
-    CONFIG_OPTS="--disable-xhydra"
-    MAKE_OPTS="XHYDRA_SUPPORT="
-fi
-
 set -e
 
+SRCNAM=thc-$PRGNAM
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+XHYDRA=${XHYDRA:-1}
+if [ "$XHYDRA" = "1" ]; then
+    CONFIG_OPTS=""
+    MAKE_OPTS=""
+else
+    CONFIG_OPTS="--disable-xhydra"
+    MAKE_OPTS="XHYDRA_SUPPORT="
+fi
 
 echo CONFIG_OPTS is $CONFIG_OPTS
 ./configure $CONFIG_OPTS --prefix=$PKG/usr
@@ -69,7 +71,6 @@ make install
 mkdir -p $PKG/usr/share/$PRGNAM
 mv $PKG/usr/etc/* $PKG/usr/share/$PRGNAM
 rm -rf $PKG/usr/etc
-
 #  Fix paths in dpl4hydra.sh
 sed -i -e "s|^INSTALLDIR=.*|INSTALLDIR=/usr|" $PKG/usr/bin/dpl4hydra.sh
 sed -i -e "s|^LOCATION=.*|LOCATION=share/$PRGNAM|" $PKG/usr/bin/dpl4hydra.sh