Module Name:    src
Committed By:   christos
Date:           Fri Jan 27 18:02:09 UTC 2017

Modified Files:
        src/crypto/external/bsd/heimdal: heimdal2netbsd

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


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/crypto/external/bsd/heimdal/heimdal2netbsd

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

Modified files:

Index: src/crypto/external/bsd/heimdal/heimdal2netbsd
diff -u src/crypto/external/bsd/heimdal/heimdal2netbsd:1.6 src/crypto/external/bsd/heimdal/heimdal2netbsd:1.7
--- src/crypto/external/bsd/heimdal/heimdal2netbsd:1.6	Tue Apr 22 10:07:31 2014
+++ src/crypto/external/bsd/heimdal/heimdal2netbsd	Fri Jan 27 13:02:09 2017
@@ -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 @@ find $d -type f -print | xargs egrep -l 
 	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' || (

Reply via email to