From 5ecdd3c4d325eb91b33e8415ce4f6542760742c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Tue, 19 Jan 2016 14:25:22 +0000
Subject: [PATCH] Use 'svn list -R' instead of find, and recognize comments in
 shell scripts and {ssh,sshd}_config.

---
 crypto/openssh/freebsd-pre-merge.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crypto/openssh/freebsd-pre-merge.sh b/crypto/openssh/freebsd-pre-merge.sh
index 676cabfd506c..473474c2c4da 100755
--- a/crypto/openssh/freebsd-pre-merge.sh
+++ b/crypto/openssh/freebsd-pre-merge.sh
@@ -5,10 +5,10 @@
 
 :>keywords
 :>rcsid
-find . -type f -name '*.[1-9ch]' | cut -c 3- | \
+svn list -R | grep -v '/$' | \
 while read f ; do
 	svn proplist -v $f | grep -q 'FreeBSD=%H' || continue
-	egrep -l '(\.\\"|/\*) \$FreeBSD[:\$]' $f >>keywords
+	egrep -l '^(#|\.\\"|/\*)[[:space:]]+\$FreeBSD[:\$]' $f >>keywords
 	egrep -l '__RCSID\("\$FreeBSD[:\$]' $f >>rcsid
 done
 sort -u keywords rcsid | xargs perl -n -i -e '