<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/478bc669be0dfa467d25636f60d602bb2266fe88">https://github.com/macports/macports-ports/commit/478bc669be0dfa467d25636f60d602bb2266fe88</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 478bc669be0 misc ports: add missing braces around expressions
</span>478bc669be0 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 478bc669be0dfa467d25636f60d602bb2266fe88
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Jan 31 09:13:53 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> misc ports: add missing braces around expressions
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Expressions should be wrapped in braces to avoid double evaluation.
</span>---
aqua/FScript/Portfile | 6 +++---
audio/faust-devel/Portfile | 2 +-
audio/faust/Portfile | 2 +-
databases/mysql51/Portfile | 4 ++--
databases/oracle-instantclient/Portfile | 2 +-
devel/boost/Portfile | 2 +-
devel/boost169/Portfile | 2 +-
devel/git/Portfile | 2 +-
devel/jmeter/Portfile | 2 +-
devel/meson/Portfile | 2 +-
devel/xapian-core/Portfile | 2 +-
gis/grass7/Portfile | 2 +-
graphics/MoltenVK/Portfile | 4 ++--
graphics/unpaper/Portfile | 2 +-
java/maven2/Portfile | 2 +-
java/maven31/Portfile | 2 +-
java/maven32/Portfile | 2 +-
java/openjdk/Portfile | 8 ++++----
lang/libomp/Portfile | 2 +-
mail/libmilter/Portfile | 2 +-
math/imaxima/Portfile | 2 +-
math/taucs/Portfile | 2 +-
multimedia/mythtv.27/Portfile | 6 +++---
multimedia/mythtv.28/Portfile | 6 +++---
net/junkbuster/Portfile | 4 ++--
net/macos-vpn-server/Portfile | 2 +-
net/snort/Portfile | 2 +-
print/ghostscript/Portfile | 2 +-
python/py-pyphant/Portfile | 2 +-
python/py-scrapy/Portfile | 2 +-
python/py-service_identity/Portfile | 2 +-
science/geant4/Portfile | 4 ++--
science/hdf5/Portfile | 2 +-
science/plumed/Portfile | 2 +-
security/aide/Portfile | 2 +-
security/lastpass-cli/Portfile | 2 +-
security/ophcrack/Portfile | 2 +-
security/tor/Portfile | 2 +-
sysutils/collectd/Portfile | 2 +-
sysutils/lirc/Portfile | 2 +-
sysutils/logrotate/Portfile | 2 +-
tex/LaTeXML/Portfile | 4 ++--
tex/texlive-common/Portfile | 6 +++---
textproc/eb/Portfile | 2 +-
textproc/html-xml-utils/Portfile | 2 +-
textproc/stanford-corenlp/Portfile | 2 +-
www/duckytool/Portfile | 2 +-
www/privoxy/Portfile | 6 +++---
x11/auto-multiple-choice/Portfile | 4 ++--
49 files changed, 68 insertions(+), 68 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/aqua/FScript/Portfile b/aqua/FScript/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3fc98686e3b..573f360f8fc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/aqua/FScript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/aqua/FScript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ xcode.destroot.type ""
</span>
set is_xcode_4_x [expr [vercmp $xcodeversion 4] >= 0]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if !$is_xcode_4_x {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {!$is_xcode_4_x} {
</span> default_variants +ib_plugin
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,13 +96,13 @@ pre-build {
</span> }
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset ib_plugin] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset ib_plugin]} {
</span> set ibplugin_dir "${developer_dir}/Platforms/MacOSX.platform/Developer/Library/Interface Builder/Plug-ins"
xinstall -d -m 755 ${destroot}${ibplugin_dir}
file rename ${destroot}${applications_dir}/FScriptIBPlugin.ibplugin ${destroot}${ibplugin_dir}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset injection_service] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset injection_service]} {
</span> xinstall -d ${destroot}/Library/Services
file rename "${workpath}/F-ScriptInjectionService/Inject F-Script into application.workflow" ${destroot}/Library/Services/
reinplace "s|/Library/Frameworks|${frameworks_dir}|g" "${destroot}/Library/Services/Inject F-Script into application.workflow/Contents/document.wflow"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faust-devel/Portfile b/audio/faust-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 437097f8fb8..b2a4e2e5834 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faust-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faust-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,7 +71,7 @@ post-patch {
</span>
compiler.cxx_standard 2011
configure.cxxflags-append -std=gnu++11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span> configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/faust/Portfile b/audio/faust/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 98064515e6c..46b260f62db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/faust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/faust/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,7 +66,7 @@ post-patch {
</span>
compiler.cxx_standard 2011
configure.cxxflags-append -std=gnu++11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span> configure.cxxflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql51/Portfile b/databases/mysql51/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7090dd9c84..c8f24c1f384 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql51/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql51/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -162,12 +162,12 @@ if {${subport} eq ${name}} {
</span> variant openssl description {Enable OpenSSL support} {}
variant system_readline description {Use system readline instead of bundled readline} {}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset openssl] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset openssl]} {
</span> depends_lib-append path:lib/libssl.dylib:openssl
configure.args-delete --without-ssl
configure.args-append --with-ssl=${prefix}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset system_readline] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset system_readline]} {
</span> # "--without-readline" has the peculiar meaning "do not use the bundled copy
# of readline but use the system's (i.e. MacPorts') copy of readline"
depends_lib-append port:readline
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/oracle-instantclient/Portfile b/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f24625e2cf8..161404ae042 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/oracle-instantclient/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,7 +175,7 @@ build {
</span> # Then for each dependent dylib with a strange install_name that
# this dylib references, fix the reference to use ${lib_dir}.
foreach dep [exec otool -L ${lib}] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string match "$my_library_prefix(${my_arch})/*" ${dep}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match "$my_library_prefix(${my_arch})/*" ${dep}]} {
</span> system "install_name_tool -change ${dep} ${lib_dir}/[strsed ${dep} /^.*\\///] ${lib}"
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost/Portfile b/devel/boost/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e0e329b3ccf..5fccf3fd1af 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ depends_lib port:bzip2 \
</span>
post-extract {
fs-traverse dir ${workpath} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file isdirectory ${dir}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${dir}]} {
</span> file attributes ${dir} -permissions a+rx
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/boost169/Portfile b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4b6f041f596..1320d30201c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/boost169/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,7 @@ depends_lib port:zlib \
</span>
post-extract {
fs-traverse dir ${workpath} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file isdirectory ${dir}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${dir}]} {
</span> file attributes ${dir} -permissions a+rx
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/git/Portfile b/devel/git/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 88d979e38e4..57852235655 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/git/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,7 +170,7 @@ variant doc description {Install HTML and plaintext documentation} {
</span> }
fs-traverse f [list ${docdestroot}/howto ${docdestroot}/technical ${docdestroot}/RelNotes] {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file isdirectory ${f}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${f}]} {
</span> file attribute ${f} -permissions ugo+rx
} else {
file attribute ${f} -permissions ugo+r
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/jmeter/Portfile b/devel/jmeter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d38328f8210..08114adb3ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/jmeter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/jmeter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +50,7 @@ pre-destroot {
</span> delete {*}[glob -directory ${worksrcpath}/bin *.bat]
delete {*}[glob -directory ${worksrcpath}/bin *.cmd]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset launcher] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset launcher]} {
</span> copy ${filespath}/jmeter_launcher.sh ${worksrcpath}
reinplace "s|@@PREFIX@@|${prefix}|g" \
${worksrcpath}/jmeter_launcher.sh
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/meson/Portfile b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e44e4a05232..b95e1459862 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/meson/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ post-destroot {
</span> copy ${filespath}/cross ${destroot}${prefix}/share/meson/
fs-traverse f ${destroot}${prefix}/share/meson/cross/ {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file isdirectory ${f}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file isdirectory ${f}]} {
</span> reinplace "s|@@PREFIX@@|${prefix}|g" ${f}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/xapian-core/Portfile b/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 668f4fd7168..9a34c2f17cd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/xapian-core/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ subport xapian-omega {
</span> configure.args --with-iconv
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [string match {xapian-bindings-*} ${subport}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match {xapian-bindings-*} ${subport}]} {
</span> checksums rmd160 b9efdfd51eb2836fd942c10396f3afafe820e336 \
sha256 48a65d91e0c3a4a8f4a1ca05dc39225912088aca2c47c0048cc93b09d338ebd3 \
size 1135100
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gis/grass7/Portfile b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 146f612f779..f7aa2ee2d53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gis/grass7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ foreach pyver ${python_suffixes} {
</span> # Patches scripts to launch the selected Python version (fixes #59954)
post-patch {
foreach pyver ${python_suffixes} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset python${pyver}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset python${pyver}]} {
</span> set pyversion [string index ${pyver} 0].[string index ${pyver} 1]
set pybin ${prefix}/bin/python${pyversion}
fs-traverse f ${worksrcpath} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/MoltenVK/Portfile b/graphics/MoltenVK/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f4a97a894bb..c2e1c25a303 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/MoltenVK/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/MoltenVK/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -79,7 +79,7 @@ post-extract {
</span> set bad_submodule no
foreach {sub_author sub_project sub_commit sub_dest} ${submodules} {
set commit_file ${worksrcpath}/ExternalRevisions/${sub_project}_repo_revision
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${commit_file}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${commit_file}]} {
</span> set commit_re {^(\S+)}
} else {
set commit_file ${worksrcpath}/External/glslang/known_good.json
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,7 @@ post-extract {
</span> file mkdir [file dirname ${worksrcpath}/External/${sub_dest}]
ln -s {*}[glob ${workpath}/${sub_project}-*] ${worksrcpath}/External/${sub_dest}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${bad_submodule} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${bad_submodule}} {
</span> ui_error "The submodules should be:\n${submodules}"
return -code error "incorrect submodule commit"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/unpaper/Portfile b/graphics/unpaper/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8fe5bf263d0..a1cd10531a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/unpaper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/unpaper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +37,7 @@ use_autoreconf yes
</span>
configure.args --disable-silent-rules
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span> configure.cflags-append \
-flto
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/maven2/Portfile b/java/maven2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e5b45c61207..522e213a268 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/maven2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/maven2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ destroot {
</span>
# Fix permissions on shell scripts
foreach f { maven install_repo.sh } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${mavendir}/bin/$f] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${mavendir}/bin/$f]} {
</span> file attributes ${mavendir}/bin/$f -permissions +x
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/maven31/Portfile b/java/maven31/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 72c81e77b57..92f7d28d123 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/maven31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/maven31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -78,7 +78,7 @@ destroot {
</span>
# Fix permissions on shell scripts
foreach f { maven install_repo.sh } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${maven_path}/bin/$f] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${maven_path}/bin/$f]} {
</span> file attributes ${maven_path}/bin/$f -permissions +x
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/maven32/Portfile b/java/maven32/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 13296c7eb48..fdce2f2528c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/maven32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/maven32/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@ destroot {
</span>
# Fix permissions on shell scripts
foreach f { maven install_repo.sh } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${mavendir}/bin/$f] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${mavendir}/bin/$f]} {
</span> file attributes ${mavendir}/bin/$f -permissions +x
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/java/openjdk/Portfile b/java/openjdk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 788e4b11d2b..e97ef850d6f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/java/openjdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/java/openjdk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -340,21 +340,21 @@ if {${subport} eq "openjdk8"} {
</span> # Remove after 2021-11-28
PortGroup obsolete 1.0
replaced_by openjdk11
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif [string match *-graalvm ${subport}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[string match *-graalvm ${subport}]} {
</span> description GraalVM Community Edition based on OpenJDK ${major}
long_description ${long_description_graalvm}
master_sites https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/
distname graalvm-ce-java${major}-darwin-amd64-${version}
worksrcdir graalvm-ce-java${major}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif [string match *-openj9-large-heap ${subport}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[string match *-openj9-large-heap ${subport}]} {
</span> description Open Java Development Kit ${major} (AdoptOpenJDK) with Eclipse OpenJ9 VM for large heap sizes
long_description ${long_description_adoptopenjdk_openj9xl}
master_sites https://github.com/AdoptOpenJDK/openjdk${major}-binaries/releases/download/jdk-${version}%2B${build}_openj9-${openj9_version}/
distname OpenJDK${major}U-jdk_x64_mac_openj9_macosXL_${version}_${build}_openj9-${openj9_version}
worksrcdir jdk-${version}+${build}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif [string match *-openj9 ${subport}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {[string match *-openj9 ${subport}]} {
</span> description Open Java Development Kit ${major} (AdoptOpenJDK) with Eclipse OpenJ9 VM
long_description ${long_description_adoptopenjdk_openj9}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -370,7 +370,7 @@ if {${subport} eq "openjdk8"} {
</span> worksrcdir jdk-${version}+${build}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [string match *-graalvm ${subport}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *-graalvm ${subport}]} {
</span> homepage https://www.graalvm.org
} else {
homepage https://adoptopenjdk.net
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/libomp/Portfile b/lang/libomp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cf3b7fc5ebe..1c364191efe 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/libomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/libomp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -137,7 +137,7 @@ post-destroot {
</span> move ${instdest}/tmp/lib/${p} ${instdest}/lib/libomp/
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset top_level] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset top_level]} {
</span> system -W ${instdest}/include \
"ln -s libomp/omp.h"
foreach p {libiomp5.dylib libomp.dylib libgomp.dylib} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/mail/libmilter/Portfile b/mail/libmilter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8e80a48b8e8..379dd4f8904 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/mail/libmilter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/mail/libmilter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,7 +31,7 @@ worksrcdir sendmail-${version}
</span>
set arch_flags "${configure.cc_archflags}"
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${worksrcpath}/devtools/OS/Darwin.${os.major}.x] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${worksrcpath}/devtools/OS/Darwin.${os.major}.x]} {
</span> file copy ${worksrcpath}/devtools/OS/Darwin.${os.major}.x \
${worksrcpath}/devtools/Site/site.config.m4
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/imaxima/Portfile b/math/imaxima/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b7b9ffde504..1d2e49fe11f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/imaxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/imaxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +49,7 @@ post-destroot {
</span> }
delete ${destroot}${dir_info}/dir
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (![variant_isset emacs_app]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![variant_isset emacs_app]} {
</span> # port:maxima installs ${prefix}/share/info/imaxima.info
delete ${destroot}${dir_info}/imaxima.info
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/taucs/Portfile b/math/taucs/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fef2c3af475..be231856907 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/taucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/taucs/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,7 +39,7 @@ linalg.setup noveclibfort blas_only
</span>
post-extract {
fs-traverse item ${worksrcpath} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file isdirectory ${item}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${item}]} {
</span> file attributes ${item} -permissions a+rx
} else {
file attributes ${item} -permissions a+r
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mythtv.27/Portfile b/multimedia/mythtv.27/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 41948b52200..0586d22416b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mythtv.27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mythtv.27/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -170,12 +170,12 @@ subport mythtv-core${majorversion} {
</span> ${sedPath}/bindings/python/Makefile
reinplace -locale C "s|/usr/local|${prefix}|" ${worksrcpath}/mythtv/bindings/python/MythTV/static.py
fs-traverse f ${sedPath}/bindings/python/ {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string equal [ file extension ${f} ] ".py" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string equal [ file extension ${f} ] ".py" ]} {
</span> reinplace -locale C "s|^#! */usr/bin/env python\$|#!${pythonbin}|" ${f}
}
}
fs-traverse f ${sedPath}/programs/scripts/ {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string equal [ file extension ${f} ] ".py" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string equal [ file extension ${f} ] ".py" ]} {
</span> reinplace -locale C "s|^#! */usr/bin/env python\$|#!${pythonbin}|" ${f}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -439,7 +439,7 @@ subport mythtv-core${majorversion} {
</span> file copy ${destroot}logrotate.conf ${prefix}/etc/logrotate.conf
}
# delete leftover file, if any
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists /Library/LaunchDaemons/${plistfile}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /Library/LaunchDaemons/${plistfile}]} {
</span> file delete -force /Library/LaunchDaemons/${plistfile}
}
# The startupitem.install keyword does not exist in MacPorts < 2.1.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mythtv.28/Portfile b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a0a513364ff..f2a776ad365 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mythtv.28/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -186,12 +186,12 @@ if {$subport eq "mythtv-core${majorversion}"} {
</span> ${sedPath}/bindings/python/Makefile
reinplace -locale C "s|/usr/local|${prefix}|" ${worksrcpath}/mythtv/bindings/python/MythTV/static.py
fs-traverse f ${sedPath}/bindings/python/ {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string equal [ file extension ${f} ] ".py" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string equal [ file extension ${f} ] ".py" ]} {
</span> reinplace {*}$qflag -locale C "s|^#! */usr/bin/env python\$|#!${pythonbin}|" ${f}
}
}
fs-traverse f ${sedPath}/programs/scripts/ {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string equal [ file extension ${f} ] ".py" ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string equal [ file extension ${f} ] ".py" ]} {
</span> reinplace {*}$qflag -locale C "s|^#! */usr/bin/env python\$|#!${pythonbin}|" ${f}
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -487,7 +487,7 @@ if {$subport eq "mythtv-core${majorversion}"} {
</span> file copy ${destroot}logrotate.conf ${prefix}/etc/logrotate.conf
}
# delete leftover file, if any
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists /Library/LaunchDaemons/${plistfile}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists /Library/LaunchDaemons/${plistfile}]} {
</span> file delete -force /Library/LaunchDaemons/${plistfile}
}
# If "startupitem.install" is set to "no" in macports.conf then do not link.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/junkbuster/Portfile b/net/junkbuster/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a7d28c02f54..7b2670b37b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/junkbuster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/junkbuster/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -98,13 +98,13 @@ destroot {
</span>
post-activate {
# Make sure initial log file is present
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${prefix}/var/log/junkbuster.log] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/var/log/junkbuster.log]} {
</span> xinstall -m 0644 -o nobody -g nobody /dev/null \
${prefix}/var/log/junkbuster.log
}
# Make sure initial config files are present
foreach conf {configfile blockfile cookiefile} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${prefix}/etc/junkbuster/${conf}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/junkbuster/${conf}]} {
</span> xinstall -m 0644 ${prefix}/etc/junkbuster/${conf}.sample \
${prefix}/etc/junkbuster/${conf}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/macos-vpn-server/Portfile b/net/macos-vpn-server/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 996fbbcd7b0..0b64146069b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/macos-vpn-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/macos-vpn-server/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -74,7 +74,7 @@ set vpn_network 10.0.1.
</span>
post-activate {
# copy to actual config file if it doesn't already exist
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${SystemConfigurationPath}/com.apple.RemoteAccessServers.plist] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${SystemConfigurationPath}/com.apple.RemoteAccessServers.plist]} {
</span> xinstall -m 0644 ${sharePath}${SystemConfigurationPath}/com.apple.RemoteAccessServers.plist.macports \
${SystemConfigurationPath}/com.apple.RemoteAccessServers.plist
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/snort/Portfile b/net/snort/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index e38e3db3047..eae6825a923 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/snort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/snort/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,7 +104,7 @@ post-destroot {
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${prefix}/etc/snort/snort.conf ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/snort/snort.conf ]} {
</span> copy ${prefix}/share/examples/${name}/snort.conf.dist ${prefix}/etc/snort/snort.conf
system "touch ${prefix}/etc/snort/rules/local.rules"
system "touch ${prefix}/etc/snort/white_list.rules"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/print/ghostscript/Portfile b/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6cc71d2bd22..cd34fb4efec 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/print/ghostscript/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ post-patch {
</span>
# Ensure that MacPorts perl is used everywhere
fs-traverse f ${worksrcpath} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string match *.pl ${f}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match *.pl ${f}]} {
</span> reinplace s|/usr/bin/perl|${prefix}/bin/perl| ${f}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyphant/Portfile b/python/py-pyphant/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3b46c3719b5..67cb0c061c2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyphant/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyphant/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,7 +51,7 @@ python.versions 27
</span> if {${name} ne ${subport}} {
depends_build-append port:py${python.version}-setuptools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [string match {py??-pyphant-*} ${subport}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string match {py??-pyphant-*} ${subport}]} {
</span> depends_lib-append port:py${python.version}-pyphant
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-scrapy/Portfile b/python/py-scrapy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4092af238aa..2eccf33b3a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-scrapy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-scrapy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -54,7 +54,7 @@ if {${name} ne ${subport}} {
</span> # 5) py.test-version -vvv
# 6) Ctrl-C and it should start - there will be a lot of failures
# 7) Alternatively, run some basic commands using py-scrapy
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if 0 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {0} {
</span> depends_test-append \
port:py${python.version}-pytest \
port:py${python.version}-pytest-asyncio \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-service_identity/Portfile b/python/py-service_identity/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c9210adebe4..29557ef90fb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-service_identity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-service_identity/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,7 +44,7 @@ if {${name} ne ${subport}} {
</span> }
# Appears tests were removed in 17.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if 0 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {0} {
</span> depends_test-append port:py${python.version}-pytest
test.run yes
test.cmd py.test-${python.branch}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/geant4/Portfile b/science/geant4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 006fd0c15cc..bea24dcce25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/geant4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/geant4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -341,12 +341,12 @@ foreach {geant.version geant.revision geant.datarevision geant.patchlevel geant.
</span> post-destroot {
# two examples with some broken links
foreach example {exampleP01 exampleP02 readHits} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${destroot}${prefix}/bin/${example}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/bin/${example}]} {
</span> delete ${destroot}${prefix}/bin/${example}
}
}
# there is no option to build/install the examples elsewhere, so we move them to libexec (they have nothing to do in bin)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${destroot}${prefix}/bin] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/bin]} {
</span> move ${destroot}${prefix}/bin ${destroot}${prefix}/libexec/Geant4/Geant${geant.version_simple}/examples
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/hdf5/Portfile b/science/hdf5/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d40f8cdf89e..ed8a591bf03 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/hdf5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/hdf5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -87,7 +87,7 @@ post-configure {
</span> ${dir}/c++/src/h5c++ \
${dir}/src/libhdf5.settings \
${dir}/fortran/src/h5fc
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${configure.ccache} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.ccache}} {
</span> reinplace -W ${dir} {s|ccache ||} bin/h5cc c++/src/h5c++
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/plumed/Portfile b/science/plumed/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f9090824b86..be5518368aa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/plumed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/plumed/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,7 +97,7 @@ depends_lib-append port:gawk \
</span> # C++ library
# Required in order to use clang with gcc library on old OSX versions.
# See https://github.com/macports/macports-ports/pull/1254
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span> configure.ldflags-append -stdlib=${configure.cxx_stdlib}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/aide/Portfile b/security/aide/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index b21ca623081..739c45f5976 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/aide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/aide/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ post-destroot {
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${prefix}/etc/aide/aide.conf ] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/aide/aide.conf ]} {
</span> copy ${prefix}/share/examples/${name}/aide.conf ${prefix}/etc/aide/aide.conf
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/lastpass-cli/Portfile b/security/lastpass-cli/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7108f95fbcd..80fef0faf24 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/lastpass-cli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/lastpass-cli/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -48,7 +48,7 @@ subport ${name}-doc {
</span> }
# not ready to be used for casual use
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if 0 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {0} {
</span> pre-test {
reinplace "s|lpass|${cmake.build_dir}/lpass|g" ${worksrcpath}/test/tests
reinplace "s|lpass |${cmake.build_dir}/lpass |g" ${worksrcpath}/test/include.sh
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/ophcrack/Portfile b/security/ophcrack/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 097d28acaf9..e3c99ec5917 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/ophcrack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/ophcrack/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ post-extract {
</span> if {[variant_isset tables]} {
set tables_dir ${destroot}${prefix}/share/${name}/tables
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${hasMoreThan512MBofRAM} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${hasMoreThan512MBofRAM}} {
</span> xinstall -m 755 -d ${tables_dir}/xp_free_fast
system "unzip ${distpath}/tables_xp_free_fast.zip -d ${tables_dir}/xp_free_fast"
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/tor/Portfile b/security/tor/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de9b53a48a3..2e1d9a2f6d6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/tor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/tor/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ PidFile ${prefix}/var/run/tor/tor.pid
</span> User ${torUser}
LOCAL_TOR_CONFIGURATION"
# save the existing config if it exists
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${prefix}/etc/tor/torrc] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/etc/tor/torrc]} {
</span> file rename ${prefix}/etc/tor/torrc \
${prefix}/etc/tor/torrc.previous
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/collectd/Portfile b/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6c8d122376a..e00dee59858 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/collectd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,7 +35,7 @@ depends_build port:pkgconfig
</span> # collectd uses -Werror in their CFLAGS, which turns warnings into errors.
# Some of these are not fixable and thus need to be suppressed when clang
# is used.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if [string match *clang* ${configure.compiler}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[string match *clang* ${configure.compiler}]} {
</span> # Do not error out on unused command-line arguments
configure.cflags-append -Qunused-arguments
# Do not error out on use of IN6_IS_ADDR_MULTICAST()
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/lirc/Portfile b/sysutils/lirc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 784d2c31d3b..edbd35c3704 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/lirc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/lirc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -96,7 +96,7 @@ post-destroot {
</span> }
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${prefix}/etc/lirc/lirc_options.conf] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/lirc/lirc_options.conf]} {
</span> copy ${prefix}/etc/lirc/lirc_options.conf.template \
${prefix}/etc/lirc/lirc_options.conf
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/logrotate/Portfile b/sysutils/logrotate/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7b7f42e5c12..39de717f9fa 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/logrotate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/logrotate/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +86,7 @@ post-destroot {
</span>
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${prefix}/etc/logrotate.conf] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/logrotate.conf]} {
</span>
copy ${prefix}/share/${name}/logrotate.conf.example ${prefix}/etc/logrotate.conf
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/LaTeXML/Portfile b/tex/LaTeXML/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d54ce6baa8e..243e02ae699 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/LaTeXML/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/LaTeXML/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -83,7 +83,7 @@ post-destroot {
</span>
# Note whether we've found a TeX
post-activate {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file executable ${prefix}/bin/mktexlsr] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file executable ${prefix}/bin/mktexlsr]} {
</span> set latexml.found_tex yes
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -99,7 +99,7 @@ set latexml.mactex_candidates { \
</span> variant mactex description {Build with MacTeX support} {
# First, check if MacTeX actually seems to be there...
foreach dir ${latexml.mactex_candidates} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file executable "${dir}/kpsewhich"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file executable "${dir}/kpsewhich"]} {
</span> set latexml.mactex_bin ${dir}
break
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/tex/texlive-common/Portfile b/tex/texlive-common/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7efa7eaa3e3..f97dd3d44c9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/tex/texlive-common/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/tex/texlive-common/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -115,14 +115,14 @@ destroot {
</span> pre-activate {
# Delete ls-R index file if it exists
foreach texmfdir $texmfdirs {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${texmfdir}/ls-R] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${texmfdir}/ls-R]} {
</span> delete ${texmfdir}/ls-R
}
}
# An earlier version forgot to register language.def to this port,
# so delete it if it exists to prevent a conflict
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${texlive_texmfsysvar}/tex/generic/config/language.def] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${texlive_texmfsysvar}/tex/generic/config/language.def]} {
</span> delete ${texlive_texmfsysvar}/tex/generic/config/language.def
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +140,7 @@ post-activate {
</span> #
# Note that this could fail if mktexlsr is installed but broken
# during an upgrade, but that's ok (see #48358)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${prefix}/bin/mktexlsr] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/bin/mktexlsr]} {
</span> catch {texlive.mktexlsr}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/eb/Portfile b/textproc/eb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8bbc2fdead2..cc335fde41b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/eb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/eb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,7 +100,7 @@ post-destroot {
</span>
xinstall -d -m 755 ${destroot}${prefix}/share/dict/appendix
foreach f ${distfiles} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ([regexp "^(\[^:\]+):appendix$" ${f} m n]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[regexp "^(\[^:\]+):appendix$" ${f} m n]} {
</span> system "gunzip -dc ${distpath}/${n} | tar -xf - -C ${destroot}${prefix}/share/dict/appendix"
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/html-xml-utils/Portfile b/textproc/html-xml-utils/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c538100ad1d..fc357bcf157 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/html-xml-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/html-xml-utils/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,7 @@ post-destroot {
</span> # For backwards compatibility, restore the program prefix that was used in
# earlier versions of this port
fs-traverse f "${destroot}${prefix}/bin ${destroot}${prefix}/share/man" {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file isfile $f] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isfile $f]} {
</span> ln -s [file tail $f] [file dirname $f]/w3[file tail $f]
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/stanford-corenlp/Portfile b/textproc/stanford-corenlp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index a4892848278..5b822b3b0fd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/stanford-corenlp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/stanford-corenlp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,7 +85,7 @@ if { ${name} eq ${subport} } {
</span> }
proc xinstall_recursive_dir {srcbase destbase reldir} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file isdirectory ${srcbase}/${reldir}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file isdirectory ${srcbase}/${reldir}]} {
</span> xinstall -d \
${destbase}/${reldir}
fs-traverse f_or_d ${srcbase}/${reldir} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/duckytool/Portfile b/www/duckytool/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index c85ef2c7090..46c37dc70ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/duckytool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/duckytool/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ post-destroot {
</span> xinstall -d -m 0755 ${destroot}${prefix}/share/doc/${name}
xinstall -m 0644 ${worksrcpath}/README ${destroot}${prefix}/share/doc/${name}/README
xinstall -m 0755 ${worksrcpath}/ducky.py ${destroot}${prefix}/bin/
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [variant_isset links] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset links]} {
</span> system "cd '${worksrcpath}' && make links"
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/privoxy/Portfile b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bea2b5e177f..167612ab8bf 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/privoxy/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -80,7 +80,7 @@ post-destroot {
</span> # Rename these so local modifications are not removed on uninstall.
# NOTE: Always overwrite default.action and default.filter.
foreach privoxyConf {config match-all.action trust user.action user.filter} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${destroot}${prefix}/etc/privoxy/${privoxyConf}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${destroot}${prefix}/etc/privoxy/${privoxyConf}]} {
</span> file rename ${destroot}${prefix}/etc/privoxy/${privoxyConf} \
${destroot}${prefix}/etc/privoxy/${privoxyConf}.new
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -114,9 +114,9 @@ post-activate {
</span> }
}
foreach privoxyConf {config match-all.action trust user.action user.filter} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if ![file exists ${prefix}/etc/privoxy/${privoxyConf}] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![file exists ${prefix}/etc/privoxy/${privoxyConf}]} {
</span> # restore config files before fix #23970
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists ${prefix}/etc/privoxy/${privoxyConf}.mp_backup] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists ${prefix}/etc/privoxy/${privoxyConf}.mp_backup]} {
</span> file copy ${prefix}/etc/privoxy/${privoxyConf}.mp_backup \
${prefix}/etc/privoxy/${privoxyConf}
} else {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/auto-multiple-choice/Portfile b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 835186fd7dc..27a3a43390a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/auto-multiple-choice/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -133,7 +133,7 @@ instead of Macports texlive tools. To install the mactex variant \
</span> "/usr/texbin" \
}
foreach dir ${amc.mactex_candidates} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file executable "${dir}/kpsewhich"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file executable "${dir}/kpsewhich"]} {
</span> set amc.mactex_bin ${dir}
break
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -168,7 +168,7 @@ proc amc.mktexlsr {} {
</span> } else {
global amc.mactex_bin
system "${amc.mactex_bin}/mktexlsr"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if [file exists "${amc.mactex_bin}/mtxrun"] {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file exists "${amc.mactex_bin}/mtxrun"]} {
</span> system "${amc.mactex_bin}/mtxrun --generate"
}
}
</pre><pre style='margin:0'>
</pre>