[pkgsrc/trunk]: pkgsrc security/heimdal and arla conflict with each other bec...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6b2949fe701b
branches:  trunk
changeset: 506972:6b2949fe701b
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Jan 24 18:55:21 2006 +0000

description:
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.

diffstat:

 net/arla/Makefile         |  5 +++--
 security/heimdal/Makefile |  3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (38 lines):

diff -r 74ba1131649d -r 6b2949fe701b net/arla/Makefile
--- a/net/arla/Makefile Tue Jan 24 15:28:30 2006 +0000
+++ b/net/arla/Makefile Tue Jan 24 18:55:21 2006 +0000
@@ -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 @@
 HOMEPAGE=              http://www.stacken.kth.se/project/arla/
 COMMENT=               Free AFS implementation from KTH
 
+CONFLICTS+=            heimdal-[0-9]*
 CONFLICTS+=            lwp-[0-9]*
+CONFLICTS+=            openafs-[0-9]*
 CONFLICTS+=            rx-[0-9]*
-CONFLICTS+=            openafs-[0-9]*
 
 OSVERSION_SPECIFIC=    yes
 INFO_FILES=            arla.info send-pr.info
diff -r 74ba1131649d -r 6b2949fe701b security/heimdal/Makefile
--- a/security/heimdal/Makefile Tue Jan 24 15:28:30 2006 +0000
+++ b/security/heimdal/Makefile Tue Jan 24 18:55:21 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/12/29 06:22:09 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2006/01/24 18:55:21 wiz Exp $
 
 DISTNAME=      heimdal-0.7.1
 PKGREVISION=   2
@@ -10,6 +10,7 @@
 HOMEPAGE=      http://www.pdc.kth.se/heimdal/
 COMMENT=       Kerberos 5 implementation
 
+CONFLICTS+=    arla-[0-9]*
 CONFLICTS+=    mit-krb5-[0-9]*
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews