Module Name:	pkgsrc
Committed By:	rillig
Date:		Fri Nov 30 00:30:40 UTC 2007

Modified Files:
	pkgsrc/pkgtools/pkg_install/files/add: perform.c
	pkgsrc/pkgtools/pkg_install/files/lib: Makefile.in lib.h
Added Files:
	pkgsrc/pkgtools/pkg_install/files/lib: conflicts.c

Log Message:
Do not install a package if some of the installed packages would
conflict with it. This fixes PR 37451.


To generate a diff of this commit:
cvs rdiff -r1.67 -r1.68 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -r1.16 -r1.17 pkgsrc/pkgtools/pkg_install/files/lib/Makefile.in
cvs rdiff -r0 -r1.1 pkgsrc/pkgtools/pkg_install/files/lib/conflicts.c
cvs rdiff -r1.37 -r1.38 pkgsrc/pkgtools/pkg_install/files/lib/lib.h

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