diff --git a/devel/hs-cabal-install/Makefile b/devel/hs-cabal-install/Makefile index 1d681a3aae4c..9e79e3fed612 100644 --- a/devel/hs-cabal-install/Makefile +++ b/devel/hs-cabal-install/Makefile @@ -1,90 +1,90 @@ PORTNAME= cabal-install PORTVERSION= 3.16.1.0 -PORTREVISION= 1 +PORTREVISION= 2 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 TEST_DEPENDS= git:devel/git USES= cabal:nodefault compiler:c11 pkgconfig python:build USE_GITHUB= yes GH_ACCOUNT= haskell GH_PROJECT= cabal USE_CABAL= alex-3.5.3.0 \ async-2.2.5_3 \ atomic-counter-0.1.2.3 \ base16-bytestring-1.0.2.0_1 \ base64-bytestring-1.2.1.0_1 \ cryptohash-sha256-0.11.102.1_6 \ directory-1.3.9.0_1 \ directory-ospath-streaming-0.2.2 \ echo-0.1.4 \ ed25519-0.0.5.0_9 \ edit-distance-0.2.2.1_1 \ file-io-0.1.5 \ filepath-1.5.4.0 \ hackage-security-0.6.3.1_1 \ hashable-1.5.0.0_1 \ hsc2hs-0.68.10_4 \ HTTP-4000.4.1_6 \ network-3.2.7.0 \ network-uri-2.6.4.2_1 \ open-browser-0.4.0.0 \ os-string-2.0.7 \ process-1.6.25.0 \ random-1.3.1 \ regex-base-0.94.0.3 \ regex-posix-0.96.0.2 \ resolv-0.2.0.2_5 \ safe-exceptions-0.1.7.4_1 \ semaphore-compat-1.0.0_3 \ splitmix-0.1.3.1 \ tar-0.6.4.0_1 \ th-compat-0.1.6 \ unix-2.8.6.0_1 \ zlib-0.7.1.0_2 CABAL_EXECUTABLES= cabal SKIP_CABAL_EXTRACT= yes TESTING_UNSAFE= Tests require network access .if make(test) CABAL_HOME= ${WRKDIR}/cabal-test-home .endif 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.10.2.json + ${PYTHON_CMD} bootstrap/bootstrap.py -d bootstrap/linux-9.12.2.json do-install: ${INSTALL_PROGRAM} ${WRKSRC}/_build/bin/cabal ${STAGEDIR}${PREFIX}/bin/ do-test: cd ${WRKSRC} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} update cd ${WRKSRC} && \ ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${CABAL_HOME_ENV} ${CABAL_CMD} test all .include diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.10.2.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.10.2.json deleted file mode 100644 index 091335d4d1aa..000000000000 --- a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.10.2.json +++ /dev/null @@ -1,61 +0,0 @@ ---- bootstrap/linux-9.10.2.json.orig 2025-12-05 21:21:24 UTC -+++ bootstrap/linux-9.10.2.json -@@ -14,11 +14,11 @@ - }, - { - "package": "ghc-internal", -- "version": "9.1002.0" -+ "version": "9.1003.0" - }, - { - "package": "base", -- "version": "4.20.1.0" -+ "version": "4.20.2.0" - }, - { - "package": "array", -@@ -30,7 +30,7 @@ - }, - { - "package": "ghc-boot-th", -- "version": "9.10.2" -+ "version": "9.10.3" - }, - { - "package": "pretty", -@@ -66,7 +66,7 @@ - }, - { - "package": "os-string", -- "version": "2.0.4" -+ "version": "2.0.7" - }, - { - "package": "filepath", -@@ -78,7 +78,7 @@ - }, - { - "package": "unix", -- "version": "2.8.6.0" -+ "version": "2.8.7.0" - }, - { - "package": "directory", -@@ -90,7 +90,7 @@ - }, - { - "package": "text", -- "version": "2.1.2" -+ "version": "2.1.3" - }, - { - "package": "parsec", -@@ -98,7 +98,7 @@ - }, - { - "package": "process", -- "version": "1.6.25.0" -+ "version": "1.6.26.1" - }, - { - "package": "semaphore-compat", diff --git a/devel/hs-cabal-install/files/patch-bootstrap_linux-9.12.2.json b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.12.2.json new file mode 100644 index 000000000000..77efa90c54da --- /dev/null +++ b/devel/hs-cabal-install/files/patch-bootstrap_linux-9.12.2.json @@ -0,0 +1,104 @@ +--- bootstrap/linux-9.12.2.json.orig 2025-12-05 21:21:24 UTC ++++ bootstrap/linux-9.12.2.json +@@ -2,7 +2,7 @@ + "builtin": [ + { + "package": "rts", +- "version": "1.0.2" ++ "version": "1.0.3" + }, + { + "package": "ghc-prim", +@@ -14,11 +14,11 @@ + }, + { + "package": "ghc-internal", +- "version": "9.1202.0" ++ "version": "9.1204.0" + }, + { + "package": "base", +- "version": "4.21.0.0" ++ "version": "4.21.2.0" + }, + { + "package": "array", +@@ -34,7 +34,7 @@ + }, + { + "package": "ghc-boot-th", +- "version": "9.12.2" ++ "version": "9.12.4" + }, + { + "package": "template-haskell", +@@ -50,11 +50,11 @@ + }, + { + "package": "transformers", +- "version": "0.6.1.2" ++ "version": "0.6.3.0" + }, + { + "package": "mtl", +- "version": "2.3.1" ++ "version": "2.3.2" + }, + { + "package": "stm", +@@ -62,15 +62,15 @@ + }, + { + "package": "exceptions", +- "version": "0.10.9" ++ "version": "0.10.12" + }, + { + "package": "os-string", +- "version": "2.0.7" ++ "version": "2.0.10" + }, + { + "package": "filepath", +- "version": "1.5.4.0" ++ "version": "1.5.5.0" + }, + { + "package": "time", +@@ -78,15 +78,15 @@ + }, + { + "package": "unix", +- "version": "2.8.6.0" ++ "version": "2.8.8.0" + }, + { + "package": "file-io", +- "version": "0.1.5" ++ "version": "0.1.6" + }, + { + "package": "directory", +- "version": "1.3.9.0" ++ "version": "1.3.10.1" + }, + { + "package": "binary", +@@ -94,7 +94,7 @@ + }, + { + "package": "text", +- "version": "2.1.2" ++ "version": "2.1.4" + }, + { + "package": "parsec", +@@ -102,7 +102,7 @@ + }, + { + "package": "process", +- "version": "1.6.25.0" ++ "version": "1.6.26.1" + }, + { + "package": "semaphore-compat",