From 5bfbdca45ab244c763154ad5033869805ace8cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Sat, 4 Jun 2005 23:18:33 +0000
Subject: [PATCH] Rewrite some of the regexps so they don't match themselves.

---
 crypto/openssh/FREEBSD-tricks | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/crypto/openssh/FREEBSD-tricks b/crypto/openssh/FREEBSD-tricks
index 4ae543986b3f..b7b6ece800c7 100644
--- a/crypto/openssh/FREEBSD-tricks
+++ b/crypto/openssh/FREEBSD-tricks
@@ -1,19 +1,20 @@
 # $FreeBSD$
 
 # Shell code to remove FreeBSD tags before merging
-grep -rl '\$Fre.BSD:' . >tags
+grep -rl '\$Fre[e]BSD:' . >tags
 cat tags | while read f ; do
-    sed -i.orig -e '/\$Fre.BSD:/d' $f
+    sed -i.orig -e '/\$Fre[e]BSD:/d' $f
 done
 
 # Shell + Perl code to add FreeBSD tags wherever an OpenBSD or Id tag occurs
 cat tags |
-xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$FreeBSD\$/ && print'
+xargs perl -n -i.orig -e 'print; s/\$(Id|OpenBSD): [^\$]*\$/\$Fre[e]BSD\$/ && print'
 
 # Shell code to reexpand FreeBSD tags
 cat tags | while read f ; do
-    id=$(cvs diff $f | grep '\$Fre.BSD:' | sed 's/.*\(\$Fre.BSD:.*\$\).*/\1/') ;
+    id=$(cvs diff $f | grep '\$Fre[e]BSD:' |
+    sed 's/.*\(\$Fre[e]BSD:.*\$\).*/\1/') ;
     if [ -n "$id" ] ; then
-        sed -i.orig -e "s@\\\$Fre.BSD\\\$@$id@" $f ;
+        sed -i.orig -e "s@\\\$Fre[e]BSD\\\$@$id@" $f ;
     fi ;
 done