- Update GHC and Haskell ports to 6.10.4 (for both i386 and amd64), bump

  port revision where appropriate
- Add devel/hs-ghc-paths
- Add devel/hs-QuickCheck
- Add devel/hs-readline
- Add devel/hs-haskeline
- Add devel/hs-mmap
- Remove lang/ghc-doc
- Mark devel/lhs2TeX broken as it does not compile with GHC 6.10.4
- Set NHC98 as default compiler for devel/hs-hat as it does not compile
  with GHC 6.10.4

PR:		ports/137055, ports/137058, ports/137059, ports/137060, ports/137061,
   		ports/137062, ports/137063, ports/137063, ports/137064, ports/137065,
   		ports/137066, ports/137067, ports/137068, ports/137069, ports/137070,
   		ports/137071, ports/137072, ports/137074, ports/137075, ports/137076,
   		ports/137077, ports/137078, ports/137079, ports/137080, ports/137081,
   		ports/137082, ports/137083, ports/137084, ports/137085, ports/137086,
   		ports/137087, ports/137088, ports/137090, ports/137091, ports/137092,
   		ports/137093, ports/137094, ports/137095, ports/137096, ports/137097,
   		ports/137098, ports/137099, ports/137102, ports/137103, ports/137104,
   		ports/137107, ports/137108, ports/137109, ports/137110, ports/137111

Submitted by:	Jacula Modyun (jacula (at) gmail (dot) com),
             	Ashish Shukla (wahjava (at) gmail (dot) com) (amd64 support)
Supported by:	wxs (review, amd64 testing), tabthorpe (8.x testing)
Approved by:	tabthorpe (mentor), respective maintainers

18 files changed, 308 insertions, 212 deletions

diff --git a/x11/hs-X11-xft/Makefile b/x11/hs-X11-xft/Makefile
index b5ba3282b52a..387613dff1b1 100644
--- a/x11/hs-X11-xft/Makefile
+++ b/x11/hs-X11-xft/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x11-xft
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11-xft/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -26,36 +26,59 @@ RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 
 USE_XORG=	xft xrender
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-GHC_VERSION=	6.8.3
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		PORTNAME=${PORTNAME} \
-		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
-DOCSDIR=	${PREFIX}/share/doc/X11-xft-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=		6.10.4
+HSX11XFT_VERSION=	${PORTVERSION}
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir=''
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+HSX11XFT_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		HSX11XFT_VERSION=${HSX11XFT_VERSION} \
+		HSX11XFT_LIBDIR_REL=${HSX11XFT_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
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .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} && ${CABALCMD} configure ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install \
-	  && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSX11XFT_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/x11/hs-X11-xft/pkg-descr b/x11/hs-X11-xft/pkg-descr
index 69fd19601fdc..d9029e595b30 100644
--- a/x11/hs-X11-xft/pkg-descr
+++ b/x11/hs-X11-xft/pkg-descr
@@ -1,4 +1,4 @@
-Bindings to the Xft, X Free Type interface library, and 
-some Xrender parts.
+Bindings to the Xft, X Free Type interface library, and some Xrender parts.
+
+WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
 
-WWW:	http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
diff --git a/x11/hs-X11-xft/pkg-plist b/x11/hs-X11-xft/pkg-plist
index 07b9a37b156d..758847598f73 100644
--- a/x11/hs-X11-xft/pkg-plist
+++ b/x11/hs-X11-xft/pkg-plist
@@ -1,11 +1,16 @@
-%%SUBDIR%%/Graphics/X11/Xft.hi
-%%SUBDIR%%/Graphics/X11/Xrender.hi
-%%SUBDIR%%/HSX11-xft-0.3.o
-%%SUBDIR%%/libHSX11-xft-0.3.a
-%%SUBDIR%%/x11-xft-register.sh
-@dirrmtry %%SUBDIR%%/Graphics/X11
-@dirrmtry %%SUBDIR%%/Graphics
-@exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
+@comment $FreeBSD$
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xft.hi
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xrender.hi
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-xft-%%HSX11XFT_VERSION%%.o
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-xft-%%HSX11XFT_VERSION%%.a
+%%HSX11XFT_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
+@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
+@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%HSX11XFT_LIBDIR_REL%%
+@exec /bin/sh %D/%%HSX11XFT_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec ghc-pkg unregister X11-xft
+@unexec %D/bin/ghc-pkg unregister X11-xft
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-X11/Makefile b/x11/hs-X11/Makefile
index c3f0ecd42894..f1c3999c3ee3 100644
--- a/x11/hs-X11/Makefile
+++ b/x11/hs-X11/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	x11
 PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,60 +16,77 @@ DISTNAME=	X11-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
-# include the version verbatim. This will require a revision bump
-# on updates, but the correct quoting of `ghc --numeric-version` in the various
-# places is a real nightmare.
-GHC_VERSION=	6.8.3
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		PORTNAME=${PORTNAME} \
-		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
-
-OPTIONS=	XINERAMA "Build with Xinerama support" off
-
-.include <bsd.port.pre.mk>
-
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS+=	gmp.8:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
 USE_XORG=	x11 xext sm
 
+GHC_VERSION=	6.10.4
+HSX11_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+HSX11_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		HSX11_VERSION=${HSX11_VERSION} \
+		HSX11_LIBDIR_REL=${HSX11_LIBDIR_REL}
+
+OPTIONS=	XINERAMA "Build with Xinerama support" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_XINERAMA)
 USE_XORG+=	xinerama
 .endif
 
-# 'owned' by lang/ghc:
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
-DOCSDIR=	${PREFIX}/share/doc/X11-${PORTVERSION}
-PORTDOCS=	LICENSE html
-SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
+.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
-PLIST_SUB+=	RMLIC="@comment "
-.else
-PLIST_SUB+=	RMLIC=""
 .endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
+.SILENT:
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/local/include|${LOCALBASE}/include|g' \
 		${WRKSRC}/configure
 
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \
-	 --libsubdir='' --datasubdir=''
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build \
-	 && ${CABALCMD} --gen-script register
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install \
-	 && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSX11_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.post.mk>
diff --git a/x11/hs-X11/pkg-descr b/x11/hs-X11/pkg-descr
index ddccc4439150..ba10e1af57ec 100644
--- a/x11/hs-X11/pkg-descr
+++ b/x11/hs-X11/pkg-descr
@@ -4,4 +4,4 @@ The binding is a direct translation of C binding;
 for documentation of these calls, refer to /The Xlib Programming Manual/,
 available online at <http://tronche.com/gui/x/xlib/>.
 
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11
+WWW: http://darcs.haskell.org/X11
diff --git a/x11/hs-X11/pkg-plist b/x11/hs-X11/pkg-plist
index 1a35c3b3b685..f174ca04b720 100644
--- a/x11/hs-X11/pkg-plist
+++ b/x11/hs-X11/pkg-plist
@@ -1,41 +1,44 @@
-%%SUBDIR%%/Graphics/X11.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/AP.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/DEC.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/HP.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/Sun.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/XF86.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/XorgDefault.hi
-%%SUBDIR%%/Graphics/X11/Types.hi
-%%SUBDIR%%/Graphics/X11/Xinerama.hi
-%%SUBDIR%%/Graphics/X11/Xlib.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Atom.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Color.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Context.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Display.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Event.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Font.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Image.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Misc.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Region.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Screen.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Types.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Window.hi
-%%SUBDIR%%/HSX11-%%PORTVERSION%%.o
-%%SUBDIR%%/include/HsAllKeysyms.h
-%%SUBDIR%%/include/HsXlib.h
-%%SUBDIR%%/include/XlibExtras.h
-%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/include
-@dirrm %%SUBDIR%%/Graphics/X11/ExtraTypes
-@dirrm %%SUBDIR%%/Graphics/X11/Xlib
-@dirrm %%SUBDIR%%/Graphics/X11
-@dirrmtry %%SUBDIR%%/Graphics
-@exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
+@comment $FreeBSD$
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/AP.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/DEC.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/HP.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/Sun.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XF86.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XorgDefault.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Types.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xinerama.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Atom.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Color.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Context.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Display.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Event.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Extras.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Font.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Image.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Misc.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Region.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-%%HSX11_VERSION%%.o
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-%%HSX11_VERSION%%.a
+%%HSX11_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%HSX11_LIBDIR_REL%%
+@exec /bin/sh %D/%%HSX11_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec ghc-pkg unregister X11
+@unexec %D/bin/ghc-pkg unregister X11
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-x11-ghc/Makefile b/x11/hs-x11-ghc/Makefile
index c3f0ecd42894..f1c3999c3ee3 100644
--- a/x11/hs-x11-ghc/Makefile
+++ b/x11/hs-x11-ghc/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	x11
 PORTVERSION=	1.4.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,60 +16,77 @@ DISTNAME=	X11-${PORTVERSION}
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	X11 bindings for Haskell programs
 
-# include the version verbatim. This will require a revision bump
-# on updates, but the correct quoting of `ghc --numeric-version` in the various
-# places is a real nightmare.
-GHC_VERSION=	6.8.3
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		PORTNAME=${PORTNAME} \
-		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
-
-OPTIONS=	XINERAMA "Build with Xinerama support" off
-
-.include <bsd.port.pre.mk>
-
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 LIB_DEPENDS+=	gmp.8:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 
 USE_XORG=	x11 xext sm
 
+GHC_VERSION=	6.10.4
+HSX11_VERSION=	${PORTVERSION}
+
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
+HSX11_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		HSX11_VERSION=${HSX11_VERSION} \
+		HSX11_LIBDIR_REL=${HSX11_LIBDIR_REL}
+
+OPTIONS=	XINERAMA "Build with Xinerama support" off
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_XINERAMA)
 USE_XORG+=	xinerama
 .endif
 
-# 'owned' by lang/ghc:
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.hs
-DOCSDIR=	${PREFIX}/share/doc/X11-${PORTVERSION}
-PORTDOCS=	LICENSE html
-SUBDIR=		${PORTNAME}${PKGNAMESUFFIX}
+.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
-PLIST_SUB+=	RMLIC="@comment "
-.else
-PLIST_SUB+=	RMLIC=""
 .endif
+BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
+
+HSCOLOUR_VERSION=	1.13
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
+
+PORTDOCS=	*
+.endif
+
+.SILENT:
 
 post-patch:
 	@${REINPLACE_CMD} 's|/usr/local/include|${LOCALBASE}/include|g' \
 		${WRKSRC}/configure
 
 do-configure:
-	cd ${WRKSRC} && ${CABALCMD} configure --ghc --prefix=${PREFIX} --libdir=${CABALDIR} \
-	 --libsubdir='' --datasubdir=''
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.hs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build \
-	 && ${CABALCMD} --gen-script register
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install \
-	 && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSX11_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.post.mk>
diff --git a/x11/hs-x11-ghc/pkg-descr b/x11/hs-x11-ghc/pkg-descr
index ddccc4439150..ba10e1af57ec 100644
--- a/x11/hs-x11-ghc/pkg-descr
+++ b/x11/hs-x11-ghc/pkg-descr
@@ -4,4 +4,4 @@ The binding is a direct translation of C binding;
 for documentation of these calls, refer to /The Xlib Programming Manual/,
 available online at <http://tronche.com/gui/x/xlib/>.
 
-WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11
+WWW: http://darcs.haskell.org/X11
diff --git a/x11/hs-x11-ghc/pkg-plist b/x11/hs-x11-ghc/pkg-plist
index 1a35c3b3b685..f174ca04b720 100644
--- a/x11/hs-x11-ghc/pkg-plist
+++ b/x11/hs-x11-ghc/pkg-plist
@@ -1,41 +1,44 @@
-%%SUBDIR%%/Graphics/X11.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/AP.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/DEC.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/HP.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/Sun.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/XF86.hi
-%%SUBDIR%%/Graphics/X11/ExtraTypes/XorgDefault.hi
-%%SUBDIR%%/Graphics/X11/Types.hi
-%%SUBDIR%%/Graphics/X11/Xinerama.hi
-%%SUBDIR%%/Graphics/X11/Xlib.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Atom.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Color.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Context.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Display.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Event.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Extras.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Font.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Image.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Misc.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Region.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Screen.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Types.hi
-%%SUBDIR%%/Graphics/X11/Xlib/Window.hi
-%%SUBDIR%%/HSX11-%%PORTVERSION%%.o
-%%SUBDIR%%/include/HsAllKeysyms.h
-%%SUBDIR%%/include/HsXlib.h
-%%SUBDIR%%/include/XlibExtras.h
-%%SUBDIR%%/libHSX11-%%PORTVERSION%%.a
-%%SUBDIR%%/%%PORTNAME%%-register.sh
-%%RMLIC%%%%DOCSDIR%%/LICENSE
-%%RMLIC%%@dirrm %%DOCSDIR%%
-@dirrmtry %%SUBDIR%%/include
-@dirrm %%SUBDIR%%/Graphics/X11/ExtraTypes
-@dirrm %%SUBDIR%%/Graphics/X11/Xlib
-@dirrm %%SUBDIR%%/Graphics/X11
-@dirrmtry %%SUBDIR%%/Graphics
-@exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
+@comment $FreeBSD$
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/AP.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/DEC.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/HP.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/Sun.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XF86.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes/XorgDefault.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Types.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xinerama.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Atom.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Color.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Context.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Display.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Event.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Extras.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Font.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Image.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Misc.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Region.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Screen.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Types.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib/Window.hi
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-%%HSX11_VERSION%%.o
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsAllKeysyms.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/HsXlib.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include/XlibExtras.h
+%%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-%%HSX11_VERSION%%.a
+%%HSX11_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/include
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xlib
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/ExtraTypes
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
+@dirrm %%HSX11_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%HSX11_LIBDIR_REL%%
+@exec /bin/sh %D/%%HSX11_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec ghc-pkg unregister X11
+@unexec %D/bin/ghc-pkg unregister X11
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-x11-xft-ghc/Makefile b/x11/hs-x11-xft-ghc/Makefile
index b5ba3282b52a..387613dff1b1 100644
--- a/x11/hs-x11-xft-ghc/Makefile
+++ b/x11/hs-x11-xft-ghc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	x11-xft
 PORTVERSION=	0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/X11-xft/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -26,36 +26,59 @@ RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 
 USE_XORG=	xft xrender
 
-CABALCMD=	${LOCALBASE}/bin/runghc Setup.lhs
-CABALDIR=	${PREFIX}/lib/ghc-${GHC_VERSION}/cabal
-GHC_VERSION=	6.8.3
-PLIST_SUB+=	GHC_VERSION=${GHC_VERSION} \
-		PORTVERSION=${PORTVERSION} \
-		PORTNAME=${PORTNAME} \
-		SUBDIR=lib/ghc-${GHC_VERSION}/cabal
-DOCSDIR=	${PREFIX}/share/doc/X11-xft-${PORTVERSION}
-PORTDOCS=	LICENSE html
+GHC_VERSION=		6.10.4
+HSX11XFT_VERSION=	${PORTVERSION}
 
-CONFIGURE_ARGS=	--ghc --prefix=${PREFIX} --libdir=${CABALDIR} --libsubdir='' --datasubdir=''
+GHC_CMD=	${LOCALBASE}/bin/ghc
+SETUP_CMD=	./setup
+
+DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
+HSX11XFT_LIBDIR_REL=	lib/${DISTNAME}
+
+PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
+		HSX11XFT_VERSION=${HSX11XFT_VERSION} \
+		HSX11XFT_LIBDIR_REL=${HSX11XFT_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
-.else
-PLIST_DIRS+=	%%DOCSDIR%%
-PLIST_FILES+=	%%DOCSDIR%%/LICENSE
 .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} && ${CABALCMD} configure ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${GHC_CMD} --make Setup.lhs -o setup -package Cabal \
+		     && ${SETUP_CMD} configure --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABALCMD} build && ${CABALCMD} --gen-script register
+	cd ${WRKSRC} && ${SETUP_CMD} build \
+		     && ${SETUP_CMD} register --gen-script
+
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABALCMD} haddock
+	cd ${WRKSRC} && ${SETUP_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
-	cd ${WRKSRC} && ${CABALCMD} install \
-	  && ${INSTALL_SCRIPT} ${WRKSRC}/register.sh ${CABALDIR}/${PORTNAME}-register.sh
+	cd ${WRKSRC} && ${SETUP_CMD} install \
+		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HSX11XFT_LIBDIR_REL}/register.sh
+
+post-install:
+	${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff --git a/x11/hs-x11-xft-ghc/pkg-descr b/x11/hs-x11-xft-ghc/pkg-descr
index 69fd19601fdc..d9029e595b30 100644
--- a/x11/hs-x11-xft-ghc/pkg-descr
+++ b/x11/hs-x11-xft-ghc/pkg-descr
@@ -1,4 +1,4 @@
-Bindings to the Xft, X Free Type interface library, and 
-some Xrender parts.
+Bindings to the Xft, X Free Type interface library, and some Xrender parts.
+
+WWW: http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
 
-WWW:	http://hackage.haskell.org/cgi-bin/hackage-scripts/package/X11-xft
diff --git a/x11/hs-x11-xft-ghc/pkg-plist b/x11/hs-x11-xft-ghc/pkg-plist
index 07b9a37b156d..758847598f73 100644
--- a/x11/hs-x11-xft-ghc/pkg-plist
+++ b/x11/hs-x11-xft-ghc/pkg-plist
@@ -1,11 +1,16 @@
-%%SUBDIR%%/Graphics/X11/Xft.hi
-%%SUBDIR%%/Graphics/X11/Xrender.hi
-%%SUBDIR%%/HSX11-xft-0.3.o
-%%SUBDIR%%/libHSX11-xft-0.3.a
-%%SUBDIR%%/x11-xft-register.sh
-@dirrmtry %%SUBDIR%%/Graphics/X11
-@dirrmtry %%SUBDIR%%/Graphics
-@exec /bin/sh %D/%%SUBDIR%%/%%PORTNAME%%-register.sh
+@comment $FreeBSD$
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xft.hi
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11/Xrender.hi
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSX11-xft-%%HSX11XFT_VERSION%%.o
+%%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSX11-xft-%%HSX11XFT_VERSION%%.a
+%%HSX11XFT_LIBDIR_REL%%/register.sh
+%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
+%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
+@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/X11
+@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics
+@dirrm %%HSX11XFT_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
+@dirrm %%HSX11XFT_LIBDIR_REL%%
+@exec /bin/sh %D/%%HSX11XFT_LIBDIR_REL%%/register.sh
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec ghc-pkg unregister X11-xft
+@unexec %D/bin/ghc-pkg unregister X11-xft
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
diff --git a/x11/hs-xmobar/Makefile b/x11/hs-xmobar/Makefile
index 9bd2dfc17244..22832e542c0b 100644
--- a/x11/hs-xmobar/Makefile
+++ b/x11/hs-xmobar/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmobar
-PORTVERSION=	0.9
-PORTREVISION=	2
+PORTVERSION=	0.9.2
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmobar/${PORTVERSION}/ \
 		http://carte.kerneled.org/mirror/
diff --git a/x11/hs-xmobar/distinfo b/x11/hs-xmobar/distinfo
index 5b933e1a4f21..bb56346eab9c 100644
--- a/x11/hs-xmobar/distinfo
+++ b/x11/hs-xmobar/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmobar-0.9.tar.gz) = b9cd54d4a7aee0067cfb8043ba9ab5cb
-SHA256 (xmobar-0.9.tar.gz) = 1e52e9ec669504ae66ae98fbd5291a7034e28723bf93abe29345d5567aefeba9
-SIZE (xmobar-0.9.tar.gz) = 37172
+MD5 (xmobar-0.9.2.tar.gz) = 1177eef9f032256ccf370239a0703eab
+SHA256 (xmobar-0.9.2.tar.gz) = 361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66
+SIZE (xmobar-0.9.2.tar.gz) = 29334
diff --git a/x11/hs-xmobar/pkg-plist b/x11/hs-xmobar/pkg-plist
index 81f3b79bf8d4..8aa558e830a5 100644
--- a/x11/hs-xmobar/pkg-plist
+++ b/x11/hs-xmobar/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/xmobar
 %%RMLIC%%%%DOCSDIR%%/LICENSE
 %%RMLIC%%@dirrm %%DOCSDIR%%
diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile
index 9bd2dfc17244..22832e542c0b 100644
--- a/x11/xmobar/Makefile
+++ b/x11/xmobar/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	xmobar
-PORTVERSION=	0.9
-PORTREVISION=	2
+PORTVERSION=	0.9.2
 CATEGORIES=	x11 haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/xmobar/${PORTVERSION}/ \
 		http://carte.kerneled.org/mirror/
diff --git a/x11/xmobar/distinfo b/x11/xmobar/distinfo
index 5b933e1a4f21..bb56346eab9c 100644
--- a/x11/xmobar/distinfo
+++ b/x11/xmobar/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmobar-0.9.tar.gz) = b9cd54d4a7aee0067cfb8043ba9ab5cb
-SHA256 (xmobar-0.9.tar.gz) = 1e52e9ec669504ae66ae98fbd5291a7034e28723bf93abe29345d5567aefeba9
-SIZE (xmobar-0.9.tar.gz) = 37172
+MD5 (xmobar-0.9.2.tar.gz) = 1177eef9f032256ccf370239a0703eab
+SHA256 (xmobar-0.9.2.tar.gz) = 361295f5dc912512a2eb644ecd331562a271243192be6215cb071e44f50c7c66
+SIZE (xmobar-0.9.2.tar.gz) = 29334
diff --git a/x11/xmobar/pkg-plist b/x11/xmobar/pkg-plist
index 81f3b79bf8d4..8aa558e830a5 100644
--- a/x11/xmobar/pkg-plist
+++ b/x11/xmobar/pkg-plist
@@ -1,3 +1,4 @@
+@comment $FreeBSD$
 bin/xmobar
 %%RMLIC%%%%DOCSDIR%%/LICENSE
 %%RMLIC%%@dirrm %%DOCSDIR%%