diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-04 06:09:36 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-04 06:09:36 +0000 |
| commit | fd91f5268eb447c7f3b2d7f5721dcf987a255d2d (patch) | |
| tree | bf7f3dd056ae58ba089311cb709f99144d73d52a /mk | |
| parent | 5f555f193c053b57c2dfb6f94e70af500f3561e9 (diff) | |
| download | pkgsrc-fd91f5268eb447c7f3b2d7f5721dcf987a255d2d.tar.gz | |
Make LOCKFILE into a "private" variable by prepending with an underscore.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 0de9a18cdfc..9e34196ae9e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ show-distfiles: # 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 @@ acquire-lock: .USE 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 @@ release-lock: .USE @${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} \ |