git: 045972fb5aad - main - devel/hs-cabal-install: Chase GHC upgrade

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Tue, 13 May 2025 07:35:09 UTC
The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=045972fb5aad4774b5fc7d7998598e17ef223ee0

commit 045972fb5aad4774b5fc7d7998598e17ef223ee0
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2025-05-12 10:07:07 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2025-05-13 07:34:32 +0000

    devel/hs-cabal-install: Chase GHC upgrade
---
 devel/hs-cabal-install/Makefile                    |  3 +-
 .../files/patch-bootstrap_linux-9.6.4.json         | 34 ---------------------
 .../files/patch-bootstrap_linux-9.8.2.json         | 35 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile
index 0271ba4b4443..202863f48d7f 100644
--- a/devel/hs-cabal-install/Makefile
+++ b/devel/hs-cabal-install/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	cabal-install
 PORTVERSION=	3.14.2.0
+PORTREVISION=	1
 DISTVERSIONPREFIX=	${PORTNAME}-v
 CATEGORIES=	devel haskell
 EXTRACT_ONLY=	${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX}
@@ -68,7 +69,7 @@ post-extract:
 
 do-build:
 	cd ${WRKSRC} && \
-		${PYTHON_CMD} bootstrap/bootstrap.py -d bootstrap/linux-9.6.4.json
+		${PYTHON_CMD} bootstrap/bootstrap.py -d bootstrap/linux-9.8.2.json
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/_build/bin/cabal ${STAGEDIR}${PREFIX}/bin/
diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.6.4.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.6.4.json
deleted file mode 100644
index b2095c5e004c..000000000000
--- a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.6.4.json
+++ /dev/null
@@ -1,34 +0,0 @@
---- bootstrap/linux-9.6.4.json.orig	2025-04-03 19:39:49 UTC
-+++ bootstrap/linux-9.6.4.json
-@@ -14,11 +14,11 @@
-         },
-         {
-             "package": "base",
--            "version": "4.18.2.0"
-+            "version": "4.18.3.0"
-         },
-         {
-             "package": "array",
--            "version": "0.5.6.0"
-+            "version": "0.5.8.0"
-         },
-         {
-             "package": "deepseq",
-@@ -26,7 +26,7 @@
-         },
-         {
-             "package": "ghc-boot-th",
--            "version": "9.6.4"
-+            "version": "9.6.7"
-         },
-         {
-             "package": "pretty",
-@@ -42,7 +42,7 @@
-         },
-         {
-             "package": "bytestring",
--            "version": "0.11.5.3"
-+            "version": "0.11.5.4"
-         },
-         {
-             "package": "transformers",
diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.8.2.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.8.2.json
new file mode 100644
index 000000000000..890df879ac03
--- /dev/null
+++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.8.2.json
@@ -0,0 +1,35 @@
+--- bootstrap/linux-9.8.2.json.orig	2025-04-03 19:39:49 UTC
++++ bootstrap/linux-9.8.2.json
+@@ -14,19 +14,19 @@
+         },
+         {
+             "package": "base",
+-            "version": "4.19.1.0"
++            "version": "4.19.2.0"
+         },
+         {
+             "package": "array",
+-            "version": "0.5.6.0"
++            "version": "0.5.8.0"
+         },
+         {
+             "package": "deepseq",
+-            "version": "1.5.0.0"
++            "version": "1.5.1.0"
+         },
+         {
+             "package": "ghc-boot-th",
+-            "version": "9.8.2"
++            "version": "9.8.4"
+         },
+         {
+             "package": "pretty",
+@@ -54,7 +54,7 @@
+         },
+         {
+             "package": "stm",
+-            "version": "2.5.2.1"
++            "version": "2.5.3.1"
+         },
+         {
+             "package": "exceptions",