3 files changed, 26 insertions, 34 deletions

diff --git a/devel/hs-alex/Makefile b/devel/hs-alex/Makefile
index 8476c684320c..afdb46961b73 100644
--- a/devel/hs-alex/Makefile
+++ b/devel/hs-alex/Makefile
@@ -5,24 +5,19 @@
 # $FreeBSD$
 
 PORTNAME=	alex
-PORTVERSION=	2.0
-PORTREVISION=	2
+PORTVERSION=	2.0.1
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://www.haskell.org/alex/dist/
+MASTER_SITES=	http://www.haskell.org/alex/dist/ \
+		http://www.haskell.org/alex/doc/:doc
 PKGNAMEPREFIX=	hs-
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
+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+=	jade:${PORTSDIR}/textproc/jade \
-		jadetex:${PORTSDIR}/print/jadetex \
-		dvips:${PORTSDIR}/print/dvipsk-tetex \
-		${LOCALBASE}/share/sgml/docbook/3.1/docbook.dtd:${PORTSDIR}/textproc/docbook-310 \
-		${LOCALBASE}/share/sgml/docbook/dsssl:${PORTSDIR}/textproc/dsssl-docbook-modular
-.endif
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -38,16 +33,11 @@ BROKEN=		"Does not compile on FreeBSD >= 5.x"
 .endif
 
 .if !defined(NOPORTDOCS)
-post-build:
-	${GMAKE} -C ${WRKSRC}/alex/doc ps
-.endif
-
 post-install:
 	${MKDIR} ${EXAMPLESDIR}
 	${FIND} ${WRKSRC}/alex/examples -type f -exec ${INSTALL_DATA} \{\} ${EXAMPLESDIR} \;
-.if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/alex/doc/alex.ps ${DOCSDIR}
+	${INSTALL_DATA} ${DISTDIR}/alex.ps ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/hs-alex/distinfo b/devel/hs-alex/distinfo
index 58f0571a15b1..76dc1e00063e 100644
--- a/devel/hs-alex/distinfo
+++ b/devel/hs-alex/distinfo
@@ -1,2 +1,4 @@
-MD5 (alex-2.0-src.tar.gz) = b054a44a25587c8496172566ae5bcc7c
-SIZE (alex-2.0-src.tar.gz) = 376133
+MD5 (alex-2.0.1-src.tar.gz) = edb62560e29c8de23913c65c52adbf19
+SIZE (alex-2.0.1-src.tar.gz) = 346724
+MD5 (alex.ps) = 37d1f13d8857354fd584df41832ee717
+SIZE (alex.ps) = 130871
diff --git a/devel/hs-alex/pkg-plist b/devel/hs-alex/pkg-plist
index 9c87a7beb90b..45668ca02e55 100644
--- a/devel/hs-alex/pkg-plist
+++ b/devel/hs-alex/pkg-plist
@@ -12,18 +12,18 @@ lib/alex-%%PORTVERSION%%/AlexWrapper-gscan
 @dirrm lib/alex-%%PORTVERSION%%
 %%PORTDOCS%%%%DOCSDIR%%/alex.ps
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%EXAMPLESDIR%%/Makefile
-%%EXAMPLESDIR%%/Tokens.x
-%%EXAMPLESDIR%%/Tokens_gscan.x
-%%EXAMPLESDIR%%/Tokens_posn.x
-%%EXAMPLESDIR%%/examples.x
-%%EXAMPLESDIR%%/haskell.x
-%%EXAMPLESDIR%%/lit.x
-%%EXAMPLESDIR%%/pp.x
-%%EXAMPLESDIR%%/state.x
-%%EXAMPLESDIR%%/tiny.y
-%%EXAMPLESDIR%%/tkns.hs
-%%EXAMPLESDIR%%/words.x
-%%EXAMPLESDIR%%/words_monad.x
-%%EXAMPLESDIR%%/words_posn.x
-@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
+%%PORTDOCS%%%%EXAMPLESDIR%%/Tokens.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/Tokens_gscan.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/Tokens_posn.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/examples.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/haskell.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/lit.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/pp.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/state.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/tiny.y
+%%PORTDOCS%%%%EXAMPLESDIR%%/tkns.hs
+%%PORTDOCS%%%%EXAMPLESDIR%%/words.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/words_monad.x
+%%PORTDOCS%%%%EXAMPLESDIR%%/words_posn.x
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%