From 9b24805230a3188cc043ba69f976facab732ccbd Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Sat, 13 Apr 2002 10:57:56 +0000
Subject: [PATCH] Fix copyrights, and undo SCS ID damage.

---
 usr.bin/make/Makefile    | 1 +
 usr.bin/make/buf.c       | 3 ++-
 usr.bin/make/buf.h       | 5 +++--
 usr.bin/make/compat.c    | 3 ++-
 usr.bin/make/cond.c      | 3 ++-
 usr.bin/make/config.h    | 5 +++--
 usr.bin/make/dir.c       | 3 ++-
 usr.bin/make/dir.h       | 5 +++--
 usr.bin/make/for.c       | 7 +++++--
 usr.bin/make/hash.c      | 3 ++-
 usr.bin/make/hash.h      | 5 +++--
 usr.bin/make/job.c       | 3 ++-
 usr.bin/make/job.h       | 5 +++--
 usr.bin/make/list.h      | 5 +++--
 usr.bin/make/lst.h       | 5 +++--
 usr.bin/make/main.c      | 6 ++++--
 usr.bin/make/make.1      | 4 ++--
 usr.bin/make/make.h      | 2 +-
 usr.bin/make/nonints.h   | 2 +-
 usr.bin/make/pathnames.h | 2 +-
 usr.bin/make/sprite.h    | 2 +-
 21 files changed, 49 insertions(+), 30 deletions(-)

diff --git a/usr.bin/make/Makefile b/usr.bin/make/Makefile
index 4d29da7e0c97..d9b64caa1f3b 100644
--- a/usr.bin/make/Makefile
+++ b/usr.bin/make/Makefile
@@ -1,4 +1,5 @@
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
+#	$Id: Makefile,v 1.6 1994/06/30 05:33:39 cgd Exp $
 # $FreeBSD$
 
 PROG=	make
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index 88ed2dfefb73..ed4310924cff 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index d6367bee732e..d3c6afa3edb8 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)buf.h	8.1 (Berkeley) 6/6/93
+ *	@(#)buf.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index 788f8b0d1292..f0d08aae9728 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index 3f4ca218a306..d02452fbdc45 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 1bf6e9f883e3..fee8536927f0 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)config.h	8.1 (Berkeley) 6/6/93
+ *	@(#)config.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 7ea7c65bed4d..c00956ca50f4 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index 0f84a7b93f96..ec706432a24b 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)dir.h	8.1 (Berkeley) 6/6/93
+ *	@(#)dir.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index c68604f12a6f..129d73192a5b 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -1,6 +1,9 @@
 /*
- * Copyright (c) 1992, The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Christos Zoulas.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
diff --git a/usr.bin/make/hash.c b/usr.bin/make/hash.c
index 08e257f9e1c8..31d39c643d8a 100644
--- a/usr.bin/make/hash.c
+++ b/usr.bin/make/hash.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/hash.h b/usr.bin/make/hash.h
index 6809901d9cc4..9e14c53055be 100644
--- a/usr.bin/make/hash.h
+++ b/usr.bin/make/hash.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)hash.h	8.1 (Berkeley) 6/6/93
+ *	@(#)hash.h	8.1 (Berkeley) 6/6/93
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index 8d709550d6e7..ed1ee089aa42 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index 7626f397e83d..d59bc1616597 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)job.h	8.1 (Berkeley) 6/6/93
+ *	@(#)job.h	8.1 (Berkeley) 6/6/93
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/list.h b/usr.bin/make/list.h
index 4c9b3957456e..3f441e7b6901 100644
--- a/usr.bin/make/list.h
+++ b/usr.bin/make/list.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)list.h	8.1 (Berkeley) 6/6/93
+ *	@(#)list.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index 565479b368ee..9c18fb307300 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -1,5 +1,6 @@
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  * Copyright (c) 1988, 1989 by Adam de Boor
  * Copyright (c) 1989 by Berkeley Softworks
  * All rights reserved.
@@ -35,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)lst.h	8.1 (Berkeley) 6/6/93
+ *	@(#)lst.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index faebba6eb95f..f3c2ca71e712 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -38,10 +38,12 @@
  * @(#)main.c      8.3 (Berkeley) 3/19/94
  */
 
-#include <sys/cdefs.h>
 #ifndef lint
-__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993  The Regents of the University of California.  All rights reserved.");
+static char copyright[] =
+"@(#) Copyright (c) 1988, 1989, 1990, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
+#include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
 /*-
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index b8f4574feeff..f764be92acac 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -29,10 +29,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
+.\"	@(#)make.1	8.8 (Berkeley) 6/13/95
 .\" $FreeBSD$
 .\"
-.Dd March 19, 1994
+.Dd June 13, 1995
 .Dt MAKE 1
 .Os
 .Sh NAME
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 4f4e571bd4ac..63c5ab9cd2c2 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)make.h	8.3 (Berkeley) 6/13/95
+ *	@(#)make.h	8.3 (Berkeley) 6/13/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/nonints.h b/usr.bin/make/nonints.h
index 9e50f4cd9683..ad1e46d55098 100644
--- a/usr.bin/make/nonints.h
+++ b/usr.bin/make/nonints.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)nonints.h	8.3 (Berkeley) 3/19/94
+ *	@(#)nonints.h	8.4 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 1f15c082ead7..d16167cc1f69 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -30,7 +30,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)pathnames.h	5.2 (Berkeley) 6/1/90
+ *	@(#)pathnames.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */
 
diff --git a/usr.bin/make/sprite.h b/usr.bin/make/sprite.h
index 6e3207b347df..11ecc36b5b08 100644
--- a/usr.bin/make/sprite.h
+++ b/usr.bin/make/sprite.h
@@ -35,7 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)sprite.h	8.1 (Berkeley) 6/6/93
+ *	@(#)sprite.h	8.2 (Berkeley) 4/28/95
  * $FreeBSD$
  */