Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Jan 24 18:55:21 UTC 2006

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

Log Message:
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.


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

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