- Updated to 1.8.1 [1]

- Added overridable PORTREVISION (initial value 0) to allow slave port
  (zabbix-frontend) to bump independently of the master port

PR:		ports/143311 [1]
Submitted by:	Jim Riggs <ports@christianserving.org> (maintainer) [1]

6 files changed, 22 insertions, 10 deletions

diff --git a/net-mgmt/zabbix-server/Makefile b/net-mgmt/zabbix-server/Makefile
index d8a86df74956..83c0dc2c5a06 100644
--- a/net-mgmt/zabbix-server/Makefile
+++ b/net-mgmt/zabbix-server/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.8
+PORTVERSION=	1.8.1
+PORTREVISION?=	0
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -43,6 +44,7 @@ SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
 
 .if ${ZABBIX_BUILD} != "agent"
 LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
diff --git a/net-mgmt/zabbix-server/distinfo b/net-mgmt/zabbix-server/distinfo
index 3ee658f07890..da5e3d690fe6 100644
--- a/net-mgmt/zabbix-server/distinfo
+++ b/net-mgmt/zabbix-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.8.tar.gz) = 066153713c05f873b4344e4ea1e065e9
-SHA256 (zabbix-1.8.tar.gz) = 6743f01f27116ead7b48927ac184708bb920541c88e63602fe1f2b7401866eec
-SIZE (zabbix-1.8.tar.gz) = 3549582
+MD5 (zabbix-1.8.1.tar.gz) = ab1a5006a885d780084bb870320abbc9
+SHA256 (zabbix-1.8.1.tar.gz) = ef487766f22527d79fd7a2631b615c34d04103038341f1dc16eceb77172d8a7c
+SIZE (zabbix-1.8.1.tar.gz) = 3607414
diff --git a/net-mgmt/zabbix-server/pkg-plist.frontend b/net-mgmt/zabbix-server/pkg-plist.frontend
index 1bc178631f52..621b136ab5df 100644
--- a/net-mgmt/zabbix-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix-server/pkg-plist.frontend
@@ -2,6 +2,7 @@
 %%WWWDIR%%/acknow.php
 %%WWWDIR%%/actionconf.php
 %%WWWDIR%%/api/.htaccess
+%%WWWDIR%%/api/classes/class.apiexception.php
 %%WWWDIR%%/api/classes/class.caction.php
 %%WWWDIR%%/api/classes/class.calert.php
 %%WWWDIR%%/api/classes/class.capiinfo.php
@@ -14,6 +15,7 @@
 %%WWWDIR%%/api/classes/class.citem.php
 %%WWWDIR%%/api/classes/class.cmaintenance.php
 %%WWWDIR%%/api/classes/class.cmap.php
+%%WWWDIR%%/api/classes/class.cproxy.php
 %%WWWDIR%%/api/classes/class.cscreen.php
 %%WWWDIR%%/api/classes/class.cscript.php
 %%WWWDIR%%/api/classes/class.ctemplate.php
@@ -218,6 +220,7 @@
 %%WWWDIR%%/include/.htaccess
 %%WWWDIR%%/include/acknow.inc.php
 %%WWWDIR%%/include/actions.inc.php
+%%WWWDIR%%/include/apicalls.inc.php
 %%WWWDIR%%/include/audit.inc.php
 %%WWWDIR%%/include/blocks.inc.php
 %%WWWDIR%%/include/classes/.htaccess
@@ -323,6 +326,7 @@
 %%WWWDIR%%/include/profiles.inc.php
 %%WWWDIR%%/include/regexp.inc.php
 %%WWWDIR%%/include/reports.inc.php
+%%WWWDIR%%/include/requirements.inc.php
 %%WWWDIR%%/include/screens.inc.php
 %%WWWDIR%%/include/scripts.inc.php
 %%WWWDIR%%/include/services.inc.php
@@ -337,10 +341,10 @@
 %%WWWDIR%%/js/class.cmap.js
 %%WWWDIR%%/js/class.cookie.js
 %%WWWDIR%%/js/class.cscreen.js
+%%WWWDIR%%/js/class.cswitcher.js
 %%WWWDIR%%/js/class.ctree.js
 %%WWWDIR%%/js/class.curl.js
 %%WWWDIR%%/js/class.pmaster.js
-%%WWWDIR%%/js/class.switcher.js
 %%WWWDIR%%/js/common.js
 %%WWWDIR%%/js/functions.js
 %%WWWDIR%%/js/gtlc.js
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index d8a86df74956..83c0dc2c5a06 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.8
+PORTVERSION=	1.8.1
+PORTREVISION?=	0
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -43,6 +44,7 @@ SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
 MAKE_ARGS+=	ARCH=freebsd
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-${ZABBIX_BUILD}
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"
 
 .if ${ZABBIX_BUILD} != "agent"
 LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
diff --git a/net-mgmt/zabbix2-server/distinfo b/net-mgmt/zabbix2-server/distinfo
index 3ee658f07890..da5e3d690fe6 100644
--- a/net-mgmt/zabbix2-server/distinfo
+++ b/net-mgmt/zabbix2-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.8.tar.gz) = 066153713c05f873b4344e4ea1e065e9
-SHA256 (zabbix-1.8.tar.gz) = 6743f01f27116ead7b48927ac184708bb920541c88e63602fe1f2b7401866eec
-SIZE (zabbix-1.8.tar.gz) = 3549582
+MD5 (zabbix-1.8.1.tar.gz) = ab1a5006a885d780084bb870320abbc9
+SHA256 (zabbix-1.8.1.tar.gz) = ef487766f22527d79fd7a2631b615c34d04103038341f1dc16eceb77172d8a7c
+SIZE (zabbix-1.8.1.tar.gz) = 3607414
diff --git a/net-mgmt/zabbix2-server/pkg-plist.frontend b/net-mgmt/zabbix2-server/pkg-plist.frontend
index 1bc178631f52..621b136ab5df 100644
--- a/net-mgmt/zabbix2-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix2-server/pkg-plist.frontend
@@ -2,6 +2,7 @@
 %%WWWDIR%%/acknow.php
 %%WWWDIR%%/actionconf.php
 %%WWWDIR%%/api/.htaccess
+%%WWWDIR%%/api/classes/class.apiexception.php
 %%WWWDIR%%/api/classes/class.caction.php
 %%WWWDIR%%/api/classes/class.calert.php
 %%WWWDIR%%/api/classes/class.capiinfo.php
@@ -14,6 +15,7 @@
 %%WWWDIR%%/api/classes/class.citem.php
 %%WWWDIR%%/api/classes/class.cmaintenance.php
 %%WWWDIR%%/api/classes/class.cmap.php
+%%WWWDIR%%/api/classes/class.cproxy.php
 %%WWWDIR%%/api/classes/class.cscreen.php
 %%WWWDIR%%/api/classes/class.cscript.php
 %%WWWDIR%%/api/classes/class.ctemplate.php
@@ -218,6 +220,7 @@
 %%WWWDIR%%/include/.htaccess
 %%WWWDIR%%/include/acknow.inc.php
 %%WWWDIR%%/include/actions.inc.php
+%%WWWDIR%%/include/apicalls.inc.php
 %%WWWDIR%%/include/audit.inc.php
 %%WWWDIR%%/include/blocks.inc.php
 %%WWWDIR%%/include/classes/.htaccess
@@ -323,6 +326,7 @@
 %%WWWDIR%%/include/profiles.inc.php
 %%WWWDIR%%/include/regexp.inc.php
 %%WWWDIR%%/include/reports.inc.php
+%%WWWDIR%%/include/requirements.inc.php
 %%WWWDIR%%/include/screens.inc.php
 %%WWWDIR%%/include/scripts.inc.php
 %%WWWDIR%%/include/services.inc.php
@@ -337,10 +341,10 @@
 %%WWWDIR%%/js/class.cmap.js
 %%WWWDIR%%/js/class.cookie.js
 %%WWWDIR%%/js/class.cscreen.js
+%%WWWDIR%%/js/class.cswitcher.js
 %%WWWDIR%%/js/class.ctree.js
 %%WWWDIR%%/js/class.curl.js
 %%WWWDIR%%/js/class.pmaster.js
-%%WWWDIR%%/js/class.switcher.js
 %%WWWDIR%%/js/common.js
 %%WWWDIR%%/js/functions.js
 %%WWWDIR%%/js/gtlc.js