[pkgsrc/trunk]: pkgsrc/mk Move test for the lockfile within the target's shel...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6fe01d67c007
branches:  trunk
changeset: 513811:6fe01d67c007
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jun 04 05:25:08 2006 +0000

description:
Move test for the lockfile within the target's shell code instead of
testing for it at the Makefile level.

diffstat:

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

diffs (31 lines):

diff -r 79322738704b -r 6fe01d67c007 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Jun 04 04:31:47 2006 +0000
+++ b/mk/bsd.pkg.mk     Sun Jun 04 05:25:08 2006 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1829 2006/06/04 04:31:47 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1830 2006/06/04 05:25:08 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1196,18 +1196,15 @@
 ${WRKDIR}:
 .if !defined(KEEP_WRKDIR)
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
-.    if !exists(${LOCKFILE})
-       ${_PKG_SILENT}${_PKG_DEBUG}${RM} -rf ${WRKDIR}
-.    endif
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       ${TEST} -f ${LOCKFILE} || ${RM} -fr ${WRKDIR}
 .  endif
 .endif
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}
 .if defined(WRKOBJDIR)
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
-.    if !exists(${LOCKFILE})
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${RM} -f ${WRKDIR_BASENAME} || ${TRUE}
-.    endif
+       ${TEST} -f ${LOCKFILE} || ${RM} -f ${WRKDIR_BASENAME}
 .  endif
 .  if !empty(CREATE_WRKDIR_SYMLINK:M[Yy][Ee][Ss])
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \