More changes to use __FBSDID() for setting rcsids, and fix the

format of 'sccsid' lines so they consistently match style(9)
Also the 'sccsid' line is formatted to match style(9), and
a 'From:' is removed so the sccsid returns to what it was back
in the days of '-r CSRG' (1996).

Reviewed by:	discussed with bde and obrien
MFC after:	15 days

usr.sbin/lpr/lpr/lpr.c

@@ -43,13 +43,14 @@ static const char copyright[] =
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
-#ifndef lint
 #if 0
-static char sccsid[] = "@(#)from: lpr.c	8.4 (Berkeley) 4/28/95";
-#endif
-static const char rcsid[] =
-  "$FreeBSD$";
+#ifndef lint
+static char sccsid[] = "@(#)lpr.c	8.4 (Berkeley) 4/28/95";
 #endif /* not lint */
+#endif
+
+#include "lp.cdefs.h"		/* A cross-platform version of <sys/cdefs.h> */
+__FBSDID("$FreeBSD$");
 
 /*
  *      lpr -- off line print