[pkgsrc/trunk]: pkgsrc/mk In the "makedirs" target, it is clear that the lock...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/960624f1dfd1
branches:  trunk
changeset: 517091:960624f1dfd1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Aug 04 06:27:27 2006 +0000

description:
In the "makedirs" target, it is clear that the lock file is always the
_WRKDIR_LOCKFILE and never _PREFIX_LOCKFILE, so use that to keep things
simple.

Replaced ECHO with ECHO_MSG in the message for creating the WRKDIR
symlink.

diffstat:

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

diffs (34 lines):

diff -r 322cb9b7b788 -r 960624f1dfd1 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Fri Aug 04 05:55:18 2006 +0000
+++ b/mk/bsd.pkg.mk     Fri Aug 04 06:27:27 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1881 2006/08/04 05:55:18 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1882 2006/08/04 06:27:27 rillig Exp $
 #
 # This file is in the public domain.
 #
@@ -614,8 +614,7 @@
 .if !defined(KEEP_WRKDIR)
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${_GET_LOCKFILE_CMD};                                           \
-       ${TEST} -f "$$lockfile" || ${RM} -fr ${WRKDIR}
+       ${TEST} -f ${_WRKDIR_LOCKFILE} || ${RM} -fr ${WRKDIR}
 .  endif
 .endif
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}
@@ -630,12 +629,11 @@
  ${.CURDIR}/${WRKDIR_BASENAME}:
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${_GET_LOCKFILE_CMD};                                           \
-       ${TEST} -f "$$lockfile" || ${RM} -f ${.TARGET}
+       ${TEST} -f ${_WRKDIR_LOCKFILE} || ${RM} -f ${.TARGET}
 .  endif
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        if ${LN} -s ${WRKDIR} ${.TARGET} 2>/dev/null; then              \
-               ${ECHO} "${.TARGET:T} -> ${WRKDIR}";                    \
+               ${ECHO_MSG} "${.TARGET:T} -> ${WRKDIR}";                \
        fi
 .endif