From bb4544df9ace63bacb4f113c781faab96bfc1dec Mon Sep 17 00:00:00 2001
From: espie <espie@openbsd.org>
Date: Mon, 19 Jul 2010 19:46:43 +0000
Subject: [PATCH] Correct $OpenBSD$ stuff

---
 usr.bin/make/Makefile.boot              |  3 +--
 usr.bin/make/arch.c                     |  3 +--
 usr.bin/make/arch.h                     |  3 +--
 usr.bin/make/buf.c                      |  3 +--
 usr.bin/make/buf.h                      |  3 +--
 usr.bin/make/cmd_exec.c                 |  3 +--
 usr.bin/make/cmd_exec.h                 |  3 +--
 usr.bin/make/compat.c                   |  3 +--
 usr.bin/make/compat.h                   |  3 +--
 usr.bin/make/cond.c                     |  3 +--
 usr.bin/make/cond.h                     |  3 +--
 usr.bin/make/cond_int.h                 |  3 +--
 usr.bin/make/config.h                   |  3 +--
 usr.bin/make/defines.h                  |  3 +--
 usr.bin/make/dir.c                      |  3 +--
 usr.bin/make/dir.h                      |  3 +--
 usr.bin/make/error.c                    |  3 +--
 usr.bin/make/error.h                    |  3 +--
 usr.bin/make/extern.h                   |  3 +--
 usr.bin/make/for.c                      |  3 +--
 usr.bin/make/for.h                      |  3 +--
 usr.bin/make/garray.h                   |  3 +--
 usr.bin/make/generate.c                 |  3 +--
 usr.bin/make/gnode.h                    |  3 +--
 usr.bin/make/init.c                     |  3 +--
 usr.bin/make/init.h                     |  3 +--
 usr.bin/make/job.c                      |  3 +--
 usr.bin/make/job.h                      |  3 +--
 usr.bin/make/lowparse.c                 |  3 +--
 usr.bin/make/lowparse.h                 |  3 +--
 usr.bin/make/lst.h                      |  3 +--
 usr.bin/make/lst.lib/lstAddNew.c        |  3 +--
 usr.bin/make/lst.lib/lstAppend.c        |  3 +--
 usr.bin/make/lst.lib/lstConcat.c        |  3 +--
 usr.bin/make/lst.lib/lstConcatDestroy.c |  3 +--
 usr.bin/make/lst.lib/lstDeQueue.c       |  3 +--
 usr.bin/make/lst.lib/lstDestroy.c       |  3 +--
 usr.bin/make/lst.lib/lstDupl.c          |  3 +--
 usr.bin/make/lst.lib/lstFindFrom.c      |  3 +--
 usr.bin/make/lst.lib/lstForEachFrom.c   |  3 +--
 usr.bin/make/lst.lib/lstInit.c          |  3 +--
 usr.bin/make/lst.lib/lstInsert.c        |  3 +--
 usr.bin/make/lst.lib/lstInt.h           |  3 +--
 usr.bin/make/lst.lib/lstMember.c        |  3 +--
 usr.bin/make/lst.lib/lstRemove.c        |  3 +--
 usr.bin/make/lst.lib/lstReplace.c       |  3 +--
 usr.bin/make/lst.lib/lstSucc.c          |  3 +--
 usr.bin/make/lst_t.h                    |  3 +--
 usr.bin/make/main.c                     |  3 +--
 usr.bin/make/main.h                     |  3 +--
 usr.bin/make/make.1                     |  5 ++---
 usr.bin/make/make.c                     |  3 +--
 usr.bin/make/make.h                     |  3 +--
 usr.bin/make/memory.c                   |  3 +--
 usr.bin/make/memory.h                   |  3 +--
 usr.bin/make/parse.c                    |  3 +--
 usr.bin/make/parse.h                    |  3 +--
 usr.bin/make/parsevar.c                 |  3 +--
 usr.bin/make/parsevar.h                 |  3 +--
 usr.bin/make/pathnames.h                |  3 +--
 usr.bin/make/regress.c                  |  3 +--
 usr.bin/make/stats.c                    |  3 +--
 usr.bin/make/stats.h                    |  3 +--
 usr.bin/make/str.c                      |  3 +--
 usr.bin/make/str.h                      |  1 +
 usr.bin/make/suff.c                     |  3 +--
 usr.bin/make/suff.h                     |  3 +--
 usr.bin/make/symtable.h                 |  3 +--
 usr.bin/make/targ.c                     |  3 +--
 usr.bin/make/targ.h                     |  3 +--
 usr.bin/make/targequiv.h                | 27 +++++++++++++++++++++++++
 usr.bin/make/timestamp.c                |  3 +--
 usr.bin/make/timestamp.h                |  3 +--
 usr.bin/make/timestamp_t.h              |  3 +--
 usr.bin/make/util.c                     |  3 +--
 usr.bin/make/var.c                      |  3 +--
 usr.bin/make/var.h                      |  1 +
 usr.bin/make/var_int.h                  |  1 +
 usr.bin/make/varmodifiers.c             |  5 ++---
 usr.bin/make/varmodifiers.h             |  3 +--
 usr.bin/make/varname.c                  |  3 +--
 81 files changed, 109 insertions(+), 156 deletions(-)

diff --git a/usr.bin/make/Makefile.boot b/usr.bin/make/Makefile.boot
index 0a77ef8ec75..18df4dca240 100644
--- a/usr.bin/make/Makefile.boot
+++ b/usr.bin/make/Makefile.boot
@@ -1,5 +1,4 @@
-#	$OpenPackages: Makefile.boot,v 1.5 2001/04/06 00:09:55 will Exp $
-#	$OpenBSD: Makefile.boot,v 1.9 2010/02/03 20:45:44 miod Exp $
+#	$OpenBSD: Makefile.boot,v 1.10 2010/07/19 19:46:43 espie Exp $
 #
 # a very simple makefile...
 #
diff --git a/usr.bin/make/arch.c b/usr.bin/make/arch.c
index 0e65cd981eb..aeac77fd21c 100644
--- a/usr.bin/make/arch.c
+++ b/usr.bin/make/arch.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: arch.c,v 1.78 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: arch.c,v 1.79 2010/07/19 19:46:43 espie Exp $ */
 /*	$NetBSD: arch.c,v 1.17 1996/11/06 17:58:59 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/arch.h b/usr.bin/make/arch.h
index 0e7d8ecade9..73a51e1174a 100644
--- a/usr.bin/make/arch.h
+++ b/usr.bin/make/arch.h
@@ -1,7 +1,6 @@
 #ifndef ARCH_H
 #define ARCH_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: arch.h,v 1.5 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: arch.h,v 1.6 2010/07/19 19:46:43 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/buf.c b/usr.bin/make/buf.c
index b3eec470f5a..92a9451caf9 100644
--- a/usr.bin/make/buf.c
+++ b/usr.bin/make/buf.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: buf.c,v 1.22 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: buf.c,v 1.23 2010/07/19 19:46:43 espie Exp $	*/
 /*	$NetBSD: buf.c,v 1.9 1996/12/31 17:53:21 christos Exp $ */
 
 /*
diff --git a/usr.bin/make/buf.h b/usr.bin/make/buf.h
index df07c45eeb2..980d15a9546 100644
--- a/usr.bin/make/buf.h
+++ b/usr.bin/make/buf.h
@@ -1,8 +1,7 @@
 #ifndef _BUF_H
 #define _BUF_H
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: buf.h,v 1.18 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: buf.h,v 1.19 2010/07/19 19:46:43 espie Exp $	*/
 /*	$NetBSD: buf.h,v 1.7 1996/12/31 17:53:22 christos Exp $ */
 
 /*
diff --git a/usr.bin/make/cmd_exec.c b/usr.bin/make/cmd_exec.c
index 132677fc3db..fad09169c84 100644
--- a/usr.bin/make/cmd_exec.c
+++ b/usr.bin/make/cmd_exec.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: cmd_exec.c,v 1.7 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: cmd_exec.c,v 1.8 2010/07/19 19:46:43 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
diff --git a/usr.bin/make/cmd_exec.h b/usr.bin/make/cmd_exec.h
index 3bca2d3c35f..c7735b62118 100644
--- a/usr.bin/make/cmd_exec.h
+++ b/usr.bin/make/cmd_exec.h
@@ -1,7 +1,6 @@
 #ifndef CMD_EXEC_H
 #define CMD_EXEC_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: cmd_exec.h,v 1.3 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: cmd_exec.h,v 1.4 2010/07/19 19:46:43 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/compat.c b/usr.bin/make/compat.c
index e2cb26b4d7e..6bbf39a77a8 100644
--- a/usr.bin/make/compat.c
+++ b/usr.bin/make/compat.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: compat.c,v 1.73 2010/04/25 13:59:53 espie Exp $	*/
+/*	$OpenBSD: compat.c,v 1.74 2010/07/19 19:46:43 espie Exp $	*/
 /*	$NetBSD: compat.c,v 1.14 1996/11/06 17:59:01 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/compat.h b/usr.bin/make/compat.h
index 19b25046c24..fbdd66f2a94 100644
--- a/usr.bin/make/compat.h
+++ b/usr.bin/make/compat.h
@@ -1,7 +1,6 @@
 #ifndef COMPAT_H
 #define COMPAT_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: compat.h,v 1.2 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: compat.h,v 1.3 2010/07/19 19:46:43 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/cond.c b/usr.bin/make/cond.c
index adb89c70f12..b1420d3eb10 100644
--- a/usr.bin/make/cond.c
+++ b/usr.bin/make/cond.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: cond.c,v 1.42 2010/04/25 13:59:53 espie Exp $	*/
+/*	$OpenBSD: cond.c,v 1.43 2010/07/19 19:46:43 espie Exp $	*/
 /*	$NetBSD: cond.c,v 1.7 1996/11/06 17:59:02 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/cond.h b/usr.bin/make/cond.h
index a9ffb0656df..5b973cac2d5 100644
--- a/usr.bin/make/cond.h
+++ b/usr.bin/make/cond.h
@@ -1,7 +1,6 @@
 #ifndef COND_H
 #define COND_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: cond.h,v 1.4 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: cond.h,v 1.5 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/cond_int.h b/usr.bin/make/cond_int.h
index a428f8bc7f6..88d4970a71d 100644
--- a/usr.bin/make/cond_int.h
+++ b/usr.bin/make/cond_int.h
@@ -1,5 +1,4 @@
-/* $OpenPackages$ */
-/* $OpenBSD: cond_int.h,v 1.5 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: cond_int.h,v 1.6 2010/07/19 19:46:44 espie Exp $ */
 
 /* List of all keywords recognized by the make parser */
 #define COND_IF		"if"
diff --git a/usr.bin/make/config.h b/usr.bin/make/config.h
index 0e4f2846317..1c26df4be33 100644
--- a/usr.bin/make/config.h
+++ b/usr.bin/make/config.h
@@ -1,8 +1,7 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: config.h,v 1.17 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: config.h,v 1.18 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: config.h,v 1.7 1996/11/06 17:59:03 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/defines.h b/usr.bin/make/defines.h
index 2aecd8cd1e7..9a18a3ced37 100644
--- a/usr.bin/make/defines.h
+++ b/usr.bin/make/defines.h
@@ -1,8 +1,7 @@
 #ifndef DEFINES_H
 #define DEFINES_H
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: defines.h,v 1.8 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: defines.h,v 1.9 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/dir.c b/usr.bin/make/dir.c
index 0574d2b697d..f77adfda31d 100644
--- a/usr.bin/make/dir.c
+++ b/usr.bin/make/dir.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: dir.c,v 1.58 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: dir.c,v 1.59 2010/07/19 19:46:44 espie Exp $ */
 /*	$NetBSD: dir.c,v 1.14 1997/03/29 16:51:26 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/dir.h b/usr.bin/make/dir.h
index b72b7e40016..c1c28803dc2 100644
--- a/usr.bin/make/dir.h
+++ b/usr.bin/make/dir.h
@@ -1,8 +1,7 @@
 #ifndef DIR_H
 #define DIR_H
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: dir.h,v 1.25 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: dir.h,v 1.26 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: dir.h,v 1.4 1996/11/06 17:59:05 christos Exp $ */
 
 /*
diff --git a/usr.bin/make/error.c b/usr.bin/make/error.c
index e3c9484eea2..c79961bf837 100644
--- a/usr.bin/make/error.c
+++ b/usr.bin/make/error.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: error.c,v 1.18 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: error.c,v 1.19 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/error.h b/usr.bin/make/error.h
index f6a18fbe55b..f81a7ec253d 100644
--- a/usr.bin/make/error.h
+++ b/usr.bin/make/error.h
@@ -1,7 +1,6 @@
 #ifndef ERROR_H
 #define ERROR_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: error.h,v 1.10 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: error.h,v 1.11 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/extern.h b/usr.bin/make/extern.h
index ecc63e023ce..89797d685b9 100644
--- a/usr.bin/make/extern.h
+++ b/usr.bin/make/extern.h
@@ -1,8 +1,7 @@
 #ifndef EXTERN_H
 #define EXTERN_H
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: extern.h,v 1.42 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: extern.h,v 1.43 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: nonints.h,v 1.12 1996/11/06 17:59:19 christos Exp $	*/
 
 /*-
diff --git a/usr.bin/make/for.c b/usr.bin/make/for.c
index f9ef535de3f..e22aba59364 100644
--- a/usr.bin/make/for.c
+++ b/usr.bin/make/for.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: for.c,v 1.41 2010/07/15 10:37:32 espie Exp $	*/
+/*	$OpenBSD: for.c,v 1.42 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: for.c,v 1.4 1996/11/06 17:59:05 christos Exp $ */
 
 /*
diff --git a/usr.bin/make/for.h b/usr.bin/make/for.h
index 5a5e8cdec9a..3aa1c6a30e2 100644
--- a/usr.bin/make/for.h
+++ b/usr.bin/make/for.h
@@ -1,7 +1,6 @@
 #ifndef FOR_H
 #define FOR_H
-/*	$OpenPackages$ */
-/* $OpenBSD: for.h,v 1.4 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: for.h,v 1.5 2010/07/19 19:46:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
diff --git a/usr.bin/make/garray.h b/usr.bin/make/garray.h
index 2c98341d74c..01ba165d76b 100644
--- a/usr.bin/make/garray.h
+++ b/usr.bin/make/garray.h
@@ -1,8 +1,7 @@
 #ifndef GARRAY_H
 #define GARRAY_H
 
-/* $OpenPackages$ */
-/* $OpenBSD: garray.h,v 1.5 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: garray.h,v 1.6 2010/07/19 19:46:44 espie Exp $ */
 /* Growable array implementation */
 
 /*
diff --git a/usr.bin/make/generate.c b/usr.bin/make/generate.c
index 13a05588ee0..4ca1a08e912 100644
--- a/usr.bin/make/generate.c
+++ b/usr.bin/make/generate.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: generate.c,v 1.11 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: generate.c,v 1.12 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/gnode.h b/usr.bin/make/gnode.h
index 31e28241231..8c179854b04 100644
--- a/usr.bin/make/gnode.h
+++ b/usr.bin/make/gnode.h
@@ -1,7 +1,6 @@
 #ifndef GNODE_H
 #define GNODE_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: gnode.h,v 1.16 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: gnode.h,v 1.17 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/init.c b/usr.bin/make/init.c
index 0831ddfde0a..98320561ced 100644
--- a/usr.bin/make/init.c
+++ b/usr.bin/make/init.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: init.c,v 1.5 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: init.c,v 1.6 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/init.h b/usr.bin/make/init.h
index 474ba16add0..2b9ca15ee25 100644
--- a/usr.bin/make/init.h
+++ b/usr.bin/make/init.h
@@ -1,7 +1,6 @@
 #ifndef INIT_H
 #define INIT_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: init.h,v 1.2 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: init.h,v 1.3 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/job.c b/usr.bin/make/job.c
index f99b3fdbc70..54cb8d1d893 100644
--- a/usr.bin/make/job.c
+++ b/usr.bin/make/job.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: job.c,v 1.119 2010/07/15 10:37:32 espie Exp $	*/
+/*	$OpenBSD: job.c,v 1.120 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: job.c,v 1.16 1996/11/06 17:59:08 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/job.h b/usr.bin/make/job.h
index a9b3e1fdcca..89689195ea2 100644
--- a/usr.bin/make/job.h
+++ b/usr.bin/make/job.h
@@ -1,8 +1,7 @@
 #ifndef _JOB_H_
 #define _JOB_H_
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: job.h,v 1.24 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: job.h,v 1.25 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: job.h,v 1.5 1996/11/06 17:59:10 christos Exp $ */
 
 /*
diff --git a/usr.bin/make/lowparse.c b/usr.bin/make/lowparse.c
index 0237cf1b4e2..6b5b2d95ea8 100644
--- a/usr.bin/make/lowparse.c
+++ b/usr.bin/make/lowparse.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lowparse.c,v 1.23 2010/07/15 10:41:11 espie Exp $ */
+/*	$OpenBSD: lowparse.c,v 1.24 2010/07/19 19:46:44 espie Exp $ */
 
 /* low-level parsing functions. */
 
diff --git a/usr.bin/make/lowparse.h b/usr.bin/make/lowparse.h
index a011893717f..c1b0aef9ff0 100644
--- a/usr.bin/make/lowparse.h
+++ b/usr.bin/make/lowparse.h
@@ -1,8 +1,7 @@
 #ifndef LOWPARSE_H
 #define LOWPARSE_H
 
-/* $OpenPackages$ */
-/* $OpenBSD: lowparse.h,v 1.6 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: lowparse.h,v 1.7 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.bin/make/lst.h b/usr.bin/make/lst.h
index f1c9b03f1f5..d4f3903ee45 100644
--- a/usr.bin/make/lst.h
+++ b/usr.bin/make/lst.h
@@ -1,8 +1,7 @@
 #ifndef _LST_H_
 #define _LST_H_
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: lst.h,v 1.28 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: lst.h,v 1.29 2010/07/19 19:46:44 espie Exp $ */
 /*	$NetBSD: lst.h,v 1.7 1996/11/06 17:59:12 christos Exp $ */
 
 /*
diff --git a/usr.bin/make/lst.lib/lstAddNew.c b/usr.bin/make/lst.lib/lstAddNew.c
index fba4fa0c79d..8cf84a6974c 100644
--- a/usr.bin/make/lst.lib/lstAddNew.c
+++ b/usr.bin/make/lst.lib/lstAddNew.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstAddNew.c,v 1.7 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstAddNew.c,v 1.8 2010/07/19 19:46:44 espie Exp $	*/
 /* ex:ts=8 sw=4:
  */
 
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index 6b95fbdf505..5734b9fd5c5 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstAppend.c,v 1.19 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstAppend.c,v 1.20 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstAppend.c,v 1.5 1996/11/06 17:59:31 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index 4164ffef791..d2ff7dbcc08 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstConcat.c,v 1.19 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstConcat.c,v 1.20 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstConcatDestroy.c b/usr.bin/make/lst.lib/lstConcatDestroy.c
index e42f26eab52..46c48e54d88 100644
--- a/usr.bin/make/lst.lib/lstConcatDestroy.c
+++ b/usr.bin/make/lst.lib/lstConcatDestroy.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstConcatDestroy.c,v 1.10 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstConcatDestroy.c,v 1.11 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index fbdb324b5e8..9062183de7e 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstDeQueue.c,v 1.18 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstDeQueue.c,v 1.19 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstDeQueue.c,v 1.5 1996/11/06 17:59:36 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index f4c06cef593..4d4d4976fe0 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstDestroy.c,v 1.19 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstDestroy.c,v 1.20 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstDestroy.c,v 1.6 1996/11/06 17:59:37 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index 272a9383a55..7c09c7b32be 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstDupl.c,v 1.21 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstDupl.c,v 1.22 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstDupl.c,v 1.6 1996/11/06 17:59:37 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 3772403d541..10d91669af6 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstFindFrom.c,v 1.17 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstFindFrom.c,v 1.18 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstFindFrom.c,v 1.6 1996/11/06 17:59:40 christos Exp $ */
 
 /*
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 388ac431068..ac2f2e89527 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstForEachFrom.c,v 1.18 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstForEachFrom.c,v 1.19 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstForEachFrom.c,v 1.5 1996/11/06 17:59:42 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index 9f58088a7ec..d503b6b094d 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstInit.c,v 1.18 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstInit.c,v 1.19 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstInit.c,v 1.5 1996/11/06 17:59:43 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 446fa660928..7be5babc862 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstInsert.c,v 1.19 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstInsert.c,v 1.20 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstInsert.c,v 1.5 1996/11/06 17:59:44 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index 9547d8bcfce..f88a8ba8785 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstInt.h,v 1.14 2003/06/03 02:56:12 millert Exp $	*/
+/*	$OpenBSD: lstInt.h,v 1.15 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstInt.h,v 1.7 1996/11/06 17:59:44 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index 84221414707..5951bf4d16f 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstMember.c,v 1.16 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstMember.c,v 1.17 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstMember.c,v 1.5 1996/11/06 17:59:48 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index 544a490c2fb..00d2a0bce1b 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstRemove.c,v 1.18 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstRemove.c,v 1.19 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstRemove.c,v 1.5 1996/11/06 17:59:50 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 739fc622d76..fa9dd6a5601 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstReplace.c,v 1.17 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstReplace.c,v 1.18 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstReplace.c,v 1.5 1996/11/06 17:59:51 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index 8a6055e9465..285f93f2b76 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lstSucc.c,v 1.16 2007/09/16 09:46:14 espie Exp $	*/
+/*	$OpenBSD: lstSucc.c,v 1.17 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: lstSucc.c,v 1.5 1996/11/06 17:59:52 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/lst_t.h b/usr.bin/make/lst_t.h
index 6c84cd967c8..d94e942004b 100644
--- a/usr.bin/make/lst_t.h
+++ b/usr.bin/make/lst_t.h
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: lst_t.h,v 1.2 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: lst_t.h,v 1.3 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/main.c b/usr.bin/make/main.c
index d78accb51e7..646e9b82ad9 100644
--- a/usr.bin/make/main.c
+++ b/usr.bin/make/main.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: main.c,v 1.94 2010/07/15 10:41:11 espie Exp $ */
+/*	$OpenBSD: main.c,v 1.95 2010/07/19 19:46:44 espie Exp $ */
 /*	$NetBSD: main.c,v 1.34 1997/03/24 20:56:36 gwr Exp $	*/
 
 /*
diff --git a/usr.bin/make/main.h b/usr.bin/make/main.h
index 0220bd663ee..469487ee058 100644
--- a/usr.bin/make/main.h
+++ b/usr.bin/make/main.h
@@ -1,7 +1,6 @@
 #ifndef MAIN_H
 #define MAIN_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: main.h,v 1.4 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: main.h,v 1.5 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/make.1 b/usr.bin/make/make.1
index 6af65a307b4..cb3508afa70 100644
--- a/usr.bin/make/make.1
+++ b/usr.bin/make/make.1
@@ -1,5 +1,4 @@
-.\"	$OpenBSD: make.1,v 1.86 2010/02/04 07:46:20 jmc Exp $
-.\"	$OpenPackages$
+.\"	$OpenBSD: make.1,v 1.87 2010/07/19 19:46:44 espie Exp $
 .\"	$NetBSD: make.1,v 1.18 1997/03/10 21:19:53 christos Exp $
 .\"
 .\" Copyright (c) 1990, 1993
@@ -31,7 +30,7 @@
 .\"
 .\"	from: @(#)make.1	8.4 (Berkeley) 3/19/94
 .\"
-.Dd $Mdocdate: February 4 2010 $
+.Dd $Mdocdate: July 19 2010 $
 .Dt MAKE 1
 .Os
 .Sh NAME
diff --git a/usr.bin/make/make.c b/usr.bin/make/make.c
index 1fb27c80aa1..9bb1c84223e 100644
--- a/usr.bin/make/make.c
+++ b/usr.bin/make/make.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: make.c,v 1.60 2009/08/16 09:53:43 espie Exp $	*/
+/*	$OpenBSD: make.c,v 1.61 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: make.c,v 1.10 1996/11/06 17:59:15 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/make.h b/usr.bin/make/make.h
index 430bbaccc2a..91839fb5533 100644
--- a/usr.bin/make/make.h
+++ b/usr.bin/make/make.h
@@ -1,8 +1,7 @@
 #ifndef _MAKE_H_
 #define _MAKE_H_
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: make.h,v 1.37 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: make.h,v 1.38 2010/07/19 19:46:44 espie Exp $ */
 /*	$NetBSD: make.h,v 1.15 1997/03/10 21:20:00 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/memory.c b/usr.bin/make/memory.c
index bb90c156d5b..e3090eec537 100644
--- a/usr.bin/make/memory.c
+++ b/usr.bin/make/memory.c
@@ -1,5 +1,4 @@
-/* $OpenPackages$ */
-/* $OpenBSD: memory.c,v 1.7 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: memory.c,v 1.8 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
diff --git a/usr.bin/make/memory.h b/usr.bin/make/memory.h
index df9a15b2f73..1e7cb10f863 100644
--- a/usr.bin/make/memory.h
+++ b/usr.bin/make/memory.h
@@ -1,8 +1,7 @@
 #ifndef MEMORY_H
 #define MEMORY_H
 
-/* $OpenPackages$ */
-/* $OpenBSD: memory.h,v 1.6 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: memory.h,v 1.7 2010/07/19 19:46:44 espie Exp $ */
 
 /*-
  * Copyright (c) 1988, 1989, 1990, 1993
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c
index d9c09d0a4c2..49563165d4e 100644
--- a/usr.bin/make/parse.c
+++ b/usr.bin/make/parse.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: parse.c,v 1.98 2010/07/15 10:41:11 espie Exp $	*/
+/*	$OpenBSD: parse.c,v 1.99 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/parse.h b/usr.bin/make/parse.h
index b7388d625b0..2e2dec1b7ef 100644
--- a/usr.bin/make/parse.h
+++ b/usr.bin/make/parse.h
@@ -1,7 +1,6 @@
 #ifndef PARSE_H
 #define PARSE_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: parse.h,v 1.4 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: parse.h,v 1.5 2010/07/19 19:46:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
diff --git a/usr.bin/make/parsevar.c b/usr.bin/make/parsevar.c
index 1de7b4f7304..db0f053a342 100644
--- a/usr.bin/make/parsevar.c
+++ b/usr.bin/make/parsevar.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: parsevar.c,v 1.13 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: parsevar.c,v 1.14 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: parse.c,v 1.29 1997/03/10 21:20:04 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/parsevar.h b/usr.bin/make/parsevar.h
index 11e4df8faf7..71933c3e85d 100644
--- a/usr.bin/make/parsevar.h
+++ b/usr.bin/make/parsevar.h
@@ -1,7 +1,6 @@
 #ifndef PARSEVAR_H
 #define PARSEVAR_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: parsevar.h,v 1.4 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: parsevar.h,v 1.5 2010/07/19 19:46:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
diff --git a/usr.bin/make/pathnames.h b/usr.bin/make/pathnames.h
index 96d695a02e2..e8e2dcd698d 100644
--- a/usr.bin/make/pathnames.h
+++ b/usr.bin/make/pathnames.h
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: pathnames.h,v 1.11 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: pathnames.h,v 1.12 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: pathnames.h,v 1.6 1996/11/06 17:59:21 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/regress.c b/usr.bin/make/regress.c
index 35e9f496c1e..7ac31d57eb2 100644
--- a/usr.bin/make/regress.c
+++ b/usr.bin/make/regress.c
@@ -1,5 +1,4 @@
-/* $OpenPackages$ */
-/* $OpenBSD: regress.c,v 1.6 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: regress.c,v 1.7 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.bin/make/stats.c b/usr.bin/make/stats.c
index fade35c555c..f119915c225 100644
--- a/usr.bin/make/stats.c
+++ b/usr.bin/make/stats.c
@@ -1,5 +1,4 @@
-/* $OpenPackages$ */
-/* $OpenBSD: stats.c,v 1.9 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: stats.c,v 1.10 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.bin/make/stats.h b/usr.bin/make/stats.h
index 26b4b08a222..bfbedb54ea1 100644
--- a/usr.bin/make/stats.h
+++ b/usr.bin/make/stats.h
@@ -1,7 +1,6 @@
 #ifndef STAT_H
 #define STAT_H
-/* $OpenPackages$ */
-/* $OpenBSD: stats.h,v 1.5 2010/07/19 19:30:37 espie Exp $ */
+/* $OpenBSD: stats.h,v 1.6 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.bin/make/str.c b/usr.bin/make/str.c
index c88b8ed6a94..14ef624c611 100644
--- a/usr.bin/make/str.c
+++ b/usr.bin/make/str.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: str.c,v 1.26 2010/07/19 19:30:37 espie Exp $	*/
+/*	$OpenBSD: str.c,v 1.27 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: str.c,v 1.13 1996/11/06 17:59:23 christos Exp $	*/
 
 /*-
diff --git a/usr.bin/make/str.h b/usr.bin/make/str.h
index a0bb8471840..0668fcafc7d 100644
--- a/usr.bin/make/str.h
+++ b/usr.bin/make/str.h
@@ -1,5 +1,6 @@
 #ifndef STR_H
 #define STR_H
+/* $OpenBSD: str.h,v 1.2 2010/07/19 19:46:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
diff --git a/usr.bin/make/suff.c b/usr.bin/make/suff.c
index f14e92421c6..4a9a480c0f5 100644
--- a/usr.bin/make/suff.c
+++ b/usr.bin/make/suff.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: suff.c,v 1.78 2010/04/25 13:59:53 espie Exp $ */
+/*	$OpenBSD: suff.c,v 1.79 2010/07/19 19:46:44 espie Exp $ */
 /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/suff.h b/usr.bin/make/suff.h
index c3d2525b1e0..0c217e448b1 100644
--- a/usr.bin/make/suff.h
+++ b/usr.bin/make/suff.h
@@ -1,7 +1,6 @@
 #ifndef SUFF_H
 #define SUFF_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: suff.h,v 1.5 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: suff.h,v 1.6 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/symtable.h b/usr.bin/make/symtable.h
index db4afc419b1..d2e8105a6f4 100644
--- a/usr.bin/make/symtable.h
+++ b/usr.bin/make/symtable.h
@@ -1,7 +1,6 @@
 #ifndef SYMTABLE_H
 #define SYMTABLE_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: symtable.h,v 1.3 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: symtable.h,v 1.4 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/targ.c b/usr.bin/make/targ.c
index 1e0740e7a8a..5c3e8407c67 100644
--- a/usr.bin/make/targ.c
+++ b/usr.bin/make/targ.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: targ.c,v 1.61 2010/07/19 19:30:37 espie Exp $ */
+/*	$OpenBSD: targ.c,v 1.62 2010/07/19 19:46:44 espie Exp $ */
 /*	$NetBSD: targ.c,v 1.11 1997/02/20 16:51:50 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/targ.h b/usr.bin/make/targ.h
index c4a3d17024b..790e6768fbf 100644
--- a/usr.bin/make/targ.h
+++ b/usr.bin/make/targ.h
@@ -1,7 +1,6 @@
 #ifndef TARG_H
 #define TARG_H
-/*	$OpenPackages$ */
-/*	$OpenBSD: targ.h,v 1.8 2010/07/19 19:30:38 espie Exp $ */
+/*	$OpenBSD: targ.h,v 1.9 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/targequiv.h b/usr.bin/make/targequiv.h
index bb094152da0..4146ef00acd 100644
--- a/usr.bin/make/targequiv.h
+++ b/usr.bin/make/targequiv.h
@@ -1,3 +1,30 @@
+/*	$OpenBSD: targequiv.h,v 1.2 2010/07/19 19:46:44 espie Exp $ */
+/*
+ * Copyright (c) 2007-2008 Marc Espie.
+ *
+ * Extensive code changes for the OpenBSD project.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OPENBSD PROJECT AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OPENBSD
+ * PROJECT OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 #ifndef TARGEQUIV_H
 #define TARGEQUIV_H
 extern void look_harder_for_target(GNode *);
diff --git a/usr.bin/make/timestamp.c b/usr.bin/make/timestamp.c
index 3581f3037b3..275fda17c2a 100644
--- a/usr.bin/make/timestamp.c
+++ b/usr.bin/make/timestamp.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: timestamp.c,v 1.5 2010/07/19 19:30:38 espie Exp $ */
+/*	$OpenBSD: timestamp.c,v 1.6 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/timestamp.h b/usr.bin/make/timestamp.h
index 1514b7ddc64..376ffa86cdf 100644
--- a/usr.bin/make/timestamp.h
+++ b/usr.bin/make/timestamp.h
@@ -1,8 +1,7 @@
 #ifndef TIMESTAMP_H
 #define TIMESTAMP_H
 
-/*	$OpenPackages$ */
-/*	$OpenBSD: timestamp.h,v 1.5 2010/07/19 19:30:38 espie Exp $ */
+/*	$OpenBSD: timestamp.h,v 1.6 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/timestamp_t.h b/usr.bin/make/timestamp_t.h
index 36c56d32236..4e70a8deb51 100644
--- a/usr.bin/make/timestamp_t.h
+++ b/usr.bin/make/timestamp_t.h
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: timestamp_t.h,v 1.2 2010/07/19 19:30:38 espie Exp $ */
+/*	$OpenBSD: timestamp_t.h,v 1.3 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 2001 Marc Espie.
diff --git a/usr.bin/make/util.c b/usr.bin/make/util.c
index fa204960bb8..caf72848ff3 100644
--- a/usr.bin/make/util.c
+++ b/usr.bin/make/util.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: util.c,v 1.24 2010/07/19 19:30:38 espie Exp $	*/
+/*	$OpenBSD: util.c,v 1.25 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: util.c,v 1.10 1996/12/31 17:56:04 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/var.c b/usr.bin/make/var.c
index ebeaf20637e..da78bc9f280 100644
--- a/usr.bin/make/var.c
+++ b/usr.bin/make/var.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: var.c,v 1.86 2010/04/25 13:59:53 espie Exp $	*/
+/*	$OpenBSD: var.c,v 1.87 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
 
 /*
diff --git a/usr.bin/make/var.h b/usr.bin/make/var.h
index 0ef90145e55..a23e986056a 100644
--- a/usr.bin/make/var.h
+++ b/usr.bin/make/var.h
@@ -1,5 +1,6 @@
 #ifndef VAR_H
 #define VAR_H
+/* $OpenBSD: var.h,v 1.14 2010/07/19 19:46:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
diff --git a/usr.bin/make/var_int.h b/usr.bin/make/var_int.h
index 5b3489e4b4e..f3cd53ec95d 100644
--- a/usr.bin/make/var_int.h
+++ b/usr.bin/make/var_int.h
@@ -1,5 +1,6 @@
 #ifndef VAR_INT_H
 #define VAR_INT_H
+/* $OpenBSD: var_int.h,v 1.2 2010/07/19 19:46:44 espie Exp $ */
 /*
  * Copyright (c) 2001 Marc Espie.
  *
diff --git a/usr.bin/make/varmodifiers.c b/usr.bin/make/varmodifiers.c
index f7c402cb048..a22ebcc9df4 100644
--- a/usr.bin/make/varmodifiers.c
+++ b/usr.bin/make/varmodifiers.c
@@ -1,9 +1,8 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: varmodifiers.c,v 1.26 2010/07/19 19:30:38 espie Exp $	*/
+/*	$OpenBSD: varmodifiers.c,v 1.27 2010/07/19 19:46:44 espie Exp $	*/
 /*	$NetBSD: var.c,v 1.18 1997/03/18 19:24:46 christos Exp $	*/
 
 /*
- * Copyright (c) 1999 Marc Espie.
+ * Copyright (c) 1999-2010 Marc Espie.
  *
  * Extensive code changes for the OpenBSD project.
  *
diff --git a/usr.bin/make/varmodifiers.h b/usr.bin/make/varmodifiers.h
index 235846855b1..93d6cf7c729 100644
--- a/usr.bin/make/varmodifiers.h
+++ b/usr.bin/make/varmodifiers.h
@@ -1,8 +1,7 @@
 #ifndef VARMODIFIERS_H
 #define VARMODIFIERS_H
 
-/* $OpenPackages$ */
-/* $OpenBSD: varmodifiers.h,v 1.11 2010/07/19 19:30:38 espie Exp $ */
+/* $OpenBSD: varmodifiers.h,v 1.12 2010/07/19 19:46:44 espie Exp $ */
 
 /*
  * Copyright (c) 1999 Marc Espie.
diff --git a/usr.bin/make/varname.c b/usr.bin/make/varname.c
index ade006ea48a..cbacb14c2ba 100644
--- a/usr.bin/make/varname.c
+++ b/usr.bin/make/varname.c
@@ -1,5 +1,4 @@
-/*	$OpenPackages$ */
-/*	$OpenBSD: varname.c,v 1.4 2010/07/19 19:30:38 espie Exp $	*/
+/*	$OpenBSD: varname.c,v 1.5 2010/07/19 19:46:44 espie Exp $	*/
 /*
  * Copyright (c) 2001 Marc Espie.
  *
-- 
2.20.1