diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile index d3e2354b538a..7a812aae5240 100644 --- a/devel/hs-cabal-install/Makefile +++ b/devel/hs-cabal-install/Makefile @@ -1,69 +1,69 @@ PORTNAME= cabal-install PORTVERSION= 3.10.1.0 DISTVERSIONPREFIX= ${PORTNAME}-v -PORTREVISION= 1 +PORTREVISION= 2 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 python:build USE_GITHUB= yes GH_ACCOUNT= haskell GH_PROJECT= cabal USE_CABAL= async-2.2.4_2 \ base16-bytestring-1.0.2.0 \ base64-bytestring-1.2.1.0 \ cryptohash-sha256-0.11.102.1_1 \ data-array-byte-0.1.0.1_1 \ directory-1.3.7.1 \ echo-0.1.4 \ ed25519-0.0.5.0_6 \ edit-distance-0.2.2.1_1 \ hackage-security-0.6.2.3_2 \ hashable-1.4.2.0 \ HTTP-4000.4.1_1 \ lukko-0.1.1.3_3 \ network-3.1.2.7 \ network-uri-2.6.4.2 \ process-1.6.17.0 \ random-1.2.1.1 \ regex-base-0.94.0.2_1 \ regex-posix-0.96.0.1_1 \ resolv-0.1.2.0_5 \ safe-exceptions-0.1.7.3 \ splitmix-0.1.0.4_2 \ tar-0.5.1.1_5 \ th-compat-0.1.4 \ zlib-0.6.3.0_1 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.2.6.json + ${PYTHON_CMD} bootstrap/bootstrap.py -d bootstrap/linux-9.4.4.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.2.6.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.2.6.json deleted file mode 100644 index f49c7664f939..000000000000 --- a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.2.6.json +++ /dev/null @@ -1,11 +0,0 @@ ---- bootstrap/linux-9.2.6.json.orig 2023-03-09 15:46:30 UTC -+++ bootstrap/linux-9.2.6.json -@@ -26,7 +26,7 @@ - }, - { - "package": "ghc-boot-th", -- "version": "9.2.6" -+ "version": "9.2.7" - }, - { - "package": "pretty", diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.4.4.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.4.4.json new file mode 100644 index 000000000000..69bd31c5c4a5 --- /dev/null +++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.4.4.json @@ -0,0 +1,48 @@ +--- bootstrap/linux-9.4.4.json.orig 2023-03-09 15:46:30 UTC ++++ bootstrap/linux-9.4.4.json +@@ -14,7 +14,7 @@ + }, + { + "package": "base", +- "version": "4.17.0.0" ++ "version": "4.17.1.0" + }, + { + "package": "array", +@@ -26,7 +26,7 @@ + }, + { + "package": "ghc-boot-th", +- "version": "9.4.4" ++ "version": "9.4.5" + }, + { + "package": "pretty", +@@ -38,11 +38,11 @@ + }, + { + "package": "bytestring", +- "version": "0.11.3.1" ++ "version": "0.11.4.0" + }, + { + "package": "containers", +- "version": "0.6.6" ++ "version": "0.6.7" + }, + { + "package": "binary", +@@ -74,11 +74,11 @@ + }, + { + "package": "text", +- "version": "2.0.1" ++ "version": "2.0.2" + }, + { + "package": "parsec", +- "version": "3.1.15.0" ++ "version": "3.1.16.1" + }, + { + "package": "process",