diff -uNr hs-uuagc.orig/Makefile hs-uuagc/Makefile
--- hs-uuagc.orig/Makefile	2009-09-02 15:38:39.000000000 +0000
+++ hs-uuagc/Makefile	2009-12-19 16:16:43.000000000 +0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	uuagc
-PORTVERSION=	0.9.10
+PORTVERSION=	0.9.12
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -19,26 +19,60 @@
 LIB_DEPENDS+=	gmp.8:${PORTSDIR}/math/libgmp4
 
 GHC_VERSION=	6.10.4
+UUAGC_VERSION=	${PORTVERSION}
 
 GHC_CMD=	${LOCALBASE}/bin/ghc
 SETUP_CMD=	./setup
 
-DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+UUAGC_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		UUAGC_VERSION=${UUAGC_VERSION} \
+		UUAGC_LIBDIR_REL=${UUAGC_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.15
+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
+	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
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${UUAGC_LIBDIR_REL}/register.sh
 
 post-install:
 	${STRIP_CMD} ${PREFIX}/bin/uuagc
 	${CHMOD} ${BINMODE} ${PREFIX}/bin/uuagc
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff -uNr hs-uuagc.orig/distinfo hs-uuagc/distinfo
--- hs-uuagc.orig/distinfo	2009-09-02 15:38:39.000000000 +0000
+++ hs-uuagc/distinfo	2009-12-19 14:37:25.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (uuagc-0.9.10.tar.gz) = 4be7fb2b0e7477b929e88977ab2c66f9
-SHA256 (uuagc-0.9.10.tar.gz) = cdbe78b6138a67bbc612f0f667f70ba483ebbdaa4d0c87c5508cfb5e68a49dcb
-SIZE (uuagc-0.9.10.tar.gz) = 191213
+MD5 (uuagc-0.9.12.tar.gz) = d8e67d97ac15145f0d60f4bc53600066
+SHA256 (uuagc-0.9.12.tar.gz) = a6e6793be22c39bee2d3539aad30c34409f2af62bfbb93b272da9d6bf08979be
+SIZE (uuagc-0.9.12.tar.gz) = 198285
diff -uNr hs-uuagc.orig/pkg-plist hs-uuagc/pkg-plist
--- hs-uuagc.orig/pkg-plist	2009-09-02 15:38:39.000000000 +0000
+++ hs-uuagc/pkg-plist	2009-12-19 15:13:39.000000000 +0000
@@ -1,4 +1,21 @@
 @comment $FreeBSD: ports/devel/hs-uuagc/pkg-plist,v 1.2 2009/09/02 15:38:39 pgj Exp $
 bin/uuagc
-%%DOCSDIR%%/LICENSE
-@dirrm %%DOCSDIR%%
+%%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC.hi
+%%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/AbsSyn.hi
+%%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/Options.hi
+%%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/Parser.hi
+%%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC/UUAGC.hi
+%%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSuuagc-0.9.12.o
+%%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSuuagc-0.9.12.a
+%%UUAGC_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple/UUAGC
+@dirrm %%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution/Simple
+@dirrm %%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Distribution
+@dirrm %%UUAGC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%UUAGC_LIBDIR_REL%%
+@exec /bin/sh %D/%%UUAGC_LIBDIR_REL%%/register.sh
+@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
+@unexec %D/bin/ghc-pkg unregister uuagc
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old