From jacula@gmail.com  Sun Jul 27 16:13:09 2008
Return-Path: <jacula@gmail.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C25E31065673
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2008 16:13:09 +0000 (UTC)
	(envelope-from jacula@gmail.com)
Received: from mu-out-0910.google.com (mu-out-0910.google.com [209.85.134.189])
	by mx1.freebsd.org (Postfix) with ESMTP id E3D728FC17
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2008 16:13:08 +0000 (UTC)
	(envelope-from jacula@gmail.com)
Received: by mu-out-0910.google.com with SMTP id i2so3072425mue.3
        for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2008 09:13:07 -0700 (PDT)
Received: by 10.103.40.5 with SMTP id s5mr2404226muj.133.1217175186419;
        Sun, 27 Jul 2008 09:13:06 -0700 (PDT)
Received: from splork.wirewater.yow ( [79.18.225.20])
        by mx.google.com with ESMTPS id s10sm29371880mue.16.2008.07.27.09.13.04
        (version=TLSv1/SSLv3 cipher=RC4-MD5);
        Sun, 27 Jul 2008 09:13:05 -0700 (PDT)
Received: from localhost.wirewater.yow [127.0.0.1]
 	by splork.wirewater.yow (Sendmail: 8.14.2/8.14.2) with ESMTP id m6RGD2HA083664
 	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 27 Jul 2008 16:13:03 GMT
Received: by splork.wirewater.yow (Sendmail: 8.14.2/8.14.2/Submit) id m6RGD2X0083663
	;
 	Sun, 27 Jul 2008 16:13:02 GMT
Message-Id: <200807271613.m6RGD2X0083663@splork.wirewater.yow>
Date: Sun, 27 Jul 2008 09:13:05 -0700 (PDT)
From: Jacula Modyun <jacula@gmail.com>
Reply-To: Jacula Modyun <jacula@gmail.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE]: print/hs-hscolour updated to port version 1.10
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         126008
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE]: print/hs-hscolour updated to port version 1.10
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Jul 27 16:20:02 UTC 2008
>Closed-Date:    Fri Aug 15 04:52:07 UTC 2008
>Last-Modified:  Fri Aug 15 05:00:03 UTC 2008
>Originator:     Jacula Modyun
>Release:        FreeBSD 7.0-STABLE i386
>Organization:
>Environment:
System: FreeBSD splork.wirewater.yow 7.0-STABLE FreeBSD 7.0-STABLE #0: Wed Jul 23 11:54:05 UTC 2008 root@splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386


	
>Description:

Hi all.

This patch-set is related to the updating of hscolour to the 1.10 version.
The changes are minimal and the only relevant difference about hscolour is
that the title of HTML output is now the filename.

Jacula Modyun

>How-To-Repeat:
	
>Fix:

	

--- patch-hs-hscolour begins here ---
diff -uNr hs-hscolour.orig/Makefile hs-hscolour/Makefile
--- hs-hscolour.orig/Makefile	2008-07-18 20:05:16.000000000 +0000
+++ hs-hscolour/Makefile	2008-07-27 10:55:13.000000000 +0000
@@ -6,15 +6,17 @@
 #
 
 PORTNAME=	hscolour
-PORTVERSION=	1.9
-PORTREVISION=	1
+PORTVERSION=	1.10
 CATEGORIES=	print haskell
-MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/
+MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
+		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
 
 MAINTAINER=	jacula@gmail.com
 COMMENT=	Colourise Haskell code
 
+LIB_DEPENDS+=	gmp.7:${PORTSDIR}/math/libgmp4
+
 .if !defined(SLAVE)
 BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc
 .else
@@ -31,10 +33,8 @@
 DOCSDIR=		${PREFIX}/share/doc/${DISTNAME}
 
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		DATADIR_REL=${DATADIR_REL} \
 		HSCOLOUR_LIBDIR_REL=${HSCOLOUR_LIBDIR_REL} \
 		HSCOLOUR_VERSION=${HSCOLOUR_VERSION} \
-		DOCSDIR_REL=${DOCSDIR_REL}
 
 .SILENT:
 
diff -uNr hs-hscolour.orig/distinfo hs-hscolour/distinfo
--- hs-hscolour.orig/distinfo	2008-02-29 19:54:21.000000000 +0000
+++ hs-hscolour/distinfo	2008-07-26 14:39:06.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (hscolour-1.9.tar.gz) = badfe50d4215f23d0e17928b24f80773
-SHA256 (hscolour-1.9.tar.gz) = 9d961264fe86f7128673c624943062ea0af19b1c80e303fcdb6957cadc5ac774
-SIZE (hscolour-1.9.tar.gz) = 43119
+MD5 (hscolour-1.10.tar.gz) = 553b71a6b269b023de7050461918a8e0
+SHA256 (hscolour-1.10.tar.gz) = ebeeb6829d8789b16a66753144dfcf4ba35f12d40ff978be4b5669d8cbb09073
+SIZE (hscolour-1.10.tar.gz) = 51246
diff -uNr hs-hscolour.orig/pkg-descr hs-hscolour/pkg-descr
--- hs-hscolour.orig/pkg-descr	2008-02-29 19:54:21.000000000 +0000
+++ hs-hscolour/pkg-descr	2008-07-26 15:11:14.000000000 +0000
@@ -1,24 +1,28 @@
-hscolour is a small Haskell script to colourise Haskell
-code. It currently has four output formats: 
+hscolour is a small Haskell script to colourise Haskell code.
+It currently has five output formats: 
 
-  ANSI terminal codes, HTML 3.2 with <font> tags,
-  HTML 4.01 with CSS, and LaTeX.
+- ANSI terminal codes
+- HTML 3.2 with <font> tags
+- HTML 4.01 with CSS
+- LaTeX
+- mIRC chat codes
 
 author:		Malcolm Wallace
 maintainer:	Malcolm Wallace
 license:	GPL
 WWW:		http://www.cs.york.ac.uk/fp/darcs/hscolour
-package-url:	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/
+package-url:	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib
+
 Exposed-Modules: 
-  Language.Haskell.HsColour,
-  Language.Haskell.HsColour.ANSI,
-  Language.Haskell.HsColour.Anchors,
-  Language.Haskell.HsColour.Classify,
-  Language.Haskell.HsColour.ColourHighlight,
-  Language.Haskell.HsColour.Colourise,
-  Language.Haskell.HsColour.TTY,
-  Language.Haskell.HsColour.HTML,
-  Language.Haskell.HsColour.LaTeX,
-  Language.Haskell.HsColour.General,
-  Language.Haskell.HsColour.MIRC,
-  Language.Haskell.HsColour.CSS
+	Language.Haskell.HsColour
+	Language.Haskell.HsColour.ANSI
+	Language.Haskell.HsColour.Anchors
+	Language.Haskell.HsColour.Classify
+	Language.Haskell.HsColour.ColourHighlight
+	Language.Haskell.HsColour.Colourise
+	Language.Haskell.HsColour.TTY
+	Language.Haskell.HsColour.HTML
+	Language.Haskell.HsColour.LaTeX
+	Language.Haskell.HsColour.General
+	Language.Haskell.HsColour.MIRC
+	Language.Haskell.HsColour.CSS
diff -uNr hs-hscolour.orig/pkg-plist hs-hscolour/pkg-plist
--- hs-hscolour.orig/pkg-plist	2008-02-29 19:54:21.000000000 +0000
+++ hs-hscolour/pkg-plist	2008-07-26 15:01:40.000000000 +0000
@@ -14,17 +14,17 @@
 %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour/TTY.hi
 %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHShscolour-%%HSCOLOUR_VERSION%%.a
 %%HSCOLOUR_LIBDIR_REL%%/register.sh
-%%DOCSDIR_REL%%/LICENCE-GPL
-%%DOCSDIR_REL%%/README
-%%DATADIR_REL%%/hscolour.css
-@dirrm %%DATADIR_REL%%
-@dirrm %%DOCSDIR_REL%%
+%%DOCSDIR%%/LICENCE-GPL
+%%DOCSDIR%%/README
+%%DATADIR%%/hscolour.css
+@dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
 @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell/HsColour
 @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language/Haskell
 @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Language
 @dirrm %%HSCOLOUR_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
 @dirrm %%HSCOLOUR_LIBDIR_REL%%
 @exec /bin/sh %D/%%HSCOLOUR_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 hscolour || /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 hscolour
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-hscolour ends here ---

--- patch-hs-hscolour-docs begins here ---
diff -uNr hs-hscolour-docs.orig/Makefile hs-hscolour-docs/Makefile
--- hs-hscolour-docs.orig/Makefile	2008-02-29 20:50:33.000000000 +0000
+++ hs-hscolour-docs/Makefile	2008-07-27 08:40:22.000000000 +0000
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	hscolour-docs
-PORTVERSION=	1.9
+PORTVERSION=	1.10
 CATEGORIES=	print haskell
-MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/
+MASTER_SITES=	ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/ \
+		http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
 DISTNAME=	hscolour-${PORTVERSION}
 
@@ -20,24 +21,23 @@
 		HsColour:${PORTSDIR}/print/hs-hscolour
 
 HSCOLOUR_VERSION=	${PORTVERSION}
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 
 CABAL_CMD=	runghc Setup.hs
 
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-PLIST_SUB=	DOCSDIR_REL=${DOCSDIR_REL}
 
 .SILENT:
 
 do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
+	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build && \
-		${CABAL_CMD} haddock --executables --hyperlink-source \
-				     --hscolour-css=${LOCALBASE}/share/hscolour-${HSCOLOUR_VERSION}/hscolour.css
+	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 
 do-install:
 	${MKDIR} ${DOCSDIR}/html
-	cd ${WRKSRC}/dist/doc/html/hscolour && ${CP} -R * ${DOCSDIR}/html
+	cd ${WRKSRC}/dist/doc/html/hscolour && ${COPYTREE_SHARE} \* ${DOCSDIR}/html
 
 .include <bsd.port.mk>
diff -uNr hs-hscolour-docs.orig/distinfo hs-hscolour-docs/distinfo
--- hs-hscolour-docs.orig/distinfo	2008-02-29 20:50:33.000000000 +0000
+++ hs-hscolour-docs/distinfo	2008-07-26 14:52:24.000000000 +0000
@@ -1,3 +1,3 @@
-MD5 (hscolour-1.9.tar.gz) = badfe50d4215f23d0e17928b24f80773
-SHA256 (hscolour-1.9.tar.gz) = 9d961264fe86f7128673c624943062ea0af19b1c80e303fcdb6957cadc5ac774
-SIZE (hscolour-1.9.tar.gz) = 43119
+MD5 (hscolour-1.10.tar.gz) = 553b71a6b269b023de7050461918a8e0
+SHA256 (hscolour-1.10.tar.gz) = ebeeb6829d8789b16a66753144dfcf4ba35f12d40ff978be4b5669d8cbb09073
+SIZE (hscolour-1.10.tar.gz) = 51246
diff -uNr hs-hscolour-docs.orig/pkg-plist hs-hscolour-docs/pkg-plist
--- hs-hscolour-docs.orig/pkg-plist	2008-02-29 20:50:33.000000000 +0000
+++ hs-hscolour-docs/pkg-plist	2008-07-26 14:55:01.000000000 +0000
@@ -1,60 +1,60 @@
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-General.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR_REL%%/html/HsColour/Language-Haskell-HsColour.html
-%%DOCSDIR_REL%%/html/HsColour/Main.html
-%%DOCSDIR_REL%%/html/HsColour/doc-index.html
-%%DOCSDIR_REL%%/html/HsColour/haddock-util.js
-%%DOCSDIR_REL%%/html/HsColour/haddock.css
-%%DOCSDIR_REL%%/html/HsColour/haskell_icon.gif
-%%DOCSDIR_REL%%/html/HsColour/index.html
-%%DOCSDIR_REL%%/html/HsColour/minus.gif
-%%DOCSDIR_REL%%/html/HsColour/plus.gif
-%%DOCSDIR_REL%%/html/HsColour/src/Main.html
-%%DOCSDIR_REL%%/html/HsColour/src/hscolour.css
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-General.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR_REL%%/html/Language-Haskell-HsColour.html
-%%DOCSDIR_REL%%/html/doc-index.html
-%%DOCSDIR_REL%%/html/haddock-util.js
-%%DOCSDIR_REL%%/html/haddock.css
-%%DOCSDIR_REL%%/html/haskell_icon.gif
-%%DOCSDIR_REL%%/html/hscolour.haddock
-%%DOCSDIR_REL%%/html/index.html
-%%DOCSDIR_REL%%/html/minus.gif
-%%DOCSDIR_REL%%/html/plus.gif
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-ANSI.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-Anchors.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-CSS.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-Classify.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-ColourHighlight.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-Colourise.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-General.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-HTML.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-LaTeX.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-MIRC.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour-TTY.html
-%%DOCSDIR_REL%%/html/src/Language-Haskell-HsColour.html
-%%DOCSDIR_REL%%/html/src/hscolour.css
-@dirrm %%DOCSDIR_REL%%/html/src
-@dirrm %%DOCSDIR_REL%%/html/HsColour/src
-@dirrm %%DOCSDIR_REL%%/html/HsColour
-@dirrm %%DOCSDIR_REL%%/html
-@dirrmtry %%DOCSDIR_REL%%
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-ANSI.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Anchors.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-CSS.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Classify.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-ColourHighlight.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-Colourise.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-General.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-HTML.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-LaTeX.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-MIRC.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour-TTY.html
+%%DOCSDIR%%/html/HsColour/Language-Haskell-HsColour.html
+%%DOCSDIR%%/html/HsColour/Main.html
+%%DOCSDIR%%/html/HsColour/doc-index.html
+%%DOCSDIR%%/html/HsColour/haddock-util.js
+%%DOCSDIR%%/html/HsColour/haddock.css
+%%DOCSDIR%%/html/HsColour/haskell_icon.gif
+%%DOCSDIR%%/html/HsColour/index.html
+%%DOCSDIR%%/html/HsColour/minus.gif
+%%DOCSDIR%%/html/HsColour/plus.gif
+%%DOCSDIR%%/html/HsColour/src/Main.html
+%%DOCSDIR%%/html/HsColour/src/hscolour.css
+%%DOCSDIR%%/html/Language-Haskell-HsColour-ANSI.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-Anchors.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-CSS.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-Classify.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-ColourHighlight.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-Colourise.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-General.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-HTML.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-LaTeX.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-MIRC.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour-TTY.html
+%%DOCSDIR%%/html/Language-Haskell-HsColour.html
+%%DOCSDIR%%/html/doc-index.html
+%%DOCSDIR%%/html/haddock-util.js
+%%DOCSDIR%%/html/haddock.css
+%%DOCSDIR%%/html/haskell_icon.gif
+%%DOCSDIR%%/html/hscolour.haddock
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/minus.gif
+%%DOCSDIR%%/html/plus.gif
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-ANSI.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Anchors.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-CSS.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Classify.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-ColourHighlight.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-Colourise.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-General.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-HTML.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-LaTeX.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-MIRC.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour-TTY.html
+%%DOCSDIR%%/html/src/Language-Haskell-HsColour.html
+%%DOCSDIR%%/html/src/hscolour.css
+@dirrm %%DOCSDIR%%/html/src
+@dirrm %%DOCSDIR%%/html/HsColour/src
+@dirrm %%DOCSDIR%%/html/HsColour
+@dirrm %%DOCSDIR%%/html
+@dirrmtry %%DOCSDIR%%
--- patch-hs-hscolour-docs ends here ---

--- patch-ghc begins here ---
diff -uNr ghc.orig/Makefile ghc/Makefile
--- ghc.orig/Makefile	2008-07-18 20:05:15.000000000 +0000
+++ ghc/Makefile	2008-07-25 07:29:49.000000000 +0000
@@ -6,6 +6,7 @@
 
 PORTNAME=	ghc
 PORTVERSION=	6.8.3
+PORTREVISION=	1
 CATEGORIES=	lang haskell
 MASTER_SITES=	http://www.haskell.org/ghc/dist/${PORTVERSION}/:source \
 		http://www.haskell.org/ghc/dist/${PORTVERSION}/FreeBSD/:boot \
@@ -112,7 +113,7 @@
 		ftp://ftp.cs.york.ac.uk/pub/haskell/contrib/:docs
 
 DISTFILES+=	haddock-2.1.0.tar.gz:docs \
-		hscolour-1.9.tar.gz:docs
+		hscolour-1.10.tar.gz:docs
 
 EXTRACT_ONLY=	${_DISTFILES:C/hscolour.*$//g:C/haddock.*$//g}
 
diff -uNr ghc.orig/distinfo ghc/distinfo
--- ghc.orig/distinfo	2008-07-18 20:05:15.000000000 +0000
+++ ghc/distinfo	2008-07-24 14:29:45.000000000 +0000
@@ -16,6 +16,6 @@
 MD5 (haddock-2.1.0.tar.gz) = 8971b42827758aa06519aeeecbfa30e6
 SHA256 (haddock-2.1.0.tar.gz) = 1b67869e493e56366207a128949998851f975d821e0952c2c717840d2eadaca7
 SIZE (haddock-2.1.0.tar.gz) = 95531
-MD5 (hscolour-1.9.tar.gz) = badfe50d4215f23d0e17928b24f80773
-SHA256 (hscolour-1.9.tar.gz) = 9d961264fe86f7128673c624943062ea0af19b1c80e303fcdb6957cadc5ac774
-SIZE (hscolour-1.9.tar.gz) = 43119
+MD5 (hscolour-1.10.tar.gz) = 553b71a6b269b023de7050461918a8e0
+SHA256 (hscolour-1.10.tar.gz) = ebeeb6829d8789b16a66753144dfcf4ba35f12d40ff978be4b5669d8cbb09073
+SIZE (hscolour-1.10.tar.gz) = 51246
--- patch-ghc ends here ---

--- patch-hs-haddock-docs begins here ---
diff -uNr hs-haddock-docs.orig/Makefile hs-haddock-docs/Makefile
--- hs-haddock-docs.orig/Makefile	2008-05-24 09:15:24.000000000 +0000
+++ hs-haddock-docs/Makefile	2008-07-25 08:31:19.000000000 +0000
@@ -7,6 +7,7 @@
 
 PORTNAME=	haddock-docs
 PORTVERSION=	2.1.0
+PORTREVISION=	1
 CATEGORIES=	devel haskell
 MASTER_SITES=	http://www.haskell.org/haddock/dist/
 PKGNAMEPREFIX=	hs-
@@ -33,13 +34,12 @@
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//g}
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 
-HSCOLOUR_VERSION=	1.9
+HSCOLOUR_VERSION=	1.10
 HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 
 CABAL_CMD=	runghc Setup.lhs
 
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
-PLIST_SUB=	DOCSDIR_REL=${DOCSDIR_REL}
 
 .SILENT:
 
@@ -47,20 +47,20 @@
 	@${REINPLACE_CMD} -e 's|/usr/local/share/sgml/catalog||' ${WRKSRC}/doc/configure.ac
 
 do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc ${CONFIGURE_ARGS}
+	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w ${CONFIGURE_ARGS}
 	cd ${WRKSRC}/doc && ${AUTOCONF} && ./configure ${CONFIGURE_ARGS}
 
 do-build:
-	cd ${WRKSRC} && ${CABAL_CMD} build && \
-		${CABAL_CMD} haddock --executables --hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
+	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 	cd ${WRKSRC}/doc && \
 		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} html
 
 do-install:
 	${MKDIR} ${DOCSDIR}/html && \
-		cd ${WRKSRC}/dist/doc/html/haddock && ${CP} -R * ${DOCSDIR}/html
+		cd ${WRKSRC}/dist/doc/html/haddock && ${COPYTREE_SHARE} \*  ${DOCSDIR}/html
 	${MKDIR} ${DOCSDIR}/users_guide && \
-		cd ${WRKSRC}/doc/haddock && ${CP} -R * ${DOCSDIR}/users_guide
+		cd ${WRKSRC}/doc/haddock && ${COPYTREE_SHARE} \* ${DOCSDIR}/users_guide
 
 post-install:
 	@${ECHO_MSG}
diff -uNr hs-haddock-docs.orig/pkg-plist hs-haddock-docs/pkg-plist
--- hs-haddock-docs.orig/pkg-plist	2008-07-25 07:03:44.000000000 +0000
+++ hs-haddock-docs/pkg-plist	2008-07-25 08:53:21.000000000 +0000
@@ -1,96 +1,96 @@
-%%DOCSDIR_REL%%/html/Distribution-Haddock.html
-%%DOCSDIR_REL%%/html/Haddock-DocName.html
-%%DOCSDIR_REL%%/html/Haddock-GHC-Utils.html
-%%DOCSDIR_REL%%/html/doc-index.html
-%%DOCSDIR_REL%%/html/haddock-util.js
-%%DOCSDIR_REL%%/html/haddock.css
-%%DOCSDIR_REL%%/html/haddock.haddock
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-DevHelp.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-HH.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-HH2.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-HaddockDB.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-Hoogle.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Backends-Html.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-DocName.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Exception.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-GHC-Typecheck.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-GHC-Utils.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-GHC.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface-AttachInstances.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface-Create.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface-Rename.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Interface.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-InterfaceFile.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-ModuleTree.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Options.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Types.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils-BlockTable.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils-FastMutInt2.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils-Html.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Utils.html
-%%DOCSDIR_REL%%/html/haddock/Haddock-Version.html
-%%DOCSDIR_REL%%/html/haddock/Main.html
-%%DOCSDIR_REL%%/html/haddock/Paths_haddock.html
-%%DOCSDIR_REL%%/html/haddock/doc-index.html
-%%DOCSDIR_REL%%/html/haddock/haddock-util.js
-%%DOCSDIR_REL%%/html/haddock/haddock.css
-%%DOCSDIR_REL%%/html/haddock/haskell_icon.gif
-%%DOCSDIR_REL%%/html/haddock/index.html
-%%DOCSDIR_REL%%/html/haddock/minus.gif
-%%DOCSDIR_REL%%/html/haddock/plus.gif
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-DevHelp.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-HH.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-HH2.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-HaddockDB.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-Hoogle.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Backends-Html.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-DocName.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Exception.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-GHC-Typecheck.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-GHC-Utils.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-GHC.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface-AttachInstances.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface-Create.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface-Rename.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Interface.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-InterfaceFile.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-ModuleTree.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Options.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Types.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils-BlockTable.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils-FastMutInt2.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils-Html.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Utils.html
-%%DOCSDIR_REL%%/html/haddock/src/Haddock-Version.html
-%%DOCSDIR_REL%%/html/haddock/src/Main.html
-%%DOCSDIR_REL%%/html/haddock/src/hscolour.css
-%%DOCSDIR_REL%%/html/haskell_icon.gif
-%%DOCSDIR_REL%%/html/index.html
-%%DOCSDIR_REL%%/html/minus.gif
-%%DOCSDIR_REL%%/html/plus.gif
-%%DOCSDIR_REL%%/html/src/Distribution-Haddock.html
-%%DOCSDIR_REL%%/html/src/Haddock-Exception.html
-%%DOCSDIR_REL%%/html/src/Haddock-InterfaceFile.html
-%%DOCSDIR_REL%%/html/src/Haddock-Types.html
-%%DOCSDIR_REL%%/html/src/hscolour.css
-%%DOCSDIR_REL%%/users_guide/ch01s03.html
-%%DOCSDIR_REL%%/users_guide/ch03s02.html
-%%DOCSDIR_REL%%/users_guide/ch03s03.html
-%%DOCSDIR_REL%%/users_guide/ch03s04.html
-%%DOCSDIR_REL%%/users_guide/ch03s05.html
-%%DOCSDIR_REL%%/users_guide/ch03s08.html
-%%DOCSDIR_REL%%/users_guide/fptools.css
-%%DOCSDIR_REL%%/users_guide/hyperlinking.html
-%%DOCSDIR_REL%%/users_guide/index.html
-%%DOCSDIR_REL%%/users_guide/introduction.html
-%%DOCSDIR_REL%%/users_guide/invoking.html
-%%DOCSDIR_REL%%/users_guide/ix01.html
-%%DOCSDIR_REL%%/users_guide/license.html
-%%DOCSDIR_REL%%/users_guide/markup.html
-%%DOCSDIR_REL%%/users_guide/module-attributes.html
-@dirrm %%DOCSDIR_REL%%/users_guide
-@dirrm %%DOCSDIR_REL%%/html/src
-@dirrm %%DOCSDIR_REL%%/html/haddock/src
-@dirrm %%DOCSDIR_REL%%/html/haddock
-@dirrm %%DOCSDIR_REL%%/html
-@dirrmtry %%DOCSDIR_REL%%
+%%DOCSDIR%%/html/Distribution-Haddock.html
+%%DOCSDIR%%/html/Haddock-DocName.html
+%%DOCSDIR%%/html/Haddock-GHC-Utils.html
+%%DOCSDIR%%/html/doc-index.html
+%%DOCSDIR%%/html/haddock-util.js
+%%DOCSDIR%%/html/haddock.css
+%%DOCSDIR%%/html/haddock.haddock
+%%DOCSDIR%%/html/haddock/Haddock-Backends-DevHelp.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-HH.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-HH2.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-HaddockDB.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-Hoogle.html
+%%DOCSDIR%%/html/haddock/Haddock-Backends-Html.html
+%%DOCSDIR%%/html/haddock/Haddock-DocName.html
+%%DOCSDIR%%/html/haddock/Haddock-Exception.html
+%%DOCSDIR%%/html/haddock/Haddock-GHC-Typecheck.html
+%%DOCSDIR%%/html/haddock/Haddock-GHC-Utils.html
+%%DOCSDIR%%/html/haddock/Haddock-GHC.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface-AttachInstances.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface-Create.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface-Rename.html
+%%DOCSDIR%%/html/haddock/Haddock-Interface.html
+%%DOCSDIR%%/html/haddock/Haddock-InterfaceFile.html
+%%DOCSDIR%%/html/haddock/Haddock-ModuleTree.html
+%%DOCSDIR%%/html/haddock/Haddock-Options.html
+%%DOCSDIR%%/html/haddock/Haddock-Types.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils-BlockTable.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils-FastMutInt2.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils-Html.html
+%%DOCSDIR%%/html/haddock/Haddock-Utils.html
+%%DOCSDIR%%/html/haddock/Haddock-Version.html
+%%DOCSDIR%%/html/haddock/Main.html
+%%DOCSDIR%%/html/haddock/Paths_haddock.html
+%%DOCSDIR%%/html/haddock/doc-index.html
+%%DOCSDIR%%/html/haddock/haddock-util.js
+%%DOCSDIR%%/html/haddock/haddock.css
+%%DOCSDIR%%/html/haddock/haskell_icon.gif
+%%DOCSDIR%%/html/haddock/index.html
+%%DOCSDIR%%/html/haddock/minus.gif
+%%DOCSDIR%%/html/haddock/plus.gif
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-DevHelp.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-HH.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-HH2.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-HaddockDB.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-Hoogle.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Backends-Html.html
+%%DOCSDIR%%/html/haddock/src/Haddock-DocName.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Exception.html
+%%DOCSDIR%%/html/haddock/src/Haddock-GHC-Typecheck.html
+%%DOCSDIR%%/html/haddock/src/Haddock-GHC-Utils.html
+%%DOCSDIR%%/html/haddock/src/Haddock-GHC.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface-AttachInstances.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface-Create.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface-Rename.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Interface.html
+%%DOCSDIR%%/html/haddock/src/Haddock-InterfaceFile.html
+%%DOCSDIR%%/html/haddock/src/Haddock-ModuleTree.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Options.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Types.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils-BlockTable.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils-FastMutInt2.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils-Html.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Utils.html
+%%DOCSDIR%%/html/haddock/src/Haddock-Version.html
+%%DOCSDIR%%/html/haddock/src/Main.html
+%%DOCSDIR%%/html/haddock/src/hscolour.css
+%%DOCSDIR%%/html/haskell_icon.gif
+%%DOCSDIR%%/html/index.html
+%%DOCSDIR%%/html/minus.gif
+%%DOCSDIR%%/html/plus.gif
+%%DOCSDIR%%/html/src/Distribution-Haddock.html
+%%DOCSDIR%%/html/src/Haddock-Exception.html
+%%DOCSDIR%%/html/src/Haddock-InterfaceFile.html
+%%DOCSDIR%%/html/src/Haddock-Types.html
+%%DOCSDIR%%/html/src/hscolour.css
+%%DOCSDIR%%/users_guide/ch01s03.html
+%%DOCSDIR%%/users_guide/ch03s02.html
+%%DOCSDIR%%/users_guide/ch03s03.html
+%%DOCSDIR%%/users_guide/ch03s04.html
+%%DOCSDIR%%/users_guide/ch03s05.html
+%%DOCSDIR%%/users_guide/ch03s08.html
+%%DOCSDIR%%/users_guide/fptools.css
+%%DOCSDIR%%/users_guide/hyperlinking.html
+%%DOCSDIR%%/users_guide/index.html
+%%DOCSDIR%%/users_guide/introduction.html
+%%DOCSDIR%%/users_guide/invoking.html
+%%DOCSDIR%%/users_guide/ix01.html
+%%DOCSDIR%%/users_guide/license.html
+%%DOCSDIR%%/users_guide/markup.html
+%%DOCSDIR%%/users_guide/module-attributes.html
+@dirrm %%DOCSDIR%%/users_guide
+@dirrm %%DOCSDIR%%/html/src
+@dirrm %%DOCSDIR%%/html/haddock/src
+@dirrm %%DOCSDIR%%/html/haddock
+@dirrm %%DOCSDIR%%/html
+@dirrmtry %%DOCSDIR%%
--- patch-hs-haddock-docs ends here ---

--- patch-hs-HGL-ghc begins here ---
diff -uNr hs-HGL-ghc.orig/Makefile hs-HGL-ghc/Makefile
--- hs-HGL-ghc.orig/Makefile	2008-07-18 20:05:15.000000000 +0000
+++ hs-HGL-ghc/Makefile	2008-07-25 07:12:30.000000000 +0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	HGL
 PORTVERSION=	3.2.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -20,6 +20,7 @@
 		hs-x11-ghc>=1.2.1:${PORTSDIR}/x11/hs-x11-ghc
 
 GHC_VERSION=	6.8.3
+HGL_VERSION=	${PORTVERSION}
 
 CABAL_CMD=	${LOCALBASE}/bin/runghc Setup.hs
 
@@ -27,7 +28,8 @@
 DOCSDIR=	${PREFIX}/share/doc/${DISTNAME}
 
 PLIST_SUB=	GHC_VERSION=${GHC_VERSION} \
-		HGL_LIBDIR_REL=${HGL_LIBDIR_REL}
+		HGL_LIBDIR_REL=${HGL_LIBDIR_REL} \
+		HGL_VERSION=${HGL_VERSION}
 
 .if defined(NOPORTDOCS)
 PLIST_SUB+=		NOPORTDOCS=""
@@ -39,7 +41,8 @@
 BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock \
 		HsColour:${PORTSDIR}/print/hs-hscolour
 
-HSCOLOUR_VERSION=	1.9
+HSCOLOUR_VERSION=	1.10
+HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 
 PORTDOCS=	*
 .endif
@@ -47,20 +50,22 @@
 .SILENT:
 
 do-configure:
-	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --prefix=${PREFIX}
+	cd ${WRKSRC} && ${CABAL_CMD} configure --ghc --haddock-options=-w --prefix=${PREFIX}
 
 do-build:
 	cd ${WRKSRC} && ${CABAL_CMD} build \
 		     && ${CABAL_CMD} register --gen-script
 
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC} && ${CABAL_CMD} haddock --executables --hyperlink-source \
-				    --hscolour-css=${LOCALBASE}/share/hscolour-${HSCOLOUR_VERSION}/hscolour.css
+	cd ${WRKSRC} && ${CABAL_CMD} haddock --hyperlink-source \
+					     --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif
 
 do-install:
 	cd ${WRKSRC} && ${CABAL_CMD} install \
 		     && ${INSTALL_SCRIPT} register.sh ${PREFIX}/${HGL_LIBDIR_REL}/register.sh
+
+post-install:
 	@${RM} -f ${PREFIX}/lib/ghc-${GHC_VERSION}/package.conf.old
 
 .include <bsd.port.mk>
diff -uNr hs-HGL-ghc.orig/pkg-plist hs-HGL-ghc/pkg-plist
--- hs-HGL-ghc.orig/pkg-plist	2008-03-01 17:38:36.000000000 +0000
+++ hs-HGL-ghc/pkg-plist	2008-07-26 15:02:06.000000000 +0000
@@ -25,8 +25,8 @@
 %%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Types.hi
 %%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/HGL/X11/Window.hi
 %%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Graphics/SOE.hi
-%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHGL-3.2.0.0.o
-%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHGL-3.2.0.0.a
+%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HSHGL-%%HGL_VERSION%%.o
+%%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHSHGL-%%HGL_VERSION%%.a
 %%HGL_LIBDIR_REL%%/register.sh
 %%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
 %%NOPORTDOCS%%@dirrm %%DOCSDIR%%
@@ -38,6 +38,6 @@
 @dirrm %%HGL_LIBDIR_REL%%/ghc-%%GHC_VERSION%%
 @dirrm %%HGL_LIBDIR_REL%%
 @exec /bin/sh %D/%%HGL_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 HGL || /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 HGL
+@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
--- patch-hs-HGL-ghc ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sun Jul 27 17:01:34 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126008 
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Tue Aug 12 10:06:13 UTC 2008 
Responsible-Changed-Why:  
back to the pool. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126008 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126008: commit references a PR
Date: Fri, 15 Aug 2008 03:19:44 +0000 (UTC)

 edwin       2008-08-15 03:19:37 UTC
 
   FreeBSD ports repository
 
   Modified files:
     print/hs-hscolour    Makefile distinfo pkg-descr pkg-plist 
   Log:
   [MAINTAINER UPDATE]: print/hs-hscolour updated to port version 1.10
   
   Step 1 - print/hs-hscolour
   
   PR:             ports/126008
   Submitted by:   Jacula Modyun <jacula@gmail.com>
   
   Revision  Changes    Path
   1.3       +5 -5      ports/print/hs-hscolour/Makefile
   1.2       +3 -3      ports/print/hs-hscolour/distinfo
   1.2       +21 -17    ports/print/hs-hscolour/pkg-descr
   1.2       +8 -8      ports/print/hs-hscolour/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126008: commit references a PR
Date: Fri, 15 Aug 2008 03:30:34 +0000 (UTC)

 edwin       2008-08-15 03:30:20 UTC
 
   FreeBSD ports repository
 
   Modified files:
     print/hs-hscolour-docs Makefile distinfo pkg-plist 
   Log:
   [MAINTAINER UPDATE]: print/hs-hscolour updated to port version 1.10
   
   Step 2 - print/hs-hscolour-docs
   
   PR:             ports/126008
   Submitted by:   Jacula Modyun <jacula@gmail.com>
   
   Revision  Changes    Path
   1.2       +8 -8      ports/print/hs-hscolour-docs/Makefile
   1.2       +3 -3      ports/print/hs-hscolour-docs/distinfo
   1.2       +60 -60    ports/print/hs-hscolour-docs/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126008: commit references a PR
Date: Fri, 15 Aug 2008 04:34:17 +0000 (UTC)

 edwin       2008-08-15 04:34:09 UTC
 
   FreeBSD ports repository
 
   Modified files:
     lang/ghc             Makefile distinfo 
   Log:
   [MAINTAINER UPDATE]: print/hs-hscolour updated to port version 1.10
   
   Step 3 - lang/ghc
   
   PR:             ports/126008
   Submitted by:   Jacula Modyun <jacula@gmail.com>
   
   Revision  Changes    Path
   1.70      +2 -1      ports/lang/ghc/Makefile
   1.33      +3 -3      ports/lang/ghc/distinfo
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126008: commit references a PR
Date: Fri, 15 Aug 2008 04:44:00 +0000 (UTC)

 edwin       2008-08-15 04:43:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     devel/hs-haddock-docs Makefile pkg-plist 
   Log:
   [MAINTAINER UPDATE]: print/hs-hscolour updated to port version 1.10
   
   Step 4 - devel/hs-haddock-docs
   
   PR:             ports/126008
   Submitted by:   Jacula Modyun <jacula@gmail.com>
   
   Revision  Changes    Path
   1.3       +7 -7      ports/devel/hs-haddock-docs/Makefile
   1.4       +96 -96    ports/devel/hs-haddock-docs/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Fri Aug 15 04:52:03 UTC 2008 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126008 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126008: commit references a PR
Date: Fri, 15 Aug 2008 04:52:06 +0000 (UTC)

 edwin       2008-08-15 04:51:57 UTC
 
   FreeBSD ports repository
 
   Modified files:
     graphics/hs-HGL-ghc  Makefile pkg-plist 
   Log:
   [MAINTAINER UPDATE]: print/hs-hscolour updated to port version 1.10
   
   Step 5 - graphics/hs-HGL-ghc
   
   PR:             ports/126008
   Submitted by:   Jacula Modyun <jacula@gmail.com>
   
   Revision  Changes    Path
   1.3       +11 -6     ports/graphics/hs-HGL-ghc/Makefile
   1.2       +5 -5      ports/graphics/hs-HGL-ghc/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
