frueauf
Fri Jun  5 04:22:20 PDT 1998
Update of /cvsroot/src/usr.sbin/pkg_install/add
In directory nb00:/tmp/cvs-serv24490/add

Modified Files:
	perform.c pkg_add.1 
Log Message:
Add support for CONFLICTS entry, implement -C switch for pkg_create
and document that new feature.


frueauf
Fri Jun  5 04:22:20 PDT 1998
Update of /cvsroot/src/usr.sbin/pkg_install/create
In directory nb00:/tmp/cvs-serv24490/create

Modified Files:
	create.h main.c perform.c pkg_create.1 
Log Message:
Add support for CONFLICTS entry, implement -C switch for pkg_create
and document that new feature.


frueauf
Fri Jun  5 04:22:20 PDT 1998
Update of /cvsroot/src/usr.sbin/pkg_install/lib
In directory nb00:/tmp/cvs-serv24490/lib

Modified Files:
	lib.h plist.c 
Log Message:
Add support for CONFLICTS entry, implement -C switch for pkg_create
and document that new feature.


frueauf
Fri Jun  5 04:23:09 PDT 1998
Update of /cvsroot/pkgsrc/mk
In directory nb00:/tmp/cvs-serv24486

Modified Files:
	bsd.pkg.mk 
Log Message:
Add support for CONFLICTS entry.


sakamoto
Fri Jun  5 04:27:09 PDT 1998
Update of /cvsroot/src/sys/arch/powerpc/include
In directory nb00:/tmp/cvs-serv24598/powerpc/include

Modified Files:
	vmparam.h 
Log Message:
Merge in MACHINE_NEW_NONCONTIG support and some fix from Tsubai-San.
UVM support.


sakamoto
Fri Jun  5 04:27:10 PDT 1998
Update of /cvsroot/src/sys/arch/powerpc/powerpc
In directory nb00:/tmp/cvs-serv24598/powerpc/powerpc

Modified Files:
	pmap.c trap.c vm_machdep.c 
Log Message:
Merge in MACHINE_NEW_NONCONTIG support and some fix from Tsubai-San.
UVM support.


sakamoto
Fri Jun  5 04:27:10 PDT 1998
Update of /cvsroot/src/sys/arch/ofppc/conf
In directory nb00:/tmp/cvs-serv24598/ofppc/conf

Modified Files:
	GENERIC 
Log Message:
Merge in MACHINE_NEW_NONCONTIG support and some fix from Tsubai-San.
UVM support.


sakamoto
Fri Jun  5 04:27:10 PDT 1998
Update of /cvsroot/src/sys/arch/ofppc/include
In directory nb00:/tmp/cvs-serv24598/ofppc/include

Modified Files:
	vmparam.h 
Log Message:
Merge in MACHINE_NEW_NONCONTIG support and some fix from Tsubai-San.
UVM support.


sakamoto
Fri Jun  5 04:27:11 PDT 1998
Update of /cvsroot/src/sys/arch/ofppc/ofppc
In directory nb00:/tmp/cvs-serv24598/ofppc/ofppc

Modified Files:
	locore.S machdep.c 
Log Message:
Merge in MACHINE_NEW_NONCONTIG support and some fix from Tsubai-San.
UVM support.


frueauf
Fri Jun  5 04:29:17 PDT 1998
Update of /cvsroot/doc
In directory nb00:/tmp/cvs-serv24712

Modified Files:
	pkg-CHANGES 
Log Message:
Note addition of CONFLICTS feature.