ports/137066: [maintainer update]: update of graphics/hs-HGL-ghc to ghc-6.10.4

[Jacula Modyun]

>Number:         137066
>Category:       ports
>Synopsis:       [maintainer update]: update of graphics/hs-HGL-ghc to ghc-6.10.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Jul 24 17:00:09 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Jacula Modyun
>Release:        FreeBSD 7.1-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD splork.wirewater.yow 7.1-PRERELEASE FreeBSD 7.1-PRERELEASE #0: Sat Oct 18 11:22:07 UTC 2008 root at splork.wirewater.yow:/usr/obj/usr/src/sys/JACULA i386


	
>Description:

See the PR: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/137055

>How-To-Repeat:
	
>Fix:

	

--- patch-hs-HGL-ghc.diff begins here ---
diff -uNr hs-HGL-ghc.orig/Makefile hs-HGL-ghc/Makefile
--- hs-HGL-ghc.orig/Makefile	2009-03-06 19:32:58.000000000 +0000
+++ hs-HGL-ghc/Makefile	2009-07-22 06:25:23.000000000 +0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	HGL
 PORTVERSION=	3.2.0.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics haskell
 MASTER_SITES=	http://hackage.haskell.org/packages/archive/${PORTNAME}/${PORTVERSION}/
 PKGNAMEPREFIX=	hs-
@@ -16,10 +16,12 @@
 MAINTAINER=	jacula at gmail.com
 COMMENT=	A simple graphics library based on X11 or Win32
 
-BUILD_DEPENDS+=	ghc:${PORTSDIR}/lang/ghc \
+BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
+		hs-x11-ghc>=1.2.1:${PORTSDIR}/x11/hs-x11-ghc
+RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		hs-x11-ghc>=1.2.1:${PORTSDIR}/x11/hs-x11-ghc
 
-GHC_VERSION=	6.8.3
+GHC_VERSION=	6.10.4
 HGL_VERSION=	${PORTVERSION}
 
 CABAL_CMD=	${LOCALBASE}/bin/runghc Setup.hs
@@ -38,10 +40,14 @@
 .endif
 
 .if !defined(NOPORTDOCS)
-BUILD_DEPENDS+=	haddock:${PORTSDIR}/devel/hs-haddock \
-		HsColour:${PORTSDIR}/print/hs-hscolour
 
-HSCOLOUR_VERSION=	1.12
+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.13
 HSCOLOUR_DATADIR=	${PREFIX}/share/hscolour-${HSCOLOUR_VERSION}
 
 PORTDOCS=	*
diff -uNr hs-HGL-ghc.orig/files/patch-HGL.cabal hs-HGL-ghc/files/patch-HGL.cabal
--- hs-HGL-ghc.orig/files/patch-HGL.cabal	1970-01-01 00:00:00.000000000 +0000
+++ hs-HGL-ghc/files/patch-HGL.cabal	2009-07-14 16:56:31.000000000 +0000
@@ -0,0 +1,11 @@
+--- HGL.cabal.orig	2009-07-14 16:55:20.000000000 +0000
++++ HGL.cabal	2009-07-14 16:56:13.000000000 +0000
+@@ -22,7 +22,7 @@
+ 
+ library
+   if flag(split-base)
+-    build-depends: base >= 3, array
++    build-depends: base < 4, array
+   else
+     build-depends: base < 2
+   exposed-modules:
--- patch-hs-HGL-ghc.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: