svn commit: r301906 - in head: lang/ghc print/hs-hscolour

[Gabor Pali]

Author: pgj
Date: Fri Aug  3 03:08:54 2012
New Revision: 301906
URL: http://svn.freebsd.org/changeset/ports/301906

Log:
  - Update HsColour to 1.20.2
  - Use the new options framework
  
  Obtained from:	FreeBSD Haskell

Modified:
  head/lang/ghc/bsd.cabal.mk
  head/print/hs-hscolour/Makefile
  head/print/hs-hscolour/distinfo

Modified: head/lang/ghc/bsd.cabal.mk
==============================================================================
--- head/lang/ghc/bsd.cabal.mk	Fri Aug  3 03:05:56 2012	(r301905)
+++ head/lang/ghc/bsd.cabal.mk	Fri Aug  3 03:08:54 2012	(r301906)
@@ -164,7 +164,7 @@ HADDOCK_OPTS=	${HADDOCK_EXE}
 .if ${PORT_OPTIONS:MHSCOLOUR}
 BUILD_DEPENDS+=	HsColour:${PORTSDIR}/print/hs-hscolour
 
-HSCOLOUR_VERSION=	1.19
+HSCOLOUR_VERSION=	1.20.2
 HSCOLOUR_DATADIR=	${LOCALBASE}/share/ghc-${GHC_VERSION}/cabal/hscolour-${HSCOLOUR_VERSION}
 HADDOCK_OPTS+=		--hyperlink-source --hscolour-css=${HSCOLOUR_DATADIR}/hscolour.css
 .endif # HSCOLOUR

Modified: head/print/hs-hscolour/Makefile
==============================================================================
--- head/print/hs-hscolour/Makefile	Fri Aug  3 03:05:56 2012	(r301905)
+++ head/print/hs-hscolour/Makefile	Fri Aug  3 03:08:54 2012	(r301906)
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	hscolour
-PORTVERSION=	1.19
-PORTREVISION=	2
+PORTVERSION=	1.20.2
 PORTEPOCH=	1
 CATEGORIES=	print haskell
 
@@ -21,13 +20,15 @@ CABAL_SETUP=	Setup.hs
 
 EXECUTABLE=	HsColour
 
-.if defined(WITH_HSCOLOUR_DOCS)
+.include <bsd.port.options.mk>
+.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
+.include <bsd.port.mk>
+
 pre-everything::
+.if ${PORT_OPTIONS:MHSCOLOUR}
 	@${ECHO_MSG} "================================================================="
 	@${ECHO_MSG} " Please note that you will not be able to build HsColour-enabled "
 	@${ECHO_MSG} " documentation without installing HsColour without that first.   "
 	@${ECHO_MSG} "================================================================="
+	@sleep 5
 .endif
-
-.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
-.include <bsd.port.mk>

Modified: head/print/hs-hscolour/distinfo
==============================================================================
--- head/print/hs-hscolour/distinfo	Fri Aug  3 03:05:56 2012	(r301905)
+++ head/print/hs-hscolour/distinfo	Fri Aug  3 03:08:54 2012	(r301906)
@@ -1,2 +1,2 @@
-SHA256 (cabal/hscolour-1.19.tar.gz) = 7f9d2cfafbd300793686fd4e9f4ddb3f6463f300a22129db898db47956689f9f
-SIZE (cabal/hscolour-1.19.tar.gz) = 25466
+SHA256 (cabal/hscolour-1.20.2.tar.gz) = a52910f4c4c5576bed80e23aa914c71c3975d4cd9cd79a9c85e2617d97a8824a
+SIZE (cabal/hscolour-1.20.2.tar.gz) = 25722