pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk/checksum Strip out *all* of the lines containing Ne...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/49db2a4de7f9
branches:  trunk
changeset: 532238:49db2a4de7f9
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Aug 14 19:22:31 2007 +0000

description:
Strip out *all* of the lines containing NetBSD RCS ID tags that may
be lurking in patches before computing their checksum.

diffstat:

 mk/checksum/distinfo.awk |  17 +++++------------
 1 files changed, 5 insertions(+), 12 deletions(-)

diffs (41 lines):

diff -r 48f5543513a5 -r 49db2a4de7f9 mk/checksum/distinfo.awk
--- a/mk/checksum/distinfo.awk  Tue Aug 14 19:19:01 2007 +0000
+++ b/mk/checksum/distinfo.awk  Tue Aug 14 19:22:31 2007 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/awk -f
 #
-# $NetBSD: distinfo.awk,v 1.2 2007/08/14 19:19:01 jlam Exp $
+# $NetBSD: distinfo.awk,v 1.3 2007/08/14 19:22:31 jlam Exp $
 #
 # Copyright (c) 2007 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -57,7 +57,7 @@
 #
 #      For example:
 #
-#      $NetBSD: distinfo.awk,v 1.2 2007/08/14 19:19:01 jlam Exp $
+#      $NetBSD: distinfo.awk,v 1.3 2007/08/14 19:22:31 jlam Exp $
 #
 #      SHA1 (make-3.81.tar.gz) = cd4fa5a3184176492bf0799593a8f250a728210c
 #      RMD160 (make-3.81.tar.gz) = a713a72875cb9a29568677c98022465c6f55cbbf
@@ -327,17 +327,10 @@
                if ((system(cmd) != 0) || !is_patch(file)) continue
                for (a = 0; a < P; a++) {
                        alg = patch_algorithms[a]
-                       cmd = SED " 1q " patch
+                       cmd = SED " -e '/[$]NetBSD.*/d' " patch " | " DIGEST " " alg
                        cmd | getline; close(cmd)
-                       if ($0 ~ /^[$]NetBSD/) {
-                               cmd = SED " 1d " patch " | " DIGEST " " alg
-                               cmd | getline; close(cmd)
-                               sub("^", alg " (" file ") = ")
-                               lines[L++] = $0
-                       } else {
-                               cmd = "cd " dir " && " DIGEST " " alg " " file
-                               cmd | getline lines[L++]; close(cmd)
-                       }
+                       sub("^", alg " (" file ") = ")
+                       lines[L++] = $0
                }
        }
 }



Home | Main Index | Thread Index | Old Index