Module Name:	pkgsrc
Committed By:	wiz
Date:		Sat Feb 26 15:52:52 UTC 2005

Modified Files:
	pkgsrc/misc/openoffice: Makefile

Log Message:
We also need to conflict with the old package name
of openoffice-bin (openoffice-linux) since people might still
have it installed or binary packages lying around.


To generate a diff of this commit:
cvs rdiff -r1.59 -r1.60 pkgsrc/misc/openoffice/Makefile

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