3 files changed, 32 insertions, 34 deletions

diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 4cd21d7c3690..536b31b9a88d 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	0.7
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/haddock/
 PKGNAMEPREFIX=	hs-
@@ -28,28 +27,44 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textpr
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
+CONFIGURE_ARGS=	--prefix=${PREFIX}
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	autoconf:259:env
+
 PLIST_SUB+=	HADDOCK_VERSION=${PORTVERSION}
+PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
-IGNORE=		Needs perl >= 5.6
+IGNORE=		needs perl >= 5.6
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog||' ${WRKSRC}/doc/configure.ac
+
+do-configure:
+	cd ${WRKSRC} && runhaskell Setup.lhs configure --ghc ${CONFIGURE_ARGS}
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS}
+.endif
+
+do-build:
+	cd ${WRKSRC} && runhaskell Setup.lhs build
 
 post-build:
 .if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC}/haddock/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/haddock
 .if !defined(NOPORTDOCS)
-	@(cd ${WRKSRC}/haddock/doc && ${CP} -R haddock ${PREFIX}/share/doc)
+	@(cd ${WRKSRC}/doc && ${CP} -R haddock ${PREFIX}/share/doc)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 1330f6befbb7..5b12739b292f 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,3 +1,3 @@
-MD5 (haddock-0.7-src.tar.gz) = 759419e78416d5f093190968a4dc18f5
-SHA256 (haddock-0.7-src.tar.gz) = c33e80106a42b2400c358cb0f293e2e7979ef5dab2dec8c55c72b7a57a9f6217
-SIZE (haddock-0.7-src.tar.gz) = 424745
+MD5 (haddock-0.8-src.tar.gz) = 0a1bb64e7642f64d2560dc258c570c1d
+SHA256 (haddock-0.8-src.tar.gz) = d54078dd9dc75aa589cb05fbe1136c1fb41d4a346e30b71de948425ea7c05a55
+SIZE (haddock-0.8-src.tar.gz) = 162872
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
index 1339a44fcf01..3aa4a71fcdd6 100644
--- a/devel/hs-haddock/pkg-plist
+++ b/devel/hs-haddock/pkg-plist
@@ -1,26 +1,9 @@
 bin/haddock
-bin/haddock-%%HADDOCK_VERSION%%
-lib/haddock-%%HADDOCK_VERSION%%/haddock.bin
-share/haddock-%%HADDOCK_VERSION%%/haddock.css
-share/haddock-%%HADDOCK_VERSION%%/haddock.js
-share/haddock-%%HADDOCK_VERSION%%/haskell_icon.gif
-share/haddock-%%HADDOCK_VERSION%%/minus.gif
-share/haddock-%%HADDOCK_VERSION%%/plus.gif
-%%PORTDOCS%%%%DOCSDIR%%/ch01s03.html
-%%PORTDOCS%%%%DOCSDIR%%/ch03s02.html
-%%PORTDOCS%%%%DOCSDIR%%/ch03s03.html
-%%PORTDOCS%%%%DOCSDIR%%/ch03s04.html
-%%PORTDOCS%%%%DOCSDIR%%/ch03s05.html
-%%PORTDOCS%%%%DOCSDIR%%/ch03s08.html
-%%PORTDOCS%%%%DOCSDIR%%/fptools.css
-%%PORTDOCS%%%%DOCSDIR%%/hyperlinking.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/invoking.html
-%%PORTDOCS%%%%DOCSDIR%%/ix01.html
-%%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/markup.html
-%%PORTDOCS%%%%DOCSDIR%%/module-attributes.html
-@dirrm lib/haddock-%%HADDOCK_VERSION%%
+share/haddock-%%HADDOCK_VERSION%%/html/haddock.css
+share/haddock-%%HADDOCK_VERSION%%/html/haddock-DEBUG.css
+share/haddock-%%HADDOCK_VERSION%%/html/haddock.js
+share/haddock-%%HADDOCK_VERSION%%/html/haskell_icon.gif
+share/haddock-%%HADDOCK_VERSION%%/html/minus.gif
+share/haddock-%%HADDOCK_VERSION%%/html/plus.gif
+@dirrm share/haddock-%%HADDOCK_VERSION%%/html
 @dirrm share/haddock-%%HADDOCK_VERSION%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%