Module Name:	pkgsrc
Committed By:	adrianp
Date:		Fri May 19 12:21:52 UTC 2006

Modified Files:
	pkgsrc/audio/faad2: Makefile
	pkgsrc/multimedia/mpeg4ip: Makefile

Log Message:
faad2 and mpeg4ip conflict on lib/libmp4v2.la so add the appropriate
CONFLICTS statement.


To generate a diff of this commit:
cvs rdiff -r1.32 -r1.33 pkgsrc/audio/faad2/Makefile
cvs rdiff -r1.3 -r1.4 pkgsrc/multimedia/mpeg4ip/Makefile

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