2 files changed, 9 insertions, 12 deletions
diff --git a/development/happy/happy.SlackBuild b/development/happy/happy.SlackBuild
index 5e66a10dafd0..7d8e13cd2b20 100644
--- a/development/happy/happy.SlackBuild
+++ b/development/happy/happy.SlackBuild
@@ -2,20 +2,18 @@
 
 # Slackware build script for happy
 
-# Written by Mikko Varri (vmj@linuxbox.fi)
+# Written by Mikko Värri (vmj@linuxbox.fi)
 # Public domain.
 
 PRGNAM=happy
-VERSION=${VERSION:-1.18.4}
+VERSION=${VERSION:-1.18.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -55,11 +53,11 @@ find . \
  -exec chmod 644 {} \;
 
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 runghc Setup.lhs configure \
   --prefix=/usr \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --flags="-threaded -dynamic"
+  --ghc-options="-threaded -dynamic"
 
 runghc Setup.lhs build
 runghc Setup.lhs copy --destdir=$PKG
@@ -76,4 +74,3 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
-
diff --git a/development/happy/happy.info b/development/happy/happy.info
index 5bed021cb4f8..699df288315d 100644
--- a/development/happy/happy.info
+++ b/development/happy/happy.info
@@ -1,10 +1,10 @@
 PRGNAM="happy"
-VERSION="1.18.4"
+VERSION="1.18.5"
 HOMEPAGE="http://haskell.org/happy"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/happy/1.18.4/happy-1.18.4.tar.gz"
-MD5SUM="614e3ef9623dbeefc4c8ca699912efb4"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/happy/1.18.5/happy-1.18.5.tar.gz"
+MD5SUM="9e77b67df7b6a4d7273383cc890f39e8"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Mikko Varri"
+MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="rworkman"
+APPROVED="Erik Hanson"