Module Name:	src
Committed By:	erh
Date:		Fri Dec 10 21:49:31 UTC 2004

Modified Files:
	src/usr.sbin/pkg_install: README
	src/usr.sbin/pkg_install/add: add.h main.c perform.c pkg_add.1
	src/usr.sbin/pkg_install/lib: lib.h str.c version.h

Log Message:
Sync with pkgsrc to get double -u feature.  Bump version to 20041209.
Add note in README explaining that changes should be made here first,
then merged to pkgsrc.


To generate a diff of this commit:
cvs rdiff -r1.11 -r1.12 src/usr.sbin/pkg_install/README
cvs rdiff -r1.6 -r1.7 src/usr.sbin/pkg_install/add/add.h
cvs rdiff -r1.32 -r1.33 src/usr.sbin/pkg_install/add/main.c
cvs rdiff -r1.103 -r1.104 src/usr.sbin/pkg_install/add/perform.c
cvs rdiff -r1.50 -r1.51 src/usr.sbin/pkg_install/add/pkg_add.1
cvs rdiff -r1.71 -r1.72 src/usr.sbin/pkg_install/lib/lib.h
cvs rdiff -r1.48 -r1.49 src/usr.sbin/pkg_install/lib/str.c
cvs rdiff -r1.59 -r1.60 src/usr.sbin/pkg_install/lib/version.h

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