From 7d052dc00de83c1221e2611166d20ae59101c096 Mon Sep 17 00:00:00 2001 From: wennmach Date: Thu, 12 Apr 2001 14:58:09 +0000 Subject: cyrus-imap depends on cyrus-sasl, which, if USE_KERBEROS is defined, depends on kth-krb4, which used to conflict with ... cyrus-imap. kth-krb4 now no longer installs man/man5/krb.equiv.5 and the conflict is resolved. --- mail/cyrus-imapd/Makefile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'mail/cyrus-imapd') diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 1c61728f029..8cc3ec59654 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2001/04/12 14:05:40 wennmach Exp $ +# $NetBSD: Makefile,v 1.12 2001/04/12 14:58:09 wennmach Exp $ DISTNAME= cyrus-imapd-1.6.24 PKGNAME= ${DISTNAME}nb1 @@ -10,10 +10,6 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://asg.web.cmu.edu/cyrus/imapd/ COMMENT= IMAP server -# The conflict with kth-krb4-* is only on one file, man/man5/krb.equiv.5 and -# should be resolved. -CONFLICTS= kth-krb4-* - DEPENDS+= tcl>=8.3.2:../../lang/tcl DEPENDS+= cyrus-sasl>=1.5.24nb2:../../security/cyrus-sasl -- cgit v1.2.3