[25886] trunk/dports/net/zabbix

[source_changes at macosforge.org]

Revision: 25886
          http://trac.macosforge.org/projects/macports/changeset/25886
Author:   markd at macports.org
Date:     2007-06-04 10:03:06 -0700 (Mon, 04 Jun 2007)

Log Message:
-----------
Update to 1.4.

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

Removed Paths:
-------------
    trunk/dports/net/zabbix/files/patch-configure

Modified: trunk/dports/net/zabbix/Portfile
===================================================================
--- trunk/dports/net/zabbix/Portfile	2007-06-04 16:12:11 UTC (rev 25885)
+++ trunk/dports/net/zabbix/Portfile	2007-06-04 17:03:06 UTC (rev 25886)
@@ -3,7 +3,7 @@
 PortSystem	1.0
 
 name			zabbix
-version			1.1.6
+version			1.4
 categories		net
 maintainers		markd at macports.org
 platforms		darwin
@@ -14,11 +14,9 @@
 
 homepage		http://www.zabbix.com
 master_sites		sourceforge
-checksums		md5 baa6896c5f41ed286bca3c40e419e1cf
+checksums		md5 29f605d939c10c571dac79a107a7745f
 default_variants	+server
 
-patchfiles		patch-configure
-
 depends_lib		port:mysql5 \
 				port:fping
 
@@ -26,7 +24,6 @@
 
 configure.args		--enable-server \
 			--enable-agent \
-			--with-mysql=${prefix} \
 			--with-net-snmp \
 			--bindir=${prefix}/bin/zabbix \
 			--sbindir=${prefix}/sbin/zabbix \
@@ -34,7 +31,8 @@
 			--datadir=${prefix}/share/zabbix \
 			--sysconfdir=${prefix}/etc/zabbix \
 			--localstatedir=${prefix}/var/zabbix \
-			--mandir=${prefix}/man
+			--mandir=${prefix}/man \
+			--with-mysql=${prefix}/lib/mysql5/bin/mysql_config
 
 if { [variant_isset agent_only] } {
 	startupitem.create      yes
@@ -56,18 +54,18 @@
 				port:fping
 
 	configure.args-delete	--enable-server \
-				--with-mysql=${prefix} \
+				--with-mysql=${prefix}/lib/mysql5/bin/mysql_config \
 				--with-net-snmp					
 }
 
 build {}
 
-post-extract {
+post-patch {
         reinplace "s|#DBSocket=/tmp/mysql.sock|DBSocket=${prefix}/var/run/mysql5/mysqld.sock|g" \
                 ${worksrcpath}/misc/conf/zabbix_server.conf
                 
         reinplace "s|#FpingLocation=/usr/sbin/fping|FpingLocation=${prefix}/sbin/fping|g" \
-        		${worksrcpath}/misc/conf/zabbix_server.conf
+        	${worksrcpath}/misc/conf/zabbix_server.conf
 }
 
 pre-destroot {
@@ -106,15 +104,12 @@
 		
 # Copy database data and schemas
         xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/data
-        xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/mysql
-        xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/postgresql
+        xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/schema
 
         eval xinstall -m 755 [glob ${worksrcpath}/create/data/*.*] \
                 ${destroot}${prefix}/share/zabbix/data
-        eval xinstall -m 755 [glob ${worksrcpath}/create/mysql/*] \
-                ${destroot}${prefix}/share/zabbix/mysql
-        eval xinstall -m 755 [glob ${worksrcpath}/create/postgresql/*] \
-                ${destroot}${prefix}/share/zabbix/postgresql
+        eval xinstall -m 755 [glob ${worksrcpath}/create/schema/*] \
+                ${destroot}${prefix}/share/zabbix/schema
 
 # Copy the front end
         xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/frontends/php
@@ -167,10 +162,8 @@
 
 # Copy Win32 agent for normal and agent_only installs
 		xinstall -d -m 755 -d ${destroot}${prefix}/share/zabbix/zabbix_agent_win32
-		xinstall -m 755 ${worksrcpath}/src/zabbix_agent_win32/Release/ZabbixW32.exe \
+		xinstall -m 755 ${worksrcpath}/bin/win32/zabbix_agentd.exe \
 			${destroot}${prefix}/share/zabbix/zabbix_agent_win32
-		xinstall -m 755 ${worksrcpath}/src/zabbix_agent_win32/doc/ReadMe.txt \
-			${destroot}${prefix}/share/zabbix/zabbix_agent_win32
 }
 
 post-activate {
@@ -200,8 +193,7 @@
 
 
 3) A Win32 agent is in ${prefix}/share/zabbix/zabbix_agent_win32 for
-   installation on Windows NT 4.0, Windows 2000, and Windows XP.  See
-   the ReadMe.txt for instructions.
+   installation on Windows NT 4.0, Windows 2000, and Windows XP.
 
 
 \n"
@@ -237,8 +229,8 @@
 	mysql> exit;
 
 -Import the ZABBIX Schema
-	cd ${prefix}/share/zabbix/mysql
-	cat schema.sql | mysql5 -u root -p zabbix
+	cd ${prefix}/share/zabbix/schema
+	cat mysql.sql | mysql5 -u root -p zabbix
 	cd ${prefix}/share/zabbix/data
 	cat data.sql | mysql5 -u root -p zabbix
 

Deleted: trunk/dports/net/zabbix/files/patch-configure
===================================================================
--- trunk/dports/net/zabbix/files/patch-configure	2007-06-04 16:12:11 UTC (rev 25885)
+++ trunk/dports/net/zabbix/files/patch-configure	2007-06-04 17:03:06 UTC (rev 25886)
@@ -1,12 +0,0 @@
---- configure.org	2006-05-31 00:06:26.000000000 -0700
-+++ configure	2006-06-01 18:08:54.000000000 -0700
-@@ -6664,6 +6664,9 @@
- 			elif test -f $withval/include/mysql.h; then
- 				MYSQL_INCDIR=$withval/include
- 				MYSQL_LIBDIR=$withval/lib
-+			elif test -f $withval/include/mysql5/mysql/mysql.h; then
-+				MYSQL_INCDIR=$withval/include/mysql5/mysql
-+				MYSQL_LIBDIR=$withval/lib/mysql5/mysql
- 			else
- 			echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070604/aa6930c4/attachment.html