<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/15c29002e5dbb7c70d3a01cde996188c078fae88">https://github.com/macports/macports-ports/commit/15c29002e5dbb7c70d3a01cde996188c078fae88</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 15c29002e5d MacPorts port: update to 2.8.0-beta1
</span>15c29002e5d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 15c29002e5dbb7c70d3a01cde996188c078fae88
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Oct 2 00:14:28 2022 +1000
<span style='display:block; white-space:pre;color:#404040;'> MacPorts port: update to 2.8.0-beta1
</span>---
sysutils/MacPorts/Portfile | 21 +++++++++++++--------
sysutils/MacPorts/files/tclsh.patch | 11 +++++++++++
2 files changed, 24 insertions(+), 8 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/MacPorts/Portfile b/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b5d900d6ee8..6c305483d09 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/MacPorts/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup macports macports-base 2.7.2 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup macports macports-base 2.8.0-beta1 v
</span> name MacPorts
categories sysutils macports
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,15 +17,15 @@ long_description \
</span> notes "This port cannot directly be used to upgrade MacPorts; use 'port\
selfupdate' for that."
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.macports.org
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://www.macports.org/
</span> distname ${name}-${version}
github.tarball_from releases
# testing subdir is for non-final releases only
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#dist_subdir ${name}/testing
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir ${name}/testing
</span> use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 e679490431b2cd9d2cd661181d37da9962b126d5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1c7ddb4ef819d3fdfcbb73a4ba44f7f6125cd0b764d663f097a7f834baac40f2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f03c83e56f8d4b066b71197f7b6fe6bb347bba85 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 a9d776b0f1a90058ee95cf19e31216c29b14d1e990bd0b10a3eeff8dbe77930c
</span>
variant keep_prefix description "Use configured prefix instead of enforcing /opt/local" {}
if {![variant_isset keep_prefix]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -180,7 +180,9 @@ platform darwin {
</span> # Notarization requires static libs to be signed, but
# codesign(1) doesn't seem to be able to sign them properly.
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/libexec/macports/lib/libtclstub8.5.a
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete {*}[glob ${destroot}${prefix}/libexec/macports/lib/libtclstub*.a] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${destroot}${prefix}/libexec/macports/lib/tdbc*/libtdbcstub*.a] \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {*}[glob ${destroot}${prefix}/libexec/macports/lib/itcl*/libitclstub*.a]
</span> }
} elseif {${os.major} >= 11} {
# Lion through Catalina only run on x86_64.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -193,7 +195,10 @@ platform darwin {
</span> }
# FIXME: "error: The specified item could not be found in the keychain."
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #if {${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 18} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Workaround: in-tree tclsh can't be used to install tcllib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # when it has been signed (ignores DYLD_* vars).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append tclsh.patch
</span> # post-build {
# if {[getuid] == 0 && [info exists sudo_user]} {
# set codesign_cmd "/usr/bin/env SUDO_USER=${sudo_user} HOME=/Users/${sudo_user} ${build.cmd} codesign"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -202,7 +207,7 @@ platform darwin {
</span> # }
# system -W ${worksrcpath} ${codesign_cmd}
# }
<span style='display:block; white-space:pre;background:#ffe0e0;'>- #}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
destroot.violate_mtree yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/MacPorts/files/tclsh.patch b/sysutils/MacPorts/files/tclsh.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..5d6c4110cb7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/MacPorts/files/tclsh.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- vendor/Makefile.in.orig 2022-10-01 14:45:32.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ vendor/Makefile.in 2022-10-01 20:05:23.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -78,7 +78,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ install-tcllib:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -rf $(DESTDIR)$(TCL_PACKAGE_PATH)/tcllib1.1{5,7,8}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @echo ===\> making $(@:%-tcllib=%) in ${DIRPRFX}@VENDOR_TCLLIB_SUBDIR@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- @umask 0022; $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ TCLSH_PROG=@INTREE_TCLSH@ @VENDOR_TCLLIB_INSTALL@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ @umask 0022; $(MAKE) -C @VENDOR_TCLLIB_SUBDIR@ TCLSH_PROG=/usr/bin/tclsh @VENDOR_TCLLIB_INSTALL@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @chmod -R ugo+rX $(DESTDIR)${PREFIX}/libexec/macports/lib/tcllib*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test:
</span></pre><pre style='margin:0'>
</pre>