From 0541587a3fb06d9472c49e13cad6e259e1e5a14c Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 24 Jan 2006 18:55:21 +0000
Subject: security/heimdal and arla conflict with each other because of:
 bin/mk_cmds lib/libroken.la lib/libsl.la lib/libss.la
 man/man3/arg_printusage.3 man/man3/getarg.3

Addresses PR 32610 and PR 32611 by Ola Eriksson.
---
 net/arla/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'net/arla/Makefile')

diff --git a/net/arla/Makefile b/net/arla/Makefile
index c64d652ecfe..1bf2685a221 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/01/15 21:01:46 cube Exp $
+# $NetBSD: Makefile,v 1.52 2006/01/24 18:55:21 wiz Exp $
 
 DISTNAME=		arla-0.41
 PKGREVISION=		1
@@ -9,9 +9,10 @@ MAINTAINER=		wennmach@NetBSD.org
 HOMEPAGE=		http://www.stacken.kth.se/project/arla/
 COMMENT=		Free AFS implementation from KTH
 
+CONFLICTS+=		heimdal-[0-9]*
 CONFLICTS+=		lwp-[0-9]*
-CONFLICTS+=		rx-[0-9]*
 CONFLICTS+=		openafs-[0-9]*
+CONFLICTS+=		rx-[0-9]*
 
 OSVERSION_SPECIFIC=	yes
 INFO_FILES=		arla.info send-pr.info
-- 
cgit v1.2.3