Index: head/net/zabbix/Makefile
===================================================================
--- head/net/zabbix/Makefile	(revision 98232)
+++ head/net/zabbix/Makefile	(revision 98233)
@@ -1,89 +1,96 @@
 # Ports collection makefile for:  zabbix
 # Date created:			  Jun 18 2003
 # Whom:				  Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.0b12
-PORTREVISION=	2
+PORTVERSION=	1.0b13
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|b|beta|}
 
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Very advanced network monitoring system
 
 .ifdef(ZABBIX_AGENT_ONLY)
 PKGNAMESUFFIX=	-agent
 PLIST=		${MASTERDIR}/pkg-plist.agent
 PKGMESSAGE=	nonexistent
-.else
+.else # ZABBIX_AGENT_ONLY
 LIB_DEPENDS=	netsnmp.6:${PORTSDIR}/net/net-snmp
-RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-nms \
-		fping:${PORTSDIR}/net/fping
+RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-nms
 
+.ifndef(WITHOUT_FPING)
+RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
+.endif
+
 USE_MYSQL=	yes
 CONFIGURE_ARGS=	--with-mysql --with-net-snmp
 PKGMESSAGE=	${WRKDIR}/pkg-message
-.endif
+.endif # ZABBIX_AGENT_ONLY
 
-USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
+USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include
 
 ZABBIX_BINARIES=	zabbix_agent zabbix_agentd zabbix_sender
 ZABBIX_CONFIGS=		zabbix_agent.conf zabbix_agentd.conf
 .ifndef(ZABBIX_AGENT_ONLY)
 ZABBIX_BINARIES+=	zabbix_suckerd zabbix_trapper zabbix_trapperd
 ZABBIX_CONFIGS+=	zabbix_suckerd.conf zabbix_trapper.conf zabbix_trapperd.conf
 .endif
 
 SCRIPT_REGEX=	-e 's|%PREFIX%|${PREFIX}|g' -e 's|%LOCALBASE%|${LOCALBASE}|g'
 
 pre-patch:
 .if !defined(ZABBIX_AGENT_ONLY)
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix.sh.sample > \
 		${WRKDIR}/zabbix.sh.sample
 .endif
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \
 		${WRKDIR}/zabbix-agent.sh.sample
 
+.ifndef(ZABBIX_AGENT_ONLY)
 post-patch:
 	@${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c
+.ifdef WITHOUT_FPING
+	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf
+.endif
+.endif # ZABBIX_AGENT_ONLY
 
 do-install:
 .for FILE in ${ZABBIX_BINARIES}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${FILE} ${PREFIX}/bin
 .endfor
 	${MKDIR} ${PREFIX}/etc/zabbix
 	${LN} -sf ${PREFIX}/etc/zabbix /etc/zabbix
 .for FILE in ${ZABBIX_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \
 			${PREFIX}/etc/zabbix/${FILE}.sample
 .endfor
 .ifndef(ZABBIX_AGENT_ONLY)
 	${MKDIR} ${PREFIX}/share/zabbix
 	${MKDIR} ${PREFIX}/share/zabbix/create
 	${INSTALL_DATA} ${MASTERDIR}/scripts/dbsetup.sh \
 			${PREFIX}/share/zabbix/create
 	${CP} -Rf ${WRKSRC}/frontends/* ${PREFIX}/share/zabbix
 	${CP} -Rf ${WRKSRC}/create/* ${PREFIX}/share/zabbix/create
 	${CP} -Rf ${WRKSRC}/upgrades/dbpatches ${PREFIX}/share/zabbix
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh \
 			${PREFIX}/share/zabbix/create
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix.sh.sample \
 			${PREFIX}/etc/rc.d
 .endif
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix-agent.sh.sample \
 			${PREFIX}/etc/rc.d
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .ifndef(ZABBIX_AGENT_ONLY)
-	${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/net/zabbix/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/net/zabbix/distinfo
===================================================================
--- head/net/zabbix/distinfo	(revision 98232)
+++ head/net/zabbix/distinfo	(revision 98233)
@@ -1 +1 @@
-MD5 (zabbix-1.0beta12.tar.gz) = 8b8827272231de93cd9b93731a8369dd
+MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab

Property changes on: head/net/zabbix/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/zabbix/pkg-plist
===================================================================
--- head/net/zabbix/pkg-plist	(revision 98232)
+++ head/net/zabbix/pkg-plist	(revision 98233)
@@ -1,179 +1,196 @@
 etc/zabbix/zabbix_agent.conf.sample
 etc/zabbix/zabbix_agentd.conf.sample
 etc/zabbix/zabbix_suckerd.conf.sample
 etc/zabbix/zabbix_trapper.conf.sample
 etc/zabbix/zabbix_trapperd.conf.sample
 etc/rc.d/zabbix.sh.sample
 etc/rc.d/zabbix-agent.sh.sample
 bin/zabbix_agent
 bin/zabbix_agentd
 bin/zabbix_sender
 bin/zabbix_suckerd
 bin/zabbix_trapper
 bin/zabbix_trapperd
 %%DATADIR%%/php/audio/disaster_on.wav
 %%DATADIR%%/php/audio/warning_off.wav
 %%DATADIR%%/php/audio/warning_on.wav
 %%DATADIR%%/php/about.php
 %%DATADIR%%/php/actions.php
 %%DATADIR%%/php/alarms.php
 %%DATADIR%%/php/alerts.php
 %%DATADIR%%/php/chart.php
 %%DATADIR%%/php/chart2.php
 %%DATADIR%%/php/chart3.php
 %%DATADIR%%/php/chart4.php
 %%DATADIR%%/php/chart5.php
 %%DATADIR%%/php/chart_diff.php
 %%DATADIR%%/php/chart_sla.php
 %%DATADIR%%/php/charts.php
 %%DATADIR%%/php/compare.php
 %%DATADIR%%/php/config.php
 %%DATADIR%%/php/css.css
 %%DATADIR%%/php/graph.php
 %%DATADIR%%/php/graphs.php
 %%DATADIR%%/php/helpdesk.php
 %%DATADIR%%/php/history.php
 %%DATADIR%%/php/hosts.php
 %%DATADIR%%/php/index.php
 %%DATADIR%%/php/items.php
 %%DATADIR%%/php/latest.php
 %%DATADIR%%/php/latestalarms.php
 %%DATADIR%%/php/map.php
 %%DATADIR%%/php/maps.php
 %%DATADIR%%/php/media.php
 %%DATADIR%%/php/queue.php
 %%DATADIR%%/php/report1.php
 %%DATADIR%%/php/report2.php
 %%DATADIR%%/php/report3.php
 %%DATADIR%%/php/screenconf.php
 %%DATADIR%%/php/screenedit.php
 %%DATADIR%%/php/screens.php
 %%DATADIR%%/php/services.php
 %%DATADIR%%/php/srv_status.php
 %%DATADIR%%/php/sysmap.php
 %%DATADIR%%/php/sysmaps.php
 %%DATADIR%%/php/tr_comments.php
 %%DATADIR%%/php/tr_status.php
 %%DATADIR%%/php/trend.php
 %%DATADIR%%/php/trends.php
 %%DATADIR%%/php/triggers.php
 %%DATADIR%%/php/users.php
+%%DATADIR%%/php/images/sysmaps/old/Notebook.png
+%%DATADIR%%/php/images/sysmaps/old/Hub.png
+%%DATADIR%%/php/images/sysmaps/old/Printer.png
+%%DATADIR%%/php/images/sysmaps/old/Router.png
+%%DATADIR%%/php/images/sysmaps/old/Server.png
+%%DATADIR%%/php/images/sysmaps/old/Workstation.png
 %%DATADIR%%/php/images/sysmaps/Notebook.png
 %%DATADIR%%/php/images/sysmaps/Hub.png
 %%DATADIR%%/php/images/sysmaps/Printer.png
 %%DATADIR%%/php/images/sysmaps/Router.png
 %%DATADIR%%/php/images/sysmaps/Server.png
 %%DATADIR%%/php/images/sysmaps/Workstation.png
+%%DATADIR%%/php/images/sysmaps/README
+%%DATADIR%%/php/images/sysmaps/Phone.png
+%%DATADIR%%/php/images/sysmaps/Battery.png
+%%DATADIR%%/php/images/sysmaps/Network.png
+%%DATADIR%%/php/images/sysmaps/Satellite.png
 %%DATADIR%%/php/include/.htaccess
 %%DATADIR%%/php/include/classes.inc.php
 %%DATADIR%%/php/include/config.inc.php
 %%DATADIR%%/php/include/db.inc.php
 %%DATADIR%%/php/include/defines.inc.php
 %%DATADIR%%/create/data/data.sql
 %%DATADIR%%/create/mysql/schema.sql
 %%DATADIR%%/create/postgresql/schema.sql
 %%DATADIR%%/create/dbsetup.sh
 %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql
 @dirrm etc/zabbix
 @dirrm %%DATADIR%%/php/audio
+@dirrm %%DATADIR%%/php/images/sysmaps/old
 @dirrm %%DATADIR%%/php/images/sysmaps
 @dirrm %%DATADIR%%/php/images
 @dirrm %%DATADIR%%/php/include
 @dirrm %%DATADIR%%/php
 @dirrm %%DATADIR%%/create/data
 @dirrm %%DATADIR%%/create/mysql
 @dirrm %%DATADIR%%/create/postgresql
 @dirrm %%DATADIR%%/create
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13
 @dirrm %%DATADIR%%/dbpatches
 @dirrm %%DATADIR%%
 @exec ln -sf %D/etc/zabbix /etc/zabbix
 @unexec rm /etc/zabbix

Property changes on: head/net/zabbix/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/net-mgmt/zabbix/Makefile
===================================================================
--- head/net-mgmt/zabbix/Makefile	(revision 98232)
+++ head/net-mgmt/zabbix/Makefile	(revision 98233)
@@ -1,89 +1,96 @@
 # Ports collection makefile for:  zabbix
 # Date created:			  Jun 18 2003
 # Whom:				  Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.0b12
-PORTREVISION=	2
+PORTVERSION=	1.0b13
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|b|beta|}
 
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Very advanced network monitoring system
 
 .ifdef(ZABBIX_AGENT_ONLY)
 PKGNAMESUFFIX=	-agent
 PLIST=		${MASTERDIR}/pkg-plist.agent
 PKGMESSAGE=	nonexistent
-.else
+.else # ZABBIX_AGENT_ONLY
 LIB_DEPENDS=	netsnmp.6:${PORTSDIR}/net/net-snmp
-RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-nms \
-		fping:${PORTSDIR}/net/fping
+RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-nms
 
+.ifndef(WITHOUT_FPING)
+RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
+.endif
+
 USE_MYSQL=	yes
 CONFIGURE_ARGS=	--with-mysql --with-net-snmp
 PKGMESSAGE=	${WRKDIR}/pkg-message
-.endif
+.endif # ZABBIX_AGENT_ONLY
 
-USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
+USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include
 
 ZABBIX_BINARIES=	zabbix_agent zabbix_agentd zabbix_sender
 ZABBIX_CONFIGS=		zabbix_agent.conf zabbix_agentd.conf
 .ifndef(ZABBIX_AGENT_ONLY)
 ZABBIX_BINARIES+=	zabbix_suckerd zabbix_trapper zabbix_trapperd
 ZABBIX_CONFIGS+=	zabbix_suckerd.conf zabbix_trapper.conf zabbix_trapperd.conf
 .endif
 
 SCRIPT_REGEX=	-e 's|%PREFIX%|${PREFIX}|g' -e 's|%LOCALBASE%|${LOCALBASE}|g'
 
 pre-patch:
 .if !defined(ZABBIX_AGENT_ONLY)
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix.sh.sample > \
 		${WRKDIR}/zabbix.sh.sample
 .endif
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \
 		${WRKDIR}/zabbix-agent.sh.sample
 
+.ifndef(ZABBIX_AGENT_ONLY)
 post-patch:
 	@${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c
+.ifdef WITHOUT_FPING
+	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf
+.endif
+.endif # ZABBIX_AGENT_ONLY
 
 do-install:
 .for FILE in ${ZABBIX_BINARIES}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${FILE} ${PREFIX}/bin
 .endfor
 	${MKDIR} ${PREFIX}/etc/zabbix
 	${LN} -sf ${PREFIX}/etc/zabbix /etc/zabbix
 .for FILE in ${ZABBIX_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \
 			${PREFIX}/etc/zabbix/${FILE}.sample
 .endfor
 .ifndef(ZABBIX_AGENT_ONLY)
 	${MKDIR} ${PREFIX}/share/zabbix
 	${MKDIR} ${PREFIX}/share/zabbix/create
 	${INSTALL_DATA} ${MASTERDIR}/scripts/dbsetup.sh \
 			${PREFIX}/share/zabbix/create
 	${CP} -Rf ${WRKSRC}/frontends/* ${PREFIX}/share/zabbix
 	${CP} -Rf ${WRKSRC}/create/* ${PREFIX}/share/zabbix/create
 	${CP} -Rf ${WRKSRC}/upgrades/dbpatches ${PREFIX}/share/zabbix
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh \
 			${PREFIX}/share/zabbix/create
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix.sh.sample \
 			${PREFIX}/etc/rc.d
 .endif
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix-agent.sh.sample \
 			${PREFIX}/etc/rc.d
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .ifndef(ZABBIX_AGENT_ONLY)
-	${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/net-mgmt/zabbix/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/net-mgmt/zabbix/distinfo
===================================================================
--- head/net-mgmt/zabbix/distinfo	(revision 98232)
+++ head/net-mgmt/zabbix/distinfo	(revision 98233)
@@ -1 +1 @@
-MD5 (zabbix-1.0beta12.tar.gz) = 8b8827272231de93cd9b93731a8369dd
+MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab

Property changes on: head/net-mgmt/zabbix/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-mgmt/zabbix/pkg-plist
===================================================================
--- head/net-mgmt/zabbix/pkg-plist	(revision 98232)
+++ head/net-mgmt/zabbix/pkg-plist	(revision 98233)
@@ -1,179 +1,196 @@
 etc/zabbix/zabbix_agent.conf.sample
 etc/zabbix/zabbix_agentd.conf.sample
 etc/zabbix/zabbix_suckerd.conf.sample
 etc/zabbix/zabbix_trapper.conf.sample
 etc/zabbix/zabbix_trapperd.conf.sample
 etc/rc.d/zabbix.sh.sample
 etc/rc.d/zabbix-agent.sh.sample
 bin/zabbix_agent
 bin/zabbix_agentd
 bin/zabbix_sender
 bin/zabbix_suckerd
 bin/zabbix_trapper
 bin/zabbix_trapperd
 %%DATADIR%%/php/audio/disaster_on.wav
 %%DATADIR%%/php/audio/warning_off.wav
 %%DATADIR%%/php/audio/warning_on.wav
 %%DATADIR%%/php/about.php
 %%DATADIR%%/php/actions.php
 %%DATADIR%%/php/alarms.php
 %%DATADIR%%/php/alerts.php
 %%DATADIR%%/php/chart.php
 %%DATADIR%%/php/chart2.php
 %%DATADIR%%/php/chart3.php
 %%DATADIR%%/php/chart4.php
 %%DATADIR%%/php/chart5.php
 %%DATADIR%%/php/chart_diff.php
 %%DATADIR%%/php/chart_sla.php
 %%DATADIR%%/php/charts.php
 %%DATADIR%%/php/compare.php
 %%DATADIR%%/php/config.php
 %%DATADIR%%/php/css.css
 %%DATADIR%%/php/graph.php
 %%DATADIR%%/php/graphs.php
 %%DATADIR%%/php/helpdesk.php
 %%DATADIR%%/php/history.php
 %%DATADIR%%/php/hosts.php
 %%DATADIR%%/php/index.php
 %%DATADIR%%/php/items.php
 %%DATADIR%%/php/latest.php
 %%DATADIR%%/php/latestalarms.php
 %%DATADIR%%/php/map.php
 %%DATADIR%%/php/maps.php
 %%DATADIR%%/php/media.php
 %%DATADIR%%/php/queue.php
 %%DATADIR%%/php/report1.php
 %%DATADIR%%/php/report2.php
 %%DATADIR%%/php/report3.php
 %%DATADIR%%/php/screenconf.php
 %%DATADIR%%/php/screenedit.php
 %%DATADIR%%/php/screens.php
 %%DATADIR%%/php/services.php
 %%DATADIR%%/php/srv_status.php
 %%DATADIR%%/php/sysmap.php
 %%DATADIR%%/php/sysmaps.php
 %%DATADIR%%/php/tr_comments.php
 %%DATADIR%%/php/tr_status.php
 %%DATADIR%%/php/trend.php
 %%DATADIR%%/php/trends.php
 %%DATADIR%%/php/triggers.php
 %%DATADIR%%/php/users.php
+%%DATADIR%%/php/images/sysmaps/old/Notebook.png
+%%DATADIR%%/php/images/sysmaps/old/Hub.png
+%%DATADIR%%/php/images/sysmaps/old/Printer.png
+%%DATADIR%%/php/images/sysmaps/old/Router.png
+%%DATADIR%%/php/images/sysmaps/old/Server.png
+%%DATADIR%%/php/images/sysmaps/old/Workstation.png
 %%DATADIR%%/php/images/sysmaps/Notebook.png
 %%DATADIR%%/php/images/sysmaps/Hub.png
 %%DATADIR%%/php/images/sysmaps/Printer.png
 %%DATADIR%%/php/images/sysmaps/Router.png
 %%DATADIR%%/php/images/sysmaps/Server.png
 %%DATADIR%%/php/images/sysmaps/Workstation.png
+%%DATADIR%%/php/images/sysmaps/README
+%%DATADIR%%/php/images/sysmaps/Phone.png
+%%DATADIR%%/php/images/sysmaps/Battery.png
+%%DATADIR%%/php/images/sysmaps/Network.png
+%%DATADIR%%/php/images/sysmaps/Satellite.png
 %%DATADIR%%/php/include/.htaccess
 %%DATADIR%%/php/include/classes.inc.php
 %%DATADIR%%/php/include/config.inc.php
 %%DATADIR%%/php/include/db.inc.php
 %%DATADIR%%/php/include/defines.inc.php
 %%DATADIR%%/create/data/data.sql
 %%DATADIR%%/create/mysql/schema.sql
 %%DATADIR%%/create/postgresql/schema.sql
 %%DATADIR%%/create/dbsetup.sh
 %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql
 @dirrm etc/zabbix
 @dirrm %%DATADIR%%/php/audio
+@dirrm %%DATADIR%%/php/images/sysmaps/old
 @dirrm %%DATADIR%%/php/images/sysmaps
 @dirrm %%DATADIR%%/php/images
 @dirrm %%DATADIR%%/php/include
 @dirrm %%DATADIR%%/php
 @dirrm %%DATADIR%%/create/data
 @dirrm %%DATADIR%%/create/mysql
 @dirrm %%DATADIR%%/create/postgresql
 @dirrm %%DATADIR%%/create
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13
 @dirrm %%DATADIR%%/dbpatches
 @dirrm %%DATADIR%%
 @exec ln -sf %D/etc/zabbix /etc/zabbix
 @unexec rm /etc/zabbix

Property changes on: head/net-mgmt/zabbix/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/net-mgmt/zabbix2/Makefile
===================================================================
--- head/net-mgmt/zabbix2/Makefile	(revision 98232)
+++ head/net-mgmt/zabbix2/Makefile	(revision 98233)
@@ -1,89 +1,96 @@
 # Ports collection makefile for:  zabbix
 # Date created:			  Jun 18 2003
 # Whom:				  Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.0b12
-PORTREVISION=	2
+PORTVERSION=	1.0b13
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTNAME=	${PORTNAME}-${PORTVERSION:S|b|beta|}
 
 MAINTAINER=	asa@gascom.ru
 COMMENT=	Very advanced network monitoring system
 
 .ifdef(ZABBIX_AGENT_ONLY)
 PKGNAMESUFFIX=	-agent
 PLIST=		${MASTERDIR}/pkg-plist.agent
 PKGMESSAGE=	nonexistent
-.else
+.else # ZABBIX_AGENT_ONLY
 LIB_DEPENDS=	netsnmp.6:${PORTSDIR}/net/net-snmp
-RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-nms \
-		fping:${PORTSDIR}/net/fping
+RUN_DEPENDS=	php:${PORTSDIR}/lang/php4-nms
 
+.ifndef(WITHOUT_FPING)
+RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
+.endif
+
 USE_MYSQL=	yes
 CONFIGURE_ARGS=	--with-mysql --with-net-snmp
 PKGMESSAGE=	${WRKDIR}/pkg-message
-.endif
+.endif # ZABBIX_AGENT_ONLY
 
-USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
+USE_RC_SUBR=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include
 
 ZABBIX_BINARIES=	zabbix_agent zabbix_agentd zabbix_sender
 ZABBIX_CONFIGS=		zabbix_agent.conf zabbix_agentd.conf
 .ifndef(ZABBIX_AGENT_ONLY)
 ZABBIX_BINARIES+=	zabbix_suckerd zabbix_trapper zabbix_trapperd
 ZABBIX_CONFIGS+=	zabbix_suckerd.conf zabbix_trapper.conf zabbix_trapperd.conf
 .endif
 
 SCRIPT_REGEX=	-e 's|%PREFIX%|${PREFIX}|g' -e 's|%LOCALBASE%|${LOCALBASE}|g'
 
 pre-patch:
 .if !defined(ZABBIX_AGENT_ONLY)
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/pkg-message > ${PKGMESSAGE}
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix.sh.sample > \
 		${WRKDIR}/zabbix.sh.sample
 .endif
 	@${SED} ${SCRIPT_REGEX} ${PKGDIR}/scripts/zabbix-agent.sh.sample > \
 		${WRKDIR}/zabbix-agent.sh.sample
 
+.ifndef(ZABBIX_AGENT_ONLY)
 post-patch:
 	@${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|' ${WRKSRC}/src/zabbix_sucker/zabbix_sucker.c
+.ifdef WITHOUT_FPING
+	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_suckerd.conf
+.endif
+.endif # ZABBIX_AGENT_ONLY
 
 do-install:
 .for FILE in ${ZABBIX_BINARIES}
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${FILE} ${PREFIX}/bin
 .endfor
 	${MKDIR} ${PREFIX}/etc/zabbix
 	${LN} -sf ${PREFIX}/etc/zabbix /etc/zabbix
 .for FILE in ${ZABBIX_CONFIGS}
 	${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \
 			${PREFIX}/etc/zabbix/${FILE}.sample
 .endfor
 .ifndef(ZABBIX_AGENT_ONLY)
 	${MKDIR} ${PREFIX}/share/zabbix
 	${MKDIR} ${PREFIX}/share/zabbix/create
 	${INSTALL_DATA} ${MASTERDIR}/scripts/dbsetup.sh \
 			${PREFIX}/share/zabbix/create
 	${CP} -Rf ${WRKSRC}/frontends/* ${PREFIX}/share/zabbix
 	${CP} -Rf ${WRKSRC}/create/* ${PREFIX}/share/zabbix/create
 	${CP} -Rf ${WRKSRC}/upgrades/dbpatches ${PREFIX}/share/zabbix
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh \
 			${PREFIX}/share/zabbix/create
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix.sh.sample \
 			${PREFIX}/etc/rc.d
 .endif
 	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/zabbix-agent.sh.sample \
 			${PREFIX}/etc/rc.d
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .ifndef(ZABBIX_AGENT_ONLY)
-	${CAT} ${PKGMESSAGE}
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.mk>

Property changes on: head/net-mgmt/zabbix2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: head/net-mgmt/zabbix2/distinfo
===================================================================
--- head/net-mgmt/zabbix2/distinfo	(revision 98232)
+++ head/net-mgmt/zabbix2/distinfo	(revision 98233)
@@ -1 +1 @@
-MD5 (zabbix-1.0beta12.tar.gz) = 8b8827272231de93cd9b93731a8369dd
+MD5 (zabbix-1.0beta13.tar.gz) = 9299feaa14ff5f9c6218e15a560270ab

Property changes on: head/net-mgmt/zabbix2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net-mgmt/zabbix2/pkg-plist
===================================================================
--- head/net-mgmt/zabbix2/pkg-plist	(revision 98232)
+++ head/net-mgmt/zabbix2/pkg-plist	(revision 98233)
@@ -1,179 +1,196 @@
 etc/zabbix/zabbix_agent.conf.sample
 etc/zabbix/zabbix_agentd.conf.sample
 etc/zabbix/zabbix_suckerd.conf.sample
 etc/zabbix/zabbix_trapper.conf.sample
 etc/zabbix/zabbix_trapperd.conf.sample
 etc/rc.d/zabbix.sh.sample
 etc/rc.d/zabbix-agent.sh.sample
 bin/zabbix_agent
 bin/zabbix_agentd
 bin/zabbix_sender
 bin/zabbix_suckerd
 bin/zabbix_trapper
 bin/zabbix_trapperd
 %%DATADIR%%/php/audio/disaster_on.wav
 %%DATADIR%%/php/audio/warning_off.wav
 %%DATADIR%%/php/audio/warning_on.wav
 %%DATADIR%%/php/about.php
 %%DATADIR%%/php/actions.php
 %%DATADIR%%/php/alarms.php
 %%DATADIR%%/php/alerts.php
 %%DATADIR%%/php/chart.php
 %%DATADIR%%/php/chart2.php
 %%DATADIR%%/php/chart3.php
 %%DATADIR%%/php/chart4.php
 %%DATADIR%%/php/chart5.php
 %%DATADIR%%/php/chart_diff.php
 %%DATADIR%%/php/chart_sla.php
 %%DATADIR%%/php/charts.php
 %%DATADIR%%/php/compare.php
 %%DATADIR%%/php/config.php
 %%DATADIR%%/php/css.css
 %%DATADIR%%/php/graph.php
 %%DATADIR%%/php/graphs.php
 %%DATADIR%%/php/helpdesk.php
 %%DATADIR%%/php/history.php
 %%DATADIR%%/php/hosts.php
 %%DATADIR%%/php/index.php
 %%DATADIR%%/php/items.php
 %%DATADIR%%/php/latest.php
 %%DATADIR%%/php/latestalarms.php
 %%DATADIR%%/php/map.php
 %%DATADIR%%/php/maps.php
 %%DATADIR%%/php/media.php
 %%DATADIR%%/php/queue.php
 %%DATADIR%%/php/report1.php
 %%DATADIR%%/php/report2.php
 %%DATADIR%%/php/report3.php
 %%DATADIR%%/php/screenconf.php
 %%DATADIR%%/php/screenedit.php
 %%DATADIR%%/php/screens.php
 %%DATADIR%%/php/services.php
 %%DATADIR%%/php/srv_status.php
 %%DATADIR%%/php/sysmap.php
 %%DATADIR%%/php/sysmaps.php
 %%DATADIR%%/php/tr_comments.php
 %%DATADIR%%/php/tr_status.php
 %%DATADIR%%/php/trend.php
 %%DATADIR%%/php/trends.php
 %%DATADIR%%/php/triggers.php
 %%DATADIR%%/php/users.php
+%%DATADIR%%/php/images/sysmaps/old/Notebook.png
+%%DATADIR%%/php/images/sysmaps/old/Hub.png
+%%DATADIR%%/php/images/sysmaps/old/Printer.png
+%%DATADIR%%/php/images/sysmaps/old/Router.png
+%%DATADIR%%/php/images/sysmaps/old/Server.png
+%%DATADIR%%/php/images/sysmaps/old/Workstation.png
 %%DATADIR%%/php/images/sysmaps/Notebook.png
 %%DATADIR%%/php/images/sysmaps/Hub.png
 %%DATADIR%%/php/images/sysmaps/Printer.png
 %%DATADIR%%/php/images/sysmaps/Router.png
 %%DATADIR%%/php/images/sysmaps/Server.png
 %%DATADIR%%/php/images/sysmaps/Workstation.png
+%%DATADIR%%/php/images/sysmaps/README
+%%DATADIR%%/php/images/sysmaps/Phone.png
+%%DATADIR%%/php/images/sysmaps/Battery.png
+%%DATADIR%%/php/images/sysmaps/Network.png
+%%DATADIR%%/php/images/sysmaps/Satellite.png
 %%DATADIR%%/php/include/.htaccess
 %%DATADIR%%/php/include/classes.inc.php
 %%DATADIR%%/php/include/config.inc.php
 %%DATADIR%%/php/include/db.inc.php
 %%DATADIR%%/php/include/defines.inc.php
 %%DATADIR%%/create/data/data.sql
 %%DATADIR%%/create/mysql/schema.sql
 %%DATADIR%%/create/postgresql/schema.sql
 %%DATADIR%%/create/dbsetup.sh
 %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql/patch.sql
 %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql/patch.sql
+%%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql/patch.sql
 @dirrm etc/zabbix
 @dirrm %%DATADIR%%/php/audio
+@dirrm %%DATADIR%%/php/images/sysmaps/old
 @dirrm %%DATADIR%%/php/images/sysmaps
 @dirrm %%DATADIR%%/php/images
 @dirrm %%DATADIR%%/php/include
 @dirrm %%DATADIR%%/php
 @dirrm %%DATADIR%%/create/data
 @dirrm %%DATADIR%%/create/mysql
 @dirrm %%DATADIR%%/create/postgresql
 @dirrm %%DATADIR%%/create
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha10_to_1.0alpha11
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha11_to_1.0alpha12
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha12_to_1.0beta1
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha3_to_1.0alpha4
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha4_to_1.0alpha5
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha6_to_1.0alpha7
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha7_to_1.0alpha8
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha8_to_1.0alpha9
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0alpha9_to_1.0alpha10
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta2_to_1.0beta3
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta3_to_1.0beta4
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta4_to_1.0beta5
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta5_to_1.0beta6
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta6_to_1.0beta7
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta7_to_1.0beta8
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta8_to_1.0beta9
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta9_to_1.0beta10
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/mysql
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11/postgresql
 @dirrm %%DATADIR%%/dbpatches/1.0beta10_to_1.0beta11
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/mysql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13/postgresql
+@dirrm %%DATADIR%%/dbpatches/1.0beta12_to_1.0beta13
 @dirrm %%DATADIR%%/dbpatches
 @dirrm %%DATADIR%%
 @exec ln -sf %D/etc/zabbix /etc/zabbix
 @unexec rm /etc/zabbix

Property changes on: head/net-mgmt/zabbix2/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property