[pkgsrc/trunk]: pkgsrc/mk Don't check for ${SHLOCK}, which isn't defined yet ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/76c2f6d60210
branches:  trunk
changeset: 493738:76c2f6d60210
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri May 13 21:13:01 2005 +0000

description:
Don't check for ${SHLOCK}, which isn't defined yet that early in
bsd.pkg.mk under the new tools framework.  Instead, just note that if
we set PKGSRC_LOCKTYPE, that pkgsrc will require shlock.  Remove
"shlock" from the large PKGSRC_USE_TOOLS list since we don't need it
all of the time.  This fixes PKGSRC_LOCKTYPE != none when using the
new tools framework.

diffstat:

 mk/bsd.pkg.mk |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r fc691a14c6b8 -r 76c2f6d60210 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri May 13 21:00:12 2005 +0000
+++ b/mk/bsd.pkg.mk     Fri May 13 21:13:01 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1643 2005/05/13 16:54:13 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1644 2005/05/13 21:13:01 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -291,9 +291,13 @@
 .if (${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once")
 .  if !defined(OBJHOSTNAME)
 PKG_FAIL_REASON+='PKGSRC_LOCKTYPE needs OBJHOSTNAME defined.'
-.  elif !exists(${SHLOCK})
+.  elif empty(_USE_NEW_TOOLS:M[yY][eE][sS])
+.    if !exists(${SHLOCK})
 PKG_FAIL_REASON+='The ${SHLOCK} utility does not exist, and is necessary for locking.'
 PKG_FAIL_REASON+='Please "${MAKE} install" in ../../pkgtools/shlock.'
+.    endif
+.  else
+PKGSRC_USE_TOOLS+=     shlock
 .  endif
 .endif
 
@@ -968,8 +972,8 @@
        [ awk basename cat chgrp chmod chown cmp cp cut date dirname    \
        echo egrep env expr false fgrep file find grep gtar gunzip      \
        gzcat gzip head hostname id install ln ls m4 mkdir mtree mv     \
-       nice pax pwd rm rmdir sed sh shlock sort tail tee test touch tr \
-       true tsort wc xargs
+       nice pax pwd rm rmdir sed sh sort tail tee test touch tr true   \
+       tsort wc xargs
 
 # We need a mail command to send mail to ${PKGSRC_MESSAGE_RECIPIENTS}.
 .if !empty(PKGSRC_MESSAGE_RECIPIENTS)