<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/00cadaf64fe34fd1885a1a4d888a89abbb18d8af">https://github.com/macports/macports-ports/commit/00cadaf64fe34fd1885a1a4d888a89abbb18d8af</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 00cadaf zabbix[34]: Update / add latest.
</span>00cadaf is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 00cadaf64fe34fd1885a1a4d888a89abbb18d8af
</span>Author: Eric A. Borisch <eborisch@macports.org>
AuthorDate: Mon Nov 12 10:20:01 2018 -0600
<span style='display:block; white-space:pre;color:#404040;'> zabbix[34]: Update / add latest.
</span>---
net/zabbix3/Portfile | 12 +--
net/{zabbix3 => zabbix4}/Portfile | 111 ++++++++++++--------------
net/zabbix4/files/log_and_pid_locations.patch | 44 ++++++++++
3 files changed, 102 insertions(+), 65 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix3/Portfile b/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4868ffe..6a92ff2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,8 +2,8 @@
</span> PortSystem 1.0
name zabbix3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.15
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
maintainers {eborisch @eborisch} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,9 +32,9 @@ dist_subdir zabbix3
</span> conflicts zabbix zabbix2
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1e2afd7a4ca348354d8c05466b9f4035af177125 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7443873cc970672d3c884230d3aeb082f2d8afcc2b757506c2d684ffdd12d77e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17476022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 fe8664e5f3a1830ef4671f10778b2e4c44fcc70d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 054cc603a3f7fb4b3ebd51d001afa2f0e4356d1086331e6067057bc51e32f1a9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 17489570
</span>
patchfiles log_and_pid_locations.patch
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@ if { ${name} ne ${subport} } {
</span>
if {![variant_isset php56] && ![variant_isset php70]
&& ![variant_isset php71]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +php56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +php71
</span> }
variant full_server description {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix3/Portfile b/net/zabbix4/Portfile
</span>similarity index 81%
copy from net/zabbix3/Portfile
copy to net/zabbix4/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index 4868ffe..48a07d8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/zabbix3/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;'>@@ -1,9 +1,9 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name zabbix3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.4.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name zabbix4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.0.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories net
maintainers {eborisch @eborisch} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,33 +20,33 @@ long_description Zabbix is the ultimate open source availability and \
</span>
distname zabbix-${version}
livecheck.name zabbix
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "Stable\/(3\[0-9.\]+)\/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "Stable\/(4\[0-9.\]+)\/"
</span> livecheck.url \
http://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/
homepage http://www.zabbix.com/
master_sites \
sourceforge:project/zabbix/ZABBIX%20Latest%20Stable/${version} \
sourceforge:project/zabbix/ZABBIX%20Release%20Candidates/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir zabbix3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+dist_subdir zabbix4
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts zabbix zabbix2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts zabbix zabbix2 zabbix3
</span>
checksums \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 1e2afd7a4ca348354d8c05466b9f4035af177125 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 7443873cc970672d3c884230d3aeb082f2d8afcc2b757506c2d684ffdd12d77e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 17476022
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 18a5b97472baeb99c8729a89d039244ba7f25fd5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c73d54074885ae68c23dddc060e9e7f24c96f808eb502c5ee648c2820790e2fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18005197
</span>
patchfiles log_and_pid_locations.patch
universal_variant no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport zabbix3-agent {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport zabbix4-agent {}
</span>
configure.args --bindir=${prefix}/bin/zabbix \
--sbindir=${prefix}/sbin/zabbix \
--libexecdir=${prefix}/libexec/zabbix \
--datadir=${prefix}/share/zabbix \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --sysconfdir=${prefix}/etc/zabbix3 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --sysconfdir=${prefix}/etc/zabbix4 \
</span> --localstatedir=${prefix}/var/zabbix \
--with-gnutls=${prefix} \
--enable-ipv6 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -62,20 +62,20 @@ depends_lib-append port:libiconv \
</span> port:libevent
if { ${name} ne ${subport} } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- conflicts zabbix2-agent
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.name zabbix3-agentd
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ conflicts zabbix2-agent zabbix3-agent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.name zabbix4-agentd
</span> startupitem.executable \
${prefix}/sbin/zabbix/zabbix_agentd \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -c ${prefix}/etc/zabbix3/zabbix_agentd.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -c ${prefix}/etc/zabbix4/zabbix_agentd.conf
</span> startupitem.pidfile auto ${prefix}/var/run/zabbix/zabbix_agentd.pid
startupitem.logfile ${prefix}/var/log/zabbix/zabbix_agentd.launch
configure.args-append --enable-agent
destroot.keepdirs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf.d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/run/zabbix3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/log/zabbix3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix4/zabbix_agentd.conf.d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/zabbix4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/zabbix
</span> } else {
depends_lib-append port:curl \
port:libssh2 \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,7 +93,7 @@ if { ${name} ne ${subport} } {
</span> --with-ssh2=${prefix} \
--with-libxml2=${prefix}/bin/xml2-config
<span style='display:block; white-space:pre;background:#ffe0e0;'>- startupitem.name zabbix3-server
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ startupitem.name zabbix4-server
</span> startupitem.start ${prefix}/sbin/zabbix/zabbix_server
set pidfile ${prefix}/var/run/zabbix/zabbix_server.pid
# Gracefully wait up to two minutes for zabbix to shut down / clean up
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -104,9 +104,9 @@ if { ${name} ne ${subport} } {
</span> startupitem.netchange yes
destroot.keepdirs \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/run/zabbix3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/var/log/zabbix3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix4/zabbix_server.conf.d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/run/zabbix4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/var/log/zabbix
</span>
foreach php {php56 php70 php71} {
variant ${php} description "Use ${php}" "
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -121,7 +121,7 @@ if { ${name} ne ${subport} } {
</span>
if {![variant_isset php56] && ![variant_isset php70]
&& ![variant_isset php71]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- default_variants +php56
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants +php71
</span> }
variant full_server description {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -227,7 +227,7 @@ post-extract {
</span> post-patch {
reinplace "s|%%PREFIX%%|${prefix}|" \
conf/zabbix_agentd.conf conf/zabbix_server.conf
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/usr/local/etc|${prefix}/etc/zabbix3|" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|/usr/local/etc|${prefix}/etc/zabbix4|" \
</span> conf/zabbix_agentd.conf conf/zabbix_server.conf
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -238,21 +238,21 @@ post-destroot {
</span> ####### AGENT #######
# Copy sample agent .conf files
xinstall -m 755 -d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix4/zabbix_agentd.conf.d
</span> xinstall -m 755 ${worksrcpath}/conf/zabbix_agentd.conf \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix4/zabbix_agentd.conf.sample
</span>
# Don't overwrite user settings on each install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- delete ${destroot}${prefix}/etc/zabbix3/zabbix_agentd.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ delete ${destroot}${prefix}/etc/zabbix4/zabbix_agentd.conf
</span> } else {
####### SERVER #######
# Copy sample server and agent .conf files
xinstall -m 755 -d \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix4/zabbix_server.conf.d
</span>
# Don't overwrite user settings on each install
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/etc/zabbix3/zabbix_server.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${destroot}${prefix}/etc/zabbix4/zabbix_server.conf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/etc/zabbix4/zabbix_server.conf.sample
</span>
# Copy database data and schemas
xinstall -m 755 -d ${destroot}${prefix}/share/zabbix/scripts
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -261,8 +261,8 @@ post-destroot {
</span> data.sql images.sql schema.sql \
${destroot}${prefix}/share/zabbix/scripts
<span style='display:block; white-space:pre;background:#ffe0e0;'>- file copy ${worksrcpath}/upgrades \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/zabbix/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #file copy ${worksrcpath}/upgrades \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ${destroot}${prefix}/share/zabbix/
</span>
# Copy the front end files
file mkdir ${destroot}${prefix}/share/zabbix/frontends/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -270,7 +270,7 @@ post-destroot {
</span> ${destroot}${prefix}/share/zabbix/frontends/
# Set permissions for etc (protect passwords) and the frontend
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chmod 660 ${destroot}${prefix}/etc/zabbix3/*"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chmod 660 ${destroot}${prefix}/etc/zabbix4/*"
</span> system "chown -R www:www ${destroot}${prefix}/share/zabbix/frontends/*"
xinstall -d -m 755 -d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -284,15 +284,15 @@ post-destroot {
</span> system "chown -R zabbix:zabbix ${destroot}${prefix}/var/${dname}/zabbix"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "chown -R zabbix:zabbix ${destroot}${prefix}/etc/zabbix3"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "chown -R zabbix:zabbix ${destroot}${prefix}/etc/zabbix4"
</span> }
if { ${name} ne ${subport} } {
notes "
#### ####
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#### ZABBIX3 agent installation section ####
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#### ZABBIX4 agent installation section ####
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-1) Edit the sample .conf file ${prefix}/etc/zabbix3/zabbix_agentd.conf.sample
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+1) Edit the sample .conf file ${prefix}/etc/zabbix4/zabbix_agentd.conf.sample
</span> (rename & omit .sample)
Set the following variable to the ip address of your ZABBIX server to\
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -303,18 +303,15 @@ if { ${name} ne ${subport} } {
</span>
2) Set zabbix_agentd to run at system boot
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port load zabbix3-agent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port load zabbix4-agent
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-3) A Win32 agent is in ${prefix}/share/zabbix/zabbix_agent_win32 for\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installation on Windows.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#### End ZABBIX3 agent installation section ####
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#### End ZABBIX4 agent installation section ####
</span> #### ####
"
} else {
notes "
#### ####
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#### Begin ZABBIX3 local server installation section ####
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#### Begin ZABBIX4 local server installation section ####
</span>
(Installing with +full_server will add all of the dependants; configuration
will still be required.)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -328,13 +325,13 @@ if { ${name} ne ${subport} } {
</span>
Follow the directions at :
<span style='display:block; white-space:pre;background:#ffe0e0;'>- https://www.zabbix.com/documentation/3.4/manual/appendix/install/db_scripts
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ https://www.zabbix.com/documentation/4.0/manual/appendix/install/db_scripts
</span>
The *.sql files it refers to are in ${prefix}/share/zabbix/scripts/
** NOTE THAT THESE ARE FOR YOUR SELECTED DATABASE VARIANT!!! **
<span style='display:block; white-space:pre;background:#ffe0e0;'>-3) Edit the sample .conf file ${prefix}/etc/zabbix3/zabbix_server.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+3) Edit the sample .conf file ${prefix}/etc/zabbix4/zabbix_server.conf
</span> (rename & omit .sample)
Modify these variables at the very least:
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -354,15 +351,11 @@ if { ${name} ne ${subport} } {
</span>
5) Set zabbix_server to run at system boot (also starts it immediately):
<span style='display:block; white-space:pre;background:#ffe0e0;'>- sudo port load zabbix3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !! Note: Your shared memory will likely need to be increased !!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- !! ( see http://support.apple.com/kb/HT4022 ) !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sudo port load zabbix4
</span>
6) A Win32 agent is in ${prefix}/share/zabbix/zabbix_agent_win32 for\
<span style='display:block; white-space:pre;background:#ffe0e0;'>- installation on Windows NT 4.0, Windows 2000, and Windows XP. See\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- the ReadMe.txt for instructions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ installation on Windows.
</span>
7) Enable your desired php version in httpd.conf and make sure the following
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -384,27 +377,27 @@ if { ${name} ne ${subport} } {
</span> 9) Read the fine manual at http://www.zabbix.com/documentation/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-#### End ZABBIX3 local server installation section ####
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#### End ZABBIX4 local server installation section ####
</span> #### ####
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-!! ZABBIX2 -> ZABBIX3 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! ZABBIX3 -> ZABBIX4 Server Upgrade process !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
</span> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-!! 0) BACK UP YOUR DATABASE !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! 0) Be sure to use 'sudo port unload zabbix3' to stop the background !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! server before deactivating zabbix3. !!
</span> !! !!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-!! 1) Be sure to use 'sudo port unload zabbix2' to stop the background !!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-!! server before deactivating zabbix2. !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! 1) BACK UP YOUR DATABASE !!
</span> !! !!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-!! 2) Create ${prefix}/etc/zabbix3/zabbix_server.conf !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! 2) Create/edit ${prefix}/etc/zabbix4/zabbix_server.conf !!
</span> !! zabbix_server.conf.sample is available for reference. !!
!! There are new features to consider. !!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-!! ** NOTE conf dir is etc/zabbix3 ** !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! ** NOTE conf dir is etc/zabbix4 ** !!
</span> !! !!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-!! 3) 'sudo port load zabbix3' after installing. !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! 3) 'sudo port load zabbix4' after installing. !!
</span> !! !!
<span style='display:block; white-space:pre;background:#ffe0e0;'>-!! For upgrade procedure, please see !!
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-!! http://www.zabbix.com/documentation/3.4/manual/installation/upgrade !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! For complete upgrade directions, please see: !!
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+!! http://www.zabbix.com/documentation/4.0/manual/installation/upgrade !!
</span> !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/zabbix4/files/log_and_pid_locations.patch b/net/zabbix4/files/log_and_pid_locations.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..f30be0d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/zabbix4/files/log_and_pid_locations.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,44 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- conf/zabbix_agentd.conf.orig 2016-02-16 14:03:55.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ conf/zabbix_agentd.conf 2016-02-16 14:08:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -10,6 +10,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PidFile=/tmp/zabbix_agentd.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MACPORTS CONFIG. PLEASE ONLY EDIT IF YOU KNOW WHAT YOU ARE DOING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PidFile=%%PREFIX%%/var/run/zabbix/zabbix_agentd.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# END MACPORTS CONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Option: LogType
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Specifies where log messages are written to:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # system - syslog
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,7 +31,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LogFile=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LogFile=/tmp/zabbix_agentd.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LogFile=%%PREFIX%%/var/log/zabbix/zabbix_agentd.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Option: LogFileSize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Maximum size of log file in MB.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- conf/zabbix_server.conf.orig 2016-02-16 14:04:00.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ conf/zabbix_server.conf 2016-02-16 14:08:34.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -35,7 +35,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # LogFile=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LogFile=/tmp/zabbix_server.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LogFile=%%PREFIX%%/var/log/zabbix/zabbix_server.log
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Option: LogFileSize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Maximum size of log file in MB.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -67,6 +67,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Default:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # PidFile=/tmp/zabbix_server.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# MACPORTS CONFIG. PLEASE ONLY EDIT IF YOU KNOW WHAT YOU ARE DOING
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++PidFile=%%PREFIX%%/var/run/zabbix/zabbix_server.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# END MACPORTS CONFIG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ### Option: SocketDir
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # IPC socket directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Directory to store IPC sockets used by internal Zabbix services.
</span></pre><pre style='margin:0'>
</pre>