<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6016c62d9a53b5dfd312b1f00c762a4fa5fcb9b5">https://github.com/macports/macports-ports/commit/6016c62d9a53b5dfd312b1f00c762a4fa5fcb9b5</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 6016c62d9a5 Remove nonstandard spaces within square brackets
</span>6016c62d9a5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6016c62d9a53b5dfd312b1f00c762a4fa5fcb9b5
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Jul 7 20:47:31 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> Remove nonstandard spaces within square brackets
</span>---
_resources/port1.0/group/apache2-1.0.tcl | 6 +++---
_resources/port1.0/group/gnustep-1.0.tcl | 2 +-
_resources/port1.0/group/mpi-1.0.tcl | 2 +-
_resources/port1.0/group/muniversal-1.0.tcl | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/apache2-1.0.tcl b/_resources/port1.0/group/apache2-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index bbbf25969ba..a6e13458c68 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/apache2-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/apache2-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,14 +127,14 @@ proc apxsInstall { moduleName activate dylibs } {
</span> mods-available mods-enabled
# strip pre-/suffix from moduleName
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set moduleName [regsub {_module} ${moduleName} "" ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set moduleName [regsub {mod_} ${moduleName} "" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set moduleName [regsub {_module} ${moduleName} ""]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set moduleName [regsub {mod_} ${moduleName} ""]
</span>
set loadFileName ${apache2.sysconfdir}/mods-available/${moduleName}.load
set loadFile [open ${loadFileName} w 644]
foreach libName ${dylibs} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set dylibFile [ exec find ${prefix}/lib -type f -iname "lib${libName}*.dylib" ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set dylibFile [exec find ${prefix}/lib -type f -iname "lib${libName}*.dylib"]
</span> puts ${loadFile} "LoadFile ${dylibFile}"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gnustep-1.0.tcl b/_resources/port1.0/group/gnustep-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index fe80800531a..694ae493753 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gnustep-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gnustep-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ array set gnustep.post_flags {}
</span>
post-patch {
foreach {src_subdir post_libs} [array get gnustep.post_flags] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set fl [ open ${worksrcpath}/$src_subdir/GNUmakefile.preamble a ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set fl [open ${worksrcpath}/$src_subdir/GNUmakefile.preamble a]
</span> puts $fl "\nSHARED_LD_POSTFLAGS += $post_libs"
close $fl
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/mpi-1.0.tcl b/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 7dd37721ae4..0d370c8ba12 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/mpi-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -330,7 +330,7 @@ proc mpi.setup {args} {
</span>
mpi.setup_variants ${mpi.variants}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set mpi [ mpi_variant_name ]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set mpi [mpi_variant_name]
</span> if {$mpi ne ""} {
set fv [fortran_variant_name]
set cv "[c_variant_name] $fv"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/muniversal-1.0.tcl b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 953c0ee7fdb..c6cfd342021 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/muniversal-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -750,7 +750,7 @@ variant universal {
</span> if { ! [catch {system "test `head -c2 ${dir1}/${fl}` == '#!'"}] } {
# Shell script, hopefully striping out arch flags works...
mergeStripArchFlags ${dir1} ${dir2} ${dir} ${fl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"} ] } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif { ! [catch {system "/usr/bin/diff -dw ${diffFormat} \"${dir1}/${fl}\" \"${dir2}/${fl}\" > \"${dir}/${fl}\"; test \$? -le 1"}] } {
</span> # diff worked
ui_debug "universal: merge: used diff to create ${prefixDir}/${fl}"
} else {
</pre><pre style='margin:0'>
</pre>