4 files changed, 37 insertions, 33 deletions

diff --git a/print/hs-hscolour/Makefile b/print/hs-hscolour/Makefile
index ce3d8b22d886..2db551eb1fdd 100644
--- a/print/hs-hscolour/Makefile
+++ b/print/hs-hscolour/Makefile
@@ -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 @@ HSCOLOUR_LIBDIR_REL=	lib/${DISTNAME}
 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 --git a/print/hs-hscolour/distinfo b/print/hs-hscolour/distinfo
index 55a92fe29766..412931ac848e 100644
--- a/print/hs-hscolour/distinfo
+++ b/print/hs-hscolour/distinfo
@@ -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 --git a/print/hs-hscolour/pkg-descr b/print/hs-hscolour/pkg-descr
index 90b104f6a3a0..c0c6df873344 100644
--- a/print/hs-hscolour/pkg-descr
+++ b/print/hs-hscolour/pkg-descr
@@ -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 --git a/print/hs-hscolour/pkg-plist b/print/hs-hscolour/pkg-plist
index 3ccccd5834fc..ad7558be7100 100644
--- a/print/hs-hscolour/pkg-plist
+++ b/print/hs-hscolour/pkg-plist
@@ -14,17 +14,17 @@ bin/HsColour
 %%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