[pkgsrc/trunk]: pkgsrc/mk Fix breakage in previous, installed pkg db files sh...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0ae9a720a3c7
branches:  trunk
changeset: 488035:0ae9a720a3c7
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Jan 24 09:31:06 2005 +0000

description:
Fix breakage in previous, installed pkg db files should be installed into
${PKG_DB_TMPDIR} not ${_PKG_DB_TMPDIR}, patch from Geoff Wing.

diffstat:

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

diffs (53 lines):

diff -r b6bf3604a73e -r 0ae9a720a3c7 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Mon Jan 24 09:03:48 2005 +0000
+++ b/mk/bsd.pkg.mk     Mon Jan 24 09:31:06 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1567 2005/01/23 22:23:40 jlam Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1568 2005/01/24 09:31:06 xtraeme Exp $
 #
 # This file is in the public domain.
 #
@@ -4870,37 +4870,37 @@
        ${_PKG_SILENT}${_PKG_DEBUG}${PKG_ADMIN} delete ${PKGNAME}
 .  endif
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
-       ${ECHO} ${COMMENT:Q} > ${_PKG_DB_TMPDIR}/+COMMENT
+       ${ECHO} ${COMMENT:Q} > ${PKG_DB_TMPDIR}/+COMMENT
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        case "${DESCR}" in                                              \
        ${PKG_DB_TMPDIR}/*|"") ;;                                       \
        *)      if ${TEST} -f ${DESCR}; then                            \
-                       ${CP} ${DESCR} ${_PKG_DB_TMPDIR}/+DESC;         \
+                       ${CP} ${DESCR} ${PKG_DB_TMPDIR}/+DESC;          \
                fi ;;                                                   \
        esac
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        case "${MESSAGE}" in                                            \
        ${PKG_DB_TMPDIR}/*|"") ;;                                       \
        *)      if ${TEST} -f ${MESSAGE}; then                          \
-                       ${CP} ${MESSAGE} ${_PKG_DB_TMPDIR}/+DISPLAY;    \
+                       ${CP} ${MESSAGE} ${PKG_DB_TMPDIR}/+DISPLAY;     \
                fi ;;                                                   \
        esac
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        case ${PKG_INSTALLATION_TYPE} in                                \
-       pkgview)        ${TOUCH} ${_PKG_DB_TMPDIR}/+VIEWS ;;            \
+       pkgview)        ${TOUCH} ${PKG_DB_TMPDIR}/+VIEWS ;;             \
        esac
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        case "${INSTALL_FILE}" in                                       \
        ${PKG_DB_TMPDIR}/*|"") ;;                                       \
        *)      if ${TEST} -f ${INSTALL_FILE}; then                     \
-                       ${CP} ${INSTALL_FILE} ${_PKG_DB_TMPDIR}/+INSTALL; \
+                       ${CP} ${INSTALL_FILE} ${PKG_DB_TMPDIR}/+INSTALL; \
                fi ;;                                                   \
        esac
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        case "${DEINSTALL_FILE}" in                                     \
        ${PKG_DB_TMPDIR}/*|"") ;;                                       \
        *)      if ${TEST} -f ${DEINSTALL_FILE}; then                   \
-                       ${CP} ${DEINSTALL_FILE} ${_PKG_DB_TMPDIR}/+DEINSTALL; \
+                       ${CP} ${DEINSTALL_FILE} ${PKG_DB_TMPDIR}/+DEINSTALL; \
                fi ;;                                                   \
        esac
        ${_PKG_SILENT}${_PKG_DEBUG}${RM} -f ${SIZE_PKG_FILE} ${SIZE_ALL_FILE}