3 files changed, 19 insertions, 17 deletions
diff --git a/development/hugs98/hugs98.SlackBuild b/development/hugs98/hugs98.SlackBuild
index 10e121b0e7..ba894fb086 100644
--- a/development/hugs98/hugs98.SlackBuild
+++ b/development/hugs98/hugs98.SlackBuild
@@ -24,20 +24,22 @@ PRGNAM=hugs98
 VERSION=Sep2006
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}	
+TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-JOBS=${JOBS:-3}
 
 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
@@ -52,7 +54,6 @@ cd $PRGNAM-plus-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go-w+r .
 
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 # most --enable's are autodetected by configure (like opengl, ffi and io encoding)
@@ -61,22 +62,18 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --build=$ARCH-slackware-linux \
   --host=$ARCH-slackware-linux
 
-# Compile the application and install it into the $PKG directory
-make -j $JOBS
+make
 make install DESTDIR=$PKG
 
-# Strip binaries and libraries - this can be done with 'make install-strip'
-# in many source trees, and that's usually acceptable if so, but if not, 
-# use this:
 ( cd $PKG
   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
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
   for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -85,13 +82,13 @@ make install DESTDIR=$PKG
 ( cd $PKG/usr/man/man1 ; ln -sf hugs.1.gz ffihugs.1.gz )
 ( cd $PKG/usr/man/man1 ; ln -sf hugs.1.gz runhugs.1.gz )
 
-# Copy program documentation into the package
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Credits License Readme docs/ffi-notes.txt docs/libraries-notes.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Credits License Readme docs/ffi-notes.txt docs/libraries-notes.txt \
+      $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/development/hugs98/hugs98.info b/development/hugs98/hugs98.info
index 246032548b..726a46103f 100644
--- a/development/hugs98/hugs98.info
+++ b/development/hugs98/hugs98.info
@@ -3,6 +3,8 @@ VERSION="Sep2006"
 HOMEPAGE="http://www.haskell.org/hugs/"
 DOWNLOAD="http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-plus-Sep2006.tar.gz"
 MD5SUM="e03e0ad79750d037237c47ebe33fa20e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Daniel"
 EMAIL="whitehate{at}gmail{dot}com"
-APPROVED="David Somero"
-\ No newline at end of file
+APPROVED="Erik Hanson"
diff --git a/development/hugs98/slack-desc b/development/hugs98/slack-desc
index 5b93da465f..b1f139e0db 100644
--- a/development/hugs98/slack-desc
+++ b/development/hugs98/slack-desc
@@ -10,7 +10,10 @@ hugs98: hugs98 ( Haskell implementation )
 hugs98: Hugs 98 is a functional programming system based on Haskell 98, the
 hugs98: de facto standard for non-strict functional programming languages.
 hugs98: Hugs 98 provides an almost complete implementation of Haskell 98.
-hugs98: 
-hugs98: 
+hugs98:
+hugs98:
+hugs98:
+hugs98:
+hugs98:
 hugs98: Homepage: http://www.haskell.org/hugs/
-hugs98: 
+hugs98: