<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/f75169c5b2a9090ef39e9d20e85e98d10e06b55b">https://github.com/macports/macports-ports/commit/f75169c5b2a9090ef39e9d20e85e98d10e06b55b</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 f75169c5b2a mas: Update to 1.8.2 (#11566)
</span>f75169c5b2a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f75169c5b2a9090ef39e9d20e85e98d10e06b55b
</span>Author: Vadim-Valdis Yudaev <judaew@outlook.de>
AuthorDate: Wed Jul 14 06:43:20 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> mas: Update to 1.8.2 (#11566)
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closed: https://trac.macports.org/ticket/63005
</span>---
sysutils/mas/Portfile | 62 +++++++++++++++----------------
sysutils/mas/files/patch-fix-version.diff | 11 ++++++
2 files changed, 41 insertions(+), 32 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 ce1d8ed880c..eb62e0922ef 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;'>@@ -1,10 +1,9 @@
</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 xcode 1.0
</span> PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup mas-cli mas 1.8.1 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup mas-cli mas 1.8.2 v
</span> revision 0
categories sysutils
description Mac App Store command line interface
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,17 +11,16 @@ long_description A simple command line interface for the Mac App Store. \
</span> Designed for scripting and automation.
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers {kimuraw @kimuraw} openmaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers {kimuraw @kimuraw} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {outlook.de:judaew @judaew} openmaintainer
</span> platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:carthage
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 3848dc246217338899981072c4c2ece2e98fd415c160adec1f4c4f826178ac5f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f5db73445c37aee6e723953b2f9564e5f097aa72 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3333823
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 e8e6495d07de2768d00a00fd8852415ee6089662a668d95411b55916c6932c15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 57a1a6ae54b47ec58510f7ee06615954a6ed6fad \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 402897
</span>
# requirements:
# - mas: Xcode 11.4 or later
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# - carthage: Xcode 10 or later (0.34.x)
</span> set xcodeversion_min_required 11.4
pre-fetch {
if {[vercmp ${xcodeversion} ${xcodeversion_min_required}] < 0} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,33 +30,33 @@ pre-fetch {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.project mas-cli.xcodeproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.configuration Release
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.scheme "mas-cli Release"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.destroot.type none
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# CODE_SIGN_IDENTITY: disable codesign
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# LD_RUNPATH_SEARCH_PATHS: override "/usr/local/Frameworks ..." in xcodeproj
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xcode.build.settings CODE_SIGN_IDENTITY= \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DSTROOT=${worksrcpath}/dst \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD_RUNPATH_SEARCH_PATHS='@executable_path/../Library/Frameworks @executable_path/../Library/Frameworks/MasKit.framework/Versions/A/Frameworks/'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix "IDELogStore: Failed to open log store".
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# xcodebuild's `-derivedDataPath` does not solve this error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.pre_args -IDECustomDerivedDataLocation=${worksrcpath}/DerivedData
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-version.diff
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-pre-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "${prefix}/bin/carthage build --platform macOS --cache-builds --configuration Release --derived-data ${worksrcpath}/DerivedData"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s,@@VERSION@@,${version},g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/Sources/MasKit/Commands/Version.swift
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # bin/mas
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${worksrcpath} dst/bin/mas ${destroot}${prefix}/bin
</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>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Library/Frameworks/MasKit.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/build/Release/MasKit.framework ${destroot}${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.cmd swift
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.target build
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args --configuration release \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --arch ${configure.build_arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-sandbox
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # other resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -W ${worksrcpath} README.md LICENSE \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHANGELOG-old.md CODE_OF_CONDUCT.md CONTRIBUTING.md \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/.build/${configure.build_arch}-apple-macosx/release/${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/bin/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set bash_complete ${prefix}/share/bash-completion/completions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${bash_complete}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/contrib/completion/mas-completion.bash \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${bash_complete}/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fish_complete ${prefix}/share/fish/vendor_completions.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -d ${destroot}${fish_complete}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/contrib/completion/mas.fish \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${bash_complete}/${name}.fish
</span> }
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..48a8e589007
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/mas/files/patch-fix-version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Sources/MasKit/Commands/Version.swift.orig 2021-07-11 15:08:53.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Sources/MasKit/Commands/Version.swift 2021-07-11 15:09:04.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18,7 +18,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /// Runs the command.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ public func run(_: Options) -> Result<Void, MASError> {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- print(Package.Version)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ print("@@VERSION@@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return .success(())
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span></pre><pre style='margin:0'>
</pre>