From c8dc539a6ac6ebc3a21bd8572807e8fa8bce863c Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 21 Nov 2009 12:09:29 +0000
Subject: [PATCH] Tweak startup sequence.

---
 mail/zarafa/zarafa/Makefile             |  4 ++--
 mail/zarafa/zarafa/files/README.OpenBSD | 18 ++++--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/mail/zarafa/zarafa/Makefile b/mail/zarafa/zarafa/Makefile
index d9a71a82a3f..ed6ec3cdddc 100644
--- a/mail/zarafa/zarafa/Makefile
+++ b/mail/zarafa/zarafa/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2009/11/18 13:55:39 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.29 2009/11/21 12:09:29 ajacoutot Exp $
 
 COMMENT-main=	MS Exchange groupware suite replacement
 COMMENT-php=	MAPI extensions for php5
@@ -6,7 +6,7 @@ COMMENT-php=	MAPI extensions for php5
 V=		6.30.5
 DISTNAME=	zarafa-${V}
 
-PKGNAME-main=	${DISTNAME}
+PKGNAME-main=	${DISTNAME}p0
 PKGNAME-php=	php5-mapi-${V}
 
 CATEGORIES=	mail www productivity
diff --git a/mail/zarafa/zarafa/files/README.OpenBSD b/mail/zarafa/zarafa/files/README.OpenBSD
index e33e65fcfa2..38225c1f0ab 100644
--- a/mail/zarafa/zarafa/files/README.OpenBSD
+++ b/mail/zarafa/zarafa/files/README.OpenBSD
@@ -1,4 +1,4 @@
-$OpenBSD: README.OpenBSD,v 1.9 2009/10/07 17:05:08 ajacoutot Exp $
+$OpenBSD: README.OpenBSD,v 1.10 2009/11/21 12:09:29 ajacoutot Exp $
 
 *** Upgrading users: refer to zarafa documentation on the web to check
 *** if any particular step is required after upgrading to a new version. 
@@ -47,19 +47,9 @@ if [ -x ${TRUEPREFIX}/bin/zarafa-server ]; then
 		sleep 1
 		i=`expr ${i} + 1`
 	done
-	echo -n ' zarafa-server' ; ${TRUEPREFIX}/bin/zarafa-server
-fi
-if [ -x ${TRUEPREFIX}/bin/zarafa-spooler ]; then
-	echo -n ' zarafa-spooler' ; ${TRUEPREFIX}/bin/zarafa-spooler
-fi
-if [ -x ${TRUEPREFIX}/bin/zarafa-monitor ]; then
-	echo -n ' zarafa-monitor' ; ${TRUEPREFIX}/bin/zarafa-monitor
-fi
-if [ -x ${TRUEPREFIX}/bin/zarafa-gateway ]; then
-	echo -n ' zarafa-gateway' ; ${TRUEPREFIX}/bin/zarafa-gateway
-fi
-if [ -x ${TRUEPREFIX}/bin/zarafa-ical ]; then
-	echo -n ' zarafa-ical' ; ${TRUEPREFIX}/bin/zarafa-ical
+	for i in zarafa-server zarafa-spooler zarafa-monitor zarafa-gateway zarafa-ical; do
+		echo -n " ${i}"; ${TRUEPREFIX}/bin/${i}
+	done
 fi