Module Name:	pkgsrc
Committed By:	wiz
Date:		Tue Jun 24 19:38:26 UTC 2003

Modified Files:
	pkgsrc/misc/staroffice: Makefile

Log Message:
Add conflicts with openoffice and openoffice-linux (over bin/soffice).
Closes PR 21972 by Brook G. Milligan.


To generate a diff of this commit:
cvs rdiff -r1.28 -r1.29 pkgsrc/misc/staroffice/Makefile

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