lang/ghc: Update to 8.10.1.

As usual, along with the compiler, many Haskell packages are updated as well.

3 files changed, 79 insertions, 73 deletions

diff --git a/x11/conlecterm/Makefile b/x11/conlecterm/Makefile
index 53487a032f5d..9897eb94574d 100644
--- a/x11/conlecterm/Makefile
+++ b/x11/conlecterm/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	conlecterm
 PORTVERSION=	1.4.1.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
@@ -28,39 +28,47 @@ INSTALL_TARGET=	install-strip
 USE_GITHUB=	yes
 GH_ACCOUNT=	hxw
 
-USE_CABAL=X11-1.9.1 \
-	aeson-1.4.7.1_1 \
-	alex-3.2.5 \
-	attoparsec-0.13.2.4 \
-	base-compat-0.11.1 \
-	base-compat-batteries-0.11.1 \
-	base-orphans-0.8.2 \
-	cairo-0.13.8.0 \
-	data-default-0.7.1.1 \
-	data-default-class-0.1.2.0 \
-	data-default-instances-containers-0.0.1 \
-	data-default-instances-dlist-0.0.1 \
-	data-default-instances-old-locale-0.0.1 \
-	dlist-0.8.0.8 \
-	glib-0.13.8.0 \
-	gtk2hs-buildtools-0.13.8.0 \
-	gtk3-0.15.4 \
-	happy-1.19.12 \
-	hashable-1.3.0.0_1 \
-	hashtables-1.2.3.4 \
-	integer-logarithms-1.0.3_2 \
-	old-locale-1.0.0.7_2 \
-	pango-0.13.8.0 \
-	primitive-0.7.0.1 \
-	random-1.1_1 \
-	scientific-0.3.6.2 \
-	tagged-0.8.6_2 \
-	th-abstraction-0.3.2.0 \
-	time-compat-1.9.3 \
-	unordered-containers-0.2.10.0_1 \
-	utf8-string-1.0.1.1_3 \
-	uuid-types-1.0.3_2 \
-	vector-0.12.1.2
+USE_CABAL=	X11-1.9.1 \
+		aeson-1.5.2.0 \
+		alex-3.2.5 \
+		assoc-1.0.1_1 \
+		attoparsec-0.13.2.4 \
+		base-compat-0.11.1 \
+		base-compat-batteries-0.11.1 \
+		base-orphans-0.8.2 \
+		bifunctors-5.5.7 \
+		cabal-doctest-1.0.8_1 \
+		cairo-0.13.8.1 \
+		comonad-5.0.6_1 \
+		data-default-0.7.1.1 \
+		data-default-class-0.1.2.0 \
+		data-default-instances-containers-0.0.1 \
+		data-default-instances-dlist-0.0.1 \
+		data-default-instances-old-locale-0.0.1 \
+		distributive-0.6.2_1 \
+		dlist-0.8.0.8 \
+		gio-0.13.8.1 \
+		glib-0.13.8.1 \
+		gtk2hs-buildtools-0.13.8.0 \
+		gtk3-0.15.5 \
+		happy-1.19.12 \
+		hashable-1.3.0.0_1 \
+		hashtables-1.2.3.4 \
+		integer-logarithms-1.0.3_2 \
+		old-locale-1.0.0.7_2 \
+		pango-0.13.8.1 \
+		primitive-0.7.0.1 \
+		random-1.1_1 \
+		scientific-0.3.6.2 \
+		tagged-0.8.6_2 \
+		th-abstraction-0.3.2.0 \
+		these-1.1 \
+		time-compat-1.9.3 \
+		transformers-compat-0.6.5 \
+		unordered-containers-0.2.11.0 \
+		utf8-string-1.0.1.1_3 \
+		uuid-types-1.0.3_2 \
+		vector-0.12.1.2
 
 PLIST_FILES+=	share/applications/conlecterm.desktop
 PLIST_FILES+=	share/icons/hicolor/scalable/apps/conlecterm.svg
diff --git a/x11/conlecterm/distinfo b/x11/conlecterm/distinfo
index 7eea205731c6..8116f308cb4b 100644
--- a/x11/conlecterm/distinfo
+++ b/x11/conlecterm/distinfo
@@ -1,12 +1,14 @@
-TIMESTAMP = 1588528610
+TIMESTAMP = 1592739876
 SHA256 (cabal/X11-1.9.1/X11-1.9.1.tar.gz) = 7581e7b3c1c8313d1f7d224d57b20c689e5f757404c9f0ec47f4d15c4541e63d
 SIZE (cabal/X11-1.9.1/X11-1.9.1.tar.gz) = 190698
-SHA256 (cabal/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz) = 07e746655fd9bec81c59927c5617877ff4fcd81d0df45c5fb8ef154fb8f40294
-SIZE (cabal/aeson-1.4.7.1/aeson-1.4.7.1.tar.gz) = 277911
-SHA256 (cabal/aeson-1.4.7.1/revision/1.cabal) = 6d8d2fd959b7122a1df9389cf4eca30420a053d67289f92cdc0dbc0dab3530ba
-SIZE (cabal/aeson-1.4.7.1/revision/1.cabal) = 7098
+SHA256 (cabal/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz) = cd3598924ffdafb5222202af73aaa59bc5d4ac8cf590e06f67b5a6a3751b932b
+SIZE (cabal/aeson-1.5.2.0/aeson-1.5.2.0.tar.gz) = 297484
 SHA256 (cabal/alex-3.2.5/alex-3.2.5.tar.gz) = b77c8a1270767c64e2adb21a6e91ee7cd904ba17edae17bc20fd03da5256e0e3
 SIZE (cabal/alex-3.2.5/alex-3.2.5.tar.gz) = 108531
+SHA256 (cabal/assoc-1.0.1/assoc-1.0.1.tar.gz) = 4000dea2fbc272ff5a15a0bf0fae1c29dea4b87b8fb4ccb8b07b8114ee2636d5
+SIZE (cabal/assoc-1.0.1/assoc-1.0.1.tar.gz) = 2946
+SHA256 (cabal/assoc-1.0.1/revision/1.cabal) = 305770dfe76319749f704a1f23240f806d22905dae1aa54e6d57dc747662dae0
+SIZE (cabal/assoc-1.0.1/revision/1.cabal) = 1205
 SHA256 (cabal/attoparsec-0.13.2.4/attoparsec-0.13.2.4.tar.gz) = ba66cd6de1749ec92568db1b9c905b43a849f0ad918d45d7b594407a02ebefb2
 SIZE (cabal/attoparsec-0.13.2.4/attoparsec-0.13.2.4.tar.gz) = 163431
 SHA256 (cabal/base-compat-0.11.1/base-compat-0.11.1.tar.gz) = 356f1542ec93e7192a9073d32a8ef1e48194275495dcec7fb0d241f4baaf6d36
@@ -15,8 +17,18 @@ SHA256 (cabal/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz)
 SIZE (cabal/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz) = 16748
 SHA256 (cabal/base-orphans-0.8.2/base-orphans-0.8.2.tar.gz) = 2a8062385e5d5dee418428a22c72b9391557bc1fe2f93bd643f7754b36b9eb01
 SIZE (cabal/base-orphans-0.8.2/base-orphans-0.8.2.tar.gz) = 20727
-SHA256 (cabal/cairo-0.13.8.0/cairo-0.13.8.0.tar.gz) = a9096acead8d38251a3f5c68c1573d19fc72a069a5e94ea24f3e4fa6be1ce925
-SIZE (cabal/cairo-0.13.8.0/cairo-0.13.8.0.tar.gz) = 53031
+SHA256 (cabal/bifunctors-5.5.7/bifunctors-5.5.7.tar.gz) = 88b3a2d4504e1139a3aef7027913faa0870631477d0a2ebb6fa67d494cdb3532
+SIZE (cabal/bifunctors-5.5.7/bifunctors-5.5.7.tar.gz) = 45689
+SHA256 (cabal/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz) = 2026a6a87d410202ce091412ca6bc33c5aca787025326b4a3d13425a23392e0e
+SIZE (cabal/cabal-doctest-1.0.8/cabal-doctest-1.0.8.tar.gz) = 10812
+SHA256 (cabal/cabal-doctest-1.0.8/revision/1.cabal) = 34dff6369d417df2699af4e15f06bc181d495eca9c51efde173deae2053c197c
+SIZE (cabal/cabal-doctest-1.0.8/revision/1.cabal) = 1491
+SHA256 (cabal/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz) = 1316412d51556205cfc097a354eddf0e51f4d319cde0498626a2854733f4f3c2
+SIZE (cabal/cairo-0.13.8.1/cairo-0.13.8.1.tar.gz) = 53026
+SHA256 (cabal/comonad-5.0.6/comonad-5.0.6.tar.gz) = 77cfb016acd1747b892c31b82daf0de93f508ba775d62562d376b354adb88fae
+SIZE (cabal/comonad-5.0.6/comonad-5.0.6.tar.gz) = 18154
+SHA256 (cabal/comonad-5.0.6/revision/1.cabal) = fdf1b529a79765a8549ac7e9d439b769cca852778742db8702a9d9b2dc27e4a4
+SIZE (cabal/comonad-5.0.6/revision/1.cabal) = 3496
 SHA256 (cabal/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz) = b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511
 SIZE (cabal/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz) = 1627
 SHA256 (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
@@ -27,14 +39,20 @@ SHA256 (cabal/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.
 SIZE (cabal/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz) = 1503
 SHA256 (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz) = 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802
 SIZE (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
+SHA256 (cabal/distributive-0.6.2/distributive-0.6.2.tar.gz) = 824ee271ded433ce6c61fe890c784642b7e20ffa4082fca609da54e7dcfc23c9
+SIZE (cabal/distributive-0.6.2/distributive-0.6.2.tar.gz) = 11308
+SHA256 (cabal/distributive-0.6.2/revision/1.cabal) = 1ad2369d4928a61a9fb8dc94b7ecc5f65a9296b07a51a2b4c397049115d82ed4
+SIZE (cabal/distributive-0.6.2/revision/1.cabal) = 3198
 SHA256 (cabal/dlist-0.8.0.8/dlist-0.8.0.8.tar.gz) = 7129cf18068d3384e305708a10426ab8f573bee1030b023a114f45f1d0ec496d
 SIZE (cabal/dlist-0.8.0.8/dlist-0.8.0.8.tar.gz) = 9262
-SHA256 (cabal/glib-0.13.8.0/glib-0.13.8.0.tar.gz) = 9cce6fb44e3c30de2bd330a6902955e3a5fce7b6e9ce41a4afb70e3a7d6e61a2
-SIZE (cabal/glib-0.13.8.0/glib-0.13.8.0.tar.gz) = 39544
+SHA256 (cabal/gio-0.13.8.1/gio-0.13.8.1.tar.gz) = 26d77f1c1d5937a73b98f29b91619d9911756819cb2894ace864626bee41b801
+SIZE (cabal/gio-0.13.8.1/gio-0.13.8.1.tar.gz) = 70144
+SHA256 (cabal/glib-0.13.8.1/glib-0.13.8.1.tar.gz) = dcd028ac6d4a7476c14585be1d845b8c4aea4c389f34e809ed1a8df7425c1a9c
+SIZE (cabal/glib-0.13.8.1/glib-0.13.8.1.tar.gz) = 39557
 SHA256 (cabal/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz) = 8dbb7dbf004e45e48aa77153bc780120d99a329c6bde76618d46b2a4f3bb8598
 SIZE (cabal/gtk2hs-buildtools-0.13.8.0/gtk2hs-buildtools-0.13.8.0.tar.gz) = 178465
-SHA256 (cabal/gtk3-0.15.4/gtk3-0.15.4.tar.gz) = 2ce4265cd2a83e9c12cb70bdbf0a711130a3290d33bc3e937bf885af901ce99d
-SIZE (cabal/gtk3-0.15.4/gtk3-0.15.4.tar.gz) = 677110
+SHA256 (cabal/gtk3-0.15.5/gtk3-0.15.5.tar.gz) = c03876dc79436aa467c93db580405f0e8eb7ca44c48d48af0fdcc17d7bafbcf8
+SIZE (cabal/gtk3-0.15.5/gtk3-0.15.5.tar.gz) = 677124
 SHA256 (cabal/happy-1.19.12/happy-1.19.12.tar.gz) = fb9a23e41401711a3b288f93cf0a66db9f97da1ce32ec4fffea4b78a0daeb40f
 SIZE (cabal/happy-1.19.12/happy-1.19.12.tar.gz) = 183254
 SHA256 (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 822e5413fbccca6ae884d3aba4066422c8b5d58d23d18b9ecb5c03273bb19ab4
@@ -51,8 +69,8 @@ SHA256 (cabal/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz) = dbaf8bf6b888fb9884
 SIZE (cabal/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz) = 3384
 SHA256 (cabal/old-locale-1.0.0.7/revision/2.cabal) = fa998be2c7e00cd26a6e9075bea790caaf3932caa3e9497ad69bc20380dd6911
 SIZE (cabal/old-locale-1.0.0.7/revision/2.cabal) = 1071
-SHA256 (cabal/pango-0.13.8.0/pango-0.13.8.0.tar.gz) = 5a70f30e7164ec7353398ecae858580958f340c7475283e6fdb0347881747eea
-SIZE (cabal/pango-0.13.8.0/pango-0.13.8.0.tar.gz) = 52658
+SHA256 (cabal/pango-0.13.8.1/pango-0.13.8.1.tar.gz) = 40a67a56687969cee9dd4cc94a8a3d0beb5ea687c8a2f3da552feb915453c82f
+SIZE (cabal/pango-0.13.8.1/pango-0.13.8.1.tar.gz) = 52671
 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
@@ -67,12 +85,14 @@ SHA256 (cabal/tagged-0.8.6/revision/2.cabal) = 1f7ca84e6c88cbb923641c60041c9f56c
 SIZE (cabal/tagged-0.8.6/revision/2.cabal) = 2606
 SHA256 (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 36fef33ad0f34b9b8fb5552fe6187579a00d5f90d938e9bc24d382a9919feb79
 SIZE (cabal/th-abstraction-0.3.2.0/th-abstraction-0.3.2.0.tar.gz) = 35111
+SHA256 (cabal/these-1.1/these-1.1.tar.gz) = bb0beb19e4f2722e09d02413f657c456c490ea9b256b6c9f167645a8b84cb137
+SIZE (cabal/these-1.1/these-1.1.tar.gz) = 8796
 SHA256 (cabal/time-compat-1.9.3/time-compat-1.9.3.tar.gz) = bb6a44e667945ddca8ded93e041ee91986a4a19f59e149a5dd21fdb1bfa3db88
 SIZE (cabal/time-compat-1.9.3/time-compat-1.9.3.tar.gz) = 50050
-SHA256 (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 65f117bdbdea9efc75fb9fd539873de7687e005d8898bb21821020a4b383c573
-SIZE (cabal/unordered-containers-0.2.10.0/unordered-containers-0.2.10.0.tar.gz) = 44733
-SHA256 (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5e9b095a9283d9e2f064fec73a81a6b6ea0b7fda3f219a8175785d2d2a3de204
-SIZE (cabal/unordered-containers-0.2.10.0/revision/1.cabal) = 5199
+SHA256 (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = da67cf11515da751b32a8ce6e96549f7268f7c435769ad19dc9766b69774620b
+SIZE (cabal/transformers-compat-0.6.5/transformers-compat-0.6.5.tar.gz) = 40421
+SHA256 (cabal/unordered-containers-0.2.11.0/unordered-containers-0.2.11.0.tar.gz) = 2b3a8c8d796f9c13aefd3a572c4b4ac0627726c037e832b8b43fd8804ec4a87c
+SIZE (cabal/unordered-containers-0.2.11.0/unordered-containers-0.2.11.0.tar.gz) = 49254
 SHA256 (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140
 SIZE (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = 8667
 SHA256 (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 68cc6cf665e7212334a51b63d6936daeaca023b2cfe8637d130acfe95f91700b
diff --git a/x11/conlecterm/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs b/x11/conlecterm/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs
deleted file mode 100644
index 94af7e6f8cb9..000000000000
--- a/x11/conlecterm/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs
+++ /dev/null
@@ -1,22 +0,0 @@
---- gtk2hs-buildtools-0.13.8.0/c2hs/toplevel/C2HSConfig.hs.orig	1970-01-01 00:00:00 UTC
-+++ gtk2hs-buildtools-0.13.8.0/c2hs/toplevel/C2HSConfig.hs
-@@ -24,7 +24,7 @@
- --  Configuration options; largely set by `configure'.
- --
- --- TODO ----------------------------------------------------------------------
----  
-+--
- module C2HSConfig (
-   --
-   -- programs and paths
-@@ -70,8 +70,8 @@ cpp  = case os of
- cppopts :: [String]
- cppopts  = case (os,cpp) of
-   ("openbsd","cpp") -> ["-xc", "-w"]
--  (_,"cpp")         -> ["-x", "c", "-w"]
--  (_,"gcc")         -> ["-E", "-x", "c", "-w"]
-+  (_,"cpp")         -> ["-x", "c", "-w", "-std=c99", "-D_Nullable=", "-D_Nonnull="]
-+  (_,"gcc")         -> ["-E", "-x", "c", "-w", "-std=c99", "-D_Nullable=", "-D_Nonnull="]
-   _                 -> []
- 
- -- C preprocessor option for including only definitions (EXPORTED)