5 files changed, 47 insertions, 12 deletions

diff --git a/net-mgmt/zabbix-server/Makefile b/net-mgmt/zabbix-server/Makefile
index 2ce0a0139aa4..c09accc97a74 100644
--- a/net-mgmt/zabbix-server/Makefile
+++ b/net-mgmt/zabbix-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.8.3
-PORTREVISION=	2
+PORTVERSION=	1.8.5
 PORTEPOCH=	2
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
@@ -16,6 +15,8 @@ PKGNAMESUFFIX?=	-server
 MAINTAINER=	ports@christianserving.org
 COMMENT=	Enterprise-class open source distributed monitoring (${PKGNAMESUFFIX:S/^-//})
 
+LICENSE=	GPLv2
+
 CONFLICTS=	${PKGBASE}-1.[0-6]*
 
 .if ${PKGNAMESUFFIX} != "-agent"
@@ -27,12 +28,12 @@ ZABBIX_BUILD=	${PKGNAMESUFFIX:S/^-//}
 .if ${ZABBIX_BUILD} != "frontend" # frontend only needs the version/distribution settings
 .if ${ZABBIX_BUILD} != "agent"
 USE_ICONV=	yes
-MAN8=		${PORTNAME}_${ZABBIX_BUILD}.8
+MAN8+=		${PORTNAME}_${ZABBIX_BUILD}.8
 USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}
 .else
 USE_ICONV=	yes
-MAN1=		${PORTNAME}_get.1 ${PORTNAME}_sender.1
-MAN8=		${PORTNAME}_${ZABBIX_BUILD}d.8
+MAN1+=		${PORTNAME}_get.1 ${PORTNAME}_sender.1
+MAN8+=		${PORTNAME}_${ZABBIX_BUILD}d.8
 USE_RC_SUBR=	${PORTNAME}_${ZABBIX_BUILD}d
 .endif
 
@@ -45,11 +46,11 @@ 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"
+CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
 
 .if ${ZABBIX_BUILD} != "agent"
 LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
-		curl:${PORTSDIR}/ftp/curl
+		execinfo:${PORTSDIR}/devel/libexecinfo
 
 SUB_FILES=	pkg-message
 
@@ -87,8 +88,9 @@ CONFIGURE_ARGS+=	--with-sqlite3
 IGNORE=		zabbix requires a database backend
 .endif
 
-.ifdef WITHOUT_CURL
-CONFIGURE_ARGS+=	--without-libcurl
+.ifdef WITH_CURL
+LIB_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+CONFIGURE_ARGS+=	--with-libcurl
 .endif
 
 .ifndef WITHOUT_LDAP
diff --git a/net-mgmt/zabbix-server/distinfo b/net-mgmt/zabbix-server/distinfo
index fe71ef9093da..bef9ba2efe42 100644
--- a/net-mgmt/zabbix-server/distinfo
+++ b/net-mgmt/zabbix-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zabbix-1.8.3.tar.gz) = 37262d751c9661a361380bf1480d277d81621d8a49c60a81667cbe258021065c
-SIZE (zabbix-1.8.3.tar.gz) = 4106152
+SHA256 (zabbix-1.8.5.tar.gz) = 885b9f1953c3f6aa1f13760340b3d23d6e01287dc46e6e241c964aec7a38ef32
+SIZE (zabbix-1.8.5.tar.gz) = 4184672
diff --git a/net-mgmt/zabbix-server/files/patch-src_libs_zbxcomms_comms.c b/net-mgmt/zabbix-server/files/patch-src_libs_zbxcomms_comms.c
new file mode 100644
index 000000000000..4388356b9f25
--- /dev/null
+++ b/net-mgmt/zabbix-server/files/patch-src_libs_zbxcomms_comms.c
@@ -0,0 +1,24 @@
+--- src/libs/zbxcomms/comms.c.orig	2011-04-15 14:17:29.000000000 -0500
++++ src/libs/zbxcomms/comms.c	2011-04-22 09:47:38.403907930 -0500
+@@ -756,19 +756,14 @@
+ 						ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
+ 			}
+ 
+-#if defined(IPV6_V6ONLY)
+-#ifdef _WINDOWS
++#if defined(IPPROTO_IPV6) && defined(IPV6_V6ONLY)
+ 			if (PF_INET6 == current_ai->ai_family &&
+ 				ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], IPPROTO_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
+-#else
+-			if (PF_INET6 == current_ai->ai_family &&
+-				ZBX_TCP_ERROR == setsockopt(s->sockets[s->num_socks], SOL_IPV6, IPV6_V6ONLY, (void *)&on, sizeof(on)))
+-#endif
+ 			{
+ 				zbx_set_tcp_strerror("setsockopt() with IPV6_V6ONLY for [[%s]:%s] failed with error %d: %s",
+ 						ip ? ip : "-", port, zbx_sock_last_error(), strerror_from_system(zbx_sock_last_error()));
+ 			}
+-#endif	/* IPV6_V6ONLY */
++#endif
+ 
+ 			if (ZBX_TCP_ERROR == bind(s->sockets[s->num_socks], current_ai->ai_addr, current_ai->ai_addrlen))
+ 			{
diff --git a/net-mgmt/zabbix-server/pkg-plist b/net-mgmt/zabbix-server/pkg-plist
index e0841088e205..317a5f4c8699 100644
--- a/net-mgmt/zabbix-server/pkg-plist
+++ b/net-mgmt/zabbix-server/pkg-plist
@@ -22,10 +22,12 @@ sbin/zabbix_%%ZABBIX_BUILD%%
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/UPS_small.png
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Workstation.png
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images/Workstation_small.png
+%%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_ibm_db2.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_mysql.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_oracle.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_pgsql.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/data/images_sqlite3.sql
+%%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/ibm_db2.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/mysql.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/oracle.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/create/schema/postgresql.sql
diff --git a/net-mgmt/zabbix-server/pkg-plist.frontend b/net-mgmt/zabbix-server/pkg-plist.frontend
index 50790e003bed..194921745bdb 100644
--- a/net-mgmt/zabbix-server/pkg-plist.frontend
+++ b/net-mgmt/zabbix-server/pkg-plist.frontend
@@ -27,6 +27,7 @@
 %%WWWDIR%%/api/classes/class.cscript.php
 %%WWWDIR%%/api/classes/class.ctemplate.php
 %%WWWDIR%%/api/classes/class.ctrigger.php
+%%WWWDIR%%/api/classes/class.ctriggerexpression.php
 %%WWWDIR%%/api/classes/class.cuser.php
 %%WWWDIR%%/api/classes/class.cusergroup.php
 %%WWWDIR%%/api/classes/class.cusermacro.php
@@ -232,6 +233,7 @@
 %%WWWDIR%%/include/classes/class.ccolorcell.php
 %%WWWDIR%%/include/classes/class.ccombobox.php
 %%WWWDIR%%/include/classes/class.ccomboitem.php
+%%WWWDIR%%/include/classes/class.cconfigfile.php
 %%WWWDIR%%/include/classes/class.cdiv.php
 %%WWWDIR%%/include/classes/class.ceditablecombobox.php
 %%WWWDIR%%/include/classes/class.cfile.php
@@ -249,9 +251,9 @@
 %%WWWDIR%%/include/classes/class.ciframe.php
 %%WWWDIR%%/include/classes/class.cimagetexttable.php
 %%WWWDIR%%/include/classes/class.cimg.php
-%%WWWDIR%%/include/classes/class.cipbox.php
 %%WWWDIR%%/include/classes/class.cjson.php
 %%WWWDIR%%/include/classes/class.cjsscript.php
+%%WWWDIR%%/include/classes/class.clabel.php
 %%WWWDIR%%/include/classes/class.cldap.php
 %%WWWDIR%%/include/classes/class.clink.php
 %%WWWDIR%%/include/classes/class.clist.php
@@ -314,6 +316,7 @@
 %%WWWDIR%%/include/locales/pl_pl.inc.php
 %%WWWDIR%%/include/locales/pt_br.inc.php
 %%WWWDIR%%/include/locales/ru_ru.inc.php
+%%WWWDIR%%/include/locales/sk_sk.inc.php
 %%WWWDIR%%/include/locales/sp_sp.inc.php
 %%WWWDIR%%/include/locales/sv_se.inc.php
 %%WWWDIR%%/include/locales/ua_ua.inc.php
@@ -339,6 +342,7 @@
 %%WWWDIR%%/include/users.inc.php
 %%WWWDIR%%/include/validate.inc.php
 %%WWWDIR%%/include/valuemap.inc.php
+%%WWWDIR%%/include/xmlschemas/screens.rng
 %%WWWDIR%%/index.php
 %%WWWDIR%%/instal.php
 %%WWWDIR%%/items.php
@@ -422,6 +426,8 @@
 %%WWWDIR%%/styles/div.css
 %%WWWDIR%%/styles/form.css
 %%WWWDIR%%/styles/ie.css
+%%WWWDIR%%/styles/ie_css_bb.css
+%%WWWDIR%%/styles/ie_css_ob.css
 %%WWWDIR%%/styles/ie_css_od.css
 %%WWWDIR%%/styles/link.css
 %%WWWDIR%%/styles/p.css
@@ -444,6 +450,7 @@
 @dirrm %%WWWDIR%%/styles
 @dirrm %%WWWDIR%%/js/scriptaculous
 @dirrm %%WWWDIR%%/js
+@dirrm %%WWWDIR%%/include/xmlschemas
 @dirrm %%WWWDIR%%/include/locales
 @dirrm %%WWWDIR%%/include/classes
 @dirrm %%WWWDIR%%/include