[pkgsrc/trunk]: pkgsrc Commit two fixes which at least for me appear to be re...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7aa43dfeb875
branches:  trunk
changeset: 543209:7aa43dfeb875
user:      he <he%pkgsrc.org@localhost>
date:      Sun Jun 08 21:04:30 2008 +0000

description:
Commit two fixes which at least for me appear to be required when
doing an old-style bulk build on 4.0 or older systems:

 - in mk/bulk/build, do "make update" instead of "make install + clean"
   when installing a new pkg_install
 - in pkgtools/pkg_install/Makefile, don't try to use our own
   executables (${WORKDIR}/pkg_add/pkg_add etc.) if they don't exist

Discussed with joerg, and even though he's not entirely happy
with the latter change, he didn't appear to have a better suggestion.

This, and putting /usr/pkg/sbin earlier than /usr/sbin in the $PATH
appears to be required to get an old-style bulk build going.

diffstat:

 mk/bulk/build                 |  5 ++---
 pkgtools/pkg_install/Makefile |  4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r ced1f73545ee -r 7aa43dfeb875 mk/bulk/build
--- a/mk/bulk/build     Sun Jun 08 18:33:28 2008 +0000
+++ b/mk/bulk/build     Sun Jun 08 21:04:30 2008 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.103 2008/01/04 15:49:07 rillig Exp $
+# $NetBSD: build,v 1.104 2008/06/08 21:04:30 he Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -232,8 +232,7 @@
          echo "build> Updating pkgtools"
          ( cd "${pkgsrc_dir}/pkgtools/pkg_install"     \
            && ${BMAKE} clean                           \
-           && ${BMAKE} install                         \
-           && ${BMAKE} clean
+           && ${BMAKE} update
          ) || die "Could not update the package tools."
        }
 }
diff -r ced1f73545ee -r 7aa43dfeb875 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Sun Jun 08 18:33:28 2008 +0000
+++ b/pkgtools/pkg_install/Makefile     Sun Jun 08 21:04:30 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.153 2008/06/02 16:40:25 joerg Exp $
+# $NetBSD: Makefile,v 1.154 2008/06/08 21:04:30 he Exp $
 
 # Notes to package maintainers:
 #
@@ -53,10 +53,12 @@
 # from an older pkg_install might required features of the new program. 
 #
 USE_NATIVE_GCC=                yes
+.if exists(${WRKSRC}/add/pkg_add)
 PKG_ADD_CMD=           ${WRKSRC}/add/pkg_add
 PKG_CREATE_CMD=                ${WRKSRC}/create/pkg_create
 PKG_DELETE_CMD=                ${WRKSRC}/delete/pkg_delete
 PKG_INFO_CMD=          ${WRKSRC}/info/pkg_info
+.endif
 
 CPPFLAGS+=             -D_LARGEFILE_SOURCE -D_LARGE_FILES
 CPPFLAGS+=             -D_FILE_OFFSET_BITS=64