<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2f6a30d903550d03afc81509ece124eec2d688ea">https://github.com/macports/macports-ports/commit/2f6a30d903550d03afc81509ece124eec2d688ea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2f6a30d903550d03afc81509ece124eec2d688ea
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Mar 14 11:02:24 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> ghc: Update to version 9.6.1
</span>---
lang/ghc/Portfile | 44 +++++++++++++++++++--------------------
lang/ghc/files/fix_extlinks.patch | 30 --------------------------
2 files changed, 21 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/Portfile b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 572a60ebce1..c3661af9389 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/ghc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,8 +6,8 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup legacysupport 1.1
name ghc
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 9.4.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 9.6.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories lang haskell
maintainers {ieee.org:s.t.smith @essandess} openmaintainer
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,26 +63,26 @@ set ghc_distname ${distname}-${ghc_build_arch}-apple-darwin
</span> # run `port clean --all ghc-prebuilt` afterwards
if {${build_arch} eq {arm64}} {
checksums ${ghc_distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8dce77267645ad8bb3edb04e8ed3625e3cfc6eb6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b50507b229e0c418b32e4b6cc060288ba9497fdd912962e3b0707d0a2b003658 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 196083128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 678e9d3fb43e8c14a0f19138b1623b62b349aa60 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1729e8cec960879c620917d935a673e54197fa2ee87c62e45c44fad2e522960a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 203793180
</span> } elseif {${build_arch} eq {x86_64}} {
checksums ${ghc_distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 195e2b7e3f5bbdfc194d167e07b1ac5035dfe219 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3a35e355ef993830c273f86ab6286aab3e825f6e53288d1980e473911e4ede94 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 186541680
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 880bcc3d981f8ff32179f4e8472c22891bc4639c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 3dcca5e83795b5b7c0af636216dc2ef9c40c70fb368bc7feb2a74921c81445ff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 195541140
</span> }
set ghc_source_checksums [list \
${distname}-src${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fc364dcf27c790a81ffe380131ce2735dc585c5c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 e8cef25a6ded1531cda7a90488d0cfb6d780657d16636daa59430be030cd67e2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 28564104 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 eaad81dfb0528999e8f05d601cfacb5a0fa2afc4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fe5ac909cb8bb087e235de97fa63aff47a8ae650efaa37a2140f4780e21f34cb \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29320824 \
</span> ]
set ghc_testsuite_checksums [list \
${distname}-testsuite${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 2abeea45399ff564f35d6a91f0930f619d009f3d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4349d6a0680cf62b54a76aa859a0c7186635a0971efeecccf676bcdeb9a2e212 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3394348 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8973660e6cfcf268cff21b10be2d8fa306647a65 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8bfa74d102da570cb87fbbc3465c7f778a4e6dc76606fef80207de7e8b64114f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7015324 \
</span> ]
# https://bgamari.github.io/media/ben@well-typed.com.asc
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,12 +98,6 @@ if {${name} eq ${subport}} {
</span> "GHC=${haskell_cabal.cabal_root}/bin/ghc" \
"PATH=${workpath}/bin:${haskell_cabal.cabal_root}/bin:$env(PATH)"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/66680
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # please remove afer this this sphinx issue is fixed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://gitlab.haskell.org/ghc/ghc/-/issues/22766
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fix_extlinks.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # https://trac.macports.org/ticket/65899
# https://trac.macports.org/wiki/UsingTheRightCompiler#testing
foreach phase {build destroot test} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -159,7 +153,7 @@ if {${name} eq ${subport}} {
</span> ${distname}-testsuite${extract.suffix}.sig
checksums-append \
${distname}-testsuite${extract.suffix}.sig \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- size 585
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 586
</span>
post-checksum {
gpg_verify.verify_gpg_signature \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -391,7 +385,7 @@ subport hadrian {
</span> # find ${worksrcpath} -type f -exec egrep -E -o '"pkg-name":"shake","pkg-version":"[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+"' {} ';'
# revbump if the version is unchanged
version 0.19.7
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span>
distname ${name}-${ghc_version}
distfiles [lindex ${ghc_source_checksums} 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -438,6 +432,10 @@ if {[exists extract.rename]} {
</span> +haskell_cabal_use_prebuilt
build.target-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --project-file=cabal.project
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --project-file=cabal.project \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --allow-newer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.post_args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --bindir=${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --datadir=${prefix}/share/${subport}
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/ghc/files/fix_extlinks.patch b/lang/ghc/files/fix_extlinks.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1e626b90cb8..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/ghc/files/fix_extlinks.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,30 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- docs/users_guide/ghc_config.py.in.orig 2022-12-24 03:19:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ docs/users_guide/ghc_config.py.in 2023-01-13 14:57:38.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extlinks = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/issues/%s', '#%s'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/wikis/%s', '#%s'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libs_base_uri = '../libraries'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libraries/Cabal/doc/conf.py.orig 2022-12-24 03:19:53.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libraries/Cabal/doc/conf.py 2023-01-13 14:54:34.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,12 +28,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # extlinks -- see http://www.sphinx-doc.org/en/stable/ext/extlinks.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extlinks = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'issue': ('https://github.com/haskell/cabal/issues/%s', '#'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'issue': ('https://github.com/haskell/cabal/issues/%s', '#%s'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', ''),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC #'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'ghc-wiki': ('https://gitlab.haskell.org/ghc/ghc/-/wikis/%s', None),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'ghc-ticket': ('https://gitlab.haskell.org/ghc/ghc/-/issues/%s', 'GHC #%s'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- 'hackage-pkg': ('http://hackage.haskell.org/package/%s', ''),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ 'hackage-pkg': ('http://hackage.haskell.org/package/%s', None),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # General information about the project.
</span></pre><pre style='margin:0'>
</pre>