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

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

3 files changed, 102 insertions, 73 deletions

diff --git a/x11/conlecterm/Makefile b/x11/conlecterm/Makefile
index 9de1e9fc338d..3724b642d553 100644
--- a/x11/conlecterm/Makefile
+++ b/x11/conlecterm/Makefile
@@ -2,8 +2,10 @@
 
 PORTNAME=	conlecterm
 PORTVERSION=	1.4.1.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	x11
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	hsw@bitmark.com
 COMMENT=	Multi tabbed terminal for rxvt/xterm/emacs
@@ -26,42 +28,39 @@ INSTALL_TARGET=	install-strip
 USE_GITHUB=	yes
 GH_ACCOUNT=	hxw
 
-EXECUTABLE=	conlecterm
-
-USE_CABAL=	\
-		aeson-1.4.5.0 \
-		alex-3.2.4 \
-		attoparsec-0.13.2.3 \
-		base-compat-0.11.0 \
-		base-orphans-0.8.1 \
-		cairo-0.13.6.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.7 \
-		gio-0.13.6.0 \
-		glib-0.13.7.0 \
-		gtk2hs-buildtools-0.13.5.0 \
-		gtk3-0.15.1 \
-		happy-1.19.12 \
-		hashable-1.3.0.0 \
-		hashtables-1.2.3.4 \
-		integer-logarithms-1.0.3 \
-		old-locale-1.0.0.7_2 \
-		pango-0.13.6.0 \
-		primitive-0.7.0.0 \
-		random-1.1 \
-		scientific-0.3.6.2 \
-		tagged-0.8.6 \
-		th-abstraction-0.3.1.0 \
-		time-compat-1.9.2.2 \
-		unordered-containers-0.2.10.0_1 \
-		utf8-string-1.0.1.1_3 \
-		uuid-types-1.0.3_2 \
-		vector-0.12.0.3 \
-		X11-1.9
+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
 
 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 cf64d9b9c166..7eea205731c6 100644
--- a/x11/conlecterm/distinfo
+++ b/x11/conlecterm/distinfo
@@ -1,20 +1,22 @@
-TIMESTAMP = 1568620829
-SHA256 (cabal/conlecterm-1.4.1.0.tar.gz) = 44c1aa8cb72ef1efd445fecc2baa6694de6f1e617a25de0a4e494e162d19c70e
-SIZE (cabal/conlecterm-1.4.1.0.tar.gz) = 19789
-SHA256 (cabal/X11-1.9/X11-1.9.tar.gz) = 10138e863d8c6f860aad1755a6f1a36949cc02d83e5afacf6677fb3999f10db9
-SIZE (cabal/X11-1.9/X11-1.9.tar.gz) = 191779
-SHA256 (cabal/aeson-1.4.5.0/aeson-1.4.5.0.tar.gz) = 3f12250ffb9f83d68a4566d8dc94a6bd2c66507471f9883bf666af45c35f0aca
-SIZE (cabal/aeson-1.4.5.0/aeson-1.4.5.0.tar.gz) = 276128
-SHA256 (cabal/alex-3.2.4/alex-3.2.4.tar.gz) = d58e4d708b14ff332a8a8edad4fa8989cb6a9f518a7c6834e96281ac5f8ff232
-SIZE (cabal/alex-3.2.4/alex-3.2.4.tar.gz) = 110688
-SHA256 (cabal/attoparsec-0.13.2.3/attoparsec-0.13.2.3.tar.gz) = 3d1ac6713505e520ebb51f26cfb5f6e5a0825e25394a51419c7e035b60b2f2d9
-SIZE (cabal/attoparsec-0.13.2.3/attoparsec-0.13.2.3.tar.gz) = 162346
-SHA256 (cabal/base-compat-0.11.0/base-compat-0.11.0.tar.gz) = 46782aa5d041579600d4a068897ce2f827063a9b355111d5522cf96547e47a6b
-SIZE (cabal/base-compat-0.11.0/base-compat-0.11.0.tar.gz) = 33338
-SHA256 (cabal/base-orphans-0.8.1/base-orphans-0.8.1.tar.gz) = 442bd63aed102e753b2fed15df8ae19f35ee07af26590da63837c523b64a99db
-SIZE (cabal/base-orphans-0.8.1/base-orphans-0.8.1.tar.gz) = 19639
-SHA256 (cabal/cairo-0.13.6.0/cairo-0.13.6.0.tar.gz) = 16010fb23da00553e036d609815a959e1b0704a9d1782b0a23bda5d69d030b30
-SIZE (cabal/cairo-0.13.6.0/cairo-0.13.6.0.tar.gz) = 53013
+TIMESTAMP = 1588528610
+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/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/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
+SIZE (cabal/base-compat-0.11.1/base-compat-0.11.1.tar.gz) = 33691
+SHA256 (cabal/base-compat-batteries-0.11.1/base-compat-batteries-0.11.1.tar.gz) = caf66fed3c0a3b0437692cad18c93a7074e8524a86b8be1ce04d0a18cbf6aed8
+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/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
@@ -25,42 +27,48 @@ 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/dlist-0.8.0.7/dlist-0.8.0.7.tar.gz) = a3c06a200f9756329b09d415e7733b7204dda76ce07783e6457d0ab9ffbcba2c
-SIZE (cabal/dlist-0.8.0.7/dlist-0.8.0.7.tar.gz) = 9228
-SHA256 (cabal/gio-0.13.6.0/gio-0.13.6.0.tar.gz) = 35c74b75c438a3b311c62d9bf4b5fd9f29913ed51628c345e4590e99bc1669b2
-SIZE (cabal/gio-0.13.6.0/gio-0.13.6.0.tar.gz) = 70094
-SHA256 (cabal/glib-0.13.7.0/glib-0.13.7.0.tar.gz) = 7cc9169b2b2f1a61315d12b6a16b841644813a8e21bb8e2e65dde07c2bb20d1a
-SIZE (cabal/glib-0.13.7.0/glib-0.13.7.0.tar.gz) = 39518
-SHA256 (cabal/gtk2hs-buildtools-0.13.5.0/gtk2hs-buildtools-0.13.5.0.tar.gz) = e45f9b2f8a088a1c23b8d3618cbc765fb6a5a4bf1c8329bb513cdb18d9c14305
-SIZE (cabal/gtk2hs-buildtools-0.13.5.0/gtk2hs-buildtools-0.13.5.0.tar.gz) = 177989
-SHA256 (cabal/gtk3-0.15.1/gtk3-0.15.1.tar.gz) = f8da454e733f7e8a46667f6b91fd86afdf9c7ea5158ad1b146f41f869e4aca4f
-SIZE (cabal/gtk3-0.15.1/gtk3-0.15.1.tar.gz) = 676126
+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/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/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
 SIZE (cabal/hashable-1.3.0.0/hashable-1.3.0.0.tar.gz) = 29835
+SHA256 (cabal/hashable-1.3.0.0/revision/1.cabal) = 4c70f1407881059e93550d3742191254296b2737b793a742bd901348fb3e1fb1
+SIZE (cabal/hashable-1.3.0.0/revision/1.cabal) = 5206
 SHA256 (cabal/hashtables-1.2.3.4/hashtables-1.2.3.4.tar.gz) = 125ce62701fba3f666609f5c75f452005aa5d32dff4eeee3f3903c30b2ed55e6
 SIZE (cabal/hashtables-1.2.3.4/hashtables-1.2.3.4.tar.gz) = 58458
 SHA256 (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 5ae262018698af35bb74916fad170d96d3eb44669c72ed36db9a19a3392cec16
 SIZE (cabal/integer-logarithms-1.0.3/integer-logarithms-1.0.3.tar.gz) = 8840
+SHA256 (cabal/integer-logarithms-1.0.3/revision/2.cabal) = 63d42595ec92b71ac98a07b984b0a2eb3d4956f4ad2d856c3bf6fc3dc218d228
+SIZE (cabal/integer-logarithms-1.0.3/revision/2.cabal) = 2820
 SHA256 (cabal/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz) = dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50
 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.6.0/pango-0.13.6.0.tar.gz) = f9c54305cb6d0a0cfd8b72a50989f4a78ce6dc02ec9472ff51d9809cda8c0c93
-SIZE (cabal/pango-0.13.6.0/pango-0.13.6.0.tar.gz) = 52596
-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/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/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
+SIZE (cabal/random-1.1/revision/1.cabal) = 1777
 SHA256 (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 278d0afc87450254f8a76eab21b5583af63954efc9b74844a17a21a68013140f
 SIZE (cabal/scientific-0.3.6.2/scientific-0.3.6.2.tar.gz) = 23510
 SHA256 (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = ad16def0884cf6f05ae1ae8e90192cf9d8d9673fa264b249499bd9e4fac791dd
 SIZE (cabal/tagged-0.8.6/tagged-0.8.6.tar.gz) = 11759
-SHA256 (cabal/th-abstraction-0.3.1.0/th-abstraction-0.3.1.0.tar.gz) = 4b9e1bcc6ec3d897fb09c3d7fa2f37f0672d5370e0e3e49809886da81fe001b9
-SIZE (cabal/th-abstraction-0.3.1.0/th-abstraction-0.3.1.0.tar.gz) = 34248
-SHA256 (cabal/time-compat-1.9.2.2/time-compat-1.9.2.2.tar.gz) = a268613385d359274edf48fb2dad4af29874f58486b2d5625e3b95a371066a17
-SIZE (cabal/time-compat-1.9.2.2/time-compat-1.9.2.2.tar.gz) = 49652
+SHA256 (cabal/tagged-0.8.6/revision/2.cabal) = 1f7ca84e6c88cbb923641c60041c9f56c34f1a889759cc073cdf10542b441ff9
+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/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
@@ -73,7 +81,7 @@ SHA256 (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 9276517ab24a9b06f39d6e
 SIZE (cabal/uuid-types-1.0.3/uuid-types-1.0.3.tar.gz) = 11999
 SHA256 (cabal/uuid-types-1.0.3/revision/2.cabal) = 2cab161f274309cfd9ef62694a6bd1b47525bc4c79a827293b055e4a9eadb4d2
 SIZE (cabal/uuid-types-1.0.3/revision/2.cabal) = 2473
-SHA256 (cabal/vector-0.12.0.3/vector-0.12.0.3.tar.gz) = b8a2bfbf9d22d34a28cde9b9e92bfb054e46797754154dd5883295c38936e5a8
-SIZE (cabal/vector-0.12.0.3/vector-0.12.0.3.tar.gz) = 124899
+SHA256 (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 3b6e27683f6f20b37b8a35d0fab9e34b57dad72ac64cb16f428726780d4011bd
+SIZE (cabal/vector-0.12.1.2/vector-0.12.1.2.tar.gz) = 131049
 SHA256 (cabal/hxw-conlecterm-v1.4.1.0_GH0.tar.gz) = 44c1aa8cb72ef1efd445fecc2baa6694de6f1e617a25de0a4e494e162d19c70e
 SIZE (cabal/hxw-conlecterm-v1.4.1.0_GH0.tar.gz) = 19789
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
new file mode 100644
index 000000000000..94af7e6f8cb9
--- /dev/null
+++ b/x11/conlecterm/files/patch-gtk2hs-buildtools-0.13.5.0_c2hs_toplevel_C2HSConfig.hs
@@ -0,0 +1,22 @@
+--- 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)