Use __FBSDID() and clean up the vendor tags.

svn path=/head/; revision=90153

bin/ls/cmp.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)cmp.c	8.1 (Berkeley) 5/31/93";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>

bin/ls/lomac.c

@@ -32,7 +32,6 @@
  * SUCH DAMAGE.
  *
  * $Id: lomac.c,v 1.5 2001/11/26 19:25:52 bfeldman Exp $
- * $FreeBSD$
  */
 
 /*
@@ -40,6 +39,9 @@
  * this interface to determine the LOMAC attributes of files.
  */
 
+#include <sys/cdefs.h>
+ __FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/lomacio.h>
 

bin/ls/ls.c

@@ -34,20 +34,21 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)ls.c	8.5 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>

bin/ls/print.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)print.c	8.4 (Berkeley) 4/17/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/param.h>
 #include <sys/stat.h>

bin/ls/util.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
+#include <sys/types.h>
+
+__FBSDID("$FreeBSD$");
+
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/2/94";
-#else
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
 #endif /* not lint */
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>