rcsid[] and sccsid[] and copyright[] are essentially unmaintained (and

unmaintainable).  these days, people use source.  these id's do not provide
any benefit, and do hurt the small install media
(the 33,000 line diff is essentially mechanical)
ok with the idea millert, ok dms

4 files changed, 5 insertions, 23 deletions

diff --git a/lib/libc/Makefile b/lib/libc/Makefile
index c058fc258ec..d12d2f2521a 100644
--- a/lib/libc/Makefile
+++ b/lib/libc/Makefile
@@ -1,10 +1,4 @@
-#	$OpenBSD: Makefile,v 1.26 2006/03/14 09:19:37 deraadt Exp $
-#
-# All library objects contain sccsid strings by default; they may be
-# excluded as a space-saving measure.  To produce a library that does
-# not contain these strings, delete -DLIBC_SCCS and -DSYSLIBC_SCCS
-# from CFLAGS below.  To remove these strings from just the system call
-# stubs, remove just -DSYSLIBC_SCCS from CFLAGS.
+#	$OpenBSD: Makefile,v 1.27 2009/10/27 23:59:59 deraadt Exp $
 #
 # The NLS (message catalog) functions are always in libc.  To choose that
 # strerror(), perror(), strsignal(), psignal(), etc. actually call the NLS
diff --git a/lib/libc/Makefile.inc b/lib/libc/Makefile.inc
index cd3e853efd5..1ff69227a46 100644
--- a/lib/libc/Makefile.inc
+++ b/lib/libc/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.12 2008/09/07 20:36:07 martynas Exp $
+#	$OpenBSD: Makefile.inc,v 1.13 2009/10/27 23:59:59 deraadt Exp $
 #
 # This file contains make rules used to build libc
 #
@@ -8,7 +8,7 @@ all:
 	@echo "need to define LIBCSRCDIR" >&2; exit 1
 .endif
 
-CFLAGS+=	-DLIBC_SCCS -DSYSLIBC_SCCS -I${LIBCSRCDIR}/include
+CFLAGS+=	-I${LIBCSRCDIR}/include
 
 # Include link-time warnings about unsafe API uses (ie. strcpy)
 CFLAGS+=-DAPIWARN
diff --git a/lib/libc/stdlib/lsearch.c b/lib/libc/stdlib/lsearch.c
index 08154301998..a01d80e0083 100644
--- a/lib/libc/stdlib/lsearch.c
+++ b/lib/libc/stdlib/lsearch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lsearch.c,v 1.3 2004/10/01 04:08:45 jsg Exp $	*/
+/*	$OpenBSD: lsearch.c,v 1.4 2009/10/27 23:59:59 deraadt Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -32,10 +32,6 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-static char sccsid[] = "@(#)lsearch.c	8.1 (Berkeley) 6/4/93";
-#endif /* LIBC_SCCS and not lint */
-
 #include <sys/types.h>
 #include <string.h>
 #include <search.h>
diff --git a/lib/libc/time/strftime.c b/lib/libc/time/strftime.c
index f32626af6be..5ed91ad8e8d 100644
--- a/lib/libc/time/strftime.c
+++ b/lib/libc/time/strftime.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: strftime.c,v 1.19 2008/10/31 14:12:17 millert Exp $ */
+/*	$OpenBSD: strftime.c,v 1.20 2009/10/27 23:59:59 deraadt Exp $ */
 #include "private.h"
 
 /*
@@ -33,14 +33,6 @@
 ** SUCH DAMAGE.
 */
 
-#if 0
-#ifndef LIBC_SCCS
-#ifndef lint
-static const char	sccsid[] = "@(#)strftime.c	5.4 (Berkeley) 3/14/89";
-#endif /* !defined lint */
-#endif /* !defined LIBC_SCCS */
-#endif
-
 #include "tzfile.h"
 #include "fcntl.h"
 #include "locale.h"