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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/42c857ca46a1
branches:  trunk
changeset: 409118:42c857ca46a1
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Wed Jan 15 20:11:11 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                                    |  4 ++--
 regress/plus_build_version/files/021-long-name                  |  3 ++-
 regress/plus_build_version/files/030-missing-colon-or-dollar    |  2 +-
 regress/plus_build_version/files/040-missing-dollar-after-colon |  2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diffs (54 lines):

diff -r d2aa8d7cb72e -r 42c857ca46a1 mk/pkgformat/pkg/metadata.mk
--- a/mk/pkgformat/pkg/metadata.mk      Wed Jan 15 20:03:10 2020 +0000
+++ b/mk/pkgformat/pkg/metadata.mk      Wed Jan 15 20:11:11 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: metadata.mk,v 1.21 2020/01/15 20:03:10 rillig Exp $
+# $NetBSD: metadata.mk,v 1.22 2020/01/15 20:11:11 rillig Exp $
 
 ######################################################################
 ### The targets below are all PRIVATE.
@@ -201,7 +201,7 @@
                   printf "%s %s\n", t, $$0 }' | \
        while read file relfile; do                                     \
                ${GREP}                                                 \
-                       -e '\$$NetBSD: metadata.mk,v 1.21 2020/01/15 20:03:10 rillig Exp $$]*[$$]'                      \
+                       -e '\$$NetBSD[:][^$$]*[$$]'                     \
                        -e '\$$NetBSD\$$'                               \
                        $$file 2>/dev/null |                            \
                ${SED} -e "s|^|$$file:|;q";                             \
diff -r d2aa8d7cb72e -r 42c857ca46a1 regress/plus_build_version/files/021-long-name
--- a/regress/plus_build_version/files/021-long-name    Wed Jan 15 20:03:10 2020 +0000
+++ b/regress/plus_build_version/files/021-long-name    Wed Jan 15 20:11:11 2020 +0000
@@ -2,6 +2,7 @@
 start with NetBSD. Only the exact name is expanded by CVS, therefore
 recording the other occurrences doesn't make sense.
 
-As of January 2020, this line gets recorded nevertheless.
+Before 2020-01-15, this line got unnecessarily recorded in
++BUILD_VERSION.
 
 $NetBSDFoundation$
diff -r d2aa8d7cb72e -r 42c857ca46a1 regress/plus_build_version/files/030-missing-colon-or-dollar
--- a/regress/plus_build_version/files/030-missing-colon-or-dollar      Wed Jan 15 20:03:10 2020 +0000
+++ b/regress/plus_build_version/files/030-missing-colon-or-dollar      Wed Jan 15 20:11:11 2020 +0000
@@ -1,7 +1,7 @@
 A complete RCS Id needs a colon or a dollar, otherwise it is not
 expanded.
 
-As of January 2020, this line gets unnecessarily recorded in
+Before 2020-01-15, this line got unnecessarily recorded in
 +BUILD_VERSION.
 
 $NetBSD
diff -r d2aa8d7cb72e -r 42c857ca46a1 regress/plus_build_version/files/040-missing-dollar-after-colon
--- a/regress/plus_build_version/files/040-missing-dollar-after-colon   Wed Jan 15 20:03:10 2020 +0000
+++ b/regress/plus_build_version/files/040-missing-dollar-after-colon   Wed Jan 15 20:11:11 2020 +0000
@@ -1,7 +1,7 @@
 Each RCS Id must end with a second dollar in the same line. Just having
 the colon is not enough.
 
-As of January 2020, this line gets unnecessarily recorded in
+Before 2020-01-15, this line got unnecessarily recorded in
 +BUILD_VERSION.
 
 $NetBSD: