CVS commit: pkgsrc

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Wed Jan 15 20:11:11 UTC 2020

Modified Files:
        pkgsrc/mk/pkgformat/pkg: metadata.mk
        pkgsrc/regress/plus_build_version/files: 021-long-name
            030-missing-colon-or-dollar 040-missing-dollar-after-colon

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/mk/pkgformat/pkg/metadata.mk
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/regress/plus_build_version/files/021-long-name \
    pkgsrc/regress/plus_build_version/files/030-missing-colon-or-dollar \
    pkgsrc/regress/plus_build_version/files/040-missing-dollar-after-colon

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/pkgformat/pkg/metadata.mk
diff -u pkgsrc/mk/pkgformat/pkg/metadata.mk:1.21 pkgsrc/mk/pkgformat/pkg/metadata.mk:1.22
--- pkgsrc/mk/pkgformat/pkg/metadata.mk:1.21    Wed Jan 15 20:03:10 2020
+++ pkgsrc/mk/pkgformat/pkg/metadata.mk Wed Jan 15 20:11:11 2020
@@ -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 @@ ${_BUILD_VERSION_FILE}:
                   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";                             \

Index: pkgsrc/regress/plus_build_version/files/021-long-name
diff -u pkgsrc/regress/plus_build_version/files/021-long-name:1.1 pkgsrc/regress/plus_build_version/files/021-long-name:1.2
--- pkgsrc/regress/plus_build_version/files/021-long-name:1.1   Sat Jan 11 12:24:32 2020
+++ pkgsrc/regress/plus_build_version/files/021-long-name       Wed Jan 15 20:11:11 2020
@@ -2,6 +2,7 @@ The RCS Id must be exactly NetBSD, not a
 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$
Index: pkgsrc/regress/plus_build_version/files/030-missing-colon-or-dollar
diff -u pkgsrc/regress/plus_build_version/files/030-missing-colon-or-dollar:1.1 pkgsrc/regress/plus_build_version/files/030-missing-colon-or-dollar:1.2
--- pkgsrc/regress/plus_build_version/files/030-missing-colon-or-dollar:1.1     Sat Jan 11 12:24:32 2020
+++ pkgsrc/regress/plus_build_version/files/030-missing-colon-or-dollar Wed Jan 15 20:11:11 2020
@@ -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
Index: pkgsrc/regress/plus_build_version/files/040-missing-dollar-after-colon
diff -u pkgsrc/regress/plus_build_version/files/040-missing-dollar-after-colon:1.1 pkgsrc/regress/plus_build_version/files/040-missing-dollar-after-colon:1.2
--- pkgsrc/regress/plus_build_version/files/040-missing-dollar-after-colon:1.1  Sat Jan 11 12:24:32 2020
+++ pkgsrc/regress/plus_build_version/files/040-missing-dollar-after-colon      Wed Jan 15 20:11:11 2020
@@ -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: