<pre style='margin:0'>
Eric A. Borisch (eborisch) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b71a494761cbea44dd74df0255a0f24406450194">https://github.com/macports/macports-ports/commit/b71a494761cbea44dd74df0255a0f24406450194</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 b71a494761c zabbix: 4.0.39, 5.0.21; prep for 6 (#14165)
</span>b71a494761c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit b71a494761cbea44dd74df0255a0f24406450194
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Tue Mar 1 14:57:38 2022 -0600
<span style='display:block; white-space:pre;color:#404040;'> zabbix: 4.0.39, 5.0.21; prep for 6 (#14165)
</span>---
net/zabbix4/Portfile | 46 ++++++++++++++++++++++++++++++----------------
1 file changed, 30 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix4/Portfile b/net/zabbix4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index fd2edcc165a..1d2615ac649 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,13 +21,14 @@ long_description Zabbix is the ultimate open source availability and \
</span> of the best commercial ones.
array set VERSIONS {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- 4 4.0.37
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 5 5.0.19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 4 4.0.39
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 5 5.0.21
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #6 6.0.1 # Haven't had a chance to test yet.
</span> }
set zver [regsub -all {[^\d]} ${subport} {}]
version $VERSIONS(${zver})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set zbranch [regsub {\.\d+$} ${version} {}]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set zbranch [regsub {\.[\drc]+$} ${version} {}]
</span>
distname zabbix-${version}
livecheck.name zabbix
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,17 +44,25 @@ dist_subdir zabbix${zver}
</span> if {$zver == 4} {
livecheck.regex "zabbix-(4\\.0\\.\[0-9\]+).tar.gz"
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 ef5add293753824391bde89d9ca453f50d7b12d8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5ae7b197c236cc0eb78f24d10def1b3123fefa29b048ec5ce0b11d5271fc8e9b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17552391
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 bdf12d771710912e039ff0fa7c6ce7c65348499a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5425693737205ab8822a7ed7289aa65ac19634cd699d759e557e8b81883b69b9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17548415
</span> }
if {$zver == 5} {
livecheck.regex "zabbix-(5\\.0\\.\[0-9\]+).tar.gz"
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 89f59d0c991915019e136870afb350587d3e29e3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7ac6bb0dccdd696886f11bbda72f0794e86f8648d5f08423330ba227a17973a1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 21367685
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 55980375dcbc5a2db10847c0922d09264c3b6e81 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6b8d0849c014b746fa0084b6c8f07eb5a244fcc5c1c4147e19945dd22f06335d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 21459282
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {$zver == 6} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex "zabbix-(6\\.0\\.\[0-9\]+).tar.gz"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 1c763ee59a26004a6c0dec863e6beaa730bf281e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2dd92383cc169ce8b8cbbe660ed656e5d6b5b75bf4936743b8a9d59cdfcf3af1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32974585
</span> }
patchfiles log_and_pid_locations.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -61,12 +70,17 @@ patchfiles log_and_pid_locations.patch
</span> universal_variant no
# LTS Versions
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport zabbix4 {conflicts zabbix5}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport zabbix5 {conflicts zabbix4}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport zabbix4-agent {conflicts zabbix5-agent}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport zabbix5-agent {conflicts zabbix4-agent}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport zabbix4-frontend {conflicts zabbix5-frontend}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-subport zabbix5-frontend {conflicts zabbix4-frontend}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport zabbix4 {conflicts zabbix5 zabbix6}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport zabbix4-agent {conflicts zabbix5-agent zabbix6-agent}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport zabbix4-frontend {conflicts zabbix5-frontend zabbix6-frontend}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport zabbix5 {conflicts zabbix4 zabbix6}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport zabbix5-agent {conflicts zabbix4-agent zabbix6-agent}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport zabbix5-frontend {conflicts zabbix4-frontend zabbix6-frontend}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#subport zabbix6 {conflicts zabbix4 zabbix5}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#subport zabbix6-agent {conflicts zabbix4-agent zabbix5-agent}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#subport zabbix6-frontend {conflicts zabbix4-frontend zabbix5-frontend}
</span>
proc isFlavor {desc subp} {
return [expr {[string first ${desc} ${subp}] >= 0}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -296,7 +310,7 @@ post-destroot {
</span> # Copy the front end files
set fedir ${destroot}${prefix}/share/zabbix/frontends
file mkdir ${fedir}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {$zver == 5} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {$zver >= 5} {
</span> file copy ${worksrcpath}/ui/ ${fedir}/php
} else {
file copy ${worksrcpath}/frontends/php/ ${fedir}
</pre><pre style='margin:0'>
</pre>