[src/trunk]: src/crypto/external/bsd/heimdal Strip first otherwise we end up ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a1ffd85f99a8
branches:  trunk
changeset: 821192:a1ffd85f99a8
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Jan 27 18:02:09 2017 +0000

description:
Strip first otherwise we end up with __RCSID("NetBSD")

diffstat:

 crypto/external/bsd/heimdal/heimdal2netbsd |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (33 lines):

diff -r 72964a683d7c -r a1ffd85f99a8 crypto/external/bsd/heimdal/heimdal2netbsd
--- a/crypto/external/bsd/heimdal/heimdal2netbsd        Fri Jan 27 17:25:34 2017 +0000
+++ b/crypto/external/bsd/heimdal/heimdal2netbsd        Fri Jan 27 18:02:09 2017 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-#      $NetBSD: heimdal2netbsd,v 1.6 2014/04/22 14:07:31 pettai Exp $
+#      $NetBSD: heimdal2netbsd,v 1.7 2017/01/27 18:02:09 christos Exp $
 #
 # Copyright (c) 2011 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -184,16 +184,16 @@
        echo froze NetBSD RCSID for $f
 done
 
+### Remove the $'s around RCS tags
+cleantags $d
+
 # Convert unexpanded RCSID's to the NetBSD way.
-find $d -type f -print | xargs egrep -l 'RCSID\("\$Id\$"\)' | while read f; do
-       sed -e 's/RCSID("\$\Id\$")/__RCSID("\$NetBSD\$")/' \
+find $d -type f -print | xargs egrep -l 'RCSID\("Id"\)' | while read f; do
+       sed -e 's/RCSID("Id")/__RCSID("\$NetBSD\$")/' \
            < $f > /tmp/heimdal1f$$ && mv /tmp/heimdal1f$$ $f && \
        echo converted RCSID to NetBSD for $f
 done
 
-### Remove the $'s around RCS tags
-cleantags $d
-
 ### Add our NetBSD RCS Id
 find $d -type f -name '*.[chly]' -print | while read c; do
        sed 1q < $c | grep -q '\$NetBSD' || (