- Update to 1.1.3

- Tweaks and fixes

Approved by:	maintainer timeout, months of inactivity
Cheers from:	EuroBSDCon 2006 Developer Summit

22 files changed, 112 insertions, 234 deletions

diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
index ab2a6bc..597d16f 100644
--- a/net-mgmt/zabbix-agent/Makefile
+++ b/net-mgmt/zabbix-agent/Makefile
@@ -1,17 +1,11 @@
-# Ports collection makefile for:  zabbix
-# Date created:			  Jun 18 2003
-# Whom:				  Sergey Akifyev <asa@gascom.ru>
+# Ports collection makefile for:	zabbix
+# Date created:		Jun 18 2003
+# Whom:			Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	zabbix-agent
-CATEGORIES=	net
-
-MAINTAINER=	asa@gascom.ru
-COMMENT=	Very advanced network monitoring system (agent only)
-
-ZABBIX_AGENT_ONLY=yes
+ZABBIX_AGENT_ONLY=	yes
 MASTERDIR=	${.CURDIR}/../../net-mgmt/zabbix
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix/Makefile b/net-mgmt/zabbix/Makefile
index f018032..7280776 100644
--- a/net-mgmt/zabbix/Makefile
+++ b/net-mgmt/zabbix/Makefile
@@ -1,22 +1,25 @@
-# Ports collection makefile for:  zabbix
-# Date created:			  Jun 18 2003
-# Whom:				  Sergey Akifyev <asa@gascom.ru>
+# Ports collection makefile for:	zabbix
+# Date created:		Jun 18 2003
+# Whom:			Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 PORTEPOCH=	1
-CATEGORIES?=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+CATEGORIES=	net-mgmt
+MASTER_SITES=	SF
 
 MAINTAINER=	asa@gascom.ru
-COMMENT=	Very advanced network monitoring system
+COMMENT=	Application and network monitoring solution
 
-.ifndef(ZABBIX_AGENT_ONLY)
+.ifdef(ZABBIX_AGENT_ONLY)
+PKGNAMESUFFIX=	-agent
+CATEGORIES=	net
+CONFLICTS=	zabbix-[0-9]*
+.else
+CONFLICTS=	zabbix-agent-[0-9]*
 OPTIONS=	PGSQL "Use a PostgreSQL backend" off \
 		MYSQL "Use a MySQL backend" on \
 		FPING "Use fping for pinging hosts" on
@@ -26,66 +29,67 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS+=--enable-agent
 .ifdef(ZABBIX_AGENT_ONLY)
 PKGNAMESUFFIX=	-agent
-PLIST=		${MASTERDIR}/pkg-plist.agent
+PLIST=		""
 .else # ZABBIX_AGENT_ONLY
 CONFIGURE_ARGS+=--enable-server
 # TODO add snmp knob
 LIB_DEPENDS=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-USE_PHP=	gd snmp sockets
+USE_PHP=	gd snmp sockets pcre
 SUB_FILES=	pkg-message
 .endif # ZABBIX_AGENT_ONLY
 
 .include <bsd.port.pre.mk>
 
 .ifndef(WITHOUT_FPING)
-RUN_DEPENDS+=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
+RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 .endif
 
 .ifndef(ZABBIX_AGENT_ONLY)
 .ifndef(WITH_PGSQL)
 .ifdef(WITHOUT_MYSQL)
-IGNORE=		You should configure to use either a MySQL or PostgreSQL backend
+IGNORE=		you should configure to use either a MySQL or PostgreSQL backend
 .endif
 .endif
 
 .ifdef(WITH_PGSQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-pgsql
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pgsql.so:${PORTSDIR}/${pgsql_DEPENDS}
 .endif
 .ifndef(WITHOUT_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/mysql.so:${PORTSDIR}/${mysql_DEPENDS}
 .endif
 CONFIGURE_ARGS+=--with-net-snmp
 .endif # ZABBIX_AGENT_ONLY
 
 USE_RC_SUBR=	zabbix_agentd.sh
-.if !defined(ZABBIX_AGENT_ONLY)
+.ifndef(ZABBIX_AGENT_ONLY)
 USE_RC_SUBR+=	zabbix_server.sh
 .endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS=	-I${LOCALBASE}/include
 
-ZABBIX_BINARIES=	zabbix_agent/zabbix_agent \
-			zabbix_agent/zabbix_agentd \
-			zabbix_get/zabbix_get \
-			zabbix_sender/zabbix_sender
-ZABBIX_CONFIGS=		zabbix_agent.conf zabbix_agentd.conf
+ZABBIX_BIN=		agent agentd get sender
+ZABBIX_CFG=		agent agentd
 .ifndef(ZABBIX_AGENT_ONLY)
-ZABBIX_BINARIES+=	zabbix_server/zabbix_server
-ZABBIX_CONFIGS+=	zabbix_server.conf
+ZABBIX_BIN+=	server
+ZABBIX_CFG+=	server
 .endif
+ZABBIX_BINFILES=	${ZABBIX_BIN:S|^|zabbix_|:C|.+|&/&|:S|agentd/|agent/|}
+ZABBIX_CFGFILES=	${ZABBIX_CFG:S|^|zabbix_|:S|$|.conf|}
+PLIST_FILES=	${ZABBIX_BIN:S|^|bin/zabbix_|} \
+		${ZABBIX_CFG:S|^|etc/zabbix/zabbix_|:S|$|.conf.sample|}
 
 post-patch:
-	@${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agent.c
-	@${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c
-.ifndef(ZABBIX_AGENT_ONLY)
-	@${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|;s|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_server/server.c
+	@${FIND} ${WRKSRC}/src -type f -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|'
 .ifdef WITHOUT_FPING
 	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf
 .endif
-.endif # ZABBIX_AGENT_ONLY
 
 .if ${ARCH} == "amd64"
 post-configure:
@@ -93,22 +97,17 @@ post-configure:
 .endif
 
 do-install:
-.for FILE in ${ZABBIX_BINARIES}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILE} ${PREFIX}/bin
-.endfor
-	${MKDIR} ${PREFIX}/etc/zabbix
-.for FILE in ${ZABBIX_CONFIGS}
-	${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \
-			${PREFIX}/etc/zabbix/${FILE}.sample
+	@${ECHO_CMD} '@unexec rmdir %D/etc/zabbix 2>/dev/null || true' >> ${TMPPLIST}
+	${INSTALL_PROGRAM} ${ZABBIX_BINFILES:S,^,${WRKSRC}/src/,} ${PREFIX}/bin/
+	${INSTALL} -d ${PREFIX}/etc/zabbix/
+.for FILE in ${ZABBIX_CFGFILES}
+	${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
-	${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} -d ${DATADIR}/create/
+	${CP} -Rf ${WRKSRC}/frontends/ ${WRKSRC}/upgrades/dbpatches ${DATADIR}/
+	${CP} -Rf ${WRKSRC}/create/ ${DATADIR}/create/
+	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh ${DATADIR}/create/
 .endif
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .ifndef(ZABBIX_AGENT_ONLY)
diff --git a/net-mgmt/zabbix/distinfo b/net-mgmt/zabbix/distinfo
index d58196a..884c820 100644
--- a/net-mgmt/zabbix/distinfo
+++ b/net-mgmt/zabbix/distinfo
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.1.1.tar.gz) = f46016b55a8450515eb6a797d43781c4
-SHA256 (zabbix-1.1.1.tar.gz) = 2878debb5688a4ff29a530d3bee9b8560aadf07fed40874b96a27e7ed9824206
-SIZE (zabbix-1.1.1.tar.gz) = 1113411
+MD5 (zabbix-1.1.3.tar.gz) = a4cb17ac443050ab7014e4b9c7895892
+SHA256 (zabbix-1.1.3.tar.gz) = 35cac8405e9b20767e37249eb22ccc16f91c2be9996ca6d736851708fb513213
+SIZE (zabbix-1.1.3.tar.gz) = 1481278
diff --git a/net-mgmt/zabbix/files/patch-src-zabbix_agent-zabbix_agent.c b/net-mgmt/zabbix/files/patch-src-zabbix_agent-zabbix_agent.c
deleted file mode 100644
index c1a6983..0000000
--- a/net-mgmt/zabbix/files/patch-src-zabbix_agent-zabbix_agent.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/zabbix_agent/zabbix_agent.c.orig	Tue Jul 25 19:51:28 2006
-+++ src/zabbix_agent/zabbix_agent.c	Tue Jul 25 19:51:42 2006
-@@ -108,7 +108,7 @@
- 
- 	if(CONFIG_FILE == NULL)
- 	{
--		CONFIG_FILE = strdup("/etc/zabbix/zabbix_agentd.conf");
-+		CONFIG_FILE = strdup("%PREFIX%/etc/zabbix/zabbix_agentd.conf");
- 	}
- 	
- 	parse_cfg_file(CONFIG_FILE,cfg);
diff --git a/net-mgmt/zabbix/files/patch-src-zabbix_agent-zabbix_agentd.c b/net-mgmt/zabbix/files/patch-src-zabbix_agent-zabbix_agentd.c
deleted file mode 100644
index 6e4549a..0000000
--- a/net-mgmt/zabbix/files/patch-src-zabbix_agent-zabbix_agentd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/zabbix_agent/zabbix_agentd.c.orig	Tue Jul 25 19:51:53 2006
-+++ src/zabbix_agent/zabbix_agentd.c	Tue Jul 25 19:52:01 2006
-@@ -298,7 +298,7 @@
- 	
- 	if(CONFIG_FILE == NULL)
- 	{
--		CONFIG_FILE = strdup("/etc/zabbix/zabbix_agentd.conf");
-+		CONFIG_FILE = strdup("%PREFIX%/etc/zabbix/zabbix_agentd.conf");
- 	}
- 
- 	parse_cfg_file(CONFIG_FILE,cfg);
diff --git a/net-mgmt/zabbix/files/patch-src-zabbix_server-server.c b/net-mgmt/zabbix/files/patch-src-zabbix_server-server.c
deleted file mode 100644
index 17cb560..0000000
--- a/net-mgmt/zabbix/files/patch-src-zabbix_server-server.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/zabbix_server/server.c.orig	Tue Jul 25 17:53:16 2006
-+++ src/zabbix_server/server.c	Tue Jul 25 17:53:22 2006
-@@ -361,7 +361,7 @@
- 
- 	if(CONFIG_FILE == NULL)
- 	{
--		CONFIG_FILE=strdup("/etc/zabbix/zabbix_server.conf");
-+		CONFIG_FILE=strdup("%PREFIX%/etc/zabbix/zabbix_server.conf");
- 	}
- 
- 	parse_cfg_file(CONFIG_FILE,cfg);
-@@ -381,7 +381,7 @@
- 	}
- 	if(CONFIG_FPING_LOCATION == NULL)
- 	{
--		CONFIG_FPING_LOCATION=strdup("/usr/sbin/fping");
-+		CONFIG_FPING_LOCATION=strdup("%LOCALBASE%/fping");
- 	}
- 
- }
diff --git a/net-mgmt/zabbix/files/zabbix_agentd.sh.in b/net-mgmt/zabbix/files/zabbix_agentd.sh.in
index 98dac63..0be45c4 100644
--- a/net-mgmt/zabbix/files/zabbix_agentd.sh.in
+++ b/net-mgmt/zabbix/files/zabbix_agentd.sh.in
@@ -8,10 +8,10 @@
 name="zabbix_agentd"
 rcvar=${name}_enable
 load_rc_config $name
+eval : \${${rcvar}='NO'}
 
 command="%%PREFIX%%/bin/${name}"
 required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
 
-eval "${rcvar}=\${${rcvar}:-'NO'}"
 
 run_rc_command "$1"
diff --git a/net-mgmt/zabbix/files/zabbix_server.sh.in b/net-mgmt/zabbix/files/zabbix_server.sh.in
index 1982f80..cb269de 100644
--- a/net-mgmt/zabbix/files/zabbix_server.sh.in
+++ b/net-mgmt/zabbix/files/zabbix_server.sh.in
@@ -8,10 +8,9 @@
 name="zabbix_server"
 rcvar=${name}_enable
 load_rc_config $name
+eval : \${${rcvar}='NO'}
 
 command="%%PREFIX%%/bin/${name}"
 required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
 
-eval "${rcvar}=\${${rcvar}:-'NO'}"
-
 run_rc_command "$1"
diff --git a/net-mgmt/zabbix/pkg-descr b/net-mgmt/zabbix/pkg-descr
index a85383f..52ecef0 100644
--- a/net-mgmt/zabbix/pkg-descr
+++ b/net-mgmt/zabbix/pkg-descr
@@ -5,4 +5,4 @@ mechanism allows easy and quckly configure email notifications
 for pre-defined events. Zabbix is freely available under the
 terms of the GNU General Public License (GPL). 
 
-WWW: http://zabbix.sourceforge.net/
+WWW: http://www.zabbix.com/
diff --git a/net-mgmt/zabbix/pkg-plist b/net-mgmt/zabbix/pkg-plist
index c5f4f7c..c9fb618 100644
--- a/net-mgmt/zabbix/pkg-plist
+++ b/net-mgmt/zabbix/pkg-plist
@@ -1,12 +1,6 @@
-bin/zabbix_agent
-bin/zabbix_agentd
-bin/zabbix_get
-bin/zabbix_sender
-bin/zabbix_server
-etc/zabbix/zabbix_agent.conf.sample
-etc/zabbix/zabbix_agentd.conf.sample
-etc/zabbix/zabbix_server.conf.sample
 %%DATADIR%%/create/data/data.sql
+%%DATADIR%%/create/data/images.sql
+%%DATADIR%%/create/data/images_pgsql.sql
 %%DATADIR%%/create/dbsetup.sh
 %%DATADIR%%/create/mysql/schema.sql
 %%DATADIR%%/create/oracle/schema.sql
@@ -228,10 +222,13 @@ etc/zabbix/zabbix_server.conf.sample
 %%DATADIR%%/php/include/locales/en_gb.inc.php
 %%DATADIR%%/php/include/locales/fr_fr.inc.php
 %%DATADIR%%/php/include/locales/it_it.inc.php
+%%DATADIR%%/php/include/locales/nl_nl.inc.php
 %%DATADIR%%/php/include/locales/ja_jp.inc.php
 %%DATADIR%%/php/include/locales/lv_lv.inc.php
+%%DATADIR%%/php/include/locales/pt_br.inc.php
 %%DATADIR%%/php/include/locales/ru_ru.inc.php
 %%DATADIR%%/php/include/locales/sp_sp.inc.php
+%%DATADIR%%/php/include/locales/sv_se.inc.php
 %%DATADIR%%/php/include/maps.inc.php
 %%DATADIR%%/php/include/media.inc.php
 %%DATADIR%%/php/include/perm.inc.php
@@ -405,4 +402,3 @@ etc/zabbix/zabbix_server.conf.sample
 @dirrm %%DATADIR%%/create/data
 @dirrm %%DATADIR%%/create
 @dirrm %%DATADIR%%
-@dirrm etc/zabbix
diff --git a/net-mgmt/zabbix/pkg-plist.agent b/net-mgmt/zabbix/pkg-plist.agent
deleted file mode 100644
index 1ed26dd..0000000
--- a/net-mgmt/zabbix/pkg-plist.agent
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/zabbix_agent
-bin/zabbix_agentd
-bin/zabbix_get
-bin/zabbix_sender
-etc/zabbix/zabbix_agent.conf.sample
-etc/zabbix/zabbix_agentd.conf.sample
-@dirrm etc/zabbix
diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile
index ab2a6bc..597d16f 100644
--- a/net-mgmt/zabbix2-agent/Makefile
+++ b/net-mgmt/zabbix2-agent/Makefile
@@ -1,17 +1,11 @@
-# Ports collection makefile for:  zabbix
-# Date created:			  Jun 18 2003
-# Whom:				  Sergey Akifyev <asa@gascom.ru>
+# Ports collection makefile for:	zabbix
+# Date created:		Jun 18 2003
+# Whom:			Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	zabbix-agent
-CATEGORIES=	net
-
-MAINTAINER=	asa@gascom.ru
-COMMENT=	Very advanced network monitoring system (agent only)
-
-ZABBIX_AGENT_ONLY=yes
+ZABBIX_AGENT_ONLY=	yes
 MASTERDIR=	${.CURDIR}/../../net-mgmt/zabbix
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net-mgmt/zabbix2/Makefile b/net-mgmt/zabbix2/Makefile
index f018032..7280776 100644
--- a/net-mgmt/zabbix2/Makefile
+++ b/net-mgmt/zabbix2/Makefile
@@ -1,22 +1,25 @@
-# Ports collection makefile for:  zabbix
-# Date created:			  Jun 18 2003
-# Whom:				  Sergey Akifyev <asa@gascom.ru>
+# Ports collection makefile for:	zabbix
+# Date created:		Jun 18 2003
+# Whom:			Sergey Akifyev <asa@gascom.ru>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	zabbix
-PORTVERSION=	1.1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.3
 PORTEPOCH=	1
-CATEGORIES?=	net-mgmt
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+CATEGORIES=	net-mgmt
+MASTER_SITES=	SF
 
 MAINTAINER=	asa@gascom.ru
-COMMENT=	Very advanced network monitoring system
+COMMENT=	Application and network monitoring solution
 
-.ifndef(ZABBIX_AGENT_ONLY)
+.ifdef(ZABBIX_AGENT_ONLY)
+PKGNAMESUFFIX=	-agent
+CATEGORIES=	net
+CONFLICTS=	zabbix-[0-9]*
+.else
+CONFLICTS=	zabbix-agent-[0-9]*
 OPTIONS=	PGSQL "Use a PostgreSQL backend" off \
 		MYSQL "Use a MySQL backend" on \
 		FPING "Use fping for pinging hosts" on
@@ -26,66 +29,67 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS+=--enable-agent
 .ifdef(ZABBIX_AGENT_ONLY)
 PKGNAMESUFFIX=	-agent
-PLIST=		${MASTERDIR}/pkg-plist.agent
+PLIST=		""
 .else # ZABBIX_AGENT_ONLY
 CONFIGURE_ARGS+=--enable-server
 # TODO add snmp knob
 LIB_DEPENDS=	netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
-USE_PHP=	gd snmp sockets
+USE_PHP=	gd snmp sockets pcre
 SUB_FILES=	pkg-message
 .endif # ZABBIX_AGENT_ONLY
 
 .include <bsd.port.pre.mk>
 
 .ifndef(WITHOUT_FPING)
-RUN_DEPENDS+=	${LOCALBASE}/sbin/fping:${PORTSDIR}/net/fping
+RUN_DEPENDS+=	fping:${PORTSDIR}/net/fping
 .endif
 
 .ifndef(ZABBIX_AGENT_ONLY)
 .ifndef(WITH_PGSQL)
 .ifdef(WITHOUT_MYSQL)
-IGNORE=		You should configure to use either a MySQL or PostgreSQL backend
+IGNORE=		you should configure to use either a MySQL or PostgreSQL backend
 .endif
 .endif
 
 .ifdef(WITH_PGSQL)
 USE_PGSQL=	yes
 CONFIGURE_ARGS+=--with-pgsql
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/pgsql.so:${PORTSDIR}/${pgsql_DEPENDS}
 .endif
 .ifndef(WITHOUT_MYSQL)
 USE_MYSQL=	yes
 CONFIGURE_ARGS+=--with-mysql
+RUN_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/mysql.so:${PORTSDIR}/${mysql_DEPENDS}
 .endif
 CONFIGURE_ARGS+=--with-net-snmp
 .endif # ZABBIX_AGENT_ONLY
 
 USE_RC_SUBR=	zabbix_agentd.sh
-.if !defined(ZABBIX_AGENT_ONLY)
+.ifndef(ZABBIX_AGENT_ONLY)
 USE_RC_SUBR+=	zabbix_server.sh
 .endif
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS=-I${LOCALBASE}/include
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}"
+CPPFLAGS=	-I${LOCALBASE}/include
 
-ZABBIX_BINARIES=	zabbix_agent/zabbix_agent \
-			zabbix_agent/zabbix_agentd \
-			zabbix_get/zabbix_get \
-			zabbix_sender/zabbix_sender
-ZABBIX_CONFIGS=		zabbix_agent.conf zabbix_agentd.conf
+ZABBIX_BIN=		agent agentd get sender
+ZABBIX_CFG=		agent agentd
 .ifndef(ZABBIX_AGENT_ONLY)
-ZABBIX_BINARIES+=	zabbix_server/zabbix_server
-ZABBIX_CONFIGS+=	zabbix_server.conf
+ZABBIX_BIN+=	server
+ZABBIX_CFG+=	server
 .endif
+ZABBIX_BINFILES=	${ZABBIX_BIN:S|^|zabbix_|:C|.+|&/&|:S|agentd/|agent/|}
+ZABBIX_CFGFILES=	${ZABBIX_CFG:S|^|zabbix_|:S|$|.conf|}
+PLIST_FILES=	${ZABBIX_BIN:S|^|bin/zabbix_|} \
+		${ZABBIX_CFG:S|^|etc/zabbix/zabbix_|:S|$|.conf.sample|}
 
 post-patch:
-	@${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agent.c
-	@${REINPLACE_CMD} 's|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_agent/zabbix_agentd.c
-.ifndef(ZABBIX_AGENT_ONLY)
-	@${REINPLACE_CMD} 's|%LOCALBASE%|${LOCALBASE}|;s|%PREFIX%|${PREFIX}|' ${WRKSRC}/src/zabbix_server/server.c
+	@${FIND} ${WRKSRC}/src -type f -print0 | ${XARGS} -0 \
+		${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|'
 .ifdef WITHOUT_FPING
 	@${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/misc/conf/zabbix_server.conf
 .endif
-.endif # ZABBIX_AGENT_ONLY
 
 .if ${ARCH} == "amd64"
 post-configure:
@@ -93,22 +97,17 @@ post-configure:
 .endif
 
 do-install:
-.for FILE in ${ZABBIX_BINARIES}
-	${INSTALL_PROGRAM} ${WRKSRC}/src/${FILE} ${PREFIX}/bin
-.endfor
-	${MKDIR} ${PREFIX}/etc/zabbix
-.for FILE in ${ZABBIX_CONFIGS}
-	${INSTALL_DATA} ${WRKSRC}/misc/conf/${FILE} \
-			${PREFIX}/etc/zabbix/${FILE}.sample
+	@${ECHO_CMD} '@unexec rmdir %D/etc/zabbix 2>/dev/null || true' >> ${TMPPLIST}
+	${INSTALL_PROGRAM} ${ZABBIX_BINFILES:S,^,${WRKSRC}/src/,} ${PREFIX}/bin/
+	${INSTALL} -d ${PREFIX}/etc/zabbix/
+.for FILE in ${ZABBIX_CFGFILES}
+	${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
-	${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} -d ${DATADIR}/create/
+	${CP} -Rf ${WRKSRC}/frontends/ ${WRKSRC}/upgrades/dbpatches ${DATADIR}/
+	${CP} -Rf ${WRKSRC}/create/ ${DATADIR}/create/
+	${INSTALL_SCRIPT} ${MASTERDIR}/scripts/dbsetup.sh ${DATADIR}/create/
 .endif
 	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
 .ifndef(ZABBIX_AGENT_ONLY)
diff --git a/net-mgmt/zabbix2/distinfo b/net-mgmt/zabbix2/distinfo
index d58196a..884c820 100644
--- a/net-mgmt/zabbix2/distinfo
+++ b/net-mgmt/zabbix2/distinfo
@@ -1,3 +1,3 @@
-MD5 (zabbix-1.1.1.tar.gz) = f46016b55a8450515eb6a797d43781c4
-SHA256 (zabbix-1.1.1.tar.gz) = 2878debb5688a4ff29a530d3bee9b8560aadf07fed40874b96a27e7ed9824206
-SIZE (zabbix-1.1.1.tar.gz) = 1113411
+MD5 (zabbix-1.1.3.tar.gz) = a4cb17ac443050ab7014e4b9c7895892
+SHA256 (zabbix-1.1.3.tar.gz) = 35cac8405e9b20767e37249eb22ccc16f91c2be9996ca6d736851708fb513213
+SIZE (zabbix-1.1.3.tar.gz) = 1481278
diff --git a/net-mgmt/zabbix2/files/patch-src-zabbix_agent-zabbix_agent.c b/net-mgmt/zabbix2/files/patch-src-zabbix_agent-zabbix_agent.c
deleted file mode 100644
index c1a6983..0000000
--- a/net-mgmt/zabbix2/files/patch-src-zabbix_agent-zabbix_agent.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/zabbix_agent/zabbix_agent.c.orig	Tue Jul 25 19:51:28 2006
-+++ src/zabbix_agent/zabbix_agent.c	Tue Jul 25 19:51:42 2006
-@@ -108,7 +108,7 @@
- 
- 	if(CONFIG_FILE == NULL)
- 	{
--		CONFIG_FILE = strdup("/etc/zabbix/zabbix_agentd.conf");
-+		CONFIG_FILE = strdup("%PREFIX%/etc/zabbix/zabbix_agentd.conf");
- 	}
- 	
- 	parse_cfg_file(CONFIG_FILE,cfg);
diff --git a/net-mgmt/zabbix2/files/patch-src-zabbix_agent-zabbix_agentd.c b/net-mgmt/zabbix2/files/patch-src-zabbix_agent-zabbix_agentd.c
deleted file mode 100644
index 6e4549a..0000000
--- a/net-mgmt/zabbix2/files/patch-src-zabbix_agent-zabbix_agentd.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/zabbix_agent/zabbix_agentd.c.orig	Tue Jul 25 19:51:53 2006
-+++ src/zabbix_agent/zabbix_agentd.c	Tue Jul 25 19:52:01 2006
-@@ -298,7 +298,7 @@
- 	
- 	if(CONFIG_FILE == NULL)
- 	{
--		CONFIG_FILE = strdup("/etc/zabbix/zabbix_agentd.conf");
-+		CONFIG_FILE = strdup("%PREFIX%/etc/zabbix/zabbix_agentd.conf");
- 	}
- 
- 	parse_cfg_file(CONFIG_FILE,cfg);
diff --git a/net-mgmt/zabbix2/files/patch-src-zabbix_server-server.c b/net-mgmt/zabbix2/files/patch-src-zabbix_server-server.c
deleted file mode 100644
index 17cb560..0000000
--- a/net-mgmt/zabbix2/files/patch-src-zabbix_server-server.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/zabbix_server/server.c.orig	Tue Jul 25 17:53:16 2006
-+++ src/zabbix_server/server.c	Tue Jul 25 17:53:22 2006
-@@ -361,7 +361,7 @@
- 
- 	if(CONFIG_FILE == NULL)
- 	{
--		CONFIG_FILE=strdup("/etc/zabbix/zabbix_server.conf");
-+		CONFIG_FILE=strdup("%PREFIX%/etc/zabbix/zabbix_server.conf");
- 	}
- 
- 	parse_cfg_file(CONFIG_FILE,cfg);
-@@ -381,7 +381,7 @@
- 	}
- 	if(CONFIG_FPING_LOCATION == NULL)
- 	{
--		CONFIG_FPING_LOCATION=strdup("/usr/sbin/fping");
-+		CONFIG_FPING_LOCATION=strdup("%LOCALBASE%/fping");
- 	}
- 
- }
diff --git a/net-mgmt/zabbix2/files/zabbix_agentd.sh.in b/net-mgmt/zabbix2/files/zabbix_agentd.sh.in
index 98dac63..0be45c4 100644
--- a/net-mgmt/zabbix2/files/zabbix_agentd.sh.in
+++ b/net-mgmt/zabbix2/files/zabbix_agentd.sh.in
@@ -8,10 +8,10 @@
 name="zabbix_agentd"
 rcvar=${name}_enable
 load_rc_config $name
+eval : \${${rcvar}='NO'}
 
 command="%%PREFIX%%/bin/${name}"
 required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
 
-eval "${rcvar}=\${${rcvar}:-'NO'}"
 
 run_rc_command "$1"
diff --git a/net-mgmt/zabbix2/files/zabbix_server.sh.in b/net-mgmt/zabbix2/files/zabbix_server.sh.in
index 1982f80..cb269de 100644
--- a/net-mgmt/zabbix2/files/zabbix_server.sh.in
+++ b/net-mgmt/zabbix2/files/zabbix_server.sh.in
@@ -8,10 +8,9 @@
 name="zabbix_server"
 rcvar=${name}_enable
 load_rc_config $name
+eval : \${${rcvar}='NO'}
 
 command="%%PREFIX%%/bin/${name}"
 required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
 
-eval "${rcvar}=\${${rcvar}:-'NO'}"
-
 run_rc_command "$1"
diff --git a/net-mgmt/zabbix2/pkg-descr b/net-mgmt/zabbix2/pkg-descr
index a85383f..52ecef0 100644
--- a/net-mgmt/zabbix2/pkg-descr
+++ b/net-mgmt/zabbix2/pkg-descr
@@ -5,4 +5,4 @@ mechanism allows easy and quckly configure email notifications
 for pre-defined events. Zabbix is freely available under the
 terms of the GNU General Public License (GPL). 
 
-WWW: http://zabbix.sourceforge.net/
+WWW: http://www.zabbix.com/
diff --git a/net-mgmt/zabbix2/pkg-plist b/net-mgmt/zabbix2/pkg-plist
index c5f4f7c..c9fb618 100644
--- a/net-mgmt/zabbix2/pkg-plist
+++ b/net-mgmt/zabbix2/pkg-plist
@@ -1,12 +1,6 @@
-bin/zabbix_agent
-bin/zabbix_agentd
-bin/zabbix_get
-bin/zabbix_sender
-bin/zabbix_server
-etc/zabbix/zabbix_agent.conf.sample
-etc/zabbix/zabbix_agentd.conf.sample
-etc/zabbix/zabbix_server.conf.sample
 %%DATADIR%%/create/data/data.sql
+%%DATADIR%%/create/data/images.sql
+%%DATADIR%%/create/data/images_pgsql.sql
 %%DATADIR%%/create/dbsetup.sh
 %%DATADIR%%/create/mysql/schema.sql
 %%DATADIR%%/create/oracle/schema.sql
@@ -228,10 +222,13 @@ etc/zabbix/zabbix_server.conf.sample
 %%DATADIR%%/php/include/locales/en_gb.inc.php
 %%DATADIR%%/php/include/locales/fr_fr.inc.php
 %%DATADIR%%/php/include/locales/it_it.inc.php
+%%DATADIR%%/php/include/locales/nl_nl.inc.php
 %%DATADIR%%/php/include/locales/ja_jp.inc.php
 %%DATADIR%%/php/include/locales/lv_lv.inc.php
+%%DATADIR%%/php/include/locales/pt_br.inc.php
 %%DATADIR%%/php/include/locales/ru_ru.inc.php
 %%DATADIR%%/php/include/locales/sp_sp.inc.php
+%%DATADIR%%/php/include/locales/sv_se.inc.php
 %%DATADIR%%/php/include/maps.inc.php
 %%DATADIR%%/php/include/media.inc.php
 %%DATADIR%%/php/include/perm.inc.php
@@ -405,4 +402,3 @@ etc/zabbix/zabbix_server.conf.sample
 @dirrm %%DATADIR%%/create/data
 @dirrm %%DATADIR%%/create
 @dirrm %%DATADIR%%
-@dirrm etc/zabbix
diff --git a/net-mgmt/zabbix2/pkg-plist.agent b/net-mgmt/zabbix2/pkg-plist.agent
deleted file mode 100644
index 1ed26dd..0000000
--- a/net-mgmt/zabbix2/pkg-plist.agent
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/zabbix_agent
-bin/zabbix_agentd
-bin/zabbix_get
-bin/zabbix_sender
-etc/zabbix/zabbix_agent.conf.sample
-etc/zabbix/zabbix_agentd.conf.sample
-@dirrm etc/zabbix