[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Don't use the existance of pkg_ad...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3123e1174077
branches:  trunk
changeset: 543784:3123e1174077
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Sun Jun 22 22:08:05 2008 +0000

description:
Don't use the existance of pkg_add as trigger to override
PKG_ADD and friends, but that the build passed the barrier.
Posted to tech-pkg@ without negative feedback.

diffstat:

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

diffs (25 lines):

diff -r a62b50e48178 -r 3123e1174077 pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Sun Jun 22 22:05:19 2008 +0000
+++ b/pkgtools/pkg_install/Makefile     Sun Jun 22 22:08:05 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2008/06/19 18:36:51 joerg Exp $
+# $NetBSD: Makefile,v 1.156 2008/06/22 22:08:05 joerg Exp $
 
 # Notes to package maintainers:
 #
@@ -52,9 +52,14 @@
 #
 # We also use the newly built pkg_{add,create,delete} since upgrading
 # from an older pkg_install might required features of the new program. 
+# Note that the definitions are only overriden for the phases that are
+# supposed to use them.  pkg_admin pmatch might be used when looking for
+# dependencies. If that is ever changed in a incompatible way, this has to
+# be rethought.
 #
 USE_NATIVE_GCC=                yes
-.if exists(${WRKSRC}/add/pkg_add)
+
+.if defined(_PKGSRC_BARRIER)
 PKG_ADD_CMD=           ${WRKSRC}/add/pkg_add
 PKG_CREATE_CMD=                ${WRKSRC}/create/pkg_create
 PKG_DELETE_CMD=                ${WRKSRC}/delete/pkg_delete