[pkgsrc/trunk]: pkgsrc/mk Consolidate the bits that add to PKGSRC_USE_TOOLS, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b66e53e4cfe7
branches:  trunk
changeset: 493868:b66e53e4cfe7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon May 16 00:00:35 2005 +0000

description:
Consolidate the bits that add to PKGSRC_USE_TOOLS, and improve the
comment for shlock.

diffstat:

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

diffs (35 lines):

diff -r 1d6c90a47b9e -r b66e53e4cfe7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun May 15 23:55:51 2005 +0000
+++ b/mk/bsd.pkg.mk     Mon May 16 00:00:35 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1655 2005/05/15 21:32:42 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1656 2005/05/16 00:00:35 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -841,6 +841,13 @@
 PKGSRC_USE_TOOLS+=     mail
 .endif
 
+# We need shlock if we're using locking to synchronize multiple builds
+# over the same pkgsrc tree.
+#
+.if ${PKGSRC_LOCKTYPE} != "none"
+PKGSRC_USE_TOOLS+=     shlock
+.endif
+
 # If MANZ is defined, then we want the final man pages to be compressed.
 # If MANZ is not defined, then we want the final man pages to be 
 # uncompressed.
@@ -883,11 +890,6 @@
 # Patch
 .include "../../mk/bsd.pkg.patch.mk"
 
-# this must come before tools/bsd.tools.mk is included
-.if ${PKGSRC_LOCKTYPE} != "none"
-PKGSRC_USE_TOOLS+=     shlock
-.endif
-
 .if !empty(_USE_NEW_TOOLS:M[yY][eE][sS])
 .include "../../mk/tools/bsd.tools.mk"
 .else