[pkgsrc/trunk]: pkgsrc mk/pkgformat: include only relevant ident strings in +...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d2aa8d7cb72e
branches:  trunk
changeset: 409117:d2aa8d7cb72e
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jan 15 20:03:10 2020 +0000

description:
mk/pkgformat: include only relevant ident strings in +BUILD_VERSION

Before, not only files containing an RCS Id were recorded in the
+BUILD_VERSION file but also files containing text that looked similar to
an RCS Id were recorded, even though these didn't contain any valuable
version information.

The effect was that before this change, pkgtools/pkglint was built over
and over again by the bulk builds since pbulk uses a different regular
expression for detecting modified files.

The regular expression for unexpanded RCS Ids is added to record files
that have never been checked in to CVS, just to have them recorded and to
distinguish them from the final committed version.

See https://mail-index.netbsd.org/tech-pkg/2020/01/11/msg022489.html.

diffstat:

 mk/pkgformat/pkg/metadata.mk              |  7 +++++--
 regress/plus_build_version/files/expected |  3 ---
 2 files changed, 5 insertions(+), 5 deletions(-)

diffs (30 lines):

diff -r 96fb2cfd03a2 -r d2aa8d7cb72e mk/pkgformat/pkg/metadata.mk
--- a/mk/pkgformat/pkg/metadata.mk      Wed Jan 15 19:37:24 2020 +0000
+++ b/mk/pkgformat/pkg/metadata.mk      Wed Jan 15 20:03:10 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.20 2020/01/13 06:52:57 taca Exp $
+# $NetBSD: metadata.mk,v 1.21 2020/01/15 20:03:10 rillig Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -200,7 +200,10 @@
        ${AWK} '{ t=$$0; sub("^${PKGSRCDIR}/", "");                     \
                   printf "%s %s\n", t, $$0 }' | \
        while read file relfile; do                                     \
-               ${GREP} '\$$NetBSD' $$file 2>/dev/null |                \
+               ${GREP}                                                 \
+                       -e '\$$NetBSD: metadata.mk,v 1.21 2020/01/15 20:03:10 rillig Exp $$]*[$$]'                      \
+                       -e '\$$NetBSD\$$'                               \
+                       $$file 2>/dev/null |                            \
                ${SED} -e "s|^|$$file:|;q";                             \
        done |                                                          \
        ${AWK} '{ sub("^${PKGSRCDIR}/", "");                            \
diff -r 96fb2cfd03a2 -r d2aa8d7cb72e regress/plus_build_version/files/expected
--- a/regress/plus_build_version/files/expected Wed Jan 15 19:37:24 2020 +0000
+++ b/regress/plus_build_version/files/expected Wed Jan 15 20:03:10 2020 +0000
@@ -1,5 +1,2 @@
 regress/plus_build_version/files/010-only-first-line:  *NetBSD: 010-only-first-line,v 1.1 2020/01/11 12:24:32 rillig Exp *
-regress/plus_build_version/files/021-long-name:        *NetBSDFoundation*
-regress/plus_build_version/files/030-missing-colon-or-dollar:  *
-regress/plus_build_version/files/040-missing-dollar-after-colon:       *
 regress/plus_build_version/spec:       *NetBSD: spec,v 1.2 2020/01/11 13:04:21 rillig Exp *