Make cleaner diffs by munging the $FreeBSD$s from the FreeBSD CVS sources back

into the new sources.

1 files changed, 15 insertions, 1 deletions

diff --git a/sys/dev/drm/drm-preprocess.sh b/sys/dev/drm/drm-preprocess.sh
index b636e2b..1da7871 100644
--- a/sys/dev/drm/drm-preprocess.sh
+++ b/sys/dev/drm/drm-preprocess.sh
@@ -2,14 +2,21 @@
 
 # $FreeBSD$
 
+cvs up -CPd *.[ch]
+
+for i in `ls *.[ch]`; do
+	mv $i $i.cvs
+done
+
 cp /usr/src/drm/bsd-core/*.[ch] .
 rm i810*.[ch]
 rm via*.[ch]
 
 # Replace drm_pciids.h with one with a $FreeBSD$
+line=`grep \\\$FreeBSD drm_pciids.h.cvs`
 rm -f drm_pciids.h
 echo "/*" >> drm_pciids.h
-echo " * \$FreeBSD\$" >> drm_pciids.h
+echo "$line" >> drm_pciids.h
 echo " */" >> drm_pciids.h
 cat /usr/src/drm/bsd-core/drm_pciids.h >> drm_pciids.h
 
@@ -18,3 +25,10 @@ for i in `ls *.[ch]`; do
 	perl drm-subprocess.pl < $i.orig > $i
 done
 
+for orig in `ls *.[ch].cvs`; do
+	real=`echo "$orig" | sed s/.cvs//`
+	line=`grep __FBSDID $orig | sed s/\\\\\$/\\\\\\\\\$/g`
+	perl -pi -e "s|__FBSDID.*|$line|g" $real
+done
+
+rm *.cvs