Use __FBSDID().

12 files changed, 56 insertions, 42 deletions

diff --git a/usr.bin/yacc/closure.c b/usr.bin/yacc/closure.c
index ed716a8..3f176c0 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 60a22bf..a4b7512 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 d265422..e45e0aa 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 3280c56..9d9f64b 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 3cba3a2..52c67f8 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 c4e3b09..bce7f20 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 fed4a53..e609d8a 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 87eedb3..190e4c8 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 e8ae554..77a4039 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 f566845..47fa6e0 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 17ac82c..0caf561 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 a1e6d45..0b65f25 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"