5 files changed, 11 insertions, 14 deletions

diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index d6a62011b526..5a5932fd6707 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -5,16 +5,16 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.18.2
+PORTVERSION=	1.18.4
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
-DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	An LALR(1) parser generator for the functional language Haskell
 
 BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
+LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
@@ -23,7 +23,6 @@ PLIST_SUB+=	RMLIC="@comment "
 PLIST_SUB+=	RMLIC=""
 .endif
 
-WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 PLIST_SUB+=	SUBDIR=share/${PORTNAME}-${PORTVERSION}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
 PORTDOCS=	LICENSE html
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index d5d637cf0a61..ee24939dbf2b 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,3 +1,3 @@
-MD5 (happy-1.18.2.tar.gz) = adb1679a1fa8cec74a6e621a4a277e98
-SHA256 (happy-1.18.2.tar.gz) = 7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae
-SIZE (happy-1.18.2.tar.gz) = 158782
+MD5 (happy-1.18.4.tar.gz) = 614e3ef9623dbeefc4c8ca699912efb4
+SHA256 (happy-1.18.4.tar.gz) = 909bec4541a92d3765e74756f752514d2d03ec7a5d3e74c18268a57fe7ffa832
+SIZE (happy-1.18.4.tar.gz) = 157585
diff --git a/devel/hs-happy/files/patch-configure b/devel/hs-happy/files/patch-doc_configure.ac
index eefbeb1437f1..cebed39431ec 100644
--- a/devel/hs-happy/files/patch-configure
+++ b/devel/hs-happy/files/patch-doc_configure.ac
@@ -1,14 +1,11 @@
-
-$FreeBSD$
-
---- doc/configure.ac.orig
-+++ doc/configure.ac
+--- doc/configure.ac.orig	2009-07-13 20:16:47.000000000 +0000
++++ doc/configure.ac	2009-07-13 20:18:47.000000000 +0000
 @@ -5,7 +5,7 @@
  
  dnl ** check for DocBook toolchain
  FP_CHECK_DOCBOOK_DTD
 -FP_DIR_DOCBOOK_XSL([/usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl])
 +FP_DIR_DOCBOOK_XSL([%%LOCALBASE%%/share/xsl/docbook /usr/share/xml/docbook/stylesheet/nwalsh/current /usr/share/xml/docbook/stylesheet/nwalsh /usr/share/sgml/docbook/docbook-xsl-stylesheets* /usr/share/sgml/docbook/xsl-stylesheets* /opt/kde?/share/apps/ksgmltools2/docbook/xsl /usr/share/docbook-xsl /usr/share/sgml/docbkxsl /usr/local/share/xsl/docbook /sw/share/xml/xsl/docbook-xsl])
- FP_PROG_FO_PROCESSOR
  
- AC_CONFIG_FILES([config.mk])
+ AC_PATH_PROG(DbLatexCmd,dblatex)
+ 
diff --git a/devel/hs-happy/pkg-descr b/devel/hs-happy/pkg-descr
index b9cc4c2fc14b..1459d7de8e51 100644
--- a/devel/hs-happy/pkg-descr
+++ b/devel/hs-happy/pkg-descr
@@ -13,6 +13,6 @@ As of version 1.5, Happy is capable of parsing full Haskell. We have a
 Haskell parser that uses Happy, which will shortly be part of the
 library collection distributed with GHC.
 
-WWW:	http://www.haskell.org/happy/
+WWW: http://www.haskell.org/happy/
 
 -- Simon Marlow <simonmar@microsoft.com>
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
index 3130ee00fb6f..702020b2d524 100644
--- a/devel/hs-happy/pkg-plist
+++ b/devel/hs-happy/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/happy
 %%SUBDIR%%/GLR_Base
 %%SUBDIR%%/GLR_Lib