Use __FBSDID over rcsid[]. Protect copyright[] where needed.

svn path=/head/; revision=114601
2024-07-21 10:19:04 +00:00 · 2003-05-03 21:06:42 +00:00 · 2003-05-03 21:06:42 +00:00 · b728350ee6 · 2020-12-20 02:59:44 +00:00
parent 6f0a94a9f1
commit b728350ee6
62 changed files with 169 additions and 242 deletions
--- a/usr.sbin/accton/accton.c
+++ b/usr.sbin/accton/accton.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
@ -38,12 +39,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)accton.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <err.h>
--- a/usr.sbin/ancontrol/ancontrol.c
+++ b/usr.sbin/ancontrol/ancontrol.c
@ -30,12 +30,14 @@
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/cdefs.h>
--- a/usr.sbin/arp/arp.c
+++ b/usr.sbin/arp/arp.c
@ -34,6 +34,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static char const copyright[] =
 "@(#) Copyright (c) 1984, 1993\n\
@ -41,12 +42,11 @@ static char const copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char const sccsid[] = "@(#)from: arp.c	8.2 (Berkeley) 1/2/94";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * arp - display, set, and delete arp table entries
--- a/usr.sbin/boot0cfg/boot0cfg.c
+++ b/usr.sbin/boot0cfg/boot0cfg.c
@ -24,10 +24,8 @@
 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/disklabel.h>
--- a/usr.sbin/cdcontrol/cdcontrol.c
+++ b/usr.sbin/cdcontrol/cdcontrol.c
@ -18,10 +18,8 @@
 *              Some code style reformatting.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/cdio.h>
 #include <sys/cdrio.h>
--- a/usr.sbin/chkgrp/chkgrp.c
+++ b/usr.sbin/chkgrp/chkgrp.c
@ -26,10 +26,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <err.h>
 #include <ctype.h>
--- a/usr.sbin/chown/chown.c
+++ b/usr.sbin/chown/chown.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993, 1994\n\
@ -38,11 +39,9 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
-#endif
 #endif /* not lint */
-
+#endif
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");

--- a/usr.sbin/chroot/chroot.c
+++ b/usr.sbin/chroot/chroot.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
@ -38,12 +39,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)chroot.c	8.1 (Berkeley) 6/9/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>

--- a/usr.sbin/dev_mkdb/dev_mkdb.c
+++ b/usr.sbin/dev_mkdb/dev_mkdb.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1990, 1993\n\
@ -38,12 +39,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)dev_mkdb.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/stat.h>
--- a/usr.sbin/edquota/edquota.c
+++ b/usr.sbin/edquota/edquota.c
@ -34,6 +34,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1990, 1993\n\
@ -41,12 +42,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)edquota.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * Disk quota editor.
--- a/usr.sbin/fdcontrol/fdcontrol.c
+++ b/usr.sbin/fdcontrol/fdcontrol.c
@ -25,10 +25,8 @@
 * DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/fdcio.h>
 #include <sys/file.h>
--- a/usr.sbin/kbdcontrol/kbdcontrol.c
+++ b/usr.sbin/kbdcontrol/kbdcontrol.c
@ -26,10 +26,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <ctype.h>
 #include <err.h>
--- a/usr.sbin/kernbb/kernbb.c
+++ b/usr.sbin/kernbb/kernbb.c
@ -8,10 +8,8 @@
 *
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <err.h>
 #include <fcntl.h>
--- a/usr.sbin/lptcontrol/lptcontrol.c
+++ b/usr.sbin/lptcontrol/lptcontrol.c
@ -28,10 +28,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <ctype.h>
 #include <err.h>
--- a/usr.sbin/mixer/mixer.c
+++ b/usr.sbin/mixer/mixer.c
@ -11,10 +11,8 @@
 * ditto for my modifications (John-Mark Gurney, 1997)
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <err.h>
 #include <fcntl.h>
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)compare.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/stat.h>
--- a/usr.sbin/mtree/create.c
+++ b/usr.sbin/mtree/create.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)create.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/stat.h>
--- a/usr.sbin/mtree/excludes.c
+++ b/usr.sbin/mtree/excludes.c
@ -27,8 +27,8 @@
 * SUCH DAMAGE.
 */

-static const char rcsid[] =
-  "$FreeBSD$";
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/time.h>		/* XXX for mtree.h */
--- a/usr.sbin/mtree/misc.c
+++ b/usr.sbin/mtree/misc.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /*not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/usr.sbin/mtree/mtree.c
+++ b/usr.sbin/mtree/mtree.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1989, 1990, 1993\n\
@ -38,12 +39,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)mtree.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/stat.h>
--- a/usr.sbin/mtree/spec.c
+++ b/usr.sbin/mtree/spec.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)spec.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/usr.sbin/mtree/verify.c
+++ b/usr.sbin/mtree/verify.c
@ -31,13 +31,13 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
 #if 0
+#ifndef lint
 static char sccsid[] = "@(#)verify.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/stat.h>
--- a/usr.sbin/newsyslog/newsyslog.c
+++ b/usr.sbin/newsyslog/newsyslog.c
@ -23,10 +23,8 @@
 * specified number of backup files around.
 */

-#ifndef lint
-static const char rcsid[] =
-"$FreeBSD$";
-#endif	/* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #define OSF
 #ifndef COMPRESS_POSTFIX
--- a/usr.sbin/procctl/procctl.c
+++ b/usr.sbin/procctl/procctl.c
@ -30,10 +30,8 @@
 *
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * procctl -- clear the event mask, and continue, any specified processes.
--- a/usr.sbin/pstat/pstat.c
+++ b/usr.sbin/pstat/pstat.c
@ -38,6 +38,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1991, 1993, 1994\n\
@ -45,12 +46,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)pstat.c	8.16 (Berkeley) 5/9/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/time.h>
--- a/usr.sbin/pwd_mkdb/pwd_mkdb.c
+++ b/usr.sbin/pwd_mkdb/pwd_mkdb.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993, 1994\n\
@ -38,12 +39,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)pwd_mkdb.c	8.5 (Berkeley) 4/20/94";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/stat.h>
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@ -29,10 +29,8 @@
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/stdint.h>
--- a/usr.sbin/quotaon/quotaon.c
+++ b/usr.sbin/quotaon/quotaon.c
@ -34,6 +34,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1990, 1993\n\
@ -41,12 +42,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)quotaon.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * Turn quota on/off for a filesystem.
--- a/usr.sbin/rarpd/rarpd.c
+++ b/usr.sbin/rarpd/rarpd.c
@ -19,16 +19,15 @@
 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1990, 1991, 1992, 1993, 1996\n\
 The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
-
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * rarpd - Reverse ARP Daemon
--- a/usr.sbin/repquota/repquota.c
+++ b/usr.sbin/repquota/repquota.c
@ -34,6 +34,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1980, 1990, 1993\n\
@ -41,12 +42,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)repquota.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * Quota report
--- a/usr.sbin/rmt/rmt.c
+++ b/usr.sbin/rmt/rmt.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
@ -38,12 +39,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)rmt.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * rmt
--- a/usr.sbin/rpc.umntall/mounttab.c
+++ b/usr.sbin/rpc.umntall/mounttab.c
@ -25,10 +25,8 @@
 *
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/syslog.h>

--- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x
+++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x
@ -31,10 +31,8 @@
 */

 #ifndef RPC_HDR
-%#ifndef lint
-%static const char rcsid[] =
-%	"$FreeBSD$";
-%#endif /* not lint */
+%#include <sys/cdefs.h>
+%__FBSDID("$FreeBSD$");
 #endif

 #ifdef RPC_HDR
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_main.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/ioctl.h>
--- a/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
+++ b/usr.sbin/rpc.yppasswdd/yppasswdd_server.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/fcntl.h>
--- a/usr.sbin/rpc.ypupdated/yp_dbdelete.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbdelete.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <stdio.h>
 #include <stdlib.h>
--- a/usr.sbin/rpc.ypupdated/yp_dbupdate.c
+++ b/usr.sbin/rpc.ypupdated/yp_dbupdate.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/fcntl.h>

--- a/usr.sbin/rpc.ypupdated/ypupdated_main.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_main.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include "ypupdate_prot.h"
 #include <stdio.h>
--- a/usr.sbin/rpc.ypupdated/ypupdated_server.c
+++ b/usr.sbin/rpc.ypupdated/ypupdated_server.c
@ -36,10 +36,8 @@
 * Columbia University, New York City
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <stdio.h>
 #include <rpc/rpc.h>
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_main.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include "ypxfrd.h"
 #include <err.h>
--- a/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
+++ b/usr.sbin/rpc.ypxfrd/ypxfrd_server.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include "ypxfrd.h"

--- a/usr.sbin/sa/main.c
+++ b/usr.sbin/sa/main.c
@ -28,16 +28,15 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1994 Christopher G. Demetriou\n\
 All rights reserved.\n";
 #endif
-
-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * sa:	system accounting
--- a/usr.sbin/sa/pdb.c
+++ b/usr.sbin/sa/pdb.c
@ -28,10 +28,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/acct.h>
--- a/usr.sbin/sa/usrdb.c
+++ b/usr.sbin/sa/usrdb.c
@ -28,10 +28,8 @@
 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/types.h>
--- a/usr.sbin/slstat/slstat.c
+++ b/usr.sbin/slstat/slstat.c
@ -21,10 +21,8 @@
 *	- Initial distribution.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/socket.h>
--- a/usr.sbin/trpt/trpt.c
+++ b/usr.sbin/trpt/trpt.c
@ -31,6 +31,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1983, 1988, 1993\n\
@ -38,12 +39,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)trpt.c	8.1 (Berkeley) 6/6/93";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/queue.h>
--- a/usr.sbin/vipw/vipw.c
+++ b/usr.sbin/vipw/vipw.c
@ -38,6 +38,7 @@
 * SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993, 1994\n\
@ -45,12 +46,11 @@ static const char copyright[] =
 #endif /* not lint */

 #ifndef lint
-#if 0
 static char sccsid[] = "@(#)vipw.c	8.3 (Berkeley) 4/2/94";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/stat.h>
--- a/usr.sbin/watch/watch.c
+++ b/usr.sbin/watch/watch.c
@ -13,10 +13,8 @@
 * Snoop stuff.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/fcntl.h>
--- a/usr.sbin/wicontrol/wicontrol.c
+++ b/usr.sbin/wicontrol/wicontrol.c
@ -30,12 +30,14 @@
 * THE POSSIBILITY OF SUCH DAMAGE.
 */

+#if 0
 #ifndef lint
 static const char copyright[] = "@(#) Copyright (c) 1997, 1998, 1999\
 	Bill Paul. All rights reserved.";
-static const char rcsid[] =
-	"$FreeBSD$";
 #endif /* not lint */
+#endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/types.h>
 #include <sys/cdefs.h>
--- a/usr.sbin/yp_mkdb/yp_mkdb.c
+++ b/usr.sbin/yp_mkdb/yp_mkdb.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <err.h>
 #include <fcntl.h>
--- a/usr.sbin/ypbind/yp_ping.c
+++ b/usr.sbin/ypbind/yp_ping.c
@ -59,14 +59,14 @@
 * Mountain View, California  94043
 */

-#ifndef lint
 #if 0
+#ifndef lint
 static char *sccsid = "@(#)from: clnt_udp.c 1.39 87/08/11 Copyr 1984 Sun Micro";
 static char *sccsid = "@(#)from: clnt_udp.c	2.2 88/08/01 4.0 RPCSRC";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
 #endif
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * clnt_udp.c, Implements a UDP/IP based, client side RPC.
--- a/usr.sbin/ypbind/ypbind.c
+++ b/usr.sbin/ypbind/ypbind.c
@ -27,10 +27,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/types.h>
--- a/usr.sbin/yppoll/yppoll.c
+++ b/usr.sbin/yppoll/yppoll.c
@ -28,10 +28,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <sys/param.h>
 #include <sys/types.h>
--- a/usr.sbin/yppush/yppush_main.c
+++ b/usr.sbin/yppush/yppush_main.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <errno.h>
 #include <signal.h>
--- a/usr.sbin/ypserv/yp_access.c
+++ b/usr.sbin/ypserv/yp_access.c
@ -31,10 +31,8 @@
 *
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <stdlib.h>
 #include <rpc/rpc.h>
--- a/usr.sbin/ypserv/yp_dblookup.c
+++ b/usr.sbin/ypserv/yp_dblookup.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <db.h>
 #include <errno.h>
--- a/usr.sbin/ypserv/yp_dnslookup.c
+++ b/usr.sbin/ypserv/yp_dnslookup.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * Do standard and reverse DNS lookups using the resolver library.
--- a/usr.sbin/ypserv/yp_error.c
+++ b/usr.sbin/ypserv/yp_error.c
@ -31,10 +31,8 @@
 *
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * error logging/reporting facilities
--- a/usr.sbin/ypserv/yp_main.c
+++ b/usr.sbin/ypserv/yp_main.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 /*
 * ypserv startup function.
--- a/usr.sbin/ypserv/yp_server.c
+++ b/usr.sbin/ypserv/yp_server.c
@ -31,10 +31,8 @@
 *
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include "yp.h"
 #include "yp_extern.h"
--- a/usr.sbin/ypserv/yp_svc_udp.c
+++ b/usr.sbin/ypserv/yp_svc_udp.c
@ -30,10 +30,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <rpc/rpc.h>
 #include <rpc/svc_dg.h>
--- a/usr.sbin/ypset/ypset.c
+++ b/usr.sbin/ypset/ypset.c
@ -27,10 +27,8 @@
 * SUCH DAMAGE.
 */

-#ifndef lint
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");

 #include <err.h>
 #include <netdb.h>