diff options
Diffstat (limited to 'net-mgmt/zabbix')
| -rw-r--r-- | net-mgmt/zabbix/Makefile | 2 | ||||
| -rw-r--r-- | net-mgmt/zabbix/distinfo | 3 | ||||
| -rw-r--r-- | net-mgmt/zabbix/files/patch-include::db.c | 41 | ||||
| -rw-r--r-- | net-mgmt/zabbix/pkg-plist | 7 |
4 files changed, 9 insertions, 44 deletions
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile index aa28891e01d2..70b1d3f18e30 100644 --- a/net-mgmt/zabbix/Makefile +++ b/net-mgmt/zabbix/Makefile @@ -6,7 +6,7 @@ # PORTNAME= zabbix -PORTVERSION= 1.0b13 +PORTVERSION= 1.0b14 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/net-mgmt/zabbix/distinfo b/net-mgmt/zabbix/distinfo index 713d13a9a9ed..53a8d0475edb 100644 --- a/net-mgmt/zabbix/distinfo +++ b/net-mgmt/zabbix/distinfo @@ -1 +1,2 @@ -MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab +MD5 (zabbix-1.0beta14.tar.gz) = 0ac320c6cd99f801d8cb7923ca790419 +SIZE (zabbix-1.0beta14.tar.gz) = 1845306 diff --git a/net-mgmt/zabbix/files/patch-include::db.c b/net-mgmt/zabbix/files/patch-include::db.c deleted file mode 100644 index 65b688a2ee3d..000000000000 --- a/net-mgmt/zabbix/files/patch-include::db.c +++ /dev/null @@ -1,41 +0,0 @@ ---- include/db.c.orig Sun Feb 15 09:55:55 2004 -+++ include/db.c Sun Feb 15 09:56:53 2004 -@@ -123,6 +123,10 @@ - */ - int DBexecute(char *query) - { -+#ifdef HAVE_PGSQL -+ PGresult *result; -+#endif -+ - /* zabbix_set_log_level(LOG_LEVEL_DEBUG);*/ - zabbix_log( LOG_LEVEL_DEBUG, "Executing query:%s",query); - #ifdef HAVE_MYSQL -@@ -138,8 +142,6 @@ - } - #endif - #ifdef HAVE_PGSQL -- PGresult *result; -- - result = PQexec(conn,query); - - if( result==NULL) -@@ -168,6 +170,9 @@ - */ - DB_RESULT *DBselect(char *query) - { -+#ifdef HAVE_PGSQL -+ PGresult *result; -+#endif - /* zabbix_set_log_level(LOG_LEVEL_DEBUG);*/ - zabbix_log( LOG_LEVEL_DEBUG, "Executing query:%s",query); - #ifdef HAVE_MYSQL -@@ -185,8 +190,6 @@ - return mysql_store_result(&mysql); - #endif - #ifdef HAVE_PGSQL -- PGresult *result; -- - result = PQexec(conn,query); - - if( result==NULL) diff --git a/net-mgmt/zabbix/pkg-plist b/net-mgmt/zabbix/pkg-plist index c5bfd3a76dae..e197b32ccfe6 100644 --- a/net-mgmt/zabbix/pkg-plist +++ b/net-mgmt/zabbix/pkg-plist @@ -64,6 +64,7 @@ bin/zabbix_trapperd %%DATADIR%%/php/images/sysmaps/old/Router.png %%DATADIR%%/php/images/sysmaps/old/Server.png %%DATADIR%%/php/images/sysmaps/old/Workstation.png +%%DATADIR%%/php/images/sysmaps/UPS.png %%DATADIR%%/php/images/sysmaps/Notebook.png %%DATADIR%%/php/images/sysmaps/Hub.png %%DATADIR%%/php/images/sysmaps/Printer.png @@ -72,7 +73,6 @@ bin/zabbix_trapperd %%DATADIR%%/php/images/sysmaps/Workstation.png %%DATADIR%%/php/images/sysmaps/README %%DATADIR%%/php/images/sysmaps/Phone.png -%%DATADIR%%/php/images/sysmaps/Battery.png %%DATADIR%%/php/images/sysmaps/Network.png %%DATADIR%%/php/images/sysmaps/Satellite.png %%DATADIR%%/php/include/.htaccess @@ -122,6 +122,8 @@ bin/zabbix_trapperd %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql +%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql/patch.sql +%%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql/patch.sql @dirrm etc/zabbix @dirrm %%DATADIR%%/php/audio @dirrm %%DATADIR%%/php/images/sysmaps/old @@ -190,6 +192,9 @@ bin/zabbix_trapperd @dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql @dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql @dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13 +@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/mysql +@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14/postgresql +@dirrm %%DATADIR%%/dbpatches/1.0beta13_to_1.0beta14 @dirrm %%DATADIR%%/dbpatches @dirrm %%DATADIR%% @exec ln -sf %D/etc/zabbix /etc/zabbix |