6 files changed, 14 insertions, 29 deletions

diff --git a/devel/hs-haddock/Makefile b/devel/hs-haddock/Makefile
index b33cb6279025..af2af4fd509b 100644
--- a/devel/hs-haddock/Makefile
+++ b/devel/hs-haddock/Makefile
@@ -5,28 +5,27 @@
 # $FreeBSD$
 
 PORTNAME=	haddock
-PORTVERSION=	2.9.2
-PORTREVISION=	3
+PORTVERSION=	2.10.0
 CATEGORIES=	devel haskell
 
 MAINTAINER=	haskell@FreeBSD.org
-COMMENT=	A documentation tool for Haskell
+COMMENT=	A documentation-generation tool for Haskell libraries
 
 LICENSE=	BSD
 
-USE_CABAL=	xhtml>=3000.2 ghc-paths
+USE_CABAL=	ghc-paths xhtml>=3000.2
+
 USE_ALEX=	true
 USE_HAPPY=	true
 
 EXECUTABLE=	haddock-${PORTVERSION}
 
-SUB_FILES=	pkg-deinstall pkg-install
-SUB_LIST=	GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXECUTABLE=${PREFIX}/bin/${EXECUTABLE}
+PLIST_SUB+=	GHC_HADDOCK_CMD=${GHC_HADDOCK_CMD} HADDOCK=${PREFIX}/bin/haddock EXECUTABLE=${PREFIX}/bin/${EXECUTABLE}
 
-CONFIGURE_ARGS=	--program-suffix=-${PORTVERSION}
+CONFIGURE_ARGS+=	--program-suffix=-${PORTVERSION}
 
 post-install::
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+	@${LN} -sf ${PREFIX}/bin/${EXECUTABLE} ${PREFIX}/bin/haddock
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/devel/hs-haddock/distinfo b/devel/hs-haddock/distinfo
index 77400f7e6dc3..2ee8e770372e 100644
--- a/devel/hs-haddock/distinfo
+++ b/devel/hs-haddock/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/haddock-2.9.2.tar.gz) = e8498520a4b8c8a03330141ba4c31d81e90dfd361de3ff7e320cdf71c2dd3ba1
-SIZE (cabal/haddock-2.9.2.tar.gz) = 154040
+SHA256 (cabal/haddock-2.10.0.tar.gz) = d107dba15e8aee5abcb540b818b5dcb8ced98bae7d0714f50192dba26cadb410
+SIZE (cabal/haddock-2.10.0.tar.gz) = 159750
diff --git a/devel/hs-haddock/files/pkg-deinstall.in b/devel/hs-haddock/files/pkg-deinstall.in
deleted file mode 100644
index 51712ae3e452..000000000000
--- a/devel/hs-haddock/files/pkg-deinstall.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-[ "$2" = "POST-DEINSTALL" ] && /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%%
-
-exit 0
diff --git a/devel/hs-haddock/files/pkg-install.in b/devel/hs-haddock/files/pkg-install.in
deleted file mode 100644
index 422f7cee7570..000000000000
--- a/devel/hs-haddock/files/pkg-install.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-[ "$2" = "POST-INSTALL" ] && /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
-
-exit 0
diff --git a/devel/hs-haddock/pkg-descr b/devel/hs-haddock/pkg-descr
index 309f42816e19..3611bfb5b9c9 100644
--- a/devel/hs-haddock/pkg-descr
+++ b/devel/hs-haddock/pkg-descr
@@ -1,8 +1,3 @@
-Haddock is a tool for automatically generating documentation from
-annotated Haskell source code. The documentation generated by Haddock
-is fully hyperlinked.
+Haddock is a documentation-generation tool for Haskell libraries.
 
-Haddock can generate documentation in multiple formats; currently HTML
-is implemented, and there is partial support for generating DocBook.
-
-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
new file mode 100644
index 000000000000..6e3b92b85c69
--- /dev/null
+++ b/devel/hs-haddock/pkg-plist
@@ -0,0 +1,3 @@
+@comment $FreeBSD$
+@exec /bin/ln -sf %%EXECUTABLE%% %%HADDOCK%%
+@unexec /bin/ln -sf %%GHC_HADDOCK_CMD%% %%HADDOCK%%