diff -urN /usr/ports/lang/ghc/Makefile ghc/Makefile
--- /usr/ports/lang/ghc/Makefile	2009-09-03 05:44:31.000000000 +0530
+++ ghc/Makefile	2009-09-06 14:02:30.000000000 +0530
@@ -22,10 +22,10 @@
 
 GHC_VERSION=		${PORTVERSION}
 BOOT_GHC_VERSION=	${GHC_VERSION}
-HADDOCK_VERSION=	2.4.2
+HADDOCK_VERSION=	2.5.0
 PORT_HADDOCK_VERSION=	${HADDOCK_VERSION}
 BOOT_HADDOCK_VERSION=	${HADDOCK_VERSION}
-HSCOLOUR_VERSION=	1.13
+HSCOLOUR_VERSION=	1.15
 GHCPATH_VERSION=	0.1.0.5
 
 USE_AUTOTOOLS=	autoconf:262:env
diff -urN /usr/ports/lang/ghc/pkg-plist ghc/pkg-plist
--- /usr/ports/lang/ghc/pkg-plist	2009-09-03 05:44:35.000000000 +0530
+++ ghc/pkg-plist	2009-09-07 08:51:04.000000000 +0530
@@ -1642,15 +1642,13 @@
 %%GHC_LIBDIR_REL%%/ghc-usage.txt
 %%GHC_LIBDIR_REL%%/ghci-usage.txt
 %%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/Distribution/Haddock.hi
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/HShaddock-2.4.2.o
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock/DocName.hi
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock/Exception.hi
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock/GHC/Utils.hi
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock/InterfaceFile.hi
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock/Types.hi
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock/Utils.hi
-%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.4.2/libHShaddock-2.4.2.a
+%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.5.0/Distribution/Haddock.hi
+%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.5.0/HShaddock-2.5.0.o
+%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.5.0/Haddock/GhcUtils.hi
+%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.5.0/Haddock/InterfaceFile.hi
+%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.5.0/Haddock/Types.hi
+%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.5.0/Haddock/Utils.hi
+%%HADDOCK%%%%GHC_LIBDIR_REL%%/haddock-2.5.0/libHShaddock-2.5.0.a
 %%GHC_LIBDIR_REL%%/haskell-src-1.0.1.3/HShaskell-src-1.0.1.3.o
 %%GHC_LIBDIR_REL%%/haskell-src-1.0.1.3/Language/Haskell/Lexer.hi
 %%PROFILE%%%%GHC_LIBDIR_REL%%/haskell-src-1.0.1.3/Language/Haskell/Lexer.p_hi
@@ -2352,10 +2350,9 @@
 @dirrm %%GHC_LIBDIR_REL%%/haskell-src-1.0.1.3/Language/Haskell
 @dirrm %%GHC_LIBDIR_REL%%/haskell-src-1.0.1.3/Language
 @dirrm %%GHC_LIBDIR_REL%%/haskell-src-1.0.1.3
-%%HADDOCK%%@dirrm %%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock/GHC
-%%HADDOCK%%@dirrm %%GHC_LIBDIR_REL%%/haddock-2.4.2/Haddock
-%%HADDOCK%%@dirrm %%GHC_LIBDIR_REL%%/haddock-2.4.2/Distribution
-%%HADDOCK%%@dirrm %%GHC_LIBDIR_REL%%/haddock-2.4.2
+%%HADDOCK%%@dirrm %%GHC_LIBDIR_REL%%/haddock-2.5.0/Haddock
+%%HADDOCK%%@dirrm %%GHC_LIBDIR_REL%%/haddock-2.5.0/Distribution
+%%HADDOCK%%@dirrm %%GHC_LIBDIR_REL%%/haddock-2.5.0
 @dirrm %%GHC_LIBDIR_REL%%/ghc-prim-0.1.0.0/GHC
 @dirrm %%GHC_LIBDIR_REL%%/ghc-prim-0.1.0.0
 @dirrm %%GHC_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include