[pkgsrc/trunk]: pkgsrc/mk Create PKG_DB_TMPDIR (${WRKDIR}/.pkgdb) in a separa...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/304ccf318e93
branches:  trunk
changeset: 503495:304ccf318e93
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Nov 22 03:38:40 2005 +0000

description:
Create PKG_DB_TMPDIR (${WRKDIR}/.pkgdb) in a separate step from creating
${WRKDIR}, and just always create it as part of a "make extract".  This
should fix problems where if an old work directory is lying around that
doesn't already have .pkgdb, then a "make reinstall" won't break.

diffstat:

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

diffs (35 lines):

diff -r 307801aa214c -r 304ccf318e93 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Tue Nov 22 03:12:19 2005 +0000
+++ b/mk/bsd.pkg.mk     Tue Nov 22 03:38:40 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1765 2005/11/20 15:34:33 rillig Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1766 2005/11/22 03:38:40 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -1626,7 +1626,6 @@
 .  endif
 .endif
        ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${WRKDIR}
-       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR}
 .if defined(WRKOBJDIR)
 .  if ${PKGSRC_LOCKTYPE} == "sleep" || ${PKGSRC_LOCKTYPE} == "once"
 .    if !exists(${LOCKFILE})
@@ -1642,6 +1641,8 @@
 .  endif
 .endif # WRKOBJDIR
 
+${PKG_DB_TMPDIR}: ${WRKDIR}
+       ${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${PKG_DB_TMPDIR}
 
 # Configure
 
@@ -2568,7 +2569,7 @@
 
 .PHONY: extract
 .if !target(extract)
-extract: checksum ${WRKDIR} acquire-extract-lock ${_EXTRACT_COOKIE} release-extract-lock
+extract: checksum ${WRKDIR} ${PKG_DB_TMPDIR} acquire-extract-lock ${_EXTRACT_COOKIE} release-extract-lock
 .endif
 
 .PHONY: patch