[pkgsrc/trunk]: pkgsrc/mk/install Remove ${WRKDIR}/.pkgdb during "install-cle...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/34669e5c7c2a
branches:  trunk
changeset: 532024:34669e5c7c2a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Aug 10 04:00:43 2007 +0000

description:
Remove ${WRKDIR}/.pkgdb during "install-clean" as that directory
contains files that are generated during the "install" phase.  This
should fix the problem where PLIST modifications were ignored if the
PLIST was modified between a "make deinstall" and a "make reinstall".

diffstat:

 mk/flavor/pkg/install.mk |  7 ++++++-
 mk/install/install.mk    |  4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r da1ccb4841f5 -r 34669e5c7c2a mk/flavor/pkg/install.mk
--- a/mk/flavor/pkg/install.mk  Fri Aug 10 03:46:10 2007 +0000
+++ b/mk/flavor/pkg/install.mk  Fri Aug 10 04:00:43 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.10 2007/05/22 16:17:16 joerg Exp $
+# $NetBSD: install.mk,v 1.11 2007/08/10 04:00:43 jlam Exp $
 #
 # _flavor-check-conflicts:
 #      Checks for conflicts between the package and installed packages.
@@ -15,6 +15,9 @@
 #      Populates the package database with the appropriate entries to
 #      register the package as being installed on the system.
 #
+# _flavor-install-clean:
+#      Removes the state files from the run of an ``install'' target.
+#
 
 _flavor-check-conflicts: .PHONY error-check
        ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${WRKDIR}/.CONFLICTS
@@ -66,3 +69,5 @@
        esac
        ${_PKG_SILENT}${_PKG_DEBUG}${_FULL_DEPENDS_CMD} |               \
                ${SORT} -u | ${_REGISTER_DEPENDENCIES} ${PKGNAME}
+
+_flavor-install-clean: .PHONY clean-metadata
diff -r da1ccb4841f5 -r 34669e5c7c2a mk/install/install.mk
--- a/mk/install/install.mk     Fri Aug 10 03:46:10 2007 +0000
+++ b/mk/install/install.mk     Fri Aug 10 04:00:43 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.43 2007/07/02 14:54:10 joerg Exp $
+# $NetBSD: install.mk,v 1.44 2007/08/10 04:00:43 jlam Exp $
 #
 # This file provides the code for the "install" phase.
 #
@@ -332,7 +332,7 @@
 ### install-clean removes the state files for the "install" and
 ### later phases so that the "install" target may be re-invoked.
 ###
-install-clean: .PHONY package-clean check-clean
+install-clean: .PHONY package-clean check-clean _flavor-install-clean
        ${RUN} ${RM} -f ${PLIST} ${_COOKIE.install}
 
 ######################################################################