1 files changed, 17 insertions, 13 deletions
diff --git a/network/hydra/hydra.SlackBuild b/network/hydra/hydra.SlackBuild
index e5f5ba066d..6171bfdd92 100644
--- a/network/hydra/hydra.SlackBuild
+++ b/network/hydra/hydra.SlackBuild
@@ -4,7 +4,7 @@
 # Updated by Kent Fritz <fritz.kent@gmail.com>
 
 PRGNAM=hydra
-VERSION=${VERSION:-7.2}
+VERSION=${VERSION:-7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 XHYDRA=${XHYDRA:-1}
@@ -39,7 +39,7 @@ fi
 if [ "$XHYDRA" = "1" ]; then
     CONFIG_OPTS=""
     MAKE_OPTS=""
-else 
+else
     CONFIG_OPTS="--disable-xhydra"
     MAKE_OPTS="XHYDRA_SUPPORT="
 fi
@@ -49,10 +49,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION-src
-tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
-cd $PRGNAM-$VERSION-src
-mkdir -p $PKG/usr/bin
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -62,12 +61,19 @@ find . \
 
 
 echo CONFIG_OPTS is $CONFIG_OPTS
-./configure $CONFIG_OPTS
+./configure $CONFIG_OPTS --prefix=$PKG/usr
 make OPTS="-I. $SLKCFLAGS" $MAKE_OPTS
-make install PREFIX=$PKG/usr DIR=/bin
+mkdir -p $PKG/usr/etc
+make install
+
+# Move password lists
+mkdir -p $PKG/usr/share/$PRGNAM
+mv $PKG/usr/etc/* $PKG/usr/share/$PRGNAM
+rm -rf $PKG/usr/etc
 
-# remove dpl4hydra stuff as it is somewhat broken
-rm $PKG/usr/bin/dpl4hydra*
+#  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
 
 # Add a desktop menu item
 if [ "$XHYDRA" = "1" ]; then
@@ -82,9 +88,7 @@ fi
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  CHANGES LICENSE* README dpl4hydra* \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGES LICENSE* README $PKG/usr/doc/$PRGNAM-$VERSION
 if [ "$XHYDRA" = "1" ]; then
   mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/hydra-gtk
   cp -a hydra-gtk/COPYING hydra-gtk/INSTALL hydra-gtk/README \