Module Name:	pkgsrc
Committed By:	jwise
Date:		Thu Jul 24 20:59:04 UTC 2003

Modified Files:
	pkgsrc/security/openssh: Makefile
	pkgsrc/security/ssh: Makefile
	pkgsrc/security/ssh2: Makefile.common

Log Message:
Mark conflicts with openssh+gssapi.


To generate a diff of this commit:
cvs rdiff -r1.102 -r1.103 pkgsrc/security/openssh/Makefile
cvs rdiff -r1.106 -r1.107 pkgsrc/security/ssh/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/security/ssh2/Makefile.common

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