summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorwiz <wiz>2006-01-24 18:56:23 +0000
committerwiz <wiz>2006-01-24 18:56:23 +0000
commita10c4752d703e4e2a58f14b6c8c33ce14dded997 (patch)
treef3766455d4a6bf0a03c5ba744558e084ad3b146b /security
parent0541587a3fb06d9472c49e13cad6e259e1e5a14c (diff)
downloadpkgsrc-a10c4752d703e4e2a58f14b6c8c33ce14dded997.tar.gz
security/heimdal and net/openafs conflict because of:
bin/compile_et bin/kpasswd bin/pagsh Addresses PR 32610 and PR 32612 by Ola Eriksson.
Diffstat (limited to 'security')
-rw-r--r--security/heimdal/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f1e4b62c30b..411c2dcc21f 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2006/01/24 18:55:21 wiz Exp $
+# $NetBSD: Makefile,v 1.52 2006/01/24 18:56:23 wiz Exp $
DISTNAME= heimdal-0.7.1
PKGREVISION= 2
@@ -12,6 +12,7 @@ COMMENT= Kerberos 5 implementation
CONFLICTS+= arla-[0-9]*
CONFLICTS+= mit-krb5-[0-9]*
+CONFLICTS+= openafs-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews