From 70dcd46ac34fc2b4b821893e4b376a0e805abc4e Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 11 Dec 2010 10:24:21 +0000
Subject: [PATCH] No need for this hack anymore.

---
 net/zabbix/Makefile             | 4 ++--
 net/zabbix/pkg/zabbix_proxy.rc  | 8 +-------
 net/zabbix/pkg/zabbix_server.rc | 8 +-------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile
index 570553fe5aa..7ccc7ffeb72 100644
--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.39 2010/12/07 21:52:03 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.40 2010/12/11 10:24:21 ajacoutot Exp $
 
 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@@ -14,7 +14,7 @@ FULLPKGPATH-web =	net/zabbix,-web
 CATEGORIES =		net
 
 REVISION-main =		6
-REVISION-server =	5
+REVISION-server =	6
 REVISION-web =		2
 
 MAJV =			${VERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/net/zabbix/pkg/zabbix_proxy.rc b/net/zabbix/pkg/zabbix_proxy.rc
index 02cfc36550c..c06076502f4 100644
--- a/net/zabbix/pkg/zabbix_proxy.rc
+++ b/net/zabbix/pkg/zabbix_proxy.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_proxy.rc,v 1.1 2010/11/22 15:39:21 ajacoutot Exp $
+# $OpenBSD: zabbix_proxy.rc,v 1.2 2010/12/11 10:24:21 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
@@ -11,12 +11,6 @@ rc_pre() {
 	install -d -o _zabbix -g _zabbix /var/run/zabbix
 }
 
-rc_start() {
-	type rc_pre >/dev/null && rc_pre
-	getcap -f /etc/login.conf zabbix 1>/dev/null 2>&1 && _class=zabbix
-	su -c ${_class:-daemon} -m root -c "${daemon} ${daemon_flags}" >/dev/null
-}
-
 rc_reload() {
 	rc_err "$0: reload is not supported"
 }
diff --git a/net/zabbix/pkg/zabbix_server.rc b/net/zabbix/pkg/zabbix_server.rc
index 137273b4e8f..45c7b8a2a74 100644
--- a/net/zabbix/pkg/zabbix_server.rc
+++ b/net/zabbix/pkg/zabbix_server.rc
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_server.rc,v 1.1 2010/11/22 15:39:21 ajacoutot Exp $
+# $OpenBSD: zabbix_server.rc,v 1.2 2010/12/11 10:24:21 ajacoutot Exp $
 
 . /etc/rc.d/rc.subr
 
@@ -11,12 +11,6 @@ rc_pre() {
 	install -d -o _zabbix -g _zabbix /var/run/zabbix
 }
 
-rc_start() {
-	type rc_pre >/dev/null && rc_pre
-	getcap -f /etc/login.conf zabbix 1>/dev/null 2>&1 && _class=zabbix
-	su -c ${_class:-daemon} -m root -c "${daemon} ${daemon_flags}" >/dev/null
-}
-
 rc_reload() {
 	rc_err "$0: reload is not supported"
 }