Update to 0.4

PR:		ports/40918
Submitted by:	maintainer

6 files changed, 34 insertions, 26 deletions

diff --git a/devel/haddock/Makefile b/devel/haddock/Makefile
index 2053359596a..8c0abee4e66 100644
--- a/devel/haddock/Makefile
+++ b/devel/haddock/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.haskell.org/haddock/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -23,9 +23,13 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textpr
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog||' ${WRKSRC}/configure
+
 post-build:
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}/haddock/doc && \
diff --git a/devel/haddock/distinfo b/devel/haddock/distinfo
index 608a7a4508a..a1e54aebf46 100644
--- a/devel/haddock/distinfo
+++ b/devel/haddock/distinfo
@@ -1 +1 @@
-MD5 (haddock-0.3-src.tar.gz) = f730f06735887c1e71e83cf21f6c39f6
+MD5 (haddock-0.4-src.tar.gz) = 919e38378b91a223cb1e48178f1a85bd
diff --git a/devel/haddock/pkg-plist b/devel/haddock/pkg-plist
index 6ef4d284b2e..b4412dd9dd9 100644
--- a/devel/haddock/pkg-plist
+++ b/devel/haddock/pkg-plist
@@ -1,8 +1,8 @@
 bin/haddock
-bin/haddock-0.3
-lib/haddock-0.3/haddock.bin
-lib/haddock-0.3/haddock.css
-lib/haddock-0.3/haskell_icon.gif
+bin/haddock-0.4
+lib/haddock-0.4/haddock.bin
+lib/haddock-0.4/haddock.css
+lib/haddock-0.4/haskell_icon.gif
 %%PORTDOCS%%share/doc/haddock/docbook.css
 %%PORTDOCS%%share/doc/haddock/haddock.html
 %%PORTDOCS%%share/doc/haddock/introduction.html
@@ -10,12 +10,12 @@ lib/haddock-0.3/haskell_icon.gif
 %%PORTDOCS%%share/doc/haddock/license.html
 %%PORTDOCS%%share/doc/haddock/markup.html
 %%PORTDOCS%%share/doc/haddock/module-attributes.html
-%%PORTDOCS%%share/doc/haddock/x251.html
-%%PORTDOCS%%share/doc/haddock/x275.html
-%%PORTDOCS%%share/doc/haddock/x280.html
-%%PORTDOCS%%share/doc/haddock/x321.html
-%%PORTDOCS%%share/doc/haddock/x336.html
-%%PORTDOCS%%share/doc/haddock/x404.html
+%%PORTDOCS%%share/doc/haddock/x331.html
+%%PORTDOCS%%share/doc/haddock/x355.html
+%%PORTDOCS%%share/doc/haddock/x360.html
+%%PORTDOCS%%share/doc/haddock/x403.html
+%%PORTDOCS%%share/doc/haddock/x418.html
+%%PORTDOCS%%share/doc/haddock/x486.html
 %%PORTDOCS%%share/doc/haddock/x57.html
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/caution.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/home.gif
@@ -29,6 +29,6 @@ lib/haddock-0.3/haskell_icon.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/toc-plus.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/up.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/warning.gif
-@dirrm lib/haddock-0.3
+@dirrm lib/haddock-0.4
 %%PORTDOCS%%@dirrm share/doc/haddock/stylesheet-images
 %%PORTDOCS%%@dirrm share/doc/haddock
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 2053359596a..8c0abee4e66 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.haskell.org/haddock/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
@@ -23,9 +23,13 @@ BUILD_DEPENDS+=	${LOCALBASE}/share/sgml/docbook/dsssl/modular:${PORTSDIR}/textpr
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog||' ${WRKSRC}/configure
+
 post-build:
 .if !defined(NOPORTDOCS)
 	@(cd ${WRKSRC}/haddock/doc && \
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 608a7a4508a..a1e54aebf46 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1 +1 @@
-MD5 (haddock-0.3-src.tar.gz) = f730f06735887c1e71e83cf21f6c39f6
+MD5 (haddock-0.4-src.tar.gz) = 919e38378b91a223cb1e48178f1a85bd
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
index 6ef4d284b2e..b4412dd9dd9 100644
--- a/devel/hs-haddock/pkg-plist
+++ b/devel/hs-haddock/pkg-plist
@@ -1,8 +1,8 @@
 bin/haddock
-bin/haddock-0.3
-lib/haddock-0.3/haddock.bin
-lib/haddock-0.3/haddock.css
-lib/haddock-0.3/haskell_icon.gif
+bin/haddock-0.4
+lib/haddock-0.4/haddock.bin
+lib/haddock-0.4/haddock.css
+lib/haddock-0.4/haskell_icon.gif
 %%PORTDOCS%%share/doc/haddock/docbook.css
 %%PORTDOCS%%share/doc/haddock/haddock.html
 %%PORTDOCS%%share/doc/haddock/introduction.html
@@ -10,12 +10,12 @@ lib/haddock-0.3/haskell_icon.gif
 %%PORTDOCS%%share/doc/haddock/license.html
 %%PORTDOCS%%share/doc/haddock/markup.html
 %%PORTDOCS%%share/doc/haddock/module-attributes.html
-%%PORTDOCS%%share/doc/haddock/x251.html
-%%PORTDOCS%%share/doc/haddock/x275.html
-%%PORTDOCS%%share/doc/haddock/x280.html
-%%PORTDOCS%%share/doc/haddock/x321.html
-%%PORTDOCS%%share/doc/haddock/x336.html
-%%PORTDOCS%%share/doc/haddock/x404.html
+%%PORTDOCS%%share/doc/haddock/x331.html
+%%PORTDOCS%%share/doc/haddock/x355.html
+%%PORTDOCS%%share/doc/haddock/x360.html
+%%PORTDOCS%%share/doc/haddock/x403.html
+%%PORTDOCS%%share/doc/haddock/x418.html
+%%PORTDOCS%%share/doc/haddock/x486.html
 %%PORTDOCS%%share/doc/haddock/x57.html
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/caution.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/home.gif
@@ -29,6 +29,6 @@ lib/haddock-0.3/haskell_icon.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/toc-plus.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/up.gif
 %%PORTDOCS%%share/doc/haddock/stylesheet-images/warning.gif
-@dirrm lib/haddock-0.3
+@dirrm lib/haddock-0.4
 %%PORTDOCS%%@dirrm share/doc/haddock/stylesheet-images
 %%PORTDOCS%%@dirrm share/doc/haddock