[112328] trunk/dports/net/zabbix2/Portfile

[eborisch at macports.org]

Revision: 112328
          https://trac.macports.org/changeset/112328
Author:   eborisch at macports.org
Date:     2013-10-18 14:51:58 -0700 (Fri, 18 Oct 2013)
Log Message:
-----------
zabbix2: Add percona and mysql56 variants.

Modified Paths:
--------------
    trunk/dports/net/zabbix2/Portfile

Modified: trunk/dports/net/zabbix2/Portfile
===================================================================
--- trunk/dports/net/zabbix2/Portfile	2013-10-18 21:28:37 UTC (rev 112327)
+++ trunk/dports/net/zabbix2/Portfile	2013-10-18 21:51:58 UTC (rev 112328)
@@ -22,7 +22,7 @@
 
 distname            zabbix-${version}
 livecheck.name      zabbix
-livecheck.regex     "zabbix-(\[0-9.\]+\.\[0-9.\]+)\.tar"
+livecheck.regex     "Stable\/(\[0-9.\]+\.\[0-9.\]+)\/"
 homepage            http://www.zabbix.com/
 master_sites        sourceforge:project/zabbix/ZABBIX%20Latest%20Stable/${version}
 
@@ -92,8 +92,12 @@
                  mysql=${prefix}/lib/mysql51/bin/mysql_config mysql}
         mysql55 {"MySQL 5.5"            mysql55 \
                  mysql=${prefix}/lib/mysql55/bin/mysql_config mysql}
+        mysql56 {"MySQL 5.6"            mysql56 \
+                 mysql=${prefix}/lib/mysql56/bin/mysql_config mysql}
         mariadb {"MariaDB"              mariadb \
                  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 \
@@ -119,7 +123,8 @@
         }
 
         append variant_line { "
-            set ::ZDB [lindex ${prms} 1]
+            set ::ZDB               [lindex ${prms} 1]
+            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 \
@@ -137,7 +142,9 @@
 
     if {![variant_isset mysql51] &&
         ![variant_isset mysql55] &&
+        ![variant_isset mysql56] &&
         ![variant_isset mariadb] &&
+        ![variant_isset percona] &&
         ![variant_isset pgsql81] &&
         ![variant_isset pgsql82] &&
         ![variant_isset pgsql83] &&
@@ -158,8 +165,7 @@
 
 post-extract {
     if { ${name} == ${subport} } {
-        if { (![string compare -length 5 mysql ${ZDB}] || 
-              ![string compare -length 7 mariadb ${ZDB}]) &&
+        if { ${MYSQL_MODE} == 1 &&
              [variant_isset full_server] } {
                 set repstr "s|# DBSocket=/tmp/mysql.sock|"
                 append repstr "DBSocket=${prefix}/var/run/${ZDB}/mysqld.sock|"
@@ -218,8 +224,7 @@
 # Create a startup script for the server
 # This script has a delay built into it (waiting for DB to start) so we
 # don't use a simple startupitem.executable approach
-        if { (![string compare -length 5 mysql ${ZDB}] ||
-              ![string compare -length 7 mariadb ${ZDB}] )} {
+        if { ${MYSQL_MODE} == 1 } {
             xinstall -m 755 ${portpath}/${filesdir}/zabbix_server.init.mysql \
                 ${destroot}${prefix}/share/zabbix/zabbix_server.init
             reinplace "s|__VER__|${ZDB}|g" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131018/673aa4b5/attachment.html>