<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/25e79bc1c42b2099f497f8fdc6efdfaa8835be62">https://github.com/macports/macports-ports/commit/25e79bc1c42b2099f497f8fdc6efdfaa8835be62</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 25e79bc1c42b2099f497f8fdc6efdfaa8835be62
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Thu Mar 4 07:14:36 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> portgroups: use eq/ne for string comparisons
</span>---
_resources/port1.0/group/apache2-1.0.tcl | 2 +-
_resources/port1.0/group/app-1.0.tcl | 30 +++++++++++-----------
_resources/port1.0/group/archcheck-1.0.tcl | 6 ++---
_resources/port1.0/group/cmake-1.0.tcl | 2 +-
_resources/port1.0/group/cmake-1.1.tcl | 2 +-
_resources/port1.0/group/conflicts_build-1.0.tcl | 2 +-
_resources/port1.0/group/developerversion-1.0.tcl | 4 +--
.../port1.0/group/gobject_introspection-1.0.tcl | 2 +-
_resources/port1.0/group/gpg_verify-1.0.tcl | 2 +-
_resources/port1.0/group/ocaml-1.0.tcl | 4 +--
_resources/port1.0/group/ruby-1.0.tcl | 4 +--
_resources/port1.0/group/texlive-1.0.tcl | 28 ++++++++++----------
_resources/port1.0/group/xcodeversion-1.0.tcl | 2 +-
_resources/port1.0/group/xmlcatalog-1.0.tcl | 12 ++++-----
14 files changed, 51 insertions(+), 51 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 a6e13458c68..ffe5ab3e825 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;'>@@ -142,7 +142,7 @@ proc apxsInstall { moduleName activate dylibs } {
</span>
close ${loadFile}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${activate} == "yes" } {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${activate}} {
</span> exec "${apache2.sbindir}/a2enmod" ${moduleName}
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/app-1.0.tcl b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a6caeedebc3..b8fd3683a64 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/app-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,12 +104,12 @@ default app.identifier {[app.get_default_identifier]}
</span> proc app.get_default_identifier {} {
global app.name homepage
set identifier [split [lindex [split ${homepage} "/"] 2] .]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lindex ${identifier} 0] == "www"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lindex ${identifier} 0] eq "www"} {
</span> set identifier [lrange ${identifier} 1 end]
}
set identifier [lreverse ${identifier}]
set identifier [concat ${identifier} [lrange [split ${homepage} "/"] 3 end]]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[lindex ${identifier} end] == ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[lindex ${identifier} end] eq ""} {
</span> set identifier [lrange ${identifier} 0 end-1]
}
lappend identifier [string map {"." ""} ${app.name}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -253,10 +253,10 @@ platform macosx {
</span> return -code error "app.identifier ${app.identifier} does not look like a valid CFBundleIdentifier"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${app.icon} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${app.icon} ne ""} {
</span> # Turn relative app.icon paths into absolute ones.
set icon ${app.icon}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string index ${icon} 0] != "/"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string index ${icon} 0] ne "/"} {
</span> set icon ${worksrcpath}/${icon}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -266,11 +266,11 @@ platform macosx {
</span> }
# If app.icon is an .icns file, copy it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[file extension ${icon}] == ".icns"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[file extension ${icon}] eq ".icns"} {
</span> xinstall -m 0644 ${icon} ${destroot}${applications_dir}/${app.name}.app/Contents/Resources/${app.name}.icns
# If app.icon is svg, rasterize and convert it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {[file extension ${icon}] == ".svg"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {[file extension ${icon}] eq ".svg"} {
</span> set makeicnsargs {}
foreach w {16 32 128 256 512} {
lappend makeicnsargs -$w ${worksrcpath}/${w}.png
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -293,7 +293,7 @@ platform macosx {
</span>
# Turn relative app.executable paths into absolute ones.
set executable ${app.executable}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string index ${executable} 0] != "/"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string index ${executable} 0] ne "/"} {
</span> set executable ${prefix}/bin/${executable}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -337,7 +337,7 @@ platform macosx {
</span> <string>English</string>
<key>CFBundleExecutable</key>
<string>${app.name}</string>"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${app.icon} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${app.icon} ne ""} {
</span> puts ${fp} " <key>CFBundleIconFile</key>
<string>${app.name}.icns</string>"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -349,23 +349,23 @@ platform macosx {
</span> puts ${fp} " <key>NSRequiresAquaSystemAppearance</key>
<true/>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${app.privacy_microphone} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${app.privacy_microphone} ne ""} {
</span> puts ${fp} " <key>NSMicrophoneUsageDescription</key>
<string>${app.privacy_microphone}</string>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${app.privacy_camera} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${app.privacy_camera} ne ""} {
</span> puts ${fp} " <key>NSCameraUsageDescription</key>
<string>${app.privacy_camera}</string>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${app.privacy_contacts} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${app.privacy_contacts} ne ""} {
</span> puts ${fp} " <key>NSContactsUsageDescription</key>
<string>${app.privacy_contacts}</string>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${app.privacy_calendars} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${app.privacy_calendars} ne ""} {
</span> puts ${fp} " <key>NSCalendarsUsageDescription</key>
<string>${app.privacy_calendars}</string>"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${app.privacy_photo} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${app.privacy_photo} ne ""} {
</span> puts ${fp} " <key>NSPhotoLibraryUsageDescription</key>
<string>${app.privacy_photo}</string>"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -406,12 +406,12 @@ trace variable app.icon w app._icon_trace
</span> proc app._icon_trace {optionName unusedIndex unusedOperation} {
global depends_build
upvar ${optionName} option
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set needs_dep [expr {[file extension ${option}] != ".icns"}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set needs_dep [expr {[file extension ${option}] ne ".icns"}]
</span> if {${needs_dep}} {
depends_build-delete port:makeicns
depends_build-append port:makeicns
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set needs_dep [expr {[file extension ${option}] == ".svg"}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set needs_dep [expr {[file extension ${option}] eq ".svg"}]
</span> if {${needs_dep}} {
depends_build-delete port:librsvg
depends_build-append port:librsvg
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/archcheck-1.0.tcl b/_resources/port1.0/group/archcheck-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index e73f23b1fa6..52d14470126 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/archcheck-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/archcheck-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,7 +24,7 @@ pre-configure {
</span> }
foreach file ${archcheck.files} {
# Prepend prefix if necessary.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {"/" != [string index ${file} 0]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {"/" ne [string index ${file} 0]} {
</span> set file [file join ${prefix} ${file}]
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -67,7 +67,7 @@ pre-configure {
</span> # Dependency is not universal?
if {1 == [llength ${file_archs}]} {
# Trying to install this port either universal or for non-default arch?
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {([variant_exists universal] && [variant_isset universal]) || (${build_arch} != ${configure.build_arch})} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {([variant_exists universal] && [variant_isset universal]) || (${build_arch} ne ${configure.build_arch})} {
</span> ui_error ""
ui_error "Try rebuilding ${dependency} (and all its dependencies) with"
ui_error "the +universal variant by running"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,7 +76,7 @@ pre-configure {
</span> ui_error ""
# Dependency's arch is not the default arch? User has likely upgraded
# from Leopard to Snow Leopard and has not reinstalled all ports.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${file_archs} != ${build_arch}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${file_archs} ne ${build_arch}} {
</span> ui_error ""
ui_error "Did you upgrade to a new version of macOS? If so, please see"
ui_error ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cmake-1.0.tcl b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 016b3577c91..3b045063fa0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -140,7 +140,7 @@ platform darwin {
</span>
configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span> configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
} else {
configure.args-append -DCMAKE_OSX_SYSROOT="/"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/cmake-1.1.tcl b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index a5bda75aecd..60ff0257bc1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/cmake-1.1.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -432,7 +432,7 @@ platform darwin {
</span>
configure.args-append -DCMAKE_OSX_DEPLOYMENT_TARGET="${macosx_deployment_target}"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span> configure.args-append -DCMAKE_OSX_SYSROOT="${configure.sdkroot}"
} else {
configure.args-append -DCMAKE_OSX_SYSROOT="/"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/conflicts_build-1.0.tcl b/_resources/port1.0/group/conflicts_build-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index d4b7c0df3c2..ef34f709dd7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/conflicts_build-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/conflicts_build-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ proc conflicts_build._check_for_conflicting_ports {} {
</span> global conflicts_build subport
foreach badport ${conflicts_build} {
if {![catch "registry_active ${badport}"]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${subport} == ${badport}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${subport} eq ${badport}} {
</span> ui_error "${subport} cannot be built while another version of ${badport} is active."
ui_error "Please forcibly deactivate the existing copy of ${badport}, e.g. by running:"
ui_error ""
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/developerversion-1.0.tcl b/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 9676a0061d1..df88e4b6b02 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/developerversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,7 +20,7 @@ platform macosx {
</span> pre-extract {
foreach {darwin_major minimum_developerversion} [join ${minimum_developerversions}] {
if {${darwin_major} == ${os.major}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists developerversion] || $developerversion == "none" || $developerversion == ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists developerversion] || $developerversion eq "none" || $developerversion eq ""} {
</span> ui_error "Couldn't determine your Developer Tools version."
ui_error ""
ui_error "On macOS ${macosx_version}, ${name} @${version} requires Developer Tools ${developerversion} or later but you have none installed."
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,4 +34,4 @@ platform macosx {
</span> }
}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span>\ No newline at end of file
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gobject_introspection-1.0.tcl b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c4dc059e852..1db7615cbf7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gobject_introspection-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -75,7 +75,7 @@ pre-build {
</span>
# see https://trac.macports.org/ticket/59078
# -isysroot cannot be empty (see _osx_support.py in python installation)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${configure.sdkroot} ne ""} {
</span> set sdk_root "${configure.sdkroot}"
} else {
set sdk_root "/"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/gpg_verify-1.0.tcl b/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index f80841a8a98..9f20b54bdce 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/gpg_verify-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,7 +70,7 @@ proc gpg_verify.verify_gpg_signature {pubkey_file signature_file test_file} {
</span> --verify [gpg_verify.shellescape ${signature_file}] \
[gpg_verify.shellescape ${test_file}] 2>/dev/null; \
then echo 'VERIFIED'; else echo 'UNVERIFIED'; fi"]
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[string trim ${gpg_verification}] != "VERIFIED"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[string trim ${gpg_verification}] ne "VERIFIED"} {
</span> error "GPG signature verification failed on ${test_file} with pubkey file ${pubkey_file}."
}
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/ocaml-1.0.tcl b/_resources/port1.0/group/ocaml-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 87cc44ebfea..f330542828f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/ocaml-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/ocaml-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,7 +40,7 @@ post-extract {
</span> # if this is an oasis/setup.ml based installation
proc use_oasis {option} {
depends_build-append port:ocaml-findlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${option} == "yes"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${option}} {
</span> global ocaml prefix ocamlfind_wrapper
global configure.cmd configure.pre_args
configure.cmd ${ocaml}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -56,7 +56,7 @@ proc use_oasis {option} {
</span> }
proc use_oasis_doc {option} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${option} == "yes"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${option}} {
</span> global ocaml worksrcpath
post-build {
system -W ${worksrcpath} "${ocaml} setup.ml -doc"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/ruby-1.0.tcl b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f89709be6c..2ce64218c63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/ruby-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +53,7 @@ options ruby.api_version ruby.lib ruby.archlib
</span> options ruby.version
option_proc ruby.branch ruby_set_branch
proc ruby_set_branch {option action args} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action != "set"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} {
</span> return
}
global prefix ruby.branch \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -459,7 +459,7 @@ proc ruby.setup {module vers {type "install.rb"} {docs {}} {source "custom"} {im
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$type != "gnu"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$type ne "gnu"} {
</span> configure.universal_args-delete --disable-dependency-tracking
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/texlive-1.0.tcl b/_resources/port1.0/group/texlive-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 02f34a9e691..520b9e28bb8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/texlive-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/texlive-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -258,7 +258,7 @@ proc texlive.texmfport {} {
</span> close $docfile
# install fmtutil.cnf file
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.formats} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.formats} ne ""} {
</span> xinstall -d ${destroot}${texlive_texmfsysconfig}/fmtutil.d
set fmtfilename \
${destroot}${texlive_texmfsysconfig}/fmtutil.d/10${name}.cnf
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -310,7 +310,7 @@ proc texlive.texmfport {} {
</span> }
# install updmap.cfg file
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.maps} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.maps} ne ""} {
</span> xinstall -d ${destroot}${texlive_texmfsysconfig}/updmap.d
set mapfilename \
${destroot}${texlive_texmfsysconfig}/updmap.d/10${name}.cfg
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -322,7 +322,7 @@ proc texlive.texmfport {} {
</span> }
# install languages.dat and languages.def files
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.languages} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.languages} ne ""} {
</span> xinstall -d ${destroot}${texlive_texmfsysconfig}/language.d
set langdatfilename \
${destroot}${texlive_texmfsysconfig}/language.d/10${name}.dat
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -363,13 +363,13 @@ proc texlive.texmfport {} {
</span> }
set qsynlist [join $qsyns ", "]
puts $langluafile "\t\tsynonyms = { $qsynlist },"
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$langpatt != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$langpatt ne ""} {
</span> puts $langluafile "\t\tpatterns = '$langpatt',"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$langhyph != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$langhyph ne ""} {
</span> puts $langluafile "\t\thyphenation = '$langhyph',"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$langspecial != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$langspecial ne ""} {
</span> puts $langluafile "\t\tpatterns = '$langspecial',"
}
puts $langluafile "\t},\n"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -418,16 +418,16 @@ proc texlive.texmfport {} {
</span> # Otherwise, only update the config files that are
# actually affected, and only generate the needed
# formats.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.languages} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.languages} ne ""} {
</span> system "${prefix}/libexec/texlive-update-cnf language.dat"
system "${prefix}/libexec/texlive-update-cnf language.def"
system "${prefix}/libexec/texlive-update-cnf language.dat.lua"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.maps} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.maps} ne ""} {
</span> system "${prefix}/libexec/texlive-update-cnf updmap.cfg"
catch {system "${prefix}/bin/updmap-sys"}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.formats} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.formats} ne ""} {
</span> system "${prefix}/libexec/texlive-update-cnf fmtutil.cnf"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -435,9 +435,9 @@ proc texlive.texmfport {} {
</span> # patterns, then we need to regenerate all
# formats. Otherwise, just generate the formats we just
# installed.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.languages} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.languages} ne ""} {
</span> catch {system "${prefix}/bin/fmtutil-sys --all"}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- } elseif {${texlive.formats} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${texlive.formats} ne ""} {
</span> foreach x ${texlive.formats} {
set fmtname [lindex $x 1]
catch {system "${prefix}/bin/fmtutil-sys --byfmt $fmtname"}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -459,15 +459,15 @@ proc texlive.texmfport {} {
</span> if {${texlive.use_mktexlsr} && ${texlive.use_mktexlsr_on_deactivate}} {
texlive.mktexlsr
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.forceupdatecnf} || ${texlive.languages} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.forceupdatecnf} || ${texlive.languages} ne ""} {
</span> system "${prefix}/libexec/texlive-update-cnf language.dat"
system "${prefix}/libexec/texlive-update-cnf language.def"
system "${prefix}/libexec/texlive-update-cnf language.dat.lua"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.forceupdatecnf} || ${texlive.maps} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.forceupdatecnf} || ${texlive.maps} ne ""} {
</span> system "${prefix}/libexec/texlive-update-cnf updmap.cfg"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${texlive.forceupdatecnf} || ${texlive.formats} != ""} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${texlive.forceupdatecnf} || ${texlive.formats} ne ""} {
</span> system "${prefix}/libexec/texlive-update-cnf fmtutil.cnf"
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xcodeversion-1.0.tcl b/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index 808b0d5ae99..8529f284d01 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xcodeversion-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,7 +18,7 @@ platform macosx {
</span> pre-extract {
foreach {darwin_major minimum_xcodeversion} [join ${minimum_xcodeversions}] {
if {${darwin_major} == ${os.major}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![info exists xcodeversion] || $xcodeversion == "none"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {![info exists xcodeversion] || $xcodeversion eq "none"} {
</span> ui_error "Couldn't determine your Xcode version (from '/usr/bin/xcodebuild -version')."
ui_error ""
ui_error "On macOS ${macosx_version}, ${name} @${version} requires Xcode ${minimum_xcodeversion} or later but you have none installed."
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/_resources/port1.0/group/xmlcatalog-1.0.tcl b/_resources/port1.0/group/xmlcatalog-1.0.tcl
</span><span style='display:block; white-space:pre;color:#808080;'>index c7cc7092f03..8d3cf0f05b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/_resources/port1.0/group/xmlcatalog-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/_resources/port1.0/group/xmlcatalog-1.0.tcl
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ depends_lib-append port:xmlcatmgr
</span> proc xml._set_catalog {option action args} {
global xml.catalog_list
global xml.rootcatalog
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action != "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span> foreach catalog [option ${option}] {
ui_debug "add catalog ${catalog} to ${xml.rootcatalog}"
lappend xml.catalog_list [subst {${xml.rootcatalog} ${catalog}}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,7 +68,7 @@ proc xml._set_catalog {option action args} {
</span> proc xml._set_catalog_entry {option action args} {
global xml.catalog_list
global xml.rootcatalog
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action != "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span> set clist [option ${option}]
if {[llength ${clist}] >= 2} {
set c [lindex $clist 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -81,7 +81,7 @@ proc xml._set_catalog_entry {option action args} {
</span>
proc xml._set_entity {option action args} {
global xml.entity_list
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action != "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span> set entity [option ${option}]
ui_debug "add entity ${entity}"
lappend xml.entity_list ${entity}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -89,7 +89,7 @@ proc xml._set_entity {option action args} {
</span>
proc xml._set_rewrite {option action args} {
global xml.rewrite_list
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action != "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span> set rewrite [option ${option}]
ui_debug "add rewrite ${rewrite}"
lappend xml.rewrite_list ${rewrite}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -194,7 +194,7 @@ proc xml._uninstall_catalogs {} {
</span> proc sgml._set_catalog {option action args} {
global sgml.catalog_list
global sgml.rootcatalog
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action != "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span> foreach catalog [option ${option}] {
ui_debug "add catalog ${catalog} to ${sgml.rootcatalog}"
lappend sgml.catalog_list [subst {${sgml.rootcatalog} ${catalog}}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -204,7 +204,7 @@ proc sgml._set_catalog {option action args} {
</span> proc sgml._set_catalog_entry {option action args} {
global sgml.catalog_list
global sgml.rootcatalog
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$action != "set"} return
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$action ne "set"} return
</span> set clist [option ${option}]
if {[llength ${clist}] >= 2} {
set c [lindex $clist 0]
</pre><pre style='margin:0'>
</pre>