summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-mgmt/zabbix2-server/Makefile4
-rw-r--r--net-mgmt/zabbix2-server/distinfo4
-rw-r--r--net-mgmt/zabbix2-server/pkg-plist37
-rw-r--r--net-mgmt/zabbix2-server/pkg-plist.agent5
-rw-r--r--net-mgmt/zabbix2-server/pkg-plist.frontend110
5 files changed, 10 insertions, 150 deletions
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 1ef9fc7ff6a6..c21045efeb3c 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= zabbix2
-PORTVERSION= 2.0.12
-PORTREVISION?= 1
+PORTVERSION= 2.0.13
+PORTREVISION?= 0
CATEGORIES= net-mgmt
MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
diff --git a/net-mgmt/zabbix2-server/distinfo b/net-mgmt/zabbix2-server/distinfo
index 5a0bd41df5e0..04c313058e1d 100644
--- a/net-mgmt/zabbix2-server/distinfo
+++ b/net-mgmt/zabbix2-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zabbix-2.0.12.tar.gz) = f9237297b37d41eb0ed4f0b2e1f3f2e30dc17fe19d3bbd57fb06d5f6f8acd8b7
-SIZE (zabbix-2.0.12.tar.gz) = 13699618
+SHA256 (zabbix-2.0.13.tar.gz) = e4e98ddae2e01531a05d58d4795afe87b9f1c0b77d777b706afe2ae8e6e012e2
+SIZE (zabbix-2.0.13.tar.gz) = 13798473
diff --git a/net-mgmt/zabbix2-server/pkg-plist b/net-mgmt/zabbix2-server/pkg-plist
index 4dfcb7f0ee11..27f0b8297470 100644
--- a/net-mgmt/zabbix2-server/pkg-plist
+++ b/net-mgmt/zabbix2-server/pkg-plist
@@ -35,42 +35,13 @@ sbin/zabbix_%%ZABBIX_BUILD%%
%%JAVAGW%%sbin/zabbix_java/shutdown.sh
%%JAVAGW%%sbin/zabbix_java/lib/logback-console.xml
%%JAVAGW%%sbin/zabbix_java/lib/logback-core-0.9.27.jar
-%%JAVAGW%%sbin/zabbix_java/lib/org-json-2010-12-28.jar
+%%JAVAGW%%sbin/zabbix_java/lib/android-json-4.3_r3.1.jar
%%JAVAGW%%sbin/zabbix_java/lib/logback-classic-0.9.27.jar
%%JAVAGW%%sbin/zabbix_java/lib/logback.xml
%%JAVAGW%%sbin/zabbix_java/lib/slf4j-api-1.6.1.jar
%%JAVAGW%%sbin/zabbix_java/settings.sh.sample
%%JAVAGW%%sbin/zabbix_java/startup.sh
%%JAVAGW%%sbin/zabbix_java/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
-%%JAVAGW%%@dirrmtry sbin/zabbix_java/lib
-%%JAVAGW%%@dirrmtry sbin/zabbix_java/bin
-%%JAVAGW%%@dirrmtry sbin/zabbix_java
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/oracle
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/mysql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/mysql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/postgresql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8/oracle
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.8
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/mysql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/postgresql
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/sqlite3
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/ibm_db2
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database/oracle
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database
-@dirrm %%DATADIR%%/%%ZABBIX_BUILD%%
-@dirrmtry %%DATADIR%%
-%%SERVER%%@dirrmtry %%ETCDIR%%/zabbix/alertscripts
-@dirrmtry %%ETCDIR%%/zabbix/externalscripts
-@dirrmtry %%ETCDIR%%/zabbix
-%%PROXY%%@dirrmtry %%ETCDIR%%/zabbix_proxy.conf.d
-%%SERVER%%@dirrmtry %%ETCDIR%%/zabbix_server.conf.d
-@dirrmtry %%ETCDIR%%
+%%SERVER%%@dir %%ETCDIR%%/zabbix/alertscripts
+@dir %%ETCDIR%%/zabbix/externalscripts
+@dir %%ETCDIR%%/zabbix_%%ZABBIX_BUILD%%.conf.d
diff --git a/net-mgmt/zabbix2-server/pkg-plist.agent b/net-mgmt/zabbix2-server/pkg-plist.agent
index bef621895412..f49de6049565 100644
--- a/net-mgmt/zabbix2-server/pkg-plist.agent
+++ b/net-mgmt/zabbix2-server/pkg-plist.agent
@@ -4,9 +4,8 @@ bin/zabbix_get
bin/zabbix_sender
sbin/zabbix_agent
sbin/zabbix_agentd
-@dirrmtry %%ETCDIR%%/zabbix_agentd.conf.d
-@dirrmtry %%ETCDIR%%/zabbix_agent.conf.d
-@dirrmtry %%ETCDIR%%
+@dir %%ETCDIR%%/zabbix_agentd.conf.d
+@dir %%ETCDIR%%/zabbix_agent.conf.d
man/man1/zabbix_get.1.gz
man/man1/zabbix_sender.1.gz
man/man8/zabbix_%%ZABBIX_BUILD%%d.8.gz
diff --git a/net-mgmt/zabbix2-server/pkg-plist.frontend b/net-mgmt/zabbix2-server/pkg-plist.frontend
index c32df76cf1a3..22092c5f1727 100644
--- a/net-mgmt/zabbix2-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix2-server/pkg-plist.frontend
@@ -770,113 +770,3 @@
%%WWWDIR%%/tr_logform.php
%%WWWDIR%%/auditlogs.php
%%WWWDIR%%/report6.php
-@dirrm %%WWWDIR%%/audio
-@dirrm %%WWWDIR%%/include/views/js
-@dirrm %%WWWDIR%%/include/views
-@dirrm %%WWWDIR%%/include/classes/import/formatters
-@dirrm %%WWWDIR%%/include/classes/import/readers
-@dirrm %%WWWDIR%%/include/classes/import/importers
-@dirrm %%WWWDIR%%/include/classes/import
-@dirrm %%WWWDIR%%/include/classes/tree
-@dirrm %%WWWDIR%%/include/classes/export/writers
-@dirrm %%WWWDIR%%/include/classes/export
-@dirrm %%WWWDIR%%/include/classes/debug
-@dirrm %%WWWDIR%%/include/classes/api
-@dirrm %%WWWDIR%%/include/classes/core
-@dirrm %%WWWDIR%%/include/classes/sysmaps
-@dirrm %%WWWDIR%%/include/classes/db
-@dirrm %%WWWDIR%%/include/classes/helpers/trigger
-@dirrm %%WWWDIR%%/include/classes/helpers
-@dirrm %%WWWDIR%%/include/classes/screens
-@dirrm %%WWWDIR%%/include/classes/parsers
-@dirrm %%WWWDIR%%/include/classes/validators
-@dirrm %%WWWDIR%%/include/classes
-@dirrm %%WWWDIR%%/include
-@dirrm %%WWWDIR%%/api/rpc
-@dirrm %%WWWDIR%%/api/classes
-@dirrm %%WWWDIR%%/api
-@dirrm %%WWWDIR%%/images/sysmaps/old
-@dirrm %%WWWDIR%%/images/sysmaps
-@dirrm %%WWWDIR%%/images/flash
-@dirrm %%WWWDIR%%/images/gradients
-@dirrm %%WWWDIR%%/images/general/tree
-@dirrm %%WWWDIR%%/images/general/browserwarning
-@dirrm %%WWWDIR%%/images/general/bttn
-@dirrm %%WWWDIR%%/images/general/setup
-@dirrm %%WWWDIR%%/images/general/login
-@dirrm %%WWWDIR%%/images/general/bar
-@dirrm %%WWWDIR%%/images/general
-@dirrm %%WWWDIR%%/images
-@dirrm %%WWWDIR%%/locale/hu/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/hu
-@dirrm %%WWWDIR%%/locale/pt_BR/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/pt_BR
-@dirrm %%WWWDIR%%/locale/pt_PT/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/pt_PT
-@dirrm %%WWWDIR%%/locale/pl/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/pl
-@dirrm %%WWWDIR%%/locale/es/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/es
-@dirrm %%WWWDIR%%/locale/cs/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/cs
-@dirrm %%WWWDIR%%/locale/fa/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/fa
-@dirrm %%WWWDIR%%/locale/fi/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/fi
-@dirrm %%WWWDIR%%/locale/fr/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/fr
-@dirrm %%WWWDIR%%/locale/nl/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/nl
-@dirrm %%WWWDIR%%/locale/uk/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/uk
-@dirrm %%WWWDIR%%/locale/de/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/de
-@dirrm %%WWWDIR%%/locale/ja/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/ja
-@dirrm %%WWWDIR%%/locale/zh_TW/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/zh_TW
-@dirrm %%WWWDIR%%/locale/el/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/el
-@dirrm %%WWWDIR%%/locale/lv/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/lv
-@dirrm %%WWWDIR%%/locale/ko/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/ko
-@dirrm %%WWWDIR%%/locale/sv/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/sv
-@dirrm %%WWWDIR%%/locale/zh_CN/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/zh_CN
-@dirrm %%WWWDIR%%/locale/ru/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/ru
-@dirrm %%WWWDIR%%/locale/id/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/id
-@dirrm %%WWWDIR%%/locale/it/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/it
-@dirrm %%WWWDIR%%/locale/tr/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/tr
-@dirrm %%WWWDIR%%/locale/sk/LC_MESSAGES
-@dirrm %%WWWDIR%%/locale/sk
-@dirrm %%WWWDIR%%/locale/en_US/LC_MESSAGES/
-@dirrm %%WWWDIR%%/locale/en_US/
-@dirrm %%WWWDIR%%/locale/bg/LC_MESSAGES/
-@dirrm %%WWWDIR%%/locale/bg/
-@dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES/
-@dirrm %%WWWDIR%%/locale/lt/
-@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES/
-@dirrm %%WWWDIR%%/locale/ro/
-@dirrm %%WWWDIR%%/locale
-@dirrm %%WWWDIR%%/conf
-@dirrm %%WWWDIR%%/js/jquery
-@dirrm %%WWWDIR%%/js/vendors
-@dirrm %%WWWDIR%%/js
-@dirrm %%WWWDIR%%/fonts
-@dirrm %%WWWDIR%%/styles/themes/classic/images
-@dirrm %%WWWDIR%%/styles/themes/classic
-@dirrm %%WWWDIR%%/styles/themes/darkorange/images
-@dirrm %%WWWDIR%%/styles/themes/darkorange
-@dirrm %%WWWDIR%%/styles/themes/darkblue/images
-@dirrm %%WWWDIR%%/styles/themes/darkblue
-@dirrm %%WWWDIR%%/styles/themes/originalblue/images
-@dirrm %%WWWDIR%%/styles/themes/originalblue
-@dirrm %%WWWDIR%%/styles/themes
-@dirrm %%WWWDIR%%/styles
-@dirrm %%WWWDIR%%