5 files changed, 50 insertions, 52 deletions

diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index 55e9b0d735b3..f65f3035e217 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -5,29 +5,28 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	2.1.0
-PORTREVISION=	2
+PORTVERSION=	2.4.2
 CATEGORIES=	devel haskell
-MASTER_SITES=	http://hackage.haskell.org/packages/archive/haddock/${PORTVERSION}/
+MASTER_SITES=	http://www.haskell.org/haddock/dist/ \
+		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A documentation tool for Haskell
 
 .if !defined(SLAVE)
-BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc
-
-.if exists(${LOCALBASE}/lib/libreadline.so.6)
-LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
-.endif
-
+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+       		hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+       		hs-ghc-paths>=0.1.0.5:${PORTSDIR}/devel/hs-ghc-paths
+LIB_DEPENDS=	gmp.8:${PORTSDIR}/math/libgmp4
 .else
 NO_PKG_REGISTER=
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 
-GHC_VERSION=	 6.8.3
+GHC_VERSION=		6.10.4
 HADDOCK_VERSION=	${PORTVERSION}
 
 CABAL_CMD=	runghc Setup.lhs
@@ -42,13 +41,36 @@ PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
 		HADDOCK_VERSION=${HADDOCK_VERSION} \
 		DOCSDIR_REL=${DOCSDIR_REL}
 
+.include <bsd.port.pre.mk>
+
+.if !defined(SLAVE)
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if ${PORT_HADDOCK} == 11
+ECHO_MSG=	${PRINTF} "%b"
+IGNORE+=	\n\t The ${LOCALBASE}/bin/haddock executable was already installed\n
+IGNORE+=	\t by the lang/ghc port, setting the option WITH_HADDOCK.\n
+IGNORE+=	\t You have to reinstall this last one with the right option\n
+IGNORE+=	\t WITHOUT_HADDOCK.\n\c
+.elif ${PORT_HADDOCK} == 01
+ECHO_MSG=	${PRINTF} "%b"
+IGNORE+=	\n\t This port depends on the lang/ghc port, which will install\n
+IGNORE+=	\t the ${LOCALBASE}/bin/haddock executable, for the WITH_HADDOCK\n
+IGNORE+=	\t option was set in it. You have to set the WITHOUT_HADDOCK\n
+IGNORE+=	\t options in lang/ghc before to install devel/hs-haddock.\n\c
+.endif
+.endif
+
 .SILENT:
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
+		${WRKSRC}/doc/configure.ac
+
 do-configure:
 	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build --ghc-option="-package process-1.0.0.1"
+	cd ${WRKSRC} && ${CABAL_CMD} build
 .if !defined(SLAVE)
 	cd ${WRKSRC} && ${CABAL_CMD} register --gen-script
 .endif
@@ -63,4 +85,4 @@ post-install:
 .endif
 	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index f2d7b7d109ac..13ad4cb9404e 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,3 +1,3 @@
-MD5 (haddock-2.1.0.tar.gz) = 8971b42827758aa06519aeeecbfa30e6
-SHA256 (haddock-2.1.0.tar.gz) = 1b67869e493e56366207a128949998851f975d821e0952c2c717840d2eadaca7
-SIZE (haddock-2.1.0.tar.gz) = 95531
+MD5 (haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
+SHA256 (haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
+SIZE (haddock-2.4.2.tar.gz) = 103033
diff --git a/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs b/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs
deleted file mode 100644
index dad648dbb311..000000000000
--- a/devel/hs-haddock/files/patch-src-Haddock-GHC-Typecheck.hs
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/Haddock/GHC/Typecheck.hs.orig	2008-05-01 15:13:13.000000000 +0200
-+++ src/Haddock/GHC/Typecheck.hs	2008-06-22 16:52:52.000000000 +0200
-@@ -23,6 +23,7 @@
- 
- import Data.List
- 
-+import FastString
- 
- type CheckedMod = (Module, FilePath, FullyCheckedMod)
- 
-@@ -69,7 +70,7 @@
- mkGhcModule (mod, file, checkedMod) dynflags = GhcModule {
-   ghcModule         = mod,
-   ghcFilename       = file,
--  ghcMbDocOpts      = mbOpts,
-+  ghcMbDocOpts      = fmap unpackFS mbOpts,
-   ghcHaddockModInfo = info,
-   ghcMbDoc          = mbDoc,
-   ghcGroup          = group,
-@@ -79,6 +80,6 @@
-   ghcInstances      = modInfoInstances modInfo
- }
-   where
--    HsModule _ _ _ _ _ mbOpts _ _      = unLoc parsed
-+    HsModule _ _ _ _ mbOpts _ _      = unLoc parsed
-     (group, _, mbExports, mbDoc, info) = renamed
-     (parsed, renamed, _, modInfo)      = checkedMod
diff --git a/devel/hs-haddock/pkg-descr b/devel/hs-haddock/pkg-descr
index 51e5466f6a41..309f42816e19 100644
--- a/devel/hs-haddock/pkg-descr
+++ b/devel/hs-haddock/pkg-descr
@@ -1,11 +1,8 @@
 Haddock is a tool for automatically generating documentation from
 annotated Haskell source code. The documentation generated by Haddock
 is fully hyperlinked.
+
 Haddock can generate documentation in multiple formats; currently HTML
 is implemented, and there is partial support for generating DocBook.
 
-author:		Simon Marlow, David Waern
-maintainer:	David Waern <david.waern@gmail.com>
-license:	BSD3
-exposed-modules:	Distribution.Haddock
-WWW:	http://www.haskell.org/haddock/
+WWW: http://www.haskell.org/haddock/
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
index 4c3f560b60c3..c38e4b2b0a98 100644
--- a/devel/hs-haddock/pkg-plist
+++ b/devel/hs-haddock/pkg-plist
@@ -1,12 +1,17 @@
+@comment $FreeBSD$
 bin/haddock
 %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi
 %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HShaddock-%%HADDOCK_VERSION%%.o
+%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/DocName.hi
 %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi
+%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC/Utils.hi
 %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi
 %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi
+%%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Utils.hi
 %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShaddock-%%HADDOCK_VERSION%%.a
 %%HADDOCK_LIBDIR_REL%%/register.sh
 %%DOCSDIR%%/LICENSE
+%%DATADIR_REL%%/html/frames.html
 %%DATADIR_REL%%/html/haddock-DEBUG.css
 %%DATADIR_REL%%/html/haddock-util.js
 %%DATADIR_REL%%/html/haddock.css
@@ -15,12 +20,13 @@ bin/haddock
 %%DATADIR_REL%%/html/plus.gif
 @dirrm %%DATADIR_REL%%/html
 @dirrm %%DATADIR_REL%%
-@dirrm %%DOCSDIR%%
+@dirrmtry %%DOCSDIR%%
+@dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC
 @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock
 @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution
 @dirrm %%HADDOCK_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
 @dirrm %%HADDOCK_LIBDIR_REL%%
-@exec /bin/sh %D/%%HADDOCK_LIBDIR_REL%%/register.sh
-@exec rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec if [ -x %D/bin/ghc-pkg ]; then %D/bin/ghc-pkg unregister haddock || /usr/bin/true; fi
-@unexec if [ -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old ]; then rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old || /usr/bin/true; fi
+@exec /bin/sh %%LOCALBASE%%/%%HADDOCK_LIBDIR_REL%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %%LOCALBASE%%/bin/ghc-pkg unregister haddock
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old