[pkgsrc/trunk]: pkgsrc/mk Make LOCKFILE into a "private" variable by prependi...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/764ef5733d5b
branches:  trunk
changeset: 513814:764ef5733d5b
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jun 04 06:09:36 2006 +0000

description:
Make LOCKFILE into a "private" variable by prepending with an underscore.

diffstat:

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

diffs (82 lines):

diff -r c7e98931e18c -r 764ef5733d5b mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Jun 04 05:43:56 2006 +0000
+++ b/mk/bsd.pkg.mk     Sun Jun 04 06:09:36 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1831 2006/06/04 05:26:45 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1832 2006/06/04 06:09:36 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1137,7 +1137,7 @@
 # acquire-lock, release-lock are .USE macro targets for acquiring and
 # release coarse-grained locks.
 #
-LOCKFILE=      ${WRKDIR}/.lockfile
+_LOCKFILE=     ${WRKDIR}/.lockfile
 
 acquire-lock: .USE
 .if ${PKGSRC_LOCKTYPE} == "none"
@@ -1159,27 +1159,27 @@
                exit 1;                                                 \
        fi;                                                             \
        while ${TRUE}; do                                               \
-               if ${TEST} -f /var/run/dmesg.boot -a -f ${LOCKFILE}; then \
-                       rebooted=`${FIND} /var/run/dmesg.boot -newer ${LOCKFILE} -print`; \
+               if ${TEST} -f /var/run/dmesg.boot -a -f ${_LOCKFILE}; then \
+                       rebooted=`${FIND} /var/run/dmesg.boot -newer ${_LOCKFILE} -print`; \
                        if ${TEST} -n "$$rebooted"; then                \
-                               ${STEP_MSG} "Removing stale ${LOCKFILE}"; \
-                               ${RM} -f ${LOCKFILE};                   \
+                               ${STEP_MSG} "Removing stale ${_LOCKFILE}"; \
+                               ${RM} -f ${_LOCKFILE};                  \
                        fi;                                             \
                fi;                                                     \
-               if ${SHLOCK} -f ${LOCKFILE} -p $$ppid; then             \
+               if ${SHLOCK} -f ${_LOCKFILE} -p $$ppid; then            \
                        break;                                          \
                fi;                                                     \
                case ${PKGSRC_LOCKTYPE:Q}"" in                          \
-               once)   ${ERROR_MSG} "Lock is held by pid `${CAT} ${LOCKFILE}`"; \
+               once)   ${ERROR_MSG} "Lock is held by pid `${CAT} ${_LOCKFILE}`"; \
                        exit 1;                                         \
                        ;;                                              \
-               sleep)  ${STEP_MSG} "Lock is held by pid `${CAT} ${LOCKFILE}`"; \
+               sleep)  ${STEP_MSG} "Lock is held by pid `${CAT} ${_LOCKFILE}`"; \
                        ${SLEEP} ${PKGSRC_SLEEPSECS};                   \
                        ;;                                              \
                esac;                                                   \
        done
 .  if defined(PKG_VERBOSE)
-       @${STEP_MSG} "Lock acquired for ${.TARGET:S/^acquire-//:S/-lock$//} on behalf of process `${CAT} ${LOCKFILE}`"
+       @${STEP_MSG} "Lock acquired for ${.TARGET:S/^acquire-//:S/-lock$//} on behalf of process `${CAT} ${_LOCKFILE}`"
 .  endif
 .endif
 
@@ -1188,23 +1188,23 @@
        @${DO_NADA}
 .else
 .  if defined(PKG_VERBOSE)
-       @${STEP_MSG} "Lock released for ${.TARGET:S/^release-//:S/-lock$//} on behalf of process `${CAT} ${LOCKFILE}`"
+       @${STEP_MSG} "Lock released for ${.TARGET:S/^release-//:S/-lock$//} on behalf of process `${CAT} ${_LOCKFILE}`"
 .  endif
-       ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${LOCKFILE}
+       ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${_LOCKFILE}
 .endif
 
 ${WRKDIR}:
 .if !defined(KEEP_WRKDIR)
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${TEST} -f ${LOCKFILE} || ${RM} -fr ${WRKDIR}
+       ${TEST} -f ${_LOCKFILE} || ${RM} -fr ${WRKDIR}
 .  endif
 .endif
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}
 .if defined(WRKOBJDIR)
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${TEST} -f ${LOCKFILE} || ${RM} -f ${WRKDIR_BASENAME}
+       ${TEST} -f ${_LOCKFILE} || ${RM} -f ${WRKDIR_BASENAME}
 .  endif
 .  if !empty(CREATE_WRKDIR_SYMLINK:M[Yy][Ee][Ss])
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \