From f1b6a5418eded826a52c45d76dd5eaa9ebde6061 Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Sun, 2 Dec 2001 21:24:03 +0000
Subject: [PATCH] Use __FBSDID().

---
 usr.bin/yacc/closure.c  |  8 +++++---
 usr.bin/yacc/error.c    |  8 ++++----
 usr.bin/yacc/lalr.c     |  8 +++++---
 usr.bin/yacc/lr0.c      |  8 +++++---
 usr.bin/yacc/main.c     | 12 +++---------
 usr.bin/yacc/mkpar.c    |  8 ++++----
 usr.bin/yacc/output.c   |  8 +++++---
 usr.bin/yacc/reader.c   |  8 +++++---
 usr.bin/yacc/skeleton.c |  6 +++++-
 usr.bin/yacc/symtab.c   |  8 +++++---
 usr.bin/yacc/verbose.c  |  8 +++++---
 usr.bin/yacc/warshall.c |  8 +++++---
 12 files changed, 56 insertions(+), 42 deletions(-)

diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index ed716a8314d..3f176c0b9a1 100644
--- a/usr.bin/yacc/closure.c
+++ b/usr.bin/yacc/closure.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
-#endif /* not lint */
+#endif
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/error.c b/usr.bin/yacc/error.c
index 60a22bf4aa1..a4b7512f4dd 100644
--- a/usr.bin/yacc/error.c
+++ b/usr.bin/yacc/error.c
@@ -34,13 +34,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
-#if 0
 static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 /* routines for printing error messages  */
 
diff --git a/usr.bin/yacc/lalr.c b/usr.bin/yacc/lalr.c
index d2654229f53..e45e0aad229 100644
--- a/usr.bin/yacc/lalr.c
+++ b/usr.bin/yacc/lalr.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
-#endif /* not lint */
+#endif
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/lr0.c b/usr.bin/yacc/lr0.c
index 3280c563466..9d9f64bad5e 100644
--- a/usr.bin/yacc/lr0.c
+++ b/usr.bin/yacc/lr0.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
-#endif /* not lint */
+#endif
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/main.c b/usr.bin/yacc/main.c
index 3cba3a2eb64..52c67f83843 100644
--- a/usr.bin/yacc/main.c
+++ b/usr.bin/yacc/main.c
@@ -34,19 +34,13 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char const copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
-#endif /* not lint */
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
 
 #ifndef lint
-#if 0
 static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <signal.h>
 #include <stdlib.h>
diff --git a/usr.bin/yacc/mkpar.c b/usr.bin/yacc/mkpar.c
index c4e3b0907a4..bce7f20de60 100644
--- a/usr.bin/yacc/mkpar.c
+++ b/usr.bin/yacc/mkpar.c
@@ -34,13 +34,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
-#if 0
 static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/output.c b/usr.bin/yacc/output.c
index fed4a530f8c..e609d8a4e01 100644
--- a/usr.bin/yacc/output.c
+++ b/usr.bin/yacc/output.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
-#endif /* not lint */
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/yacc/reader.c b/usr.bin/yacc/reader.c
index 87eedb37281..190e4c8300f 100644
--- a/usr.bin/yacc/reader.c
+++ b/usr.bin/yacc/reader.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
-#endif /* not lint */
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/yacc/skeleton.c b/usr.bin/yacc/skeleton.c
index e8ae5542a99..77a4039bc74 100644
--- a/usr.bin/yacc/skeleton.c
+++ b/usr.bin/yacc/skeleton.c
@@ -34,9 +34,13 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
-#endif /* not lint */
+#endif
 
 #include "defs.h"
 
diff --git a/usr.bin/yacc/symtab.c b/usr.bin/yacc/symtab.c
index f566845cf07..47fa6e0e963 100644
--- a/usr.bin/yacc/symtab.c
+++ b/usr.bin/yacc/symtab.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
-#endif /* not lint */
+#endif
 
 #include <stdlib.h>
 #include <string.h>
diff --git a/usr.bin/yacc/verbose.c b/usr.bin/yacc/verbose.c
index 17ac82c51ed..0caf561c394 100644
--- a/usr.bin/yacc/verbose.c
+++ b/usr.bin/yacc/verbose.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
-#endif /* not lint */
+#endif
 
 #include <stdlib.h>
 #include "defs.h"
diff --git a/usr.bin/yacc/warshall.c b/usr.bin/yacc/warshall.c
index a1e6d45b66e..0b65f25c69a 100644
--- a/usr.bin/yacc/warshall.c
+++ b/usr.bin/yacc/warshall.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static char const sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
-#endif /* not lint */
+#endif
 
 #include "defs.h"