WARNS=2 is going to be the default, so don't specify it. Use __FBSDID().

svn path=/head/; revision=87706

usr.bin/touch/Makefile

@@ -2,6 +2,5 @@
 # $FreeBSD$
 
 PROG=	touch
-WARNS?=	2
 
 .include <bsd.prog.mk>

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>