Module Name:	pkgsrc
Committed By:	wennmach
Date:		Thu Apr 12 14:05:41 UTC 2001

Modified Files:
	pkgsrc/mail/cyrus-imapd: Makefile

Log Message:
Add a CONFLICTS entry for kth-krb4.
This was reported in PR 12505 and noted by pkgconflict.

The conflict is only on one file, man/man5/krb.equiv.5, and should be resolved.


To generate a diff of this commit:
cvs rdiff -r1.10 -r1.11 pkgsrc/mail/cyrus-imapd/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.