svn commit: r317710 - in head/net-mgmt: zabbix2-frontend zabbix2-server

[Bryan Drewery]

Author: bdrewery
Date: Wed May  8 22:05:49 2013
New Revision: 317710
URL: http://svnweb.freebsd.org/changeset/ports/317710

Log:
  - Update to 2.0.6 [1]
  - Fix zabbix2-proxy plist
  - Fix PORTREVISION in master port
  
  PR:		ports/178182 [1]
  Submitted by:	Pakhom Golynga <pakhom706 at gmail.com> (maintainer) [1]

Modified:
  head/net-mgmt/zabbix2-frontend/Makefile
  head/net-mgmt/zabbix2-server/Makefile
  head/net-mgmt/zabbix2-server/distinfo
  head/net-mgmt/zabbix2-server/pkg-plist

Modified: head/net-mgmt/zabbix2-frontend/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-frontend/Makefile	Wed May  8 21:15:17 2013	(r317709)
+++ head/net-mgmt/zabbix2-frontend/Makefile	Wed May  8 22:05:49 2013	(r317710)
@@ -2,7 +2,6 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix2
-PORTREVISION=	2
 PKGNAMESUFFIX=	-frontend
 
 MASTERDIR=	${.CURDIR}/../zabbix2-server

Modified: head/net-mgmt/zabbix2-server/Makefile
==============================================================================
--- head/net-mgmt/zabbix2-server/Makefile	Wed May  8 21:15:17 2013	(r317709)
+++ head/net-mgmt/zabbix2-server/Makefile	Wed May  8 22:05:49 2013	(r317710)
@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	zabbix2
-PORTVERSION=	2.0.5
+PORTVERSION=	2.0.6
+PORTREVISION?=	0
 CATEGORIES=	net-mgmt
 MASTER_SITES=	SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
 PKGNAMESUFFIX?=	-server
@@ -42,6 +43,12 @@ PLIST_SUB=	PROXY="@comment "
 PLIST_SUB=	PROXY=""
 .endif
 
+.if ${ZABBIX_BUILD} == "server"
+PLIST_SUB+=	SERVER=""
+.else
+PLIST_SUB+=	SERVER="@comment "
+.endif
+
 PLIST_SUB+=	ZABBIX_BUILD=${ZABBIX_BUILD}
 SUB_LIST=	ZABBIX_BUILD=${ZABBIX_BUILD} ZABBIX_REQUIRE=${ZABBIX_REQUIRE}
 
@@ -158,7 +165,6 @@ PLIST_SUB+=      JAVAGW=""
 PLIST_SUB+=      JAVAGW="@comment "
 .endif
 
-
 post-patch:
 	@${GREP} -rl "/etc/zabbix" ${WRKSRC} \
 	  | ${XARGS} ${REINPLACE_CMD} -e 's#/etc/zabbix#${ETCDIR}#g'

Modified: head/net-mgmt/zabbix2-server/distinfo
==============================================================================
--- head/net-mgmt/zabbix2-server/distinfo	Wed May  8 21:15:17 2013	(r317709)
+++ head/net-mgmt/zabbix2-server/distinfo	Wed May  8 22:05:49 2013	(r317710)
@@ -1,2 +1,2 @@
-SHA256 (zabbix-2.0.5.tar.gz) = 9539abb848049195b6e8d24d23de40c26e07d3e5219ca890f4272a0d88cc640f
-SIZE (zabbix-2.0.5.tar.gz) = 13352744
+SHA256 (zabbix-2.0.6.tar.gz) = 46dfa7e63d3d38991cddaa7455e70179dc3fbef658ccbdce8cc8ce8e73baedf8
+SIZE (zabbix-2.0.6.tar.gz) = 13402400

Modified: head/net-mgmt/zabbix2-server/pkg-plist
==============================================================================
--- head/net-mgmt/zabbix2-server/pkg-plist	Wed May  8 21:15:17 2013	(r317709)
+++ head/net-mgmt/zabbix2-server/pkg-plist	Wed May  8 22:05:49 2013	(r317710)
@@ -67,9 +67,9 @@ sbin/zabbix_%%ZABBIX_BUILD%%
 @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%/database
 @dirrm %%DATADIR%%/%%ZABBIX_BUILD%%
 @dirrmtry %%DATADIR%%
- at dirrmtry %%ETCDIR%%/zabbix/alertscripts
+%%SERVER%%@dirrmtry %%ETCDIR%%/zabbix/alertscripts
 @dirrmtry %%ETCDIR%%/zabbix/externalscripts
 @dirrmtry %%ETCDIR%%/zabbix
 %%PROXY%%@dirrmtry %%ETCDIR%%/zabbix_proxy.conf.d
- at dirrmtry %%ETCDIR%%/zabbix_server.conf.d
+%%SERVER%%@dirrmtry %%ETCDIR%%/zabbix_server.conf.d
 @dirrmtry %%ETCDIR%%