Module Name:	pkgsrc
Committed By:	rh
Date:		Tue Mar  9 02:23:44 UTC 2004

Modified Files:
	pkgsrc/audio/cam: Makefile
	pkgsrc/graphics/feh: Makefile PLIST

Log Message:
Fix conflict between graphics/feh and audio/cam by renaming cam to feh_cam.
Fix the Perl path for feh_cam.
Bump PKGREVISION for feh.
Add CONFLICTS= feh<1.2.6nb3 to  audio/cam.


To generate a diff of this commit:
cvs rdiff -r1.13 -r1.14 pkgsrc/audio/cam/Makefile
cvs rdiff -r1.13 -r1.14 pkgsrc/graphics/feh/Makefile
cvs rdiff -r1.4 -r1.5 pkgsrc/graphics/feh/PLIST

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