Module Name:	othersrc
Committed By:	bouyer
Date:		Mon Oct 28 14:42:18 UTC 2002

Modified Files:
	othersrc/bootstrap-pkgsrc/pkg_install: configure configure.in
	othersrc/bootstrap-pkgsrc/pkg_install/add: extract.c futil.c main.c
	    perform.c pkg_add.1 verify.c
	othersrc/bootstrap-pkgsrc/pkg_install/admin: main.c pkg_admin.1
	othersrc/bootstrap-pkgsrc/pkg_install/create: main.c perform.c
	    pkg_create.1 pl.c
	othersrc/bootstrap-pkgsrc/pkg_install/delete: delete.h main.c perform.c
	    pkg_delete.1
	othersrc/bootstrap-pkgsrc/pkg_install/info: info.h main.c perform.c
	    pkg_info.1 show.c
	othersrc/bootstrap-pkgsrc/pkg_install/lib: Makefile.in config.h.in
	    exec.c file.c ftpio.c global.c lib.h.in lpkg.c path.c path.h pen.c
	    plist.c str.c version.c version.h
Removed Files:
	othersrc/bootstrap-pkgsrc/pkg_install: Makefile Makefile.inc
	othersrc/bootstrap-pkgsrc/pkg_install/add: Makefile
	othersrc/bootstrap-pkgsrc/pkg_install/admin: Makefile
	othersrc/bootstrap-pkgsrc/pkg_install/create: Makefile
	othersrc/bootstrap-pkgsrc/pkg_install/delete: Makefile
	othersrc/bootstrap-pkgsrc/pkg_install/info: Makefile
	othersrc/bootstrap-pkgsrc/pkg_install/lib: Makefile

Log Message:
Resolve conflics from import, and make necessary changes have it compile
on non-NetBSD hosts again.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r0 othersrc/bootstrap-pkgsrc/pkg_install/Makefile \
    othersrc/bootstrap-pkgsrc/pkg_install/Makefile.inc
cvs rdiff -r1.3 -r1.4 othersrc/bootstrap-pkgsrc/pkg_install/configure \
    othersrc/bootstrap-pkgsrc/pkg_install/configure.in
cvs rdiff -r1.1.1.1 -r0 othersrc/bootstrap-pkgsrc/pkg_install/add/Makefile
cvs rdiff -r1.1.1.2 -r1.2 othersrc/bootstrap-pkgsrc/pkg_install/add/extract.c \
    othersrc/bootstrap-pkgsrc/pkg_install/add/futil.c \
    othersrc/bootstrap-pkgsrc/pkg_install/add/perform.c \
    othersrc/bootstrap-pkgsrc/pkg_install/add/pkg_add.1 \
    othersrc/bootstrap-pkgsrc/pkg_install/add/verify.c
cvs rdiff -r1.3 -r1.4 othersrc/bootstrap-pkgsrc/pkg_install/add/main.c
cvs rdiff -r1.1.1.1 -r0 othersrc/bootstrap-pkgsrc/pkg_install/admin/Makefile
cvs rdiff -r1.1.1.2 -r1.2 othersrc/bootstrap-pkgsrc/pkg_install/admin/main.c \
    othersrc/bootstrap-pkgsrc/pkg_install/admin/pkg_admin.1
cvs rdiff -r1.1.1.1 -r0 othersrc/bootstrap-pkgsrc/pkg_install/create/Makefile
cvs rdiff -r1.1.1.2 -r1.2 othersrc/bootstrap-pkgsrc/pkg_install/create/main.c \
    othersrc/bootstrap-pkgsrc/pkg_install/create/pkg_create.1 \
    othersrc/bootstrap-pkgsrc/pkg_install/create/pl.c
cvs rdiff -r1.3 -r1.4 othersrc/bootstrap-pkgsrc/pkg_install/create/perform.c
cvs rdiff -r1.1.1.1 -r0 othersrc/bootstrap-pkgsrc/pkg_install/delete/Makefile
cvs rdiff -r1.1.1.2 -r1.2 \
    othersrc/bootstrap-pkgsrc/pkg_install/delete/delete.h \
    othersrc/bootstrap-pkgsrc/pkg_install/delete/main.c \
    othersrc/bootstrap-pkgsrc/pkg_install/delete/perform.c \
    othersrc/bootstrap-pkgsrc/pkg_install/delete/pkg_delete.1
cvs rdiff -r1.1.1.1 -r0 othersrc/bootstrap-pkgsrc/pkg_install/info/Makefile
cvs rdiff -r1.1.1.2 -r1.2 othersrc/bootstrap-pkgsrc/pkg_install/info/info.h \
    othersrc/bootstrap-pkgsrc/pkg_install/info/main.c \
    othersrc/bootstrap-pkgsrc/pkg_install/info/perform.c \
    othersrc/bootstrap-pkgsrc/pkg_install/info/pkg_info.1 \
    othersrc/bootstrap-pkgsrc/pkg_install/info/show.c
cvs rdiff -r1.1.1.1 -r0 othersrc/bootstrap-pkgsrc/pkg_install/lib/Makefile
cvs rdiff -r1.2 -r1.3 othersrc/bootstrap-pkgsrc/pkg_install/lib/Makefile.in \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/pen.c
cvs rdiff -r1.3 -r1.4 othersrc/bootstrap-pkgsrc/pkg_install/lib/config.h.in \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/file.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/str.c
cvs rdiff -r1.1.1.2 -r1.2 othersrc/bootstrap-pkgsrc/pkg_install/lib/exec.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/ftpio.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/global.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/lpkg.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/plist.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/version.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/version.h
cvs rdiff -r1.4 -r1.5 othersrc/bootstrap-pkgsrc/pkg_install/lib/lib.h.in
cvs rdiff -r1.1.1.1 -r1.2 othersrc/bootstrap-pkgsrc/pkg_install/lib/path.c \
    othersrc/bootstrap-pkgsrc/pkg_install/lib/path.h

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