<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/2bfbe01cb69a3de4cc0fdff635bd4d0d81f47ffb">https://github.com/macports/macports-ports/commit/2bfbe01cb69a3de4cc0fdff635bd4d0d81f47ffb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 2bfbe01cb69a3de4cc0fdff635bd4d0d81f47ffb
</span>Author: Steven Thomas Smith <s.t.smith@ieee.org>
AuthorDate: Tue Mar 14 11:03:30 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> cabal: Update to version 3.10.1.0
</span>---
lang/cabal/Portfile | 38 +++++++++++++++------------------
lang/cabal/files/patch-doc_conf_py.diff | 19 -----------------
2 files changed, 17 insertions(+), 40 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/cabal/Portfile b/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d4d37dd3671..7e2c0950a48 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/cabal/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,8 +3,8 @@
</span> PortSystem 1.0
name cabal
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.8.1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.10.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories lang haskell devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -57,18 +57,18 @@ set distfile_haskell ${cabal_distname}.tar.xz
</span> distfiles ${distfile_haskell}:haskell
# set build_arch by hand on arm64/x86_64 systems to get x86_64/arm64 checksums
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# sudo port -d checksum cabal os.arch=arm build_arch=arm64
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# run `port clean --all cabal` afterwards
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# sudo port -d checksum cabal-prebuilt os.arch=arm build_arch=arm64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# run `port clean --all cabal-prebuilt` afterwards
</span> if {${build_arch} eq {arm64}} {
checksums ${distfile_haskell} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1be8b14e19a93fd904d563133122ed8eee872ccc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f75b129c19cf3aa88cf9885cbf5da6d16f9972c7f770c528ca765b9f0563ada3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11519120
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 e148d1c570756e69cf31c1732f2ae97d5327ed6f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 fdabdc4dca42688a97f2b837165af42fcfd4c111d42ddb0d4df7bbebd5c8750e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 11711216
</span> } elseif {${build_arch} eq {x86_64}} {
checksums ${distfile_haskell} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1f752977ba663e78d9a8398c9df02fa31002b025 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 f5ff69127b0e596b0d7895a2b0b383543aa92ae46d9b1b28f2868d2a97ed0de9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5494908
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 5d6765c43751a00083e7f1408b96eab49f868643 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 893a316bd634cbcd08861306efdee86f66ec634f9562a8c59dc616f7e2e14ffa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5601212
</span> }
# cabal may use these MacPorts build tools:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -92,9 +92,9 @@ if {${name} eq ${subport}} {
</span> master_sites https://github.com/haskell/${name}/archive/refs/tags:github
distfiles ${distfile_github}:github
checksums ${distfile_github} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 dbd7aa2683cb7a9bd4e393c784aac8e1d1051aa4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 d4eff9c1fcc5212360afac8d97da83b3aff79365490a449e9c47d3988c14b6bc \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 2181318
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 489aff1c865f56b4ddb6b8b41e40187d06fd8c51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 710f9b14ad2851cb6192666599c37eff23b578cf619a1040bdf0b3f2c44df8b5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2256967
</span>
extract.only-append \
${distfile_github}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -148,13 +148,6 @@ if {[exists extract.rename]} {
</span> delete ${haskell_cabal.cabal_root}/bin/ghc-pkg
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://trac.macports.org/ticket/66680#comment:12
</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://github.com/haskell/cabal/issues/8681
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # diff -NaurdwB ./cabal-orig/doc/conf.py ./cabal-new/doc/conf.py | sed -E -e 's/\.\/cabal-(orig|new)/\./' | sed -E -e 's|/opt/local|@PREFIX@|g' > ~/Downloads/patch-doc_conf_py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-doc_conf_py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> haskell_cabal.env \
"CABAL_CONFIG=${haskell_cabal.cabal_root}/config" \
"GHC=${prefix}/bin/ghc"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,6 +156,9 @@ if {[exists extract.rename]} {
</span> build.target ${name}-install \
--project-file=cabal.project.release \
--allow-newer
<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>
post-build {
# https://github.com/haskell/cabal/blob/c1f490a50782cc89030889fae8edd9f95db7c1e4/Makefile#L207
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -190,7 +186,7 @@ if {[exists extract.rename]} {
</span> }
subport cabal-prebuilt {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span> supported_archs arm64 x86_64
use_configure no
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/cabal/files/patch-doc_conf_py.diff b/lang/cabal/files/patch-doc_conf_py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index aee88714788..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/cabal/files/patch-doc_conf_py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ./doc/conf.py 2023-01-15 15:54:29
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./doc/conf.py 2023-01-15 15:57:09
</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>