Module Name:	pkgsrc
Committed By:	wiz
Date:		Fri Mar 18 14:44:58 UTC 2005

Modified Files:
	pkgsrc/graphics/barcode: Makefile
	pkgsrc/x11/xscreensaver: Makefile

Log Message:
graphics/barcode and x11/xscreensaver conflict (because of
man/man1/barcode.1). Noted by kleink in PR 29585.


To generate a diff of this commit:
cvs rdiff -r1.7 -r1.8 pkgsrc/graphics/barcode/Makefile
cvs rdiff -r1.66 -r1.67 pkgsrc/x11/xscreensaver/Makefile

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