4 files changed, 47 insertions, 42 deletions

diff --git a/devel/hs-happy/Makefile b/devel/hs-happy/Makefile
index 80e1b74d757f..8834d065815e 100644
--- a/devel/hs-happy/Makefile
+++ b/devel/hs-happy/Makefile
@@ -5,12 +5,11 @@
 # $FreeBSD$
 
 PORTNAME=	happy
-PORTVERSION=	1.15
-PORTREVISION=	1
+PORTVERSION=	1.16
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/happy/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	simonmar@microsoft.com
 COMMENT=	An LALR(1) parser generator for the functional language Haskell
@@ -22,31 +21,35 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/html:${PORTSDIR}/textproc/docbook
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
-USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
 
 PLIST_SUB=	HAPPY_VERSION=${PORTVERSION}
 PORTDOCS=	*
 
-BOOT_COOKIE = ${WRKDIR}/.boot_done
-
-${BOOT_COOKIE}:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} boot)
+USE_GMAKE=	yes
+USE_AUTOTOOLS=	autoconf:259:env
+CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's+%%LOCALBASE%%+${LOCALBASE}+' ${WRKSRC}/doc/configure.ac
 
-pre-build: ${BOOT_COOKIE}
+do-configure:
+	cd ${WRKSRC} && runhaskell Setup.lhs configure
+	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX}
 
-post-build:
+do-build:
+	cd ${WRKSRC} && runhaskell Setup.lhs build
 .if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC}/happy/doc && \
+	@(cd ${WRKSRC}/doc && \
 	 ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html)
 .endif
 
+do-install:
+	cd ${WRKSRC} && runhaskell Setup.lhs install
+
 post-install:
+	@${STRIP_CMD} ${PREFIX}/bin/happy
 .if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC}/happy/doc && ${CP} -R happy ${PREFIX}/share/doc)
+	@(cd ${WRKSRC}/doc && ${CP} -R happy ${PREFIX}/share/doc)
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/hs-happy/distinfo b/devel/hs-happy/distinfo
index 8bed80732b9e..b9da809ef732 100644
--- a/devel/hs-happy/distinfo
+++ b/devel/hs-happy/distinfo
@@ -1,3 +1,3 @@
-MD5 (happy-1.15-src.tar.gz) = 02ceb122b904fa4a4290e6ea1072d59e
-SHA256 (happy-1.15-src.tar.gz) = 451715306f2e602fa425776b81e22a8bc59a0c9a812fa1ee824c0a9a81767534
-SIZE (happy-1.15-src.tar.gz) = 510037
+MD5 (happy-1.16.tar.gz) = b9fd2f5eba61974dab8e12873cadee6f
+SHA256 (happy-1.16.tar.gz) = 4da47f4904dbdddfb58140edb0395383feba72dfc77759e57587a526dd9496c5
+SIZE (happy-1.16.tar.gz) = 226566
diff --git a/devel/hs-happy/files/patch-configure b/devel/hs-happy/files/patch-configure
index 5481877ae8bb..eefbeb1437f1 100644
--- a/devel/hs-happy/files/patch-configure
+++ b/devel/hs-happy/files/patch-configure
@@ -1,11 +1,14 @@
---- configure.orig	Wed Jan 26 18:01:50 2005
-+++ configure	Wed Jan 26 18:02:28 2005
-@@ -4403,7 +4403,7 @@
- EOF
+
+$FreeBSD$
+
+--- doc/configure.ac.orig
++++ doc/configure.ac
+@@ -5,7 +5,7 @@
  
-   fp_cv_dir_docbook_xsl=no
--  for fp_var in /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; do
-+  for fp_var in %%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; do
-      if $XsltprocCmd ${fp_var}/html/docbook.xsl conftest.xml > /dev/null 2>&1; then
-         fp_cv_dir_docbook_xsl=$fp_var
-         break
+ 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])
diff --git a/devel/hs-happy/pkg-plist b/devel/hs-happy/pkg-plist
index 2a9c9a10d523..2b47c96398b8 100644
--- a/devel/hs-happy/pkg-plist
+++ b/devel/hs-happy/pkg-plist
@@ -1,16 +1,15 @@
 bin/happy
-bin/happy-%%HAPPY_VERSION%%
-lib/happy-%%HAPPY_VERSION%%/happy.bin
-lib/happy-%%HAPPY_VERSION%%/GLR_Base
-lib/happy-%%HAPPY_VERSION%%/GLR_Lib
-lib/happy-%%HAPPY_VERSION%%/GLR_Lib-ghc
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-coerce
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-coerce-debug
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-debug
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-ghc
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-arrays-ghc-debug
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-coerce
-lib/happy-%%HAPPY_VERSION%%/HappyTemplate-ghc
-@dirrm lib/happy-%%HAPPY_VERSION%%
+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
+@dirrm share/happy-%%HAPPY_VERSION%%