From d967637ec2a25fa80698bf6349ad79e7b6ce4828 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 20 Jan 2012 10:40:42 +0000
Subject: [PATCH] Fix restart for server and proxy by tweaking pexp. These can
 take a couple of seconds to shutdown while leaving a non-matching process.

ok robert@ (maintainer)
---
 net/zabbix/Makefile             | 3 ++-
 net/zabbix/pkg/zabbix_proxy.rc  | 4 ++--
 net/zabbix/pkg/zabbix_server.rc | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/zabbix/Makefile b/net/zabbix/Makefile
index a7c808af8de..178b5f5b820 100644
--- a/net/zabbix/Makefile
+++ b/net/zabbix/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.67 2012/01/11 22:28:19 sthen Exp $
+# $OpenBSD: Makefile,v 1.68 2012/01/20 10:40:42 ajacoutot Exp $
 
 COMMENT-main =		network and application monitoring - agent
 COMMENT-server =	network and application monitoring - server
@@ -14,6 +14,7 @@ FULLPKGPATH-web =	net/zabbix,-web
 CATEGORIES =		net
 
 REVISION-main =		0
+REVISION-server =	0
 REVISION-web =		0
 
 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 756fb3b6910..b04a8b588d3 100644
--- a/net/zabbix/pkg/zabbix_proxy.rc
+++ b/net/zabbix/pkg/zabbix_proxy.rc
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_proxy.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: zabbix_proxy.rc,v 1.6 2012/01/20 10:40:42 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/sbin/zabbix_proxy"
 
 . /etc/rc.d/rc.subr
 
-pexp="zabbix_proxy: heartbeat sender"
+pexp="zabbix_proxy"
 rc_reload=NO
 
 rc_pre() {
diff --git a/net/zabbix/pkg/zabbix_server.rc b/net/zabbix/pkg/zabbix_server.rc
index f44940e1462..c0a5f9ed7da 100644
--- a/net/zabbix/pkg/zabbix_server.rc
+++ b/net/zabbix/pkg/zabbix_server.rc
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: zabbix_server.rc,v 1.5 2010/12/27 14:50:23 ajacoutot Exp $
+# $OpenBSD: zabbix_server.rc,v 1.6 2012/01/20 10:40:42 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/sbin/zabbix_server"
 
 . /etc/rc.d/rc.subr
 
-pexp="zabbix_server: main process"
+pexp="zabbix_server"
 rc_reload=NO
 
 rc_pre() {