<pre style='margin:0'>
Zhenfu Shi (i0ntempest) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e12f2bace3ee89a9238d7a54153498605c539bc">https://github.com/macports/macports-ports/commit/7e12f2bace3ee89a9238d7a54153498605c539bc</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7e12f2bace3 mas: 1.9.0
</span>7e12f2bace3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e12f2bace3ee89a9238d7a54153498605c539bc
</span>Author: i0ntempest <i0ntempest@i0ntempest.com>
AuthorDate: Sat Jan 4 16:39:25 2025 +0800
<span style='display:block; white-space:pre;color:#404040;'> mas: 1.9.0
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Script `generate_package_swift` must be run before building this version, for the new `config` verb.
</span>---
sysutils/mas/Portfile | 26 ++++++++++++++++----------
sysutils/mas/files/patch-fix-version.diff | 11 -----------
2 files changed, 16 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/mas/Portfile b/sysutils/mas/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0cf6298d206..1d094acc8d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/mas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/mas/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,9 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mas-cli mas 1.8.8 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mas-cli mas 1.9.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git-commit a5a928a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This line is for displaying commit in CLI only
</span> revision 0
categories sysutils
description Mac App Store command line interface
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,9 +16,12 @@ license MIT
</span> maintainers {kimuraw @kimuraw} \
{judaew @judaew} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 0eabeb59eca4eca7c423a76cc70983cd100e27dd0d1f0528e26a54f35053627f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0fbb2504c1364b6eeb53968a7aa60e3b69025521 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 351935
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 4b95333b1ebe252808b25bf9759088fab0fe293a47c223bc6f36548cf5c16d4b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 8e05896d6a6a1c85c1dc57e6bca7354aa3b5d5e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 351308
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_configure no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_xcode yes
</span>
# requirements:
# - mas: Xcode 11.4 or later
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -29,15 +34,16 @@ pre-fetch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-fix-version.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@@VERSION@@,${version},g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Sources/mas/Commands/Version.swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\$(script/version)|${version}|" ${worksrcpath}/script/generate_package_swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\${1:-unknown}|MacPorts|" ${worksrcpath}/script/generate_package_swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\$(git remote get-url origin)|${git.url}|" ${worksrcpath}/script/generate_package_swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|\$(git rev-parse HEAD)|${git-commit}|" ${worksrcpath}/script/generate_package_swift
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+pre-configure {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath} "./script/generate_package_swift"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
build.cmd swift
build.target build
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/mas/files/patch-fix-version.diff b/sysutils/mas/files/patch-fix-version.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 66b05e1aa23..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/mas/files/patch-fix-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Sources/mas/Commands/Version.swift.orig 2024-11-03 14:25:25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Sources/mas/Commands/Version.swift 2024-11-03 14:39:50
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /// Runs the command.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- func run() throws {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- print(Package.version)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print("@@VERSION@@")
</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;'>- }
</span></pre><pre style='margin:0'>
</pre>