cvs commit: src/usr.sbin/pkg_install/add perform.c pkg_add.1 src/usr.sbin/pkg_install/lib Makefile lib.h plist.c

[Hiten Pandya]

hmp         2003/11/19 07:17:29 PST

DragonFly src repository

  Modified files:
    usr.sbin/pkg_install/add perform.c pkg_add.1 
    usr.sbin/pkg_install/lib Makefile lib.h plist.c 
  Log:
  Support for conflict (pkg_add -C) checking and pkg_tools (pkg_add -P).
  
  While I am here, cleanup some local variables.  This commit unbreaks
  installation of the docproj-{no}jadetex package, since ghostscript-gnu
  makes use of the @cconflicts functionality.
  
  Merged from:	FreeBSD (RELENG_4)
  
  Revision  Changes    Path
  1.3       +34 -2     src/usr.sbin/pkg_install/add/perform.c
  1.3       +20 -9     src/usr.sbin/pkg_install/add/pkg_add.1
  1.3       +2 -2      src/usr.sbin/pkg_install/lib/Makefile
  1.3       +13 -3     src/usr.sbin/pkg_install/lib/lib.h
  1.3       +7 -1      src/usr.sbin/pkg_install/lib/plist.c


http://www.dragonflybsd.org/cvsweb/src/usr.sbin/pkg_install/add/perform.c.diff?r1=1.2&r2=1.3&f=h
http://www.dragonflybsd.org/cvsweb/src/usr.sbin/pkg_install/add/pkg_add.1.diff?r1=1.2&r2=1.3&f=h
http://www.dragonflybsd.org/cvsweb/src/usr.sbin/pkg_install/lib/Makefile.diff?r1=1.2&r2=1.3&f=h
http://www.dragonflybsd.org/cvsweb/src/usr.sbin/pkg_install/lib/lib.h.diff?r1=1.2&r2=1.3&f=h
http://www.dragonflybsd.org/cvsweb/src/usr.sbin/pkg_install/lib/plist.c.diff?r1=1.2&r2=1.3&f=h