From owner-cvs-all@FreeBSD.ORG  Sun Aug 10 21:19:56 2003
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id EC63237B5B3; Sun, 10 Aug 2003 21:15:42 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 011A14471F; Sun, 10 Aug 2003 18:13:45 -0700 (PDT)
	(envelope-from kris@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7B1Di0U082446;
	Sun, 10 Aug 2003 18:13:44 -0700 (PDT)
	(envelope-from kris@repoman.freebsd.org)
Received: (from kris@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7B1DiXG082445;
	Sun, 10 Aug 2003 18:13:44 -0700 (PDT)
Message-Id: <200308110113.h7B1DiXG082445@repoman.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Sun, 10 Aug 2003 18:13:44 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_4
Subject: cvs commit: src/usr.sbin/pkg_install/add perform.c pkg_add.1
 src/usr.sbin/pkg_install/create create.h main.c perform.c
 pkg_create.1 src/usr.sbin/pkg_install/info info.h main.c
 pkg_info.1 show.c src/usr.sbin/pkg_install/lib Makefile lib.h ...
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Aug 2003 04:19:57 -0000

kris        2003/08/10 18:13:44 PDT

  FreeBSD src repository

  Modified files:        (Branch: RELENG_4)
    usr.sbin/pkg_install/add perform.c pkg_add.1 
    usr.sbin/pkg_install/create create.h main.c perform.c 
                                pkg_create.1 
    usr.sbin/pkg_install/info info.h main.c pkg_info.1 show.c 
    usr.sbin/pkg_install/lib Makefile lib.h plist.c 
  Log:
  MFC: Support for pkg_add -C (conflicts) and pkg_info -P (pkg_tools version).
  
  Revision   Changes    Path
  1.57.2.16  +31 -1     src/usr.sbin/pkg_install/add/perform.c
  1.35.2.15  +19 -8     src/usr.sbin/pkg_install/add/pkg_add.1
  1.15.2.6   +1 -0      src/usr.sbin/pkg_install/create/create.h
  1.21.2.8   +11 -6     src/usr.sbin/pkg_install/create/main.c
  1.49.2.19  +16 -0     src/usr.sbin/pkg_install/create/perform.c
  1.35.2.17  +13 -0     src/usr.sbin/pkg_install/create/pkg_create.1
  1.11.2.11  +17 -16    src/usr.sbin/pkg_install/info/info.h
  1.22.2.15  +12 -1     src/usr.sbin/pkg_install/info/main.c
  1.24.2.14  +3 -1      src/usr.sbin/pkg_install/info/pkg_info.1
  1.14.2.15  +4 -0      src/usr.sbin/pkg_install/info/show.c
  1.6.8.6    +1 -1      src/usr.sbin/pkg_install/lib/Makefile
  1.29.2.13  +12 -2     src/usr.sbin/pkg_install/lib/lib.h
  1.29.2.11  +6 -0      src/usr.sbin/pkg_install/lib/plist.c