Update lang/ghc 8.4.2 and the hs-* ports the newer versions

* Update lang/ghc to 8.4.2
* Update the boostrap compiler to 8.4.1
* Update the many hs-* ports
* Bump the rest

Thanks a lot to arrowd for doing all the heavy lifting :)

PR:		227968
Exp-run by:	antoine
Submitted by:	arrowd
Differential Revision:	https://reviews.freebsd.org/D15005

4 files changed, 11 insertions, 109 deletions

diff --git a/textproc/hs-pandoc/Makefile b/textproc/hs-pandoc/Makefile
index 7e7b890e4d93..73481fb95230 100644
--- a/textproc/hs-pandoc/Makefile
+++ b/textproc/hs-pandoc/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pandoc
-PORTVERSION=	1.19.2.1
-PORTREVISION=	1
+PORTVERSION=	2.2
 CATEGORIES=	textproc haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -11,14 +10,14 @@ COMMENT=	Conversion between markup formats
 
 LICENSE=	GPLv2
 
-USE_CABAL=	aeson base64-bytestring blaze-html \
-		blaze-markup cmark data-default \
+USE_CABAL=	Glob aeson aeson-pretty base64-bytestring blaze-html \
+		blaze-markup cmark cmark-gfm data-default \
 		deepseq-generics doctemplates extensible-exceptions  \
-		filemanip haddock-library highlighting-kate \
-		hslua HTTP JuicyPixels mtl  \
-		network network-uri pandoc-types parsec \
+		filemanip haddock-library \
+		hslua hslua-module-text HTTP JuicyPixels mtl  \
+		network network-uri pandoc-types \
 		random scientific SHA skylighting syb tagsoup\
-		temporary texmath text \
+		temporary texmath \
 		unordered-containers vector xml \
 		yaml zip-archive zlib
 
@@ -49,7 +48,7 @@ HTTPS_FLAG_CABAL=	http-client>=0.3.2 http-client-tls>=0.2 http-types>=0.8
 
 TRYPANDOC_DESC=			Build trypandoc cgi executable
 TRYPANDOC_FLAG_ENABLE=		trypandoc
-TRYPANDOC_FLAG_CABAL=		aeson highlighting-kate text wai-extra wai>=0.3 \
+TRYPANDOC_FLAG_CABAL=		aeson wai-extra wai>=0.3 \
 				http-types
 TRYPANDOC_FLAG_EXECUTABLE=	trypandoc
 
diff --git a/textproc/hs-pandoc/distinfo b/textproc/hs-pandoc/distinfo
index 5f38ab8379a5..8ed8d343faca 100644
--- a/textproc/hs-pandoc/distinfo
+++ b/textproc/hs-pandoc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499624835
-SHA256 (cabal/pandoc-1.19.2.1.tar.gz) = 08692f3d77bf95bb9ba3407f7af26de7c23134e7efcdafad0bdaf9050e2c7801
-SIZE (cabal/pandoc-1.19.2.1.tar.gz) = 2755101
+TIMESTAMP = 1524940319
+SHA256 (cabal/pandoc-2.2.tar.gz) = 0f2984a6ea4948392154ecdcffcc21c561976c63f9c8aa648a56a677b80e8569
+SIZE (cabal/pandoc-2.2.tar.gz) = 8995928
diff --git a/textproc/hs-pandoc/files/patch-pandoc.cabal b/textproc/hs-pandoc/files/patch-pandoc.cabal
deleted file mode 100644
index 07d92a10932a..000000000000
--- a/textproc/hs-pandoc/files/patch-pandoc.cabal
+++ /dev/null
@@ -1,83 +0,0 @@
---- pandoc.cabal.orig	2017-01-31 15:02:20 UTC
-+++ pandoc.cabal
-@@ -253,7 +253,7 @@ Flag old-locale
- 
- Library
-   Build-Depends: base >= 4.7 && <5,
--                 syb >= 0.1 && < 0.7,
-+                 syb >= 0.1 && < 0.8,
-                  containers >= 0.1 && < 0.6,
-                  unordered-containers >= 0.2 && < 0.3,
-                  array >= 0.3 && < 0.6,
-@@ -270,12 +270,12 @@ Library
-                  xml >= 1.3.12 && < 1.4,
-                  random >= 1 && < 1.2,
-                  extensible-exceptions >= 0.1 && < 0.2,
--                 pandoc-types >= 1.17 && < 1.18,
--                 aeson >= 0.7 && < 1.2,
-+                 pandoc-types >= 1.17 && < 1.20,
-+                 aeson >= 0.7 && < 1.3,
-                  tagsoup >= 0.13.7 && < 0.15,
-                  base64-bytestring >= 0.1 && < 1.1,
-                  zlib >= 0.5 && < 0.7,
--                 skylighting >= 0.1.1.4 && < 0.2,
-+                 skylighting >= 0.1.1.4 && < 0.4,
-                  data-default >= 0.4 && < 0.8,
-                  temporary >= 1.1 && < 1.3,
-                  blaze-html >= 0.5 && < 0.10,
-@@ -283,7 +283,7 @@ Library
-                  yaml >= 0.8.8.2 && < 0.9,
-                  scientific >= 0.2 && < 0.4,
-                  vector >= 0.10 && < 0.13,
--                 hslua >= 0.3 && < 0.5,
-+                 hslua >= 0.3 && < 0.6,
-                  binary >= 0.5 && < 0.9,
-                  SHA >= 1.6 && < 1.7,
-                  haddock-library >= 1.1 && < 1.5,
-@@ -424,15 +424,15 @@ Library
- 
- Executable pandoc
-   Build-Depends: pandoc,
--                 pandoc-types >= 1.17 && < 1.18,
-+                 pandoc-types >= 1.17 && < 1.20,
-                  base >= 4.2 && <5,
-                  directory >= 1.2 && < 1.4,
-                  filepath >= 1.1 && < 1.5,
-                  text >= 0.11 && < 1.3,
-                  bytestring >= 0.9 && < 0.11,
-                  extensible-exceptions >= 0.1 && < 0.2,
--                 skylighting >= 0.1.1.3 && < 0.2,
--                 aeson >= 0.7.0.5 && < 1.2,
-+                 skylighting >= 0.1.1.3 && < 0.4,
-+                 aeson >= 0.7.0.5 && < 1.3,
-                  yaml >= 0.8.8.2 && < 0.9,
-                  containers >= 0.1 && < 0.6,
-                  HTTP >= 4000.0.5 && < 4000.4
-@@ -498,15 +498,15 @@ Test-Suite test-pandoc
-      Hs-Source-Dirs: prelude
-      Other-Modules:  Prelude
-   Build-Depends:  base >= 4.2 && < 5,
--                  syb >= 0.1 && < 0.7,
-+                  syb >= 0.1 && < 0.8,
-                   pandoc,
--                  pandoc-types >= 1.17 && < 1.18,
-+                  pandoc-types >= 1.17 && < 1.20,
-                   bytestring >= 0.9 && < 0.11,
-                   text >= 0.11 && < 1.3,
-                   directory >= 1 && < 1.4,
-                   filepath >= 1.1 && < 1.5,
-                   process >= 1 && < 1.5,
--                  skylighting >= 0.1.1.3 && < 0.2,
-+                  skylighting >= 0.1.1.3 && < 0.4,
-                   Diff >= 0.2 && < 0.4,
-                   test-framework >= 0.3 && < 0.9,
-                   test-framework-hunit >= 0.2 && < 0.4,
-@@ -553,7 +553,7 @@ benchmark benchmark-pandoc
-      Other-Modules:  Prelude
-   Build-Depends:   pandoc,
-                    base >= 4.2 && < 5,
--                   syb >= 0.1 && < 0.7,
-+                   syb >= 0.1 && < 0.8,
-                    criterion >= 1.0 && < 1.2
-   Ghc-Options:   -rtsopts -Wall -fno-warn-unused-do-bind
-   Default-Language: Haskell98
diff --git a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs b/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
deleted file mode 100644
index 648d7ffa890d..000000000000
--- a/textproc/hs-pandoc/files/patch-src_Text_Pandoc_Writers_Custom.hs
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/Text/Pandoc/Writers/Custom.hs.orig	2017-01-25 16:07:43 UTC
-+++ src/Text/Pandoc/Writers/Custom.hs
-@@ -183,7 +183,11 @@ writeCustom luaFile opts doc@(Pandoc meta _) = do
-   setForeignEncoding utf8
-   lua <- Lua.newstate
-   Lua.openlibs lua
-+#if MIN_VERSION_hslua(0,5,0)
-+  status <- Lua.loadstring lua luaScript
-+#else
-   status <- Lua.loadstring lua luaScript luaFile
-+#endif
-   -- check for error in lua script (later we'll change the return type
-   -- to handle this more gracefully):
-   when (status /= 0) $