11 files changed, 4 insertions, 132 deletions
diff --git a/MOVED b/MOVED
index 8d0fea97964a..abacb318fa5d 100644
--- a/MOVED
+++ b/MOVED
@@ -3074,3 +3074,4 @@ devel/hs-popenhs||2007-07-11|Remove software depending on outdated lang/ghc5
 databases/p5-DBD-Pg-13||2007-06-14|Has expired: Use databases/p5-DBD-Pg instead
 multimedia/audacious-docklet|multimedia/audacious-plugins|2007-06-15|Functionality folded into plugins package
 net/cacti|net-mgmt/cacti|2007-06-18|Move to net-mgmt category
+net/zabbix-agent|net-mgmt/zabbix-agent|2007-06-18|Move to net-mgmt category
diff --git a/net-mgmt/Makefile b/net-mgmt/Makefile
index dbbcfde79f44..2fbde286850f 100644
--- a/net-mgmt/Makefile
+++ b/net-mgmt/Makefile
@@ -230,5 +230,6 @@
     SUBDIR += wispy-tools
     SUBDIR += yabm
     SUBDIR += zabbix
+    SUBDIR += zabbix-agent
 
 .include <bsd.port.subdir.mk>
diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
index d9634ae1e6aa..4c7d6abc689c 100644
--- a/net-mgmt/zabbix-agent/Makefile
+++ b/net-mgmt/zabbix-agent/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	zabbix
 PORTVERSION=	1.4
 PORTEPOCH=	1
-CATEGORIES=	net
+CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-agent
 
diff --git a/net-mgmt/zabbix2-agent/Makefile b/net-mgmt/zabbix2-agent/Makefile
index d9634ae1e6aa..4c7d6abc689c 100644
--- a/net-mgmt/zabbix2-agent/Makefile
+++ b/net-mgmt/zabbix2-agent/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	zabbix
 PORTVERSION=	1.4
 PORTEPOCH=	1
-CATEGORIES=	net
+CATEGORIES=	net-mgmt
 MASTER_SITES=	SF
 PKGNAMESUFFIX=	-agent
 
diff --git a/net/Makefile b/net/Makefile
index 27922c74856d..ae7b997293bb 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -961,7 +961,6 @@
     SUBDIR += yazproxy
     SUBDIR += yptransitd
     SUBDIR += ytalk
-    SUBDIR += zabbix-agent
     SUBDIR += zebra
     SUBDIR += zebra-server
     SUBDIR += zillion
diff --git a/net/zabbix-agent/Makefile b/net/zabbix-agent/Makefile
deleted file mode 100644
index d9634ae1e6aa..000000000000
--- a/net/zabbix-agent/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# Ports collection makefile for:	zabbix-agent
-# Date created:		Jun 18 2003
-# Whom:			Sergey Akifyev <asa@gascom.ru>
-#
-# $FreeBSD$
-#
-
-PORTNAME=	zabbix
-PORTVERSION=	1.4
-PORTEPOCH=	1
-CATEGORIES=	net
-MASTER_SITES=	SF
-PKGNAMESUFFIX=	-agent
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Application and network monitoring solution
-
-USE_GMAKE=	yes
-USE_RC_SUBR=	zabbix_agentd
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-agent --disable-server
-MAKE_ARGS=	ARCH=freebsd
-
-ZABBIX_BIN=	agent agentd get sender
-ZABBIX_CFG=	agent agentd
-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:
-	@${FIND} ${WRKSRC}/src/ -type f|${XARGS} \
-		${REINPLACE_CMD} -Ee 's|(/etc/zabbix)|${PREFIX}\1|;s|/usr/sbin|${LOCALBASE}/sbin|'
-
-do-install:
-	@${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
-	${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
-.include <bsd.port.mk>
diff --git a/net/zabbix-agent/distinfo b/net/zabbix-agent/distinfo
deleted file mode 100644
index 30a3b6723ef4..000000000000
--- a/net/zabbix-agent/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (zabbix-1.4.tar.gz) = 29f605d939c10c571dac79a107a7745f
-SHA256 (zabbix-1.4.tar.gz) = ed1cb9437a5bd3d3f81b3969303c7bfb3d395f3e636fd19ddcbc52a1a800ba66
-SIZE (zabbix-1.4.tar.gz) = 3141667
diff --git a/net/zabbix-agent/files/patch-configure b/net/zabbix-agent/files/patch-configure
deleted file mode 100644
index ca3fbf1c242a..000000000000
--- a/net/zabbix-agent/files/patch-configure
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./configure.orig	Sat Jan 27 20:39:51 2007
-+++ ./configure	Sat Jan 27 20:48:34 2007
-@@ -275,6 +275,9 @@
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
-+#include <sys/socket.h>
-+#include <sys/param.h>
-+#include <netinet/in.h>
- #if HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
diff --git a/net/zabbix-agent/files/zabbix_agentd.in b/net/zabbix-agent/files/zabbix_agentd.in
deleted file mode 100644
index 0be45c4d2b66..000000000000
--- a/net/zabbix-agent/files/zabbix_agentd.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-# PROVIDE: zabbix_agentd
-# REQUIRE: DAEMON
-# KEYWORD: shutdown
-
-. %%RC_SUBR%%
-
-name="zabbix_agentd"
-rcvar=${name}_enable
-load_rc_config $name
-eval : \${${rcvar}='NO'}
-
-command="%%PREFIX%%/bin/${name}"
-required_files="%%PREFIX%%/etc/zabbix/${name}.conf"
-
-
-run_rc_command "$1"
diff --git a/net/zabbix-agent/pkg-descr b/net/zabbix-agent/pkg-descr
deleted file mode 100644
index 52ecef039fcf..000000000000
--- a/net/zabbix-agent/pkg-descr
+++ /dev/null
@@ -1,8 +0,0 @@
-Zabbix is software for application and network monitoring.
-Zabbix supports both polling and trapping techniques to
-collect data from monitored hosts. Flexible notification
-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://www.zabbix.com/
diff --git a/net/zabbix-agent/pkg-install b/net/zabbix-agent/pkg-install
deleted file mode 100644
index bd120120918d..000000000000
--- a/net/zabbix-agent/pkg-install
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# Script was taken from mysql323-server port, and modified
-# to suit zabbix needs
-
-[ -n "${PACKAGE_BUILDING}" ] && exit 0
-
-[ "${2}" = "POST-INSTALL" ] && exit 0
-
-PATH=/bin:/usr/sbin
-
-USER=zabbix
-GROUP=${USER}
-UID=112
-GID=${UID}
-
-if pw group show "${GROUP}" 2>/dev/null; then
-	echo "You already have a group \"${GROUP}\", so I will use it."
-else
-	if pw groupadd ${GROUP} -g ${GID}; then
-		echo "Added group \"${GROUP}\"."
-	else
-		echo "Adding group \"${GROUP}\" failed..."
-		exit 1
-	fi
-fi
-
-if pw user show "${USER}" 2>/dev/null; then
-	echo "You already have a user \"${USER}\", so I will use it."
-	if pw usermod ${USER} -d /nonexistent
-	then
-		echo "Changed home directory of \"${USER}\" to /nonexistent"
-	else
-		echo "Changing home directory of \"${USER}\" to /nonexistent failed..."
-		exit 1
-	fi
-else
-	if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \
-		-d /nonexistent -s /sbin/nologin -c "Zabbix Sandbox"
-	then
-		echo "Added user \"${USER}\"."
-	else
-		echo "Adding user \"${USER}\" failed..."
-		exit 1
-	fi
-fi