pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/pkgformat/pkg `make replace' now also unsets the `m...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/69b727aef978
branches:  trunk
changeset: 444516:69b727aef978
user:      rhialto <rhialto%pkgsrc.org@localhost>
date:      Sat Jan 09 19:10:05 2021 +0000

description:
`make replace' now also unsets the `mismatch' variable.

This is for the benefit of pkg_rolling-replace 0.24.9.
ok gdt@.

diffstat:

 mk/pkgformat/pkg/replace.mk |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 8904821c9eed -r 69b727aef978 mk/pkgformat/pkg/replace.mk
--- a/mk/pkgformat/pkg/replace.mk       Sat Jan 09 17:47:49 2021 +0000
+++ b/mk/pkgformat/pkg/replace.mk       Sat Jan 09 19:10:05 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.6 2019/01/22 14:29:44 roy Exp $
+# $NetBSD: replace.mk,v 1.7 2021/01/09 19:10:05 rhialto Exp $
 #
 
 # _pkgformat-destdir-replace:
@@ -163,7 +163,7 @@
        done;                                                           \
        ${MV} ${_REQUIRED_BY_FILE} ${_PKG_DBDIR}/$$newname/+REQUIRED_BY
 
-# Removes unsafe_depends* and rebuild tags from this package.
+# Removes unsafe_depends*, rebuild and mismatch tags from this package.
 #
 # XXX: pkg_admin should not complain on unset with no +INSTALLED_INFO.
 #
@@ -172,7 +172,7 @@
        ${RUN} ${_REPLACE_NEWNAME_CMD};                                 \
        [ ! -f ${_INSTALLED_INFO_FILE} ] ||                     \
        ${MV} ${_INSTALLED_INFO_FILE} ${_PKG_DBDIR}/$$newname/+INSTALLED_INFO; \
-       for var in unsafe_depends unsafe_depends_strict rebuild; do     \
+       for var in unsafe_depends unsafe_depends_strict rebuild mismatch; do  \
                ${TEST} ! -f ${_PKG_DBDIR}/$$newname/+INSTALLED_INFO || \
                ${PKG_ADMIN} unset $$var $$newname;                     \
        done



Home | Main Index | Thread Index | Old Index