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,76 +1,77 @@ PORTNAME= cabal-install PORTVERSION= 3.14.2.0 +PORTREVISION= 1 DISTVERSIONPREFIX= ${PORTNAME}-v CATEGORIES= devel haskell EXTRACT_ONLY= ${DISTNAME_DEFAULT}${_GITHUB_EXTRACT_SUFX} MAINTAINER= haskell@FreeBSD.org COMMENT= Command-line interface for Cabal and Hackage WWW= https://www.haskell.org/cabal/ LICENSE= BSD3CLAUSE USES= cabal:nodefault compiler:c11 pkgconfig python:build USE_GITHUB= yes GH_ACCOUNT= haskell GH_PROJECT= cabal USE_CABAL= alex-3.5.1.0 \ async-2.2.5_3 \ base16-bytestring-1.0.2.0_1 \ base64-bytestring-1.2.1.0_1 \ cryptohash-sha256-0.11.102.1_5 \ data-array-byte-0.1.0.1_1 \ directory-1.3.9.0_1 \ echo-0.1.4 \ ed25519-0.0.5.0_8 \ edit-distance-0.2.2.1_1 \ file-io-0.1.4 \ filepath-1.5.4.0 \ hackage-security-0.6.2.6_4 \ hashable-1.5.0.0_1 \ hsc2hs-0.68.10_3 \ HTTP-4000.4.1_4 \ lukko-0.1.2 \ network-3.2.6.0 \ network-uri-2.6.4.2_1 \ open-browser-0.2.1.0 \ os-string-2.0.7 \ process-1.6.25.0 \ random-1.2.1.2 \ regex-base-0.94.0.2_4 \ regex-posix-0.96.0.1_3 \ resolv-0.2.0.2_4 \ safe-exceptions-0.1.7.4_1 \ semaphore-compat-1.0.0_3 \ splitmix-0.1.0.5_1 \ tar-0.6.3.0_1 \ th-compat-0.1.5_2 \ unix-2.8.6.0_1 \ zlib-0.7.1.0_2 CABAL_EXECUTABLES= cabal SKIP_CABAL_EXTRACT= yes post-extract: ${MKDIR} ${WRKSRC}/_build/tarballs/ .for package in ${USE_CABAL} ${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${EXTRACT_SUFX} ${WRKSRC}/_build/tarballs/ . if ${package:C/[^_]*//:S/_//} != "" ${CP} ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/revision/${package:C/[^_]*//:S/_//}.cabal ${WRKSRC}/_build/tarballs/${package:C/[0-9._]*$//:S/-$//}.cabal . else tar -C ${WRKDIR} -xf ${DISTDIR}/${DIST_SUBDIR}/${package:C/_[0-9]+//}/${package:C/_[0-9]+//}${EXTRACT_SUFX} --include='*.cabal' ${MV} ${WRKDIR}/${package:C/_[0-9]+//}/${package:C/[0-9._]*$//:S/-$//}.cabal ${WRKSRC}/_build/tarballs/${package:C/[0-9._]*$//:S/-$//}.cabal . endif .endfor 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/ .include 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",