ports/189135: [PATCH] net-mgmt/zabbix22-server: update to 2.2.3

Danilo G. Baio dbaio at bsd.com.br
Wed Apr 30 11:20:01 UTC 2014 

>Number:         189135
>Category:       ports
>Synopsis:       [PATCH] net-mgmt/zabbix22-server: update to 2.2.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 30 11:20:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Danilo G. Baio
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD dbaio.bs2cloud.com.br 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC
>Description:
- Update to 2.2.3
- Update to use OptionsNG
- Fix stage with JAVAGW options enabled
- Drop oracle option

Port maintainer (pakhom706 at gmail.com) is cc'd.

Generated with FreeBSD Port Tools 1.01 (mode: update, diff: SVN)
>How-To-Repeat:
>Fix:

--- zabbix22-server-2.2.3.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 352677)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix22
-PORTVERSION=	2.2.2
-PORTREVISION?=	1
+PORTVERSION=	2.2.3
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
@@ -71,6 +70,7 @@
 
 OPTIONS_DEFINE=	IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW LIBXML2
 OPTIONS_DEFAULT=	MYSQL IPV6 FPING JABBER CURL
+OPTIONS_SUB=	yes
 
 CURL_DESC=	Support for web monitoring
 FPING_DESC=	Build/install fping for ping checks
@@ -86,97 +86,55 @@
 LIBXML2_DESC=	Support for libxml2 (required by monitoring VMware)
 
 OPTIONS_SINGLE=	DB ODBC
-OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE ORACLE
+OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
 OPTIONS_SINGLE_ODBC=	IODBC UNIXODBC
 
-.include <bsd.port.options.mk>
+MYSQL_CONFIGURE_WITH=	mysql
+MYSQL_USE=	MYSQL=yes
 
-.if ${PORT_OPTIONS:MMYSQL}
-ZABBIX_REQUIRE=	" mysql"
-USE_MYSQL=	yes
-CONFIGURE_ARGS+=	--with-mysql
-.endif
+PGSQL_CONFIGURE_WITH=	postgresql
+PGSQL_USE=	PGSQL=yes
 
-.if ${PORT_OPTIONS:MPGSQL}
-ZABBIX_REQUIRE=	" postgresql"
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=	--with-postgresql
-.endif
+SQLITE_CONFIGURE_WITH=	sqlite3
+SQLITE_USE=	SQLITE=3
 
-.if ${PORT_OPTIONS:MSQLITE}
-ZABBIX_REQUIRE=	" sqlite"
-USE_SQLITE=	3
-CONFIGURE_ARGS+=	--with-sqlite3
-.endif
+CURL_CONFIGURE_WITH=	libcurl
+CURL_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-.if ${PORT_OPTIONS:MORACLE}
-ZABBIX_REQUIRE=
-CONFIGURE_ARGS+=	--with-oracle
-.endif
+LDAP_CONFIGURE_WITH=	ldap
+LDAP_USE=	OPENLDAP=yes
 
-.if ${PORT_OPTIONS:MCURL}
-LIB_DEPENDS+=	libcurl.so:${PORTSDIR}/ftp/curl
-CONFIGURE_ARGS+=	--with-libcurl
-.endif
+IPMI_CONFIGURE_WITH=	openipmi
+IPMI_LIB_DEPENDS=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
 
-.if ${PORT_OPTIONS:MLDAP}
-USE_OPENLDAP=	yes
-CONFIGURE_ARGS+=	--with-ldap
-.endif
+JABBER_CONFIGURE_WITH=	jabber
+JABBER_LIB_DEPENDS=	libiksemel.so:${PORTSDIR}/textproc/iksemel
 
-.if ${PORT_OPTIONS:MIPMI}
-LIB_DEPENDS+=	libOpenIPMI.so:${PORTSDIR}/sysutils/openipmi
-CONFIGURE_ARGS+=	--with-openipmi
-.endif
+FPING_DEPENDS=	fping:${PORTSDIR}/net/fping
 
-.if ${PORT_OPTIONS:MJABBER}
-LIB_DEPENDS+=	libiksemel.so:${PORTSDIR}/textproc/iksemel
-CONFIGURE_ARGS+=	--with-jabber
-.endif
+SSH_CONFIGURE_WITH=	ssh2
+SSH_LIB_DEPENDS=	libssh2.so:${PORTSDIR}/security/libssh2
 
-.if ${PORT_OPTIONS:MFPING}
-RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
-.endif
+IODBC_CONFIGURE_WITH=	iodbc
+IODBC_LIB_DEPENDS=	libiodbc.so:${PORTSDIR}/databases/libiodbc
 
-.if ${PORT_OPTIONS:MSSH}
-LIB_DEPENDS+=	libssh2.so:${PORTSDIR}/security/libssh2
-CONFIGURE_ARGS+=	--with-ssh2
-.endif
-
-.if ${PORT_OPTIONS:MIODBC}
-LIB_DEPENDS+=	libiodbc.so:${PORTSDIR}/databases/libiodbc
-CONFIGURE_ARGS+=	--with-iodbc
-.endif
-
-.if ${PORT_OPTIONS:MUNIXODBC}
-LIB_DEPENDS+=	libodbc.so:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-unixodbc
-.endif
+UNIXODBC_CONFIGURE_WITH=	unixodbc
+UNIXODBC_LIB_DEPENDS=	libodbc.so:${PORTSDIR}/databases/unixODBC
 .endif # if ${ZABBIX_BUILD} != "agent"
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=	--enable-ipv6
-.endif
+IPV6_CONFIGURE_ENABLE=	ipv6
 
-.if ${PORT_OPTIONS:MNMAP}
-RUN_DEPENDS+=	nmap:${PORTSDIR}/security/nmap \
+NMAP_RUN_DEPENDS=	nmap:${PORTSDIR}/security/nmap \
 		sudo:${PORTSDIR}/security/sudo
-.endif
 
-.if ${PORT_OPTIONS:MJAVAGW}
-USE_JAVA=	yes
-CONFIGURE_ARGS+=	--enable-java
-PLIST_SUB+=	ZABBIX_JAVA="sbin/zabbix_java"
-PLIST_SUB+=	JAVAGW=""
-.else
-PLIST_SUB+=	JAVAGW="@comment "
-.endif
+JAVAGW_CONFIGURE_ENABLE=	java
+JAVAGW_USE=	JAVA=yes
 
-.if ${PORT_OPTIONS:MLIBXML2}
-LIB_DEPENDS+=	libxml2.so:${PORTSDIR}/textproc/libxml2
-CONFIGURE_ARGS+=	--with-libxml2
-.endif
+LIBXML2_CONFIGURE_WITH=	libxml2
+LIBXML2_LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'
@@ -197,8 +155,7 @@
 	@${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} -f {} +
 
 post-install:
-
-.if defined(WITH_JAVAGW)
+.if ${PORT_OPTIONS:MJAVAGW}
 	@${MV} ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh ${STAGEDIR}${PREFIX}/sbin/zabbix_java/settings.sh.sample
 .endif
 
Index: distinfo
===================================================================
--- distinfo	(revision 352677)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (zabbix-2.2.2.tar.gz) = e00ef9a1d667284a2bc2ce04966204ee094ade2c0bc6a94efb9436a9aa5cb2be
-SIZE (zabbix-2.2.2.tar.gz) = 14595839
+SHA256 (zabbix-2.2.3.tar.gz) = 12a75762d474227f9af8b44abe48dd2660a76713335a37fc8147aca3c79844c1
+SIZE (zabbix-2.2.3.tar.gz) = 14649686
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 352677)
+++ pkg-plist	(working copy)
@@ -33,19 +33,19 @@
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/postgresql/patch.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/oracle/patch.sql
 %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/1.6/mysql/patch.sql
-%%JAVAGW%%%%ZABBIX_JAVA%%/shutdown.sh
-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-console.xml
-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-core-0.9.27.jar
-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/org-json-2010-12-28.jar
-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-classic-0.9.27.jar
-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback.xml
-%%JAVAGW%%%%ZABBIX_JAVA%%/lib/slf4j-api-1.6.1.jar
-%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh.sample
-%%JAVAGW%%%%ZABBIX_JAVA%%/startup.sh
-%%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-%%PORTVERSION%%.jar
-%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib
-%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/bin
-%%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%
+%%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/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.2
 @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/ibm_db2
 @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/upgrades/dbpatches/2.0/postgresql
--- zabbix22-server-2.2.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list