From owner-cvs-all@FreeBSD.ORG  Thu Apr 17 02:56:06 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 8AEF437B401; Thu, 17 Apr 2003 02:56:06 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 29CD043FAF; Thu, 17 Apr 2003 02:56:06 -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 h3H9u50U091318;
	Thu, 17 Apr 2003 02:56:05 -0700 (PDT)
	(envelope-from kris@repoman.freebsd.org)
Received: (from kris@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3H9u5an091317;
	Thu, 17 Apr 2003 02:56:05 -0700 (PDT)
Message-Id: <200304170956.h3H9u5an091317@repoman.freebsd.org>
From: Kris Kennaway <kris@FreeBSD.org>
Date: Thu, 17 Apr 2003 02:56:05 -0700 (PDT)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
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 show.c
 src/usr.sbin/pkg_install/lib lib.h plist.c
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: Thu, 17 Apr 2003 09:56:06 -0000

kris        2003/04/17 02:56:05 PDT

  FreeBSD src repository

  Modified files:
    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 show.c 
    usr.sbin/pkg_install/lib lib.h plist.c 
  Log:
  * Add explicit conflict-checking to the package tools.  Packages can
    register a list of other packages with which they conflict (via the
    -C option to pkg_create), and they will refuse to install (unless -f is
    specified) if one of the listed packages is already present.
  
  * Update documentation for the new feature as well as fleshing out some
    existing documentation.
  
  * Bump PKG_INSTALL_VERSION so this feature can be tested for.
  
  Submitted by:   Sergey Matveychuk <sem@ciam.ru>
  PR:             bin/47145
  MFC after:      2 weeks
  
  Revision  Changes    Path
  1.74      +31 -1     src/usr.sbin/pkg_install/add/perform.c
  1.59      +19 -8     src/usr.sbin/pkg_install/add/pkg_add.1
  1.22      +1 -0      src/usr.sbin/pkg_install/create/create.h
  1.34      +11 -6     src/usr.sbin/pkg_install/create/main.c
  1.77      +16 -0     src/usr.sbin/pkg_install/create/perform.c
  1.58      +13 -0     src/usr.sbin/pkg_install/create/pkg_create.1
  1.36      +4 -0      src/usr.sbin/pkg_install/info/show.c
  1.48      +3 -3      src/usr.sbin/pkg_install/lib/lib.h
  1.47      +6 -0      src/usr.sbin/pkg_install/lib/plist.c