4 files changed, 41 insertions, 35 deletions

diff --git a/devel/hs-uulib/Makefile b/devel/hs-uulib/Makefile
index f9cdad3b9881..10e47d039d23 100644
--- a/devel/hs-uulib/Makefile
+++ b/devel/hs-uulib/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	uulib
-PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTVERSION=	0.9.10
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,8 +15,9 @@ MAINTAINER=	jacula@gmail.com
 COMMENT=	Haskell Utrecht Tools Library
 
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
+RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
-GHC_VERSION=	6.8.3
+GHC_VERSION=	6.10.4
 UULIB_VERSION=	${PORTVERSION}
 
 GHC_CMD=	${LOCALBASE}/bin/ghc
@@ -30,16 +30,41 @@ PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
 		UULIB_VERSION=${UULIB_VERSION} \
 		UULIB_LIBDIR_REL=${UULIB_LIBDIR_REL}
 
+.if defined(NOPORTDOCS)
+PLIST_SUB+=		NOPORTDOCS=""
+.else
+PLIST_SUB+=		NOPORTDOCS="@comment "
+.endif
+
+.if !defined(NOPORTDOCS)
+
+PORT_HADDOCK!=	(cd  ${.CURDIR}/../../lang/ghc && ${MAKE} -V PORT_HADDOCK)
+.if !empty(PORT_HADDOCK:M?0)
+BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock
+.endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
 .SILENT:
 
 do-configure:
 	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
-		     && ${SETUP_CMD} configure --prefix=${PREFIX}
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
 	cd ${WRKSRC} && ${SETUP_CMD} build \
 		     && ${SETUP_CMD} register --gen-script
 
+.if !defined(NOPORTDOCS)
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
+.endif
+
 do-install:
 	cd ${WRKSRC} && ${SETUP_CMD} install \
 		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UULIB_LIBDIR_REL}/register.sh
diff --git a/devel/hs-uulib/distinfo b/devel/hs-uulib/distinfo
index dcd0eacdaba7..af002f2ee7f9 100644
--- a/devel/hs-uulib/distinfo
+++ b/devel/hs-uulib/distinfo
@@ -1,3 +1,3 @@
-MD5 (uulib-0.9.5.tar.gz) = 606dec3a8ea8797421e795336392f02f
-SHA256 (uulib-0.9.5.tar.gz) = 38415725133af464de582dadc7d7e60b1aeb96344b18b239d176bf2181f98563
-SIZE (uulib-0.9.5.tar.gz) =  93618
+MD5 (uulib-0.9.10.tar.gz) = 5db835e7ee4accd902a54eb26c4762d8
+SHA256 (uulib-0.9.10.tar.gz) = 1df7336ed76c278323c2e25ab53ec1afc9eba6a7c918c826e9f783e84479e08f
+SIZE (uulib-0.9.10.tar.gz) = 96312
diff --git a/devel/hs-uulib/pkg-descr b/devel/hs-uulib/pkg-descr
index 05502b0220e5..081fe1e02175 100644
--- a/devel/hs-uulib/pkg-descr
+++ b/devel/hs-uulib/pkg-descr
@@ -1,24 +1,4 @@
-Fast Parser Combinators and Pretty Printing Combinators
-libraries by the Utrecht University.
+Fast Parser Combinators and Pretty Printing Combinators libraries by the
+Utrecht University.
 
-author:
-maintainer:	Arie Middelkoop <ariem@cs.uu.nl>
-license:	LGPL-2.1
-WWW:		http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem
-package-url:	http://nix.cs.uu.nl/dist/hut/
-
-exposed-modules:
-	UU.Parsing.CharParser UU.Parsing.Derived
-	UU.Parsing.Interface UU.Parsing.MachineInterface
-	UU.Parsing.Merge UU.Parsing.Offside UU.Parsing.Perms
-	UU.Parsing.StateParser UU.Parsing UU.DData.IntBag 
-	UU.DData.Map UU.DData.MultiSet UU.DData.Queue
-	UU.DData.Scc UU.DData.Seq UU.DData.Set UU.PPrint
-	UU.Pretty.Ext UU.Pretty UU.Scanner.GenToken UU.Scanner.GenTokenOrd
-	UU.Scanner.GenTokenParser UU.Scanner.GenTokenSymbol
-	UU.Scanner.Position UU.Scanner.Scanner
-	UU.Scanner.Token UU.Scanner.TokenParser UU.Scanner.TokenShow
-	UU.Scanner UU.Util.BinaryTrees UU.Util.PermTree UU.Util.Utils
-	UU.Pretty.Basic UU.Parsing.Machine    
-	UU.DData.IntMap  
-	UU.DData.IntSet        
+WWW: http://www.cs.uu.nl/wiki/HUT/AttributeGrammarSystem
diff --git a/devel/hs-uulib/pkg-plist b/devel/hs-uulib/pkg-plist
index c1c11961d535..50f2d18d2c55 100644
--- a/devel/hs-uulib/pkg-plist
+++ b/devel/hs-uulib/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSuulib-%%UULIB_VERSION%%.o
 %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/IntBag.hi
 %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/DData/IntMap.hi
@@ -37,8 +38,8 @@
 %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util/Utils.hi
 %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSuulib-%%UULIB_VERSION%%.a
 %%UULIB_LIBDIR_REL%%/register.sh
-%%DOCSDIR%%/COPYRIGHT
-@dirrm %%DOCSDIR%%
+%%NOPORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
 @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Util
 @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Scanner
 @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/UU/Pretty
@@ -48,6 +49,6 @@
 @dirrm %%UULIB_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
 @dirrm %%UULIB_LIBDIR_REL%%
 @exec /bin/sh %D/%%UULIB_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 uulib || /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/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister uulib
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old