[pkgsrc/trunk]: pkgsrc/mk Finished the split of PKGSRC_LOCKTYPE into LOCALBAS...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/12fe3e7594b7
branches:  trunk
changeset: 525720:12fe3e7594b7
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Feb 22 07:20:41 2007 +0000

description:
Finished the split of PKGSRC_LOCKTYPE into LOCALBASE_LOCKTYPE and
WRKDIR_LOCKTYPE. Added more documentation.

diffstat:

 mk/bsd.pkg.mk          |  6 +++---
 mk/defaults/mk.conf    |  4 ++--
 mk/internal/locking.mk |  7 +++++--
 3 files changed, 10 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r 0964263a6b3c -r 12fe3e7594b7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Thu Feb 22 07:15:54 2007 +0000
+++ b/mk/bsd.pkg.mk     Thu Feb 22 07:20:41 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1907 2007/02/20 10:32:09 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1908 2007/02/22 07:20:41 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -590,7 +590,7 @@
 
 ${WRKDIR}:
 .if !defined(KEEP_WRKDIR)
-.  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
+.  if ${WRKDIR_LOCKTYPE} != "none"
        ${RUN} ${TEST} -f ${_WRKDIR_LOCKFILE} || ${RM} -fr ${WRKDIR}
 .  endif
 .endif
@@ -604,7 +604,7 @@
 .if defined(WRKOBJDIR) && !empty(CREATE_WRKDIR_SYMLINK:M[Yy][Ee][Ss])
 makedirs: ${.CURDIR}/${WRKDIR_BASENAME}
 ${.CURDIR}/${WRKDIR_BASENAME}:
-.  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
+.  if ${WRKDIR_LOCKTYPE} != "none"
        ${RUN} ${TEST} -f ${_WRKDIR_LOCKFILE} || ${RM} -f ${.TARGET}
 .  endif
        ${RUN} \
diff -r 0964263a6b3c -r 12fe3e7594b7 mk/defaults/mk.conf
--- a/mk/defaults/mk.conf       Thu Feb 22 07:15:54 2007 +0000
+++ b/mk/defaults/mk.conf       Thu Feb 22 07:20:41 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mk.conf,v 1.149 2007/02/22 07:05:57 rillig Exp $
+# $NetBSD: mk.conf,v 1.150 2007/02/22 07:20:42 rillig Exp $
 #
 
 # This file provides default values for variables that may be overridden
@@ -84,7 +84,7 @@
 #        process, the current process will sleep for PKGSRC_SLEEPSECS
 #        seconds and then try again.
 #
-#      Note: Locking requires that OBJHOSTNAME is set.
+#      See also: LOCALBASE_LOCKTYPE, WRKDIR_LOCKTYPE.
 #
 #      Keywords: lock locking parallel
 #
diff -r 0964263a6b3c -r 12fe3e7594b7 mk/internal/locking.mk
--- a/mk/internal/locking.mk    Thu Feb 22 07:15:54 2007 +0000
+++ b/mk/internal/locking.mk    Thu Feb 22 07:20:41 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: locking.mk,v 1.6 2007/02/20 22:11:10 rillig Exp $
+# $NetBSD: locking.mk,v 1.7 2007/02/22 07:20:42 rillig Exp $
 #
 # User-settable variables:
 #
@@ -16,6 +16,9 @@
 #      Default value: none
 #      Recommended: sleep
 #
+# See also: PKGSRC_LOCKTYPE.
+#
+
 # This file provides the following .USE targets:
 #
 # acquire-lock
@@ -45,7 +48,7 @@
 .for v in ${_LOCKVARS}
 _OK=   no
 .  for t in none once sleep
-.    if ${PKGSRC_LOCKTYPE} == "${t}"
+.    if ${${v}} == "${t}"
 _OK=   yes
 .    endif
 .  endfor