4 files changed, 23 insertions, 51 deletions
diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index eabf51ecb833..6b1bb61c7d72 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -5,39 +5,29 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	2.4.2
-PORTREVISION=	2
+PORTVERSION=	2.9.2
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A documentation tool for Haskell
 
-USE_HACKAGE=	ghc-paths
+LICENSE=	BSD
 
-EXECUTABLE=	haddock
+USE_CABAL=	xhtml>=3000.2 ghc-paths
+USE_ALEX=	true
+USE_HAPPY=	true
+
+EXECUTABLE=	haddock-${PORTVERSION}
 
 PORTDATA=	*
 
-.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
-.else
-GHC_CMD=	ghc
-.endif
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock
+
+CONFIGURE_ARGS=	--program-suffix=-${PORTVERSION}
+
+post-install::
+	@${LN} -sf ${PREFIX}/bin/${EXECUTABLE} ${PREFIX}/bin/haddock
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 024dc3b353d8..77400f7e6dc3 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,3 +1,2 @@
-MD5 (cabal/haddock-2.4.2.tar.gz) = c1d5238faac72727921130eb792041a2
-SHA256 (cabal/haddock-2.4.2.tar.gz) = dbf0a7d0103a3ce6a91b2a3b96148c1b9c13ea7f8bd74260c21fe98df7839547
-SIZE (cabal/haddock-2.4.2.tar.gz) = 103033
+SHA256 (cabal/haddock-2.9.2.tar.gz) = e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1
+SIZE (cabal/haddock-2.9.2.tar.gz) = 154040
diff --git a/devel/hs-haddock/files/pkg-deinstall.in b/devel/hs-haddock/files/pkg-deinstall.in
new file mode 100644
index 000000000000..51712ae3e452
--- /dev/null
+++ b/devel/hs-haddock/files/pkg-deinstall.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+# $FreeBSD$
+
+[ "$2" = "POST-DEINSTALL" ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%%
+
+exit 0
diff --git a/devel/hs-haddock/pkg-plist b/devel/hs-haddock/pkg-plist
deleted file mode 100644
index b3c29ec7ce95..000000000000
--- a/devel/hs-haddock/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-@comment $FreeBSD$
-bin/haddock
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Haddock.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/DocName.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Exception.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/InterfaceFile.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/Utils.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%DOCSDIR%%/LICENSE
-@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock/GHC
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Haddock
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %%LOCALBASE%%/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old