Module Name:	pkgsrc
Committed By:	jlam
Date:		Wed Jan 14 23:55:29 UTC 2004

Modified Files:
	pkgsrc/pkgtools/pkg_install/files/add: perform.c
	pkgsrc/pkgtools/pkg_install/files/delete: main.c
	pkgsrc/pkgtools/pkg_install/files/lib: file.c lib.h version.h
Added Files:
	pkgsrc/pkgtools/pkg_install/files/bpm: bpm.1 bpm.cat1 bpm.sh

Log Message:
Update pkgtools/pkg_install to 20040114.  Changes from version 20040106
include:

* use ${MACHINE_ARCH} instead of what uname() puts into utsname.machine.
  the former represents the CPU architecture, which is what is recorded
  in binary packages; also allow the OS name to be overridden, as pkgsrc
  doesn't always use the value of utsname.sysname.

* allow adding depoted packages if another package with the same
  ${PKGBASE} is already installed as this is explicitly allowed for in
  pkgviews.


To generate a diff of this commit:
cvs rdiff -r1.14 -r1.15 pkgsrc/pkgtools/pkg_install/files/add/perform.c
cvs rdiff -r0 -r1.1 pkgsrc/pkgtools/pkg_install/files/bpm/bpm.1 \
    pkgsrc/pkgtools/pkg_install/files/bpm/bpm.cat1 \
    pkgsrc/pkgtools/pkg_install/files/bpm/bpm.sh
cvs rdiff -r1.9 -r1.10 pkgsrc/pkgtools/pkg_install/files/delete/main.c
cvs rdiff -r1.11 -r1.12 pkgsrc/pkgtools/pkg_install/files/lib/file.c
cvs rdiff -r1.7 -r1.8 pkgsrc/pkgtools/pkg_install/files/lib/lib.h
cvs rdiff -r1.21 -r1.22 pkgsrc/pkgtools/pkg_install/files/lib/version.h

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