ports/156519: [MAINTAINER] net-mgmt/zabbix-server: update to 1.8.5

Wed Apr 20 15:40:13 UTC 2011

The following reply was made to PR ports/156519; it has been noted by GNATS.

From: Jim Riggs <ports at christianserving.org>
To: FreeBSD-gnats-submit at freebsd.org
Cc:  
Subject: Re: ports/156519: [MAINTAINER] net-mgmt/zabbix-server: update to 1.8.5
Date: Wed, 20 Apr 2011 10:37:34 -0500 (CDT)

 >Submitter-Id:	current-users
 >Originator:	Jim Riggs
 >Organization:	
 >Confidential:	no 
 >Synopsis:	Re: ports/156519: [MAINTAINER] net-mgmt/zabbix-server: update to 1.8.5
 >Severity:	non-critical
 >Priority:	low
 >Category:	ports 
 >Class:		maintainer-update
 >Release:	FreeBSD 6.3-RELEASE-p2 amd64
 >Environment:
 System: FreeBSD zion.christianserving.org 6.3-RELEASE-p2 FreeBSD 6.3-RELEASE-p2 #3: Mon May  5 21:27:22 CDT
 >Description:
 Default configure option changed upstream.

 Generated with FreeBSD Port Tools 0.77
 >How-To-Repeat:
 >Fix:

 --- zabbix-server-1.8.5,2.patch begins here ---
 diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/Makefile /root/portwork/zabbix-server/Makefile
 --- /usr/ports/net-mgmt/zabbix-server/Makefile	2011-03-19 08:15:28.000000000 -0500
 +++ /root/portwork/zabbix-server/Makefile	2011-04-20 10:20:01.000000000 -0500
 @@ -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 @@
  MAINTAINER=	ports at 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 @@
  .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

 @@ -48,8 +49,7 @@
  CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include"

  .if ${ZABBIX_BUILD} != "agent"
 -LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
 -		curl:${PORTSDIR}/ftp/curl
 +LIB_DEPENDS=	netsnmp:${PORTSDIR}/net-mgmt/net-snmp

  SUB_FILES=	pkg-message

 @@ -67,7 +67,8 @@
  		IPMI "Support for IPMI" off \
  		SSH "Support for SSH-based checks" off \
  		IODBC "Support for iODBC" off \
 -		UNIXODBC "Support for unixODBC" off
 +		UNIXODBC "Support for unixODBC" off \
 +		EXECINFO "Use execinfo for debugging traces" off

  .include <bsd.port.options.mk>

 @@ -87,8 +88,9 @@
  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
 @@ -128,6 +130,11 @@
  LIB_DEPENDS+=	odbc:${PORTSDIR}/databases/unixODBC
  CONFIGURE_ARGS+=	--with-unixodbc
  .endif
 +
 +.ifdef WITH_EXECINFO
 +LIB_DEPENDS+=	execinfo:${PORTSDIR}/devel/libexecinfo
 +CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 +.endif
  .endif # if ${ZABBIX_BUILD} != "agent"

  .ifdef WITH_IPV6
 diff -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/distinfo /root/portwork/zabbix-server/distinfo
 --- /usr/ports/net-mgmt/zabbix-server/distinfo	2011-03-20 07:54:14.000000000 -0500
 +++ /root/portwork/zabbix-server/distinfo	2011-04-20 10:04:17.000000000 -0500
 @@ -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 -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/pkg-plist /root/portwork/zabbix-server/pkg-plist
 --- /usr/ports/net-mgmt/zabbix-server/pkg-plist	2010-08-23 15:15:43.000000000 -0500
 +++ /root/portwork/zabbix-server/pkg-plist	2011-04-20 10:04:17.000000000 -0500
 @@ -22,10 +22,12 @@
  %%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 -ruN --exclude=CVS /usr/ports/net-mgmt/zabbix-server/pkg-plist.frontend /root/portwork/zabbix-server/pkg-plist.frontend
 --- /usr/ports/net-mgmt/zabbix-server/pkg-plist.frontend	2010-08-23 15:15:43.000000000 -0500
 +++ /root/portwork/zabbix-server/pkg-plist.frontend	2011-04-20 10:04:17.000000000 -0500
 @@ -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
 + at dirrm %%WWWDIR%%/include/xmlschemas
  @dirrm %%WWWDIR%%/include/locales
  @dirrm %%WWWDIR%%/include/classes
  @dirrm %%WWWDIR%%/include
 --- zabbix-server-1.8.5,2.patch ends here ---