Upgrade lang/ghc to 8.8.3 and many Haskell ports along the way.

PR:		244784
Submitted by:	Evilham <contact@evilham.com> (some ports)

10 files changed, 133 insertions, 13 deletions

diff --git a/security/hs-cryptol/Makefile b/security/hs-cryptol/Makefile
index 275706475a64..44d0fa84b306 100644
--- a/security/hs-cryptol/Makefile
+++ b/security/hs-cryptol/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	cryptol
 DISTVERSION=	2.8.0
+PORTREVISION=	1
 CATEGORIES=	security lang haskell
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,8 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cabal
 
-USE_CABAL=	\
-		FloatingHex-0.4 \
+USE_CABAL=	FloatingHex-0.4 \
 		GraphSCC-1.0.4 \
 		QuickCheck-2.13.2 \
 		alex-3.2.5 \
@@ -35,11 +35,11 @@ USE_CABAL=	\
 		monad-control-1.0.2.3 \
 		monadLib-3.10_1 \
 		panic-0.4.0.1 \
-		primitive-0.7.0.0_1 \
+		primitive-0.7.0.1 \
 		random-1.1_1 \
 		sbv-8.6 \
 		simple-smt-0.9.4_1 \
-		splitmix-0.0.3_1 \
+		splitmix-0.0.4 \
 		strict-0.3.2 \
 		syb-0.7.1 \
 		tf-random-0.5 \
diff --git a/security/hs-cryptol/distinfo b/security/hs-cryptol/distinfo
index bdb623c478ef..19efbb9eb03b 100644
--- a/security/hs-cryptol/distinfo
+++ b/security/hs-cryptol/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1582528857
+TIMESTAMP = 1584468649
 SHA256 (cabal/cryptol-2.8.0.tar.gz) = b061bf88de09de5034a3707960af01fbcc0425cdbff1085c50c00748df9910bb
 SIZE (cabal/cryptol-2.8.0.tar.gz) = 330434
 SHA256 (cabal/FloatingHex-0.4/FloatingHex-0.4.tar.gz) = b277054db48d2dec62e3831586f218cbe0a056dec44dbc032e9a73087425a24c
@@ -49,10 +49,8 @@ SHA256 (cabal/monadLib-3.10/revision/1.cabal) = 21dc120625bd612527b372e54251fd83
 SIZE (cabal/monadLib-3.10/revision/1.cabal) = 653
 SHA256 (cabal/panic-0.4.0.1/panic-0.4.0.1.tar.gz) = 15dceb4240257a8e8e451a0d9d14ca5316b204214c08e211febbdcefd1732d42
 SIZE (cabal/panic-0.4.0.1/panic-0.4.0.1.tar.gz) = 2265
-SHA256 (cabal/primitive-0.7.0.0/primitive-0.7.0.0.tar.gz) = 786a44fea328caf704b762ebc887e9e8476c4378fdf3a06c94e86ef1878d1576
-SIZE (cabal/primitive-0.7.0.0/primitive-0.7.0.0.tar.gz) = 66014
-SHA256 (cabal/primitive-0.7.0.0/revision/1.cabal) = c45abc68bec080e3f1ab347dd331617d43fded94a473086bf21aeda69a6e20bc
-SIZE (cabal/primitive-0.7.0.0/revision/1.cabal) = 3552
+SHA256 (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = dd8bb7d829f492d6200fca4a839a7563b80571c5f76b4d0fa76700ebe897f7dd
+SIZE (cabal/primitive-0.7.0.1/primitive-0.7.0.1.tar.gz) = 66023
 SHA256 (cabal/random-1.1/random-1.1.tar.gz) = b718a41057e25a3a71df693ab0fe2263d492e759679b3c2fea6ea33b171d3a5a
 SIZE (cabal/random-1.1/random-1.1.tar.gz) = 10870
 SHA256 (cabal/random-1.1/revision/1.cabal) = 7b67624fd76ddf97c206de0801dc7e888097e9d572974be9b9ea6551d76965df
@@ -63,10 +61,8 @@ SHA256 (cabal/simple-smt-0.9.4/simple-smt-0.9.4.tar.gz) = a036be4a4bf58499de3ffa
 SIZE (cabal/simple-smt-0.9.4/simple-smt-0.9.4.tar.gz) = 9302
 SHA256 (cabal/simple-smt-0.9.4/revision/1.cabal) = 93746e0c4bade39c9848549103de5b65b169f1faa5b76c7b9bcde2031f31c58f
 SIZE (cabal/simple-smt-0.9.4/revision/1.cabal) = 775
-SHA256 (cabal/splitmix-0.0.3/splitmix-0.0.3.tar.gz) = fce462557f490c6c3d264ca70ef98a2c644ba341a71e6ee9f87ee7f3e7ab0acc
-SIZE (cabal/splitmix-0.0.3/splitmix-0.0.3.tar.gz) = 13616
-SHA256 (cabal/splitmix-0.0.3/revision/1.cabal) = 455de9326ae5bbe5492cbb140fefb04cf988501e25b204dabaf755ab67400d9d
-SIZE (cabal/splitmix-0.0.3/revision/1.cabal) = 4835
+SHA256 (cabal/splitmix-0.0.4/splitmix-0.0.4.tar.gz) = aaa1b31a5320fd6a7d69a7f485ba8facdccf2253a1431feddaacc08ab2943091
+SIZE (cabal/splitmix-0.0.4/splitmix-0.0.4.tar.gz) = 13821
 SHA256 (cabal/strict-0.3.2/strict-0.3.2.tar.gz) = 2cd35a67938db635a87617d9576d5df0158b581e8e5694f07487c0f4b1549221
 SIZE (cabal/strict-0.3.2/strict-0.3.2.tar.gz) = 3948
 SHA256 (cabal/syb-0.7.1/syb-0.7.1.tar.gz) = e04a9c7ae48d9fe25e9b7a064f7122d39c710753544511e15df7a6e87fdfe700
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_Eval_Monad.hs b/security/hs-cryptol/files/patch-src_Cryptol_Eval_Monad.hs
new file mode 100644
index 000000000000..222f835ce74d
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_Eval_Monad.hs
@@ -0,0 +1,23 @@
+--- src/Cryptol/Eval/Monad.hs.orig	2001-09-09 01:46:40 UTC
++++ src/Cryptol/Eval/Monad.hs
+@@ -38,6 +38,7 @@ module Cryptol.Eval.Monad
+ 
+ import           Control.DeepSeq
+ import           Control.Monad
++import qualified Control.Monad.Fail as Fail
+ import           Control.Monad.Fix
+ import           Control.Monad.IO.Class
+ import           Data.IORef
+@@ -164,9 +165,11 @@ instance Applicative Eval where
+   {-# INLINE pure #-}
+   {-# INLINE (<*>) #-}
+ 
++instance Fail.MonadFail Eval where
++  fail x = Thunk (\_ -> fail x)
++
+ instance Monad Eval where
+   return = Ready
+-  fail x = Thunk (\_ -> fail x)
+   (>>=)  = evalBind
+   {-# INLINE return #-}
+   {-# INLINE (>>=) #-}
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_ModuleSystem_Monad.hs b/security/hs-cryptol/files/patch-src_Cryptol_ModuleSystem_Monad.hs
new file mode 100644
index 000000000000..da21eb9dfbe0
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_ModuleSystem_Monad.hs
@@ -0,0 +1,19 @@
+--- src/Cryptol/ModuleSystem/Monad.hs.orig	2020-03-17 19:06:11 UTC
++++ src/Cryptol/ModuleSystem/Monad.hs
+@@ -34,6 +34,7 @@ import           Cryptol.Utils.Ident (interactiveName,
+ import           Cryptol.Utils.PP
+ import           Cryptol.Utils.Logger(Logger)
+ 
++import qualified Control.Monad.Fail as Fail
+ import Control.Monad.IO.Class
+ import Control.Exception (IOException)
+ import Data.Function (on)
+@@ -325,6 +326,8 @@ instance Monad m => Monad (ModuleT m) where
+ 
+   {-# INLINE (>>=) #-}
+   m >>= f       = ModuleT (unModuleT m >>= unModuleT . f)
++
++instance Fail.MonadFail m => Fail.MonadFail (ModuleT m) where
+   {-# INLINE fail #-}
+   fail          = ModuleT . raise . OtherFailure
+ 
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_Parser_NoInclude.hs b/security/hs-cryptol/files/patch-src_Cryptol_Parser_NoInclude.hs
new file mode 100644
index 000000000000..324c97888105
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_Parser_NoInclude.hs
@@ -0,0 +1,10 @@
+--- src/Cryptol/Parser/NoInclude.hs.orig	2001-09-09 01:46:40 UTC
++++ src/Cryptol/Parser/NoInclude.hs
+@@ -104,7 +104,6 @@ instance A.Applicative NoIncM where
+ instance Monad NoIncM where
+   return x = M (return x)
+   m >>= f  = M (unM m >>= unM . f)
+-  fail x   = M (fail x)
+ 
+ -- | Raise an 'IncludeFailed' error.
+ includeFailed :: Located FilePath -> NoIncM a
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_Parser_NoPat.hs b/security/hs-cryptol/files/patch-src_Cryptol_Parser_NoPat.hs
new file mode 100644
index 000000000000..0079d982ce34
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_Parser_NoPat.hs
@@ -0,0 +1,10 @@
+--- src/Cryptol/Parser/NoPat.hs.orig	2001-09-09 01:46:40 UTC
++++ src/Cryptol/Parser/NoPat.hs
+@@ -542,7 +542,6 @@ instance Functor NoPatM where fmap = liftM
+ instance Applicative NoPatM where pure = return; (<*>) = ap
+ instance Monad NoPatM where
+   return x  = M (return x)
+-  fail x    = M (fail x)
+   M x >>= k = M (x >>= unM . k)
+ 
+ 
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_Parser_ParserUtils.hs b/security/hs-cryptol/files/patch-src_Cryptol_Parser_ParserUtils.hs
new file mode 100644
index 000000000000..edd906e876d7
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_Parser_ParserUtils.hs
@@ -0,0 +1,10 @@
+--- src/Cryptol/Parser/ParserUtils.hs.orig	2001-09-09 01:46:40 UTC
++++ src/Cryptol/Parser/ParserUtils.hs
+@@ -139,7 +139,6 @@ instance Applicative ParseM where
+ 
+ instance Monad ParseM where
+   return a  = P (\_ _ s -> Right (a,s))
+-  fail s    = panic "[Parser] fail" [s]
+   m >>= k   = P (\cfg p s1 -> case unP m cfg p s1 of
+                             Left e       -> Left e
+                             Right (a,s2) -> unP (k a) cfg p s2)
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_TypeCheck_Monad.hs b/security/hs-cryptol/files/patch-src_Cryptol_TypeCheck_Monad.hs
new file mode 100644
index 000000000000..dbfe3f2e1e55
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_TypeCheck_Monad.hs
@@ -0,0 +1,18 @@
+--- src/Cryptol/TypeCheck/Monad.hs.orig	2001-09-09 01:46:40 UTC
++++ src/Cryptol/TypeCheck/Monad.hs
+@@ -278,7 +278,6 @@ instance A.Applicative InferM where
+ 
+ instance Monad InferM where
+   return x      = IM (return x)
+-  fail x        = IM (fail x)
+   IM m >>= f    = IM (m >>= unIM . f)
+ 
+ instance MonadFix InferM where
+@@ -835,7 +834,6 @@ instance A.Applicative KindM where
+ 
+ instance Monad KindM where
+   return x      = KM (return x)
+-  fail x        = KM (fail x)
+   KM m >>= k    = KM (m >>= unKM . k)
+ 
+ 
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_TypeCheck_Sanity.hs b/security/hs-cryptol/files/patch-src_Cryptol_TypeCheck_Sanity.hs
new file mode 100644
index 000000000000..f8fd1bcc6a9d
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_TypeCheck_Sanity.hs
@@ -0,0 +1,10 @@
+--- src/Cryptol/TypeCheck/Sanity.hs.orig	2001-09-09 01:46:40 UTC
++++ src/Cryptol/TypeCheck/Sanity.hs
+@@ -467,7 +467,6 @@ instance A.Applicative TcM where
+ 
+ instance Monad TcM where
+   return a    = TcM (return a)
+-  fail x      = TcM (fail x)
+   TcM m >>= f = TcM (do a <- m
+                         let TcM m1 = f a
+                         m1)
diff --git a/security/hs-cryptol/files/patch-src_Cryptol_Utils_Patterns.hs b/security/hs-cryptol/files/patch-src_Cryptol_Utils_Patterns.hs
new file mode 100644
index 000000000000..d3879d7a4258
--- /dev/null
+++ b/security/hs-cryptol/files/patch-src_Cryptol_Utils_Patterns.hs
@@ -0,0 +1,24 @@
+--- src/Cryptol/Utils/Patterns.hs.orig	2001-09-09 01:46:40 UTC
++++ src/Cryptol/Utils/Patterns.hs
+@@ -5,6 +5,7 @@
+ module Cryptol.Utils.Patterns where
+ 
+ import Control.Monad(liftM,liftM2,ap,MonadPlus(..),guard)
++import qualified Control.Monad.Fail as Fail
+ import Control.Applicative(Alternative(..))
+ 
+ newtype Match b = Match (forall r. r -> (b -> r) -> r)
+@@ -17,10 +18,12 @@ instance Applicative Match where
+   (<*>)  = ap
+ 
+ instance Monad Match where
+-  fail _ = empty
+   Match m >>= f = Match $ \no yes -> m no $ \a ->
+                                      let Match n = f a in
+                                      n no yes
++
++instance Fail.MonadFail Match where
++  fail _ = empty
+ 
+ instance Alternative Match where
+   empty = Match $ \no _ -> no