3 files changed, 38 insertions, 34 deletions

diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 51495f207f25..5bde437533be 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -5,36 +5,47 @@
 # $FreeBSD$
 
 PORTNAME=	alex
-PORTVERSION=	2.0.1
-PORTREVISION=	1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://www.haskell.org/alex/dist/ \
-		http://www.haskell.org/alex/doc/:doc
+MASTER_SITES=	http://www.haskell.org/alex/dist/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX} \
-		alex.ps:doc
-EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFX}
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Alex is a tool for generating lexical analysers in Haskell
 
 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
+.endif
 
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_AUTOTOOLS=	autoconf:259:env
+CONFIGURE_ARGS=	--ghc --prefix=${PREFIX}
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
+PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+do-configure:
+	cd ${WRKSRC} && runhaskell Setup.lhs configure
+	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure --prefix=${PREFIX}
 
+do-build:
+	cd ${WRKSRC} && runhaskell Setup.lhs build
 .if !defined(NOPORTDOCS)
+	@(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/alex
+.if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
-	${FIND} ${WRKSRC}/alex/examples -type f -exec ${INSTALL_DATA} \{\} ${EXAMPLESDIR} \;
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/alex.ps ${DOCSDIR}
+	${FIND} ${WRKSRC}/examples -type f -exec ${INSTALL_DATA} \{\} ${EXAMPLESDIR} \;
+	@(cd ${WRKSRC}/doc && ${CP} -R alex ${PREFIX}/share/doc)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index 5821615a0bbb..60734e4e55f9 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,6 +1,3 @@
-MD5 (alex-2.0.1-src.tar.gz) = edb62560e29c8de23913c65c52adbf19
-SHA256 (alex-2.0.1-src.tar.gz) = 1f130cfff59c874ab89ab2efb750d6b9b121ce0a8e129a9db6653bb115187966
-SIZE (alex-2.0.1-src.tar.gz) = 346724
-MD5 (alex.ps) = 37d1f13d8857354fd584df41832ee717
-SHA256 (alex.ps) = 8ca0607d806dbf8264c2a1660dee5c33d25c7d1f5c2cb65fd19a11ab73d0fa0d
-SIZE (alex.ps) = 130871
+MD5 (alex-2.1.0.tar.gz) = 17e80d39cc3f1aba28dcea0e358c81e9
+SHA256 (alex-2.1.0.tar.gz) = 0b9c1246ca6ef27df4bfcb16d13cf7525d943ba2edc897d628605e1c9bd7d58b
+SIZE (alex-2.1.0.tar.gz) = 67619
diff --git a/devel/hs-alex/pkg-plist b/devel/hs-alex/pkg-plist
index 45668ca02e55..dbc0ea5c29d2 100644
--- a/devel/hs-alex/pkg-plist
+++ b/devel/hs-alex/pkg-plist
@@ -1,17 +1,13 @@
 bin/alex
-bin/alex-%%PORTVERSION%%
-lib/alex-%%PORTVERSION%%/alex.bin
-lib/alex-%%PORTVERSION%%/AlexTemplate
-lib/alex-%%PORTVERSION%%/AlexTemplate-ghc
-lib/alex-%%PORTVERSION%%/AlexTemplate-ghc-debug
-lib/alex-%%PORTVERSION%%/AlexTemplate-debug
-lib/alex-%%PORTVERSION%%/AlexWrapper-basic
-lib/alex-%%PORTVERSION%%/AlexWrapper-posn
-lib/alex-%%PORTVERSION%%/AlexWrapper-monad
-lib/alex-%%PORTVERSION%%/AlexWrapper-gscan
-@dirrm lib/alex-%%PORTVERSION%%
-%%PORTDOCS%%%%DOCSDIR%%/alex.ps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+share/alex-%%PORTVERSION%%/AlexTemplate
+share/alex-%%PORTVERSION%%/AlexTemplate-debug
+share/alex-%%PORTVERSION%%/AlexTemplate-ghc
+share/alex-%%PORTVERSION%%/AlexTemplate-ghc-debug
+share/alex-%%PORTVERSION%%/AlexWrapper-basic
+share/alex-%%PORTVERSION%%/AlexWrapper-posn
+share/alex-%%PORTVERSION%%/AlexWrapper-monad
+share/alex-%%PORTVERSION%%/AlexWrapper-gscan
+@dirrm share/alex-%%PORTVERSION%%
 %%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
 %%PORTDOCS%%%%EXAMPLESDIR%%/Tokens.x
 %%PORTDOCS%%%%EXAMPLESDIR%%/Tokens_gscan.x