diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-13 21:13:01 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-13 21:13:01 +0000 |
| commit | a5a98ba92c819b06b913556a5c0f1ad7fb43e1f7 (patch) | |
| tree | 3c0c6e0ea63f9502ccacb8b549258f9a3d6ef33d /mk | |
| parent | fdb0c2a36c2e51956565b69d24cc409ad5c02c50 (diff) | |
| download | pkgsrc-a5a98ba92c819b06b913556a5c0f1ad7fb43e1f7.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 7fee8a1c4cc..93d762d211b 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ PKG_FAIL_REASON+='ONLY/NOT_FOR_ARCHS/OPSYS are deprecated and must be replaced w .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 @@ PKGSRC_USE_TOOLS+= \ [ 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) |