summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorwiz <wiz>2006-01-24 18:55:21 +0000
committerwiz <wiz>2006-01-24 18:55:21 +0000
commit0541587a3fb06d9472c49e13cad6e259e1e5a14c (patch)
tree8f0d88c753762d55a3d8db5bd23e1e41332586c2 /security
parentf5e9839b1fd3cd49d47a5464dd72593f91656312 (diff)
downloadpkgsrc-0541587a3fb06d9472c49e13cad6e259e1e5a14c.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 '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 7e442cc2138..f1e4b62c30b 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -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 @@ MAINTAINER= lha@NetBSD.org
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