From 1a9e1c9da1b08d896e3031caaabc797bc0a7dbcf Mon Sep 17 00:00:00 2001
From: Mark Murray <markm@FreeBSD.org>
Date: Tue, 11 Dec 2001 23:38:24 +0000
Subject: [PATCH] WARNS=2 is going to be the default, so don't specify it. Use
 __FBSDID().

---
 usr.bin/touch/Makefile |  1 -
 usr.bin/touch/touch.c  | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/usr.bin/touch/Makefile b/usr.bin/touch/Makefile
index 293616589dd0..e44f4f2cfdcc 100644
--- a/usr.bin/touch/Makefile
+++ b/usr.bin/touch/Makefile
@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	touch
-WARNS?=	2
 
 .include <bsd.prog.mk>
diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c
index d441e3205960..3e6be8995358 100644
--- a/usr.bin/touch/touch.c
+++ b/usr.bin/touch/touch.c
@@ -31,19 +31,19 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
+
+__FBSDID("$FreeBSD$");
+
 #ifndef lint
 static const char copyright[] =
 "@(#) Copyright (c) 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
-#endif /* not lint */
+#endif
 
 #ifndef lint
-#if 0
 static const char sccsid[] = "@(#)touch.c	8.1 (Berkeley) 6/6/93";
 #endif
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif /* not lint */
 
 #include <sys/types.h>
 #include <sys/stat.h>