<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/fc7269462ed74ab549f5eb1be93d4121a496ddde">https://github.com/macports/macports-ports/commit/fc7269462ed74ab549f5eb1be93d4121a496ddde</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit fc7269462ed74ab549f5eb1be93d4121a496ddde
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun May 29 13:04:21 2022 -0700
<span style='display:block; white-space:pre;color:#404040;'> cargo_fetch PG: replace with rust PG
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The rust PG is more closely tied to the current build of Rust.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/65195
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes https://trac.macports.org/ticket/65025
</span>---
devel/mercurial/Portfile | 4 ++--
devel/mesalink/Portfile | 3 ++-
graphics/librsvg-devel/Portfile | 23 +++++++++--------------
graphics/librsvg/Portfile | 23 +++++++++--------------
net/newsboat/Portfile | 7 +++----
python/py-cryptography/Portfile | 8 ++++----
python/py-tokenizers/Portfile | 4 ++--
sysutils/watchman/Portfile | 4 ++--
8 files changed, 33 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mercurial/Portfile b/devel/mercurial/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a7e81b2eb3..0a95e3a9287 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mercurial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mercurial/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,14 +5,14 @@ PortGroup python 1.0
</span>
if {[variant_isset rust]} {
# see https://trac.macports.org/ticket/63834
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup rust 1.0
</span> }
name mercurial
# don't forget to update dependents for mercurial:
# port echo rdepends:mercurial and \( name:hg or name:mercurial \) | grep -v 'py[[:digit:]]'
version 6.1.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories devel python
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/mesalink/Portfile b/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 89549775dec..7b924bee7b9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/mesalink/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,10 @@
</span>
PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup rust 1.0
</span>
github.setup mesalock-linux mesalink 0.6.0 v
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel security
platforms darwin
license BSD
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg-devel/Portfile b/graphics/librsvg-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a826d6b7584..5a1ba6196d9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span>
name librsvg-devel
set my_name librsvg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +60,8 @@ if {[info exists librsvg.override.fallback]} {
</span>
if {${librsvg_fallback}} {
# revert to latest pre-cargo version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> version 2.40.20
revision 4
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,26 +87,20 @@ if {${librsvg_fallback}} {
</span> patchfiles-append patch-disable-viewer-pre-cargo.diff
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rust PG modifies `configure.ldflags` in callback function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gobject_introspection uses `configure.ldflags` in callback function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # therefore, rust PG must precede gobject_introspection PG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup rust 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup gobject_introspection 1.0
</span>
version 2.52.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 fd30d3a0491de672830ae523bd2955732b17aa1d \
sha256 a3f939a1e6a3a60408244632d0323f8c3b20eb4b7b000536e2e5bd93b8effaad \
size 23662708
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Only needed for linkat on macOS 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append LDFLAGS="${configure.ldflags} [legacysupport::get_library_link_flags]"
</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;'>- # cargo_fetch appends cargo build dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:rust
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # when CARGO_BUILD_TARGET is set, directory structure changes
patchfiles-append \
patch-configure-rust_target_subdir.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/librsvg/Portfile b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b98f665660f..37460174e15 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/librsvg/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,6 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup gobject_introspection 1.0
</span>
name librsvg
set my_name librsvg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,6 +60,8 @@ if {[info exists librsvg.override.fallback]} {
</span>
if {${librsvg_fallback}} {
# revert to latest pre-cargo version
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup gobject_introspection 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> version 2.40.20
revision 4
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,26 +87,20 @@ if {${librsvg_fallback}} {
</span> patchfiles-append patch-disable-viewer-pre-cargo.diff
}
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # rust PG modifies `configure.ldflags` in callback function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # gobject_introspection uses `configure.ldflags` in callback function
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # therefore, rust PG must precede gobject_introspection PG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup rust 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup gobject_introspection 1.0
</span>
version 2.52.6
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 1
</span> epoch 2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> checksums rmd160 fd30d3a0491de672830ae523bd2955732b17aa1d \
sha256 a3f939a1e6a3a60408244632d0323f8c3b20eb4b7b000536e2e5bd93b8effaad \
size 23662708
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Only needed for linkat on macOS 10.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- legacysupport.newest_darwin_requires_legacy 13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${os.major} <= [option legacysupport.newest_darwin_requires_legacy] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.env-append LDFLAGS="${configure.ldflags} [legacysupport::get_library_link_flags]"
</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;'>- # cargo_fetch appends cargo build dependency
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_build-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:rust
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # when CARGO_BUILD_TARGET is set, directory structure changes
patchfiles-append \
patch-configure-rust_target_subdir.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/newsboat/Portfile b/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 966883448fc..446b72b10a0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/newsboat/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +1,13 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup rust 1.0
</span> PortGroup github 1.0
PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup openssl 1.0
</span>
github.setup newsboat newsboat 2.27 r
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
homepage https://newsboat.org
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,6 +29,7 @@ checksums ${distname}${extract.suffix} \
</span> size 1140892 \
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+openssl.branch 3
</span>
patchfiles patch-libiconv-makefile.diff \
patch-libiconv-rust.diff
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,6 @@ use_configure yes
</span> depends_build-append port:asciidoctor \
port:docbook-xsl-nons \
port:gettext \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:rust \
</span> port:pkgconfig
depends_lib-append port:curl \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-cryptography/Portfile b/python/py-cryptography/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 48fe394dfb4..585feffc05b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-cryptography/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-cryptography/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,11 +3,10 @@
</span> PortSystem 1.0
PortGroup github 1.0
PortGroup python 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup openssl 1.0
</span>
github.setup pyca cryptography 37.0.2
name py-${github.project}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories-append devel
platforms darwin
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +42,7 @@ if {${name} ne ${subport}
</span> # legacy support
if {${python.version} eq 27
|| ${os.platform} eq "darwin" && ${os.major} < ${cryptography_darwin_min_ver}} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span> github.setup pyca cryptography 2.9.2
revision 2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ if {${name} ne ${subport}
</span> "This is a legacy version of ${python.rootname} that contains\
CVE CVE-2020-36242."
} elseif {${python.version} eq 36} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup rust 1.0
</span>
github.setup pyca cryptography 36.0.2
revision 0
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,7 +149,7 @@ if {${name} ne ${subport}
</span> winapi-i686-pc-windows-gnu 0.4.0 ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6 \
winapi-x86_64-pc-windows-gnu 0.4.0 712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f
} else {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup rust 1.0
</span>
# Needs to use the same openssl version as python itself was built with...
# https://trac.macports.org/ticket/63968
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tokenizers/Portfile b/python/py-tokenizers/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcb0fd21e77..9600d776e8f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tokenizers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tokenizers/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,12 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup rust 1.0
</span> PortGroup python 1.0
name py-tokenizers
version 0.10.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> platforms darwin
license Apache-2
maintainers nomaintainer
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/watchman/Portfile b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2fc664d67f0..3b58b4e81c8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/watchman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,10 +4,10 @@ PortSystem 1.0
</span> PortGroup github 1.0
PortGroup cmake 1.1
PortGroup boost 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup cargo_fetch 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup rust 1.0
</span>
github.setup facebook watchman 2022.01.17.00 v
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span>
categories sysutils
platforms darwin
</pre><pre style='margin:0'>
</pre>