4 files changed, 49 insertions, 27 deletions

diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 22d85c09d50b..d6a62011b526 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -5,9 +5,9 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.17
+PORTVERSION=	1.18.2
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/
+MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
@@ -18,12 +18,17 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
 .if !defined(NOPORTDOCS)
 BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook-xsl \
 		${LOCALBASE}/bin/xsltproc:${PORTSDIR}/textproc/libxslt
+PLIST_SUB+=	RMLIC="@comment "
+.else
+PLIST_SUB+=	RMLIC=""
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
-
-PLIST_SUB=	HAPPY_VERSION=${PORTVERSION}
-PORTDOCS=	*
+PLIST_SUB+=	SUBDIR=share/${PORTNAME}-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+PORTDOCS=	LICENSE html
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME}-${PORTVERSION}
+PORTEXAMPLES=	*
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:262:env
@@ -33,7 +38,7 @@ post-patch:
 	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+' ${WRKSRC}/doc/configure.ac
 
 do-configure:
-	cd ${WRKSRC} && runhaskell Setup.lhs configure
+	cd ${WRKSRC} && runhaskell Setup.lhs configure ${CONFIGURE_ARGS}
 	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX}
 
 do-build:
@@ -48,8 +53,12 @@ do-install:
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/bin/happy
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples/ && ${COPYTREE_SHARE} \* ${EXAMPLESDIR})
+.endif
 .if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC}/doc && ${CP} -R happy ${PREFIX}/share/doc)
+	@(cd ${WRKSRC}/doc && ${CP} -R happy/ ${DOCSDIR}/html)
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index fdaedda75b5c..d5d637cf0a61 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,3 +1,3 @@
-MD5 (happy-1.17.tar.gz) = 4bc931a8630ecebb751a2a8e60219313
-SHA256 (happy-1.17.tar.gz) = dca4e47d17e5d538335496236b3d2c3cbff644cf7380c987a4714e7784c70a2b
-SIZE (happy-1.17.tar.gz) = 228494
+MD5 (happy-1.18.2.tar.gz) = adb1679a1fa8cec74a6e621a4a277e98
+SHA256 (happy-1.18.2.tar.gz) = 7515922f3cfd32cd844a0abfefe0b4871f403f0d869b8644bf9cbfc0b67996ae
+SIZE (happy-1.18.2.tar.gz) = 158782
diff --git a/devel/hs-happy/pkg-descr b/devel/hs-happy/pkg-descr
index 20f0c1a7c4f9..b9cc4c2fc14b 100644
--- a/devel/hs-happy/pkg-descr
+++ b/devel/hs-happy/pkg-descr
@@ -1,4 +1,17 @@
-This is Happy version 1.9, a parser generator for Haskell 98.
+Happy is a parser generator system for Haskell, similar to the tool
+`yacc' for C. Like `yacc', it takes a file containing an annotated BNF
+specification of a grammar and produces a Haskell module containing a
+parser for the grammar.
+
+Happy is flexible: you can have several Happy parsers in the same
+program, and several entry points to a single grammar. Happy can work
+in conjunction with a lexical analyser supplied by the user (either
+hand-written or generated by another program), or it can parse a stream
+of characters directly (but this isn't practical in most cases).
+
+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/
 
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
index 1a1716e4b07d..3130ee00fb6f 100644
--- a/devel/hs-happy/pkg-plist
+++ b/devel/hs-happy/pkg-plist
@@ -1,17 +1,17 @@
 bin/happy
-share/happy-%%HAPPY_VERSION%%/GLR_Base
-share/happy-%%HAPPY_VERSION%%/GLR_Lib
-share/happy-%%HAPPY_VERSION%%/GLR_Lib-ghc
-share/happy-%%HAPPY_VERSION%%/GLR_Lib-ghc-debug
-share/happy-%%HAPPY_VERSION%%/HappyTemplate
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-coerce
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-coerce-debug
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-debug
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-ghc
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-ghc-debug
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-coerce
-share/happy-%%HAPPY_VERSION%%/HappyTemplate-ghc
-share/doc/happy-%%HAPPY_VERSION%%/LICENSE
-@dirrm share/happy-%%HAPPY_VERSION%%
-@dirrm share/doc/happy-%%HAPPY_VERSION%%
+%%SUBDIR%%/GLR_Base
+%%SUBDIR%%/GLR_Lib
+%%SUBDIR%%/GLR_Lib-ghc
+%%SUBDIR%%/GLR_Lib-ghc-debug
+%%SUBDIR%%/HappyTemplate
+%%SUBDIR%%/HappyTemplate-arrays
+%%SUBDIR%%/HappyTemplate-arrays-coerce
+%%SUBDIR%%/HappyTemplate-arrays-coerce-debug
+%%SUBDIR%%/HappyTemplate-arrays-debug
+%%SUBDIR%%/HappyTemplate-arrays-ghc
+%%SUBDIR%%/HappyTemplate-arrays-ghc-debug
+%%SUBDIR%%/HappyTemplate-coerce
+%%SUBDIR%%/HappyTemplate-ghc
+@dirrm %%SUBDIR%%
+%%RMLIC%%%%DOCSDIR%%/LICENSE
+%%RMLIC%%@dirrm %%DOCSDIR%%