Style improvements recommended by Bruce as a follow up to some

of the recent WARNS commits. The idea is:

1) FreeBSD id tags should follow vendor tags.
2) Vendor tags should not be compiled (though copyrights probably should).
3) There should be no blank line between including cdefs and __FBSDIF.

bin/chflags/chflags.c

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

lib/libpam/modules/pam_login_access/login_access.c

@@ -7,14 +7,15 @@
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifdef LOGIN_ACCESS
+#if 0
 #ifndef lint
-static const char sccsid[] = "%Z% %M% %I% %E% %U%";
+static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <ctype.h>

usr.bin/apply/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	apply
 

usr.bin/apply/apply.c

@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
+static char sccsid[] = "@(#)apply.c	8.4 (Berkeley) 4/4/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/wait.h>

usr.bin/ar/append.c

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

usr.bin/ar/ar.c

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

usr.bin/ar/archive.c

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

usr.bin/ar/contents.c

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

usr.bin/ar/delete.c

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

usr.bin/ar/extract.c

@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)extract.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)extract.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/time.h>

usr.bin/ar/misc.c

@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 

usr.bin/ar/move.c

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

usr.bin/ar/print.c

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

usr.bin/ar/replace.c

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

usr.bin/at/at.c

@@ -27,7 +27,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #define _USE_BSD 1

usr.bin/at/panic.c

@@ -24,7 +24,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 /* System Headers */

usr.bin/at/parsetime.c

@@ -34,7 +34,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 /* System Headers */

usr.bin/at/perm.c

@@ -24,7 +24,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 /* System Headers */

usr.bin/banner/banner.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)banner.c	8.4 (Berkeley) 4/29/95";
+static char sccsid[] = "@(#)banner.c	8.4 (Berkeley) 4/29/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * banner - prints large signs

usr.bin/basename/basename.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)basename.c	8.4 (Berkeley) 5/4/95";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <libgen.h>

usr.bin/biff/biff.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)biff.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)biff.c	8.1 (Berkeley) 6/6/93";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/stat.h>

usr.bin/brandelf/brandelf.c

@@ -28,7 +28,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>

usr.bin/c89/c89.c

@@ -28,7 +28,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <err.h>

usr.bin/calendar/calendar.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
+static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <errno.h>

usr.bin/calendar/day.c

@@ -32,7 +32,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>

usr.bin/calendar/io.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
+static char sccsid[] = "@(#)calendar.c  8.3 (Berkeley) 3/25/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/param.h>

usr.bin/calendar/ostern.c

@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>

usr.bin/calendar/paskha.c

@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <stdio.h>

usr.bin/cap_mkdb/cap_mkdb.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)cap_mkdb.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)cap_mkdb.c	8.1 (Berkeley) 6/6/93";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>

usr.bin/chflags/chflags.c

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

usr.bin/chkey/chkey.c

@@ -28,13 +28,14 @@
  * Mountain View, California  94043
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
+static char sccsid[] = "@(#)chkey.c 1.7 91/03/11 Copyr 1986 Sun Micro";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Copyright (C) 1986, Sun Microsystems, Inc.

usr.bin/cmp/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	cmp
 SRCS=	cmp.c misc.c regular.c special.c

usr.bin/cmp/cmp.c

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

usr.bin/cmp/misc.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)misc.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 

usr.bin/cmp/regular.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)regular.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)regular.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/mman.h>

usr.bin/cmp/special.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)special.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 

usr.bin/col/col.c

@@ -34,19 +34,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1990, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)col.c	8.5 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>

usr.bin/colcrt/colcrt.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
+static char sccsid[] = "@(#)colcrt.c	8.1 (Berkeley) 6/6/93";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <stdio.h>

usr.bin/colrm/colrm.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)colrm.c	8.2 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <err.h>

usr.bin/column/column.c

@@ -31,19 +31,20 @@
  * 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
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)column.c	8.4 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/ioctl.h>

usr.bin/comm/comm.c

@@ -34,19 +34,20 @@
  * 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
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
+static char sccsid[] = "From: @(#)comm.c	8.4 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <err.h>

usr.bin/compress/compress.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
+static char sccsid[] = "@(#)compress.c	8.2 (Berkeley) 1/7/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>

usr.bin/compress/zopen.c

@@ -35,14 +35,13 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #if defined(LIBC_SCCS) && !defined(lint)
 static char sccsid[] = "@(#)zopen.c	8.1 (Berkeley) 6/27/93";
 #endif /* LIBC_SCCS and not lint */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 /*-
  * fcompress.c - File compression ala IEEE Computer, June 1984.
  *

usr.bin/ctags/C.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
 static char sccsid[] = "@(#)C.c	8.4 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <limits.h>
 #include <stdio.h>

usr.bin/ctags/ctags.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993, 1994, 1995\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
+static char sccsid[] = "@(#)ctags.c	8.4 (Berkeley) 2/7/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <limits.h>

usr.bin/ctags/fortran.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)fortran.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <limits.h>

usr.bin/ctags/lisp.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)lisp.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <limits.h>

usr.bin/ctags/print.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)print.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <limits.h>
 #include <stdio.h>

usr.bin/ctags/tree.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)tree.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <err.h>
 #include <limits.h>

usr.bin/ctags/yacc.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)yacc.c	8.3 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <ctype.h>
 #include <limits.h>

usr.bin/finger/finger.c

@@ -44,19 +44,20 @@
  *	login time is < 6 days.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)finger.c	8.5 (Berkeley) 5/4/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * Finger prints out information about users.  It is not portable since

usr.bin/finger/lprint.c

@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)lprint.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/stat.h>
 #include <ctype.h>

usr.bin/finger/net.c

@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)net.c	8.4 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/socket.h>

usr.bin/finger/sprint.c

@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)sprint.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <db.h>
 #include <err.h>

usr.bin/finger/util.c

@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
+static char sccsid[] = "@(#)util.c	8.3 (Berkeley) 4/28/95";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/stat.h>

usr.bin/login/login.c

@@ -31,13 +31,14 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
+static char sccsid[] = "@(#)login.c	8.4 (Berkeley) 4/2/94";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
  * login [ name ]

usr.bin/login/login_access.c

@@ -7,14 +7,15 @@
   * Author: Wietse Venema, Eindhoven University of Technology, The Netherlands.
   */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifdef LOGIN_ACCESS
+#if 0
 #ifndef lint
-static const char sccsid[] = "%Z% %M% %I% %E% %U%";
+static char sccsid[] = "%Z% %M% %I% %E% %U%";
 #endif
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <ctype.h>

usr.bin/login/login_fbtab.c

@@ -59,7 +59,6 @@
  */
 
 #include <sys/cdefs.h>
-
 __FBSDID("$FreeBSD$");
 
 #include <sys/types.h>

usr.bin/logname/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$
 
 PROG=	logname
 WARNS?=	2

usr.bin/mkstr/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	mkstr
 WARNS?=	2

usr.bin/netstat/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/12/93
+# $FreeBSD$
 
 PROG=	netstat
 SRCS=	if.c inet.c inet6.c main.c mbuf.c mroute.c ipx.c route.c \

usr.bin/nfsstat/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	nfsstat
 CFLAGS+=-DNFS

usr.bin/nice/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	nice
 WARNS?=	2

usr.bin/nice/nice.c

@@ -31,19 +31,20 @@
  * 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 */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)nice.c	8.2 (Berkeley) 4/16/94";
+static char sccsid[] = "@(#)nice.c	8.2 (Berkeley) 4/16/94";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 #include <sys/time.h>

usr.bin/nohup/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	nohup
 WARNS?=	2

usr.bin/printenv/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	printenv
 MLINKS=	printenv.1 env.1

usr.bin/printenv/printenv.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)printenv.c	8.2 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)printenv.c	8.2 (Berkeley) 5/4/95";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 

usr.bin/printf/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	printf
 WARNS?=	2

usr.bin/rev/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$
 
 PROG=	rev
 WARNS?=	2

usr.bin/rev/rev.c

@@ -31,19 +31,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-__FBSDID("$FreeBSD$");
-
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
+#if 0
 #ifndef lint
-static const char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
+static char sccsid[] = "@(#)rev.c	8.3 (Berkeley) 5/4/95";
 #endif /* not lint */
+#endif
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include <sys/types.h>
 

usr.bin/sasc/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	sasc
 WARNS?=	2

usr.bin/script/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	script
 WARNS?=	2

usr.bin/soelim/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	soelim
 WARNS?=	2

usr.bin/tee/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	tee
 WARNS?=	2

usr.bin/tsort/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/9/93
+# $FreeBSD$
 
 PROG=	tsort
 WARNS?=	2

usr.bin/tty/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	tty
 WARNS?=	2

usr.bin/ul/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	ul
 WARNS?=	2

usr.bin/uniq/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	uniq
 WARNS?=	2

usr.bin/unvis/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	unvis
 WARNS?=	2

usr.bin/uudecode/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	uudecode
 WARNS?=	2

usr.bin/yacc/closure.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/error.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 /* routines for printing error messages  */

usr.bin/yacc/lalr.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/lr0.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/main.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <signal.h>

usr.bin/yacc/mkpar.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/output.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/reader.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/skeleton.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)skeleton.c	5.8 (Berkeley) 4/29/95";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include "defs.h"

usr.bin/yacc/symtab.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/verbose.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include <stdlib.h>

usr.bin/yacc/warshall.c

@@ -34,14 +34,15 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-
-#ifdef __FBSDID
-__FBSDID("$FreeBSD$");
+#if 0
+#ifndef lint
+static char sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
+#endif
 #endif
 
-#ifndef lint
-static char const sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
+#include <sys/cdefs.h>
+#ifdef __FBSDID
+__FBSDID("$FreeBSD$");
 #endif
 
 #include "defs.h"

usr.bin/yes/Makefile

@@ -1,5 +1,5 @@
-# $FreeBSD$
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
+# $FreeBSD$
 
 PROG=	yes
 WARNS?=	2