[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Use pkg_add from new build, overr...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/91582ee67156
branches:  trunk
changeset: 539060:91582ee67156
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Feb 26 13:38:57 2008 +0000

description:
Use pkg_add from new build, override *_CMD instead of the full commands.
Drop some no longer used overrides.

diffstat:

 pkgtools/pkg_install/Makefile |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (36 lines):

diff -r f8713dc61cca -r 91582ee67156 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Tue Feb 26 13:32:00 2008 +0000
+++ b/pkgtools/pkg_install/Makefile     Tue Feb 26 13:38:57 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.146 2008/02/09 14:08:05 joerg Exp $
+# $NetBSD: Makefile,v 1.147 2008/02/26 13:38:57 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -47,12 +47,13 @@
 # compiler to avoid problems with depending on pkgsrc GCC for building
 # pkg_install.
 #
-# We also use the newly built pkg_delete since upgrading from an older
-# pkg_install might required features of the new program.
+# We also use the newly built pkg_{add,create,delete} since upgrading
+# from an older pkg_install might required features of the new program. 
 #
 USE_NATIVE_GCC=                yes
-PKG_CREATE=            ${WRKSRC}/create/pkg_create
-PKG_DELETE=            ${WRKSRC}/delete/pkg_delete
+PKG_ADD_CMD=           ${WRKSRC}/add/pkg_add
+PKG_CREATE_CMD=                ${WRKSRC}/create/pkg_create
+PKG_DELETE_CMD=                ${WRKSRC}/delete/pkg_delete
 
 CPPFLAGS+=             -D_LARGEFILE_SOURCE -D_LARGE_FILES
 CPPFLAGS+=             -D_FILE_OFFSET_BITS=64
@@ -63,8 +64,6 @@
 MAKE_ENV+=             OPSYS=${OPSYS:Q}
 
 PKG_DBDIR?=            /var/db/pkg
-PKG_INFO=              ${PKG_INFO_CMD} -K ${PKG_DBDIR:Q}
-PKG_ADMIN=             ${PKG_ADMIN_CMD} -K ${PKG_DBDIR:Q}
 EGDIR=                 ${PREFIX}/share/examples/pkg_install
 
 PLIST_SUBST+=          PKG_DBDIR=${PKG_DBDIR:Q}