Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Jan 24 18:56:23 UTC 2006

Modified Files:
	pkgsrc/net/openafs: Makefile
	pkgsrc/security/heimdal: Makefile

Log Message:
security/heimdal and net/openafs conflict because of:
bin/compile_et
bin/kpasswd
bin/pagsh

Addresses PR 32610 and PR 32612 by Ola Eriksson.


To generate a diff of this commit:
cvs rdiff -r1.17 -r1.18 pkgsrc/net/openafs/Makefile
cvs rdiff -r1.51 -r1.52 pkgsrc/security/heimdal/Makefile

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