From ceefe009f7d89689c7daa39e7e6cb36e7f08259c Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Mon, 4 Jul 2011 02:48:03 +0000
Subject: [PATCH] - Mark CONFLICTS between net/openafs and net/coda6_server:
 both install sbin/backup - Bump PORTREVISION for PLIST change

PR:		ports/158584
Submitted by:	Ben Kaduk <kaduk@mit.edu> (maintainer of net/openafs)
---
 net/coda6_server/Makefile | 3 +++
 net/openafs/Makefile      | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/net/coda6_server/Makefile b/net/coda6_server/Makefile
index 61e4079bf2be..6b9285315950 100644
--- a/net/coda6_server/Makefile
+++ b/net/coda6_server/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=	coda
 PORTVERSION=	6.9.4
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.coda.cs.cmu.edu/pub/coda/src/ \
 		ftp://ftp.planetmirror.com/pub/coda/src/ \
@@ -20,6 +21,8 @@ LIB_DEPENDS=	lwp.2:${PORTSDIR}/devel/lwp \
 		rpc2.9:${PORTSDIR}/devel/rpc2 \
 		rvmlwp.3:${PORTSDIR}/devel/rvm
 
+CONFLICTS=	openafs-[0-9]*
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index 16ea49c1c01e..87077a67acaf 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	openafs
 DISTVERSION=	1.6.0pre6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net kld
 MASTER_SITES=	http://dl.central.org/dl/openafs/candidate/${DISTVERSION}/:openafs \
 		http://dl.openafs.org/dl/openafs/candidate/${DISTVERSION}/:openafs \
@@ -81,7 +81,7 @@ PLIST_SUB+=	FUSE=""
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-CONFLICTS=	heimdal-[0-9]*
+CONFLICTS=	coda-server-6.[0-9]* heimdal-[0-9]*
 
 .include "Makefile.man"