From bc505f774244919bd9d3d9222e3638b0d7d9980f Mon Sep 17 00:00:00 2001
From: Warner Losh <imp@FreeBSD.org>
Date: Sat, 8 Dec 2001 02:28:16 +0000
Subject: [PATCH] Only use __FBSDID if it is defined.  This fixes the
 4.4-release (but not stable) -> current upgrade path.

Reviewed by: markm
---
 usr.bin/colldef/parse.y | 2 ++
 usr.bin/colldef/scan.l  | 2 ++
 usr.bin/yacc/closure.c  | 2 ++
 usr.bin/yacc/error.c    | 2 ++
 usr.bin/yacc/lalr.c     | 2 ++
 usr.bin/yacc/lr0.c      | 2 ++
 usr.bin/yacc/main.c     | 2 ++
 usr.bin/yacc/mkpar.c    | 2 ++
 usr.bin/yacc/output.c   | 2 ++
 usr.bin/yacc/reader.c   | 2 ++
 usr.bin/yacc/skeleton.c | 2 ++
 usr.bin/yacc/symtab.c   | 2 ++
 usr.bin/yacc/verbose.c  | 2 ++
 usr.bin/yacc/warshall.c | 2 ++
 14 files changed, 28 insertions(+)

diff --git a/usr.bin/colldef/parse.y b/usr.bin/colldef/parse.y
index b7ef56523487..f15e4ce1621f 100644
--- a/usr.bin/colldef/parse.y
+++ b/usr.bin/colldef/parse.y
@@ -28,7 +28,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #include <err.h>
 #include <stdarg.h>
diff --git a/usr.bin/colldef/scan.l b/usr.bin/colldef/scan.l
index 04f3a57ffaa1..e5683969b74e 100644
--- a/usr.bin/colldef/scan.l
+++ b/usr.bin/colldef/scan.l
@@ -29,7 +29,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #include <ctype.h>
 #include <err.h>
diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index 3f176c0b9a1b..5921c781441c 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index a4b7512f4dd7..7158000f4779 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index e45e0aad2294..73be8feca180 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 9d9f64bad5e6..94698a07176c 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 52c67f838433..4c427c363acc 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index bce7f20de602..34aa81d9ed96 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index e609d8a4e012..d6134c9cee9c 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 190e4c8300ff..23a060fc30b4 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index 77a4039bc743..5e7ce1456697 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index 47fa6e0e9637..8b8298c19ae2 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 0caf561c3943..2b37eef0c704 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index 0b65f25c69a2..8f1cd1cb38f4 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -36,7 +36,9 @@
 
 #include <sys/cdefs.h>
 
+#ifdef __FBSDID
 __FBSDID("$FreeBSD$");
+#endif
 
 #ifndef lint
 static char const sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";