[145847] trunk/dports/net/zabbix2
eborisch at macports.org
eborisch at macports.org
Thu Feb 18 20:23:30 PST 2016
Revision: 145847
https://trac.macports.org/changeset/145847
Author: eborisch at macports.org
Date: 2016-02-18 20:23:29 -0800 (Thu, 18 Feb 2016)
Log Message:
-----------
zabbix2: Update dependencies (run vs. lib; opportunistic); bump to php56 and update DB variant versions.
Modified Paths:
--------------
trunk/dports/net/zabbix2/Portfile
trunk/dports/net/zabbix2/files/zabbix_server.init.mysql
Modified: trunk/dports/net/zabbix2/Portfile
===================================================================
--- trunk/dports/net/zabbix2/Portfile 2016-02-19 03:43:15 UTC (rev 145846)
+++ trunk/dports/net/zabbix2/Portfile 2016-02-19 04:23:29 UTC (rev 145847)
@@ -5,7 +5,7 @@
name zabbix2
version 2.4.7
-revision 0
+revision 1
categories net
maintainers eborisch openmaintainer
platforms darwin
@@ -22,7 +22,7 @@
distname zabbix-${version}
livecheck.name zabbix
-livecheck.regex "Stable\/(\[0-9.\]+)\/"
+livecheck.regex "Stable\/(2\[0-9.\]+)\/"
livecheck.url \
http://sourceforge.net/projects/zabbix/files/ZABBIX%20Latest%20Stable/
homepage http://www.zabbix.com/
@@ -52,6 +52,8 @@
startupitem.create yes
+depends_lib-append port:libiconv
+
if { ${name} ne ${subport} } {
startupitem.name zabbix2-agentd
startupitem.executable \
@@ -61,19 +63,31 @@
configure.args-append --enable-agent
} else {
- depends_lib-append port:apache2 \
- port:curl \
- port:fping \
+ depends_lib-append port:curl \
port:libssh2 \
port:net-snmp \
- port:OpenIPMI \
- port:php53 \
- port:php53-apache2handler \
- port:php53-gd \
- port:php53-gettext \
- port:php53-mbstring \
- port:php53-sockets
+ port:OpenIPMI
+ depends_run-append port:fping \
+ port:apache2
+ foreach php {php56 php70} {
+ eval [subst {
+ variant ${php} description "Use ${php}" {
+ depends_run-append port:${php} \
+ port:${php}-apache2handler \
+ port:${php}-gd \
+ port:${php}-gettext \
+ port:${php}-mbstring \
+ port:${php}-sockets
+ }
+ }]
+ }
+
+ if {![variant_isset php56] &&
+ ![variant_isset php70]} {
+ default_variants +php56
+ }
+
configure.args-append --enable-server \
--with-libcurl=${prefix}/bin/curl-config \
--with-net-snmp \
@@ -103,14 +117,10 @@
mysql=${prefix}/lib/mariadb/bin/mysql_config mysql}
percona {"Percona" percona \
mysql=${prefix}/lib/percona/bin/mysql_config mysql}
- pgsql81 {"PostgreSQL 8.1.x" postgresql81 \
- pgsql=${prefix}/lib/postgresql81/bin/pg_config postgresql}
- pgsql82 {"PostgreSQL 8.2.x" postgresql82 \
- pgsql=${prefix}/lib/postgresql82/bin/pg_config postgresql}
- pgsql83 {"PostgreSQL 8.3.x" postgresql83 \
- pgsql=${prefix}/lib/postgresql83/bin/pg_config postgresql}
pgsql84 {"PostgreSQL 8.4.x" postgresql84 \
- pgsql=${prefix}/lib/postgresql84/bin/pg_config postgresql}
+ postgresql=${prefix}/lib/postgresql84/bin/pg_config postgresql}
+ pgsql95 {"PostgreSQL 9.5.x" postgresql95 \
+ postgresql=${prefix}/lib/postgresql95/bin/pg_config postgresql}
sqlite3 {"SQLite 3.x" sqlite3 \
sqlite3=${prefix} sqlite}
}
@@ -134,9 +144,13 @@
set ::MYSQL_MODE [string equal [lindex ${prms} 3] mysql]
depends_lib-append port:[lindex ${prms} 1]
configure.args-append --with-[lindex ${prms} 2]
- depends_run-append \
- port:php53-[lindex ${prms} 3]
+ if {[variant_isset php56]} {
+ depends_run-append port:php56-[lindex ${prms} 3] }
+
+ if {[variant_isset php70]} {
+ depends_run-append port:php70-[lindex ${prms} 3] }
+
if {[string compare ${dbitem} sqlite3] && \
[variant_isset full_server]} {
depends_run-append \
@@ -152,23 +166,12 @@
![variant_isset mysql56] &&
![variant_isset mariadb] &&
![variant_isset percona] &&
- ![variant_isset pgsql81] &&
- ![variant_isset pgsql82] &&
- ![variant_isset pgsql83] &&
![variant_isset pgsql84] &&
+ ![variant_isset pgsql95] &&
![variant_isset sqlite3]} {
default_variants +mysql5
}
-# Notify anyone with +agent_only installed of new zabbix2-agent port
- variant agent_only description {Old variant -- install zabbix2-agent} {
- pre-fetch {
- ui_error \
- "Variant 'zabbix2 +agent_only' replaced by port zabbix2-agent"
- return -code error "+agent_only variant replaced by zabbix2-agent"
- }
- }
-
variant date_slash description {
Draw month/day rather than day.month on line graphs.
} {}
@@ -342,7 +345,8 @@
4) Set a symbolic link in your Apache document root pointing to the PHP
- frontend files
+ frontend files. Note that the phpNN variants only add the dependencies; it
+ is up to you to enable your desired version in httpd.conf.
sudo ln -s ${prefix}/share/zabbix/frontends/php <Apache-docroot>/zabbix
Modified: trunk/dports/net/zabbix2/files/zabbix_server.init.mysql
===================================================================
--- trunk/dports/net/zabbix2/files/zabbix_server.init.mysql 2016-02-19 03:43:15 UTC (rev 145846)
+++ trunk/dports/net/zabbix2/files/zabbix_server.init.mysql 2016-02-19 04:23:29 UTC (rev 145847)
@@ -22,7 +22,7 @@
stop)
echo "Shutting down zabbix_server"
pid=`ps -U zabbix | grep 'zabbix_server[^:]' | awk '{print $1}'`
- bin/kill $pid
+ /bin/kill $pid
MAX_WAIT=10
while [ `netstat -an | grep -q '\.10051. *LISTEN' && echo 1 || echo 0` \
== "1" ]; do
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160218/60ff206f/attachment-0001.html>
More information about the macports-changes
mailing list