summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2006-01-24 18:55:21 +0000
committerwiz <wiz@pkgsrc.org>2006-01-24 18:55:21 +0000
commite48cb1d6fe99b4313981ab21ab6afe34c29aa096 (patch)
tree8f0d88c753762d55a3d8db5bd23e1e41332586c2 /net
parentc957a9835cc0ef6b1769dc217693c379efb02c99 (diff)
downloadpkgsrc-e48cb1d6fe99b4313981ab21ab6afe34c29aa096.tar.gz
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 (limited to 'net')
-rw-r--r--net/arla/Makefile5
1 files changed, 3 insertions, 2 deletions
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