[62588] trunk/dports/net/zabbix/Portfile

[ryandesign at macports.org]

Revision: 62588
          http://trac.macports.org/changeset/62588
Author:   ryandesign at macports.org
Date:     2010-01-11 10:45:54 -0800 (Mon, 11 Jan 2010)
Log Message:
-----------
zabbix:

 * add pgsql84 variant, make mysql5 a variant too, and mark variants as conflicting (#23227)
 * compile in the build phase, not the destroot phase (#23229)
 * declare dependencies on curl and openssl (#23230)
 * fix sqlite3 variant configure arg (#23231)
 * remove unnecessary --prefix and --mandir configure args

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

Modified: trunk/dports/net/zabbix/Portfile
===================================================================
--- trunk/dports/net/zabbix/Portfile	2010-01-11 18:34:48 UTC (rev 62587)
+++ trunk/dports/net/zabbix/Portfile	2010-01-11 18:45:54 UTC (rev 62588)
@@ -4,7 +4,7 @@
 
 name			zabbix
 version			1.6.8
-revision		2
+revision		3
 categories		net
 maintainers		markd openmaintainer
 platforms		darwin
@@ -17,11 +17,10 @@
 master_sites		sourceforge
 checksums		md5 3255afd2d44454bae3ec5158920a824f
 patchfiles		patch-include-common.h
-depends_lib		path:bin/mysql_config5:mysql5 \
-				port:fping
+depends_lib		port:fping \
+			port:curl \
+			port:openssl
 
-configure.pre_args     --prefix=${prefix}
-
 configure.args		--enable-server \
 			--enable-agent \
 			--with-net-snmp \
@@ -30,9 +29,7 @@
 			--libexecdir=${prefix}/libexec/zabbix \
 			--datadir=${prefix}/share/zabbix \
 			--sysconfdir=${prefix}/etc/zabbix \
-			--localstatedir=${prefix}/var/zabbix \
-			--mandir=${prefix}/man \
-			--with-mysql=${prefix}/lib/mysql5/bin/mysql_config
+			--localstatedir=${prefix}/var/zabbix
 
 configure.ldflags-append	-lresolv
 
@@ -46,49 +43,55 @@
 	startupitem.stop        "${prefix}/share/zabbix/zabbix_server.init stop"
 }
 
-variant pgsql81 \
+variant mysql5 conflicts pgsql81 pgsql82 pgsql83 pgsql84 sqlite3 \
+        description {Use MySQL 5.x for server database} {
+        depends_lib-append      path:bin/mysql_config5:mysql5
+        configure.args-append   --with-mysql=${prefix}/lib/mysql5/bin/mysql_config
+}
+
+variant pgsql81 conflicts mysql5 pgsql82 pgsql83 pgsql84 sqlite3 \
         description {Use PostgreSQL 8.1.x for server database} {
-        depends_lib-delete      path:bin/mysql_config5:mysql5
         depends_lib-append      port:postgresql81
-        configure.args-delete   --with-mysql=${prefix}/lib/mysql5/bin/mysql_config
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql81/bin/pg_config
 }
 
-variant pgsql82 \
+variant pgsql82 conflicts mysql5 pgsql81 pgsql83 pgsql84 sqlite3 \
 	description {Use PostgreSQL 8.2.x for server database} {
-	depends_lib-delete	path:bin/mysql_config5:mysql5
 	depends_lib-append	port:postgresql82
-	configure.args-delete	--with-mysql=${prefix}/lib/mysql5/bin/mysql_config
 	configure.args-append	--with-pgsql=${prefix}/lib/postgresql82/bin/pg_config
 }
 
-variant pgsql83 \
+variant pgsql83 conflicts mysql5 pgsql81 pgsql82 pgsql84 sqlite3 \
         description {Use PostgreSQL 8.3.x for server database} {
-        depends_lib-delete      path:bin/mysql_config5:mysql5
         depends_lib-append      port:postgresql83
-        configure.args-delete   --with-mysql=${prefix}/lib/mysql5/bin/mysql_config
         configure.args-append   --with-pgsql=${prefix}/lib/postgresql83/bin/pg_config
 }
 
-variant sqlite3 \
-        description {Use SQLite3 for server database} {
-        depends_lib-delete      path:bin/mysql_config5:mysql5
+variant pgsql84 conflicts mysql5 pgsql81 pgsql82 pgsql83 sqlite3 \
+        description {Use PostgreSQL 8.4.x for server database} {
+        depends_lib-append      port:postgresql84
+        configure.args-append   --with-pgsql=${prefix}/lib/postgresql84/bin/pg_config
+}
+
+variant sqlite3 conflicts mysql5 pgsql81 pgsql82 pgsql83 pgsql84 \
+        description {Use SQLite 3.x for server database} {
         depends_lib-append      port:sqlite3
-        configure.args-delete   --with-mysql=${prefix}/lib/mysql5/bin/mysql_config
-        configure.args-append   --with-sqlite3=${prefix}/lib
+        configure.args-append   --with-sqlite3=${prefix}
 }
 
-variant agent_only \
+variant agent_only conflicts mysql5 pgsql81 pgsql82 pgsql83 pgsql84 sqlite3 \
 	description {Do not install the Zabbix server} {
-	depends_lib-delete	path:bin/mysql_config5:mysql5 \
-				port:fping
+	depends_lib-delete	port:fping \
+				port:curl \
+				port:openssl
 
 	configure.args-delete	--enable-server \
-				--with-mysql=${prefix}/lib/mysql5/bin/mysql_config \
 				--with-net-snmp
 }
 
-build {}
+if {![variant_isset pgsql81] && ![variant_isset pgsql82] && ![variant_isset pgsql83] && ![variant_isset pgsql84] && ![variant_isset sqlite3] && ![variant_isset agent_only]} {
+        default_variants +mysql5
+}
 
 post-patch {
         reinplace "s|#DBSocket=/tmp/mysql.sock|DBSocket=${prefix}/var/run/mysql5/mysqld.sock|g" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100111/61ed8aa4/attachment.html>