- Please welcome GHC 7.0.3

GHC in the ports tree has been updated to 7.0.3 and all other Haskell ports
are also updated to their corresponding Haskell Platform versions, or latest
versions.

We would like to acknowledge the support of the FreeBSD Donations Team and
Eotvos Lorand University, Faculty of Informatics who contributed to the server
that we used for testing.

We would also like to thank all the testers who tested FreeBSD Haskell ports
and provided their feedback.

PR:		ports/156642
Approved by:	tabthorpe (mentor)
Obtained from:	FreeBSD Haskell

5 files changed, 8 insertions, 53 deletions

diff --git a/benchmarks/hs-criterion/Makefile b/benchmarks/hs-criterion/Makefile
index 720fbe6e5deb..86130e8903bf 100644
--- a/benchmarks/hs-criterion/Makefile
+++ b/benchmarks/hs-criterion/Makefile
@@ -6,21 +6,23 @@
 #
 
 PORTNAME=	criterion
-PORTVERSION=	0.5.0.3
+PORTVERSION=	0.5.0.7
 CATEGORIES=	benchmarks haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Robust, reliable performance measurement and analysis for Haskell
 
-USE_HACKAGE=	deepseq>=1.1.0.0 mwc-random>=0.7.0.0 statistics>=0.6.0.0 \
-		vector>=0.6.0.2 vector-algorithms>=0.3.2
+LICENSE=	BSD
+
+USE_CABAL=	deepseq>=1.1 mtl mwc-random>=0.8.0.3 parallel parsec>=3.1 \
+		statistics>=0.8.0.5 vector>=0.7 vector-algorithms>=0.4
 
 PORTEXAMPLES=		*
 INSTALL_PORTEXAMPLES=	\
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}
 
 PORTDATA=		*
-INSTALL_PORTDATA= 	${INSTALL_DATA} ${WRKSRC}/README ${DATADIR}
+INSTALL_PORTDATA= 	${INSTALL_DATA} ${WRKSRC}/README.markdown ${DATADIR}
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/benchmarks/hs-criterion/distinfo b/benchmarks/hs-criterion/distinfo
index fb9f61c0f483..44ac386891a6 100644
--- a/benchmarks/hs-criterion/distinfo
+++ b/benchmarks/hs-criterion/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/criterion-0.5.0.3.tar.gz) = c5be3779ce8aed39287dea0dea1094bbf64192ea6ca8025c40485aaa0fc9f583
-SIZE (cabal/criterion-0.5.0.3.tar.gz) = 17764
+SHA256 (cabal/criterion-0.5.0.7.tar.gz) = b88dc6725bf3e272dc357c5c65e052e8aa18ee2c5a6577bce4866dce06bb3bb8
+SIZE (cabal/criterion-0.5.0.7.tar.gz) = 17708
diff --git a/benchmarks/hs-criterion/files/patch-Criterion__Main.hs b/benchmarks/hs-criterion/files/patch-Criterion__Main.hs
deleted file mode 100644
index dd41dac0c7f2..000000000000
--- a/benchmarks/hs-criterion/files/patch-Criterion__Main.hs
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./Criterion/Main.hs.orig	2010-03-30 00:56:34.000000000 +0200
-+++ ./Criterion/Main.hs	2010-06-07 11:28:30.097091827 +0200
-@@ -58,8 +58,7 @@
- import System.Console.GetOpt
- import System.Environment (getArgs, getProgName)
- import System.Exit (ExitCode(..), exitWith)
--import Text.Parsec
--import Text.Parsec.String
-+import Text.ParserCombinators.Parsec
- 
- -- | Parse a plot output.
- parsePlot :: Parser PlotOutput
diff --git a/benchmarks/hs-criterion/files/patch-criterion.cabal b/benchmarks/hs-criterion/files/patch-criterion.cabal
deleted file mode 100644
index 826359efad30..000000000000
--- a/benchmarks/hs-criterion/files/patch-criterion.cabal
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./criterion.cabal.orig	2010-07-14 13:56:19.000000000 +0200
-+++ ./criterion.cabal	2010-07-29 20:07:09.000000000 +0200
-@@ -53,7 +53,7 @@
-     mtl,
-     mwc-random >= 0.7.0.0,
-     parallel,
--    parsec >= 3.1.0,
-+    parsec,
-     statistics >= 0.6.0.0,
-     time,
-     vector >= 0.6.0.2,
diff --git a/benchmarks/hs-criterion/pkg-plist b/benchmarks/hs-criterion/pkg-plist
deleted file mode 100644
index 5c13f5b4bb36..000000000000
--- a/benchmarks/hs-criterion/pkg-plist
+++ /dev/null
@@ -1,24 +0,0 @@
-@comment $FreeBSD$
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Analysis.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Config.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Environment.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/IO.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Main.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Measurement.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Monad.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/MultiMap.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Plot.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion/Types.hi
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/HS%%PORTNAME%%-%%PORTVERSION%%.o
-%%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/libHS%%PORTNAME%%-%%PORTVERSION%%.a
-%%LIBDIR_REL%%/register.sh
-%%NOPORTDOCS%%%%DOCSDIR%%/LICENSE
-%%NOPORTDOCS%%@dirrmtry %%DOCSDIR%%
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%/Criterion
-@dirrm %%LIBDIR_REL%%/ghc-%%GHC_VERSION%%
-@dirrm %%LIBDIR_REL%%
-@exec /bin/sh %D/%%LIBDIR_REL%%/register.sh
-@exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
-@unexec %D/bin/ghc-pkg unregister %%PORTNAME%%-%%PORTVERSION%%
-@unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old