Sync with NetBSD:

- Merge in FreeBSD and Lite2 changes.
- Fix bug where a non-archive target with a .a suffix would always
  be considered to be out of date, since it does not have a TOC.
- Fix NetBSD PR #2930: declare missing variable.

28 files changed, 218 insertions, 215 deletions

diff --git a/usr.bin/make/lst.lib/Makefile b/usr.bin/make/lst.lib/Makefile
index ce6ae605150..88761d342a9 100644
--- a/usr.bin/make/lst.lib/Makefile
+++ b/usr.bin/make/lst.lib/Makefile
@@ -1,5 +1,5 @@
-#	$OpenBSD: Makefile,v 1.2 1996/06/26 05:36:41 deraadt Exp $
-#	$NetBSD: Makefile,v 1.3 1995/06/14 15:20:42 christos Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/11/30 21:09:09 millert Exp $
+#	$NetBSD: Makefile,v 1.4 1996/11/06 17:59:31 christos Exp $
 
 OBJ=lstAppend.o lstDupl.o lstInit.o lstOpen.o lstAtEnd.o lstEnQueue.o \
     lstInsert.o lstAtFront.o lstIsAtEnd.o lstClose.o lstFind.o lstIsEmpty.o \
diff --git a/usr.bin/make/lst.lib/lstAppend.c b/usr.bin/make/lst.lib/lstAppend.c
index 7ea02024a8a..bbb45def67b 100644
--- a/usr.bin/make/lst.lib/lstAppend.c
+++ b/usr.bin/make/lst.lib/lstAppend.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstAppend.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $	*/
-/*	$NetBSD: lstAppend.c,v 1.4 1995/06/14 15:20:44 christos Exp $	*/
+/*	$OpenBSD: lstAppend.c,v 1.3 1996/11/30 21:09:09 millert Exp $	*/
+/*	$NetBSD: lstAppend.c,v 1.5 1996/11/06 17:59:31 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstAppend.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstAppend.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstAppend.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstAppend.c,v 1.3 1996/11/30 21:09:09 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -77,23 +77,23 @@ Lst_Append (l, ln, d)
     register List 	list;
     register ListNode	lNode;
     register ListNode	nLNode;
-    
+
     if (LstValid (l) && (ln == NILLNODE && LstIsEmpty (l))) {
 	goto ok;
     }
-    
+
     if (!LstValid (l) || LstIsEmpty (l)  || ! LstNodeValid (ln, l)) {
 	return (FAILURE);
     }
     ok:
-    
+
     list = (List)l;
     lNode = (ListNode)ln;
 
     PAlloc (nLNode, ListNode);
     nLNode->datum = d;
     nLNode->useCount = nLNode->flags = 0;
-    
+
     if (lNode == NilListNode) {
 	if (list->isCirc) {
 	    nLNode->nextPtr = nLNode->prevPtr = nLNode;
@@ -104,17 +104,17 @@ Lst_Append (l, ln, d)
     } else {
 	nLNode->prevPtr = lNode;
 	nLNode->nextPtr = lNode->nextPtr;
-	
+
 	lNode->nextPtr = nLNode;
 	if (nLNode->nextPtr != NilListNode) {
 	    nLNode->nextPtr->prevPtr = nLNode;
 	}
-	
+
 	if (lNode == list->lastPtr) {
 	    list->lastPtr = nLNode;
 	}
     }
-    
+
     return (SUCCESS);
 }
 
diff --git a/usr.bin/make/lst.lib/lstAtEnd.c b/usr.bin/make/lst.lib/lstAtEnd.c
index 182d563e801..e21edd19e89 100644
--- a/usr.bin/make/lst.lib/lstAtEnd.c
+++ b/usr.bin/make/lst.lib/lstAtEnd.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstAtEnd.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $	*/
-/*	$NetBSD: lstAtEnd.c,v 1.4 1995/06/14 15:20:46 christos Exp $	*/
+/*	$OpenBSD: lstAtEnd.c,v 1.3 1996/11/30 21:09:10 millert Exp $	*/
+/*	$NetBSD: lstAtEnd.c,v 1.5 1996/11/06 17:59:32 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstAtEnd.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstAtEnd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstAtEnd.c,v 1.2 1996/06/26 05:36:42 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstAtEnd.c,v 1.3 1996/11/30 21:09:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -51,7 +51,7 @@ static char rcsid[] = "$OpenBSD: lstAtEnd.c,v 1.2 1996/06/26 05:36:42 deraadt Ex
  */
 
 #include	"lstInt.h"
-	
+
 /*-
  *-----------------------------------------------------------------------
  * Lst_AtEnd --
@@ -71,7 +71,7 @@ Lst_AtEnd (l, d)
     ClientData	d;	/* Datum to add */
 {
     register LstNode	end;
-    
+
     end = Lst_Last (l);
     return (Lst_Append (l, end, d));
 }
diff --git a/usr.bin/make/lst.lib/lstAtFront.c b/usr.bin/make/lst.lib/lstAtFront.c
index 0f9d84d1b3c..968bb9b8ad3 100644
--- a/usr.bin/make/lst.lib/lstAtFront.c
+++ b/usr.bin/make/lst.lib/lstAtFront.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstAtFront.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $	*/
-/*	$NetBSD: lstAtFront.c,v 1.4 1995/06/14 15:20:48 christos Exp $	*/
+/*	$OpenBSD: lstAtFront.c,v 1.3 1996/11/30 21:09:10 millert Exp $	*/
+/*	$NetBSD: lstAtFront.c,v 1.5 1996/11/06 17:59:33 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstAtFront.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstAtFront.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstAtFront.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstAtFront.c,v 1.3 1996/11/30 21:09:10 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,7 +72,7 @@ Lst_AtFront (l, d)
     ClientData	d;
 {
     register LstNode	front;
-    
+
     front = Lst_First (l);
     return (Lst_Insert (l, front, d));
 }
diff --git a/usr.bin/make/lst.lib/lstClose.c b/usr.bin/make/lst.lib/lstClose.c
index 5e60381a63b..19a0dee5abc 100644
--- a/usr.bin/make/lst.lib/lstClose.c
+++ b/usr.bin/make/lst.lib/lstClose.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstClose.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $	*/
-/*	$NetBSD: lstClose.c,v 1.4 1995/06/14 15:20:50 christos Exp $	*/
+/*	$OpenBSD: lstClose.c,v 1.3 1996/11/30 21:09:11 millert Exp $	*/
+/*	$NetBSD: lstClose.c,v 1.5 1996/11/06 17:59:34 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstClose.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstClose.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstClose.c,v 1.2 1996/06/26 05:36:43 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstClose.c,v 1.3 1996/11/30 21:09:11 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@ Lst_Close (l)
     Lst	    l;	  	/* The list to close */
 {
     register List 	list = (List) l;
-    
+
     if (LstValid(l) == TRUE) {
 	list->isOpen = FALSE;
 	list->atEnd = Unknown;
diff --git a/usr.bin/make/lst.lib/lstConcat.c b/usr.bin/make/lst.lib/lstConcat.c
index b2a74476308..2e3d20e9ea3 100644
--- a/usr.bin/make/lst.lib/lstConcat.c
+++ b/usr.bin/make/lst.lib/lstConcat.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstConcat.c,v 1.2 1996/06/26 05:36:44 deraadt Exp $	*/
-/*	$NetBSD: lstConcat.c,v 1.5 1995/06/14 15:20:53 christos Exp $	*/
+/*	$OpenBSD: lstConcat.c,v 1.3 1996/11/30 21:09:11 millert Exp $	*/
+/*	$NetBSD: lstConcat.c,v 1.6 1996/11/06 17:59:34 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstConcat.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstConcat.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstConcat.c,v 1.2 1996/06/26 05:36:44 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstConcat.c,v 1.3 1996/11/30 21:09:11 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -156,7 +156,7 @@ Lst_Concat (l1, l2, flags)
 
 	/*
 	 * Finish bookkeeping. The last new element becomes the last element
-	 * of list one. 
+	 * of list one.
 	 */
 	list1->lastPtr = last;
 
@@ -180,4 +180,4 @@ Lst_Concat (l1, l2, flags)
 
     return (SUCCESS);
 }
-	
+
diff --git a/usr.bin/make/lst.lib/lstDatum.c b/usr.bin/make/lst.lib/lstDatum.c
index 93df0beee50..411b8eba670 100644
--- a/usr.bin/make/lst.lib/lstDatum.c
+++ b/usr.bin/make/lst.lib/lstDatum.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstDatum.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $	*/
-/*	$NetBSD: lstDatum.c,v 1.4 1995/06/14 15:20:54 christos Exp $	*/
+/*	$OpenBSD: lstDatum.c,v 1.3 1996/11/30 21:09:12 millert Exp $	*/
+/*	$NetBSD: lstDatum.c,v 1.5 1996/11/06 17:59:35 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstDatum.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstDatum.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstDatum.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstDatum.c,v 1.3 1996/11/30 21:09:12 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstDeQueue.c b/usr.bin/make/lst.lib/lstDeQueue.c
index 21e0f6f2591..09843863392 100644
--- a/usr.bin/make/lst.lib/lstDeQueue.c
+++ b/usr.bin/make/lst.lib/lstDeQueue.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstDeQueue.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $	*/
-/*	$NetBSD: lstDeQueue.c,v 1.4 1995/06/14 15:20:56 christos Exp $	*/
+/*	$OpenBSD: lstDeQueue.c,v 1.3 1996/11/30 21:09:12 millert Exp $	*/
+/*	$NetBSD: lstDeQueue.c,v 1.5 1996/11/06 17:59:36 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstDeQueue.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstDeQueue.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstDeQueue.c,v 1.2 1996/06/26 05:36:45 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstDeQueue.c,v 1.3 1996/11/30 21:09:12 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -72,12 +72,12 @@ Lst_DeQueue (l)
 {
     ClientData	  rd;
     register ListNode	tln;
-    
+
     tln = (ListNode) Lst_First (l);
     if (tln == NilListNode) {
 	return ((ClientData) NIL);
     }
-    
+
     rd = tln->datum;
     if (Lst_Remove (l, (LstNode)tln) == FAILURE) {
 	return ((ClientData) NIL);
diff --git a/usr.bin/make/lst.lib/lstDestroy.c b/usr.bin/make/lst.lib/lstDestroy.c
index 3f23577f5a5..169d25f35d2 100644
--- a/usr.bin/make/lst.lib/lstDestroy.c
+++ b/usr.bin/make/lst.lib/lstDestroy.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstDestroy.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $	*/
-/*	$NetBSD: lstDestroy.c,v 1.5 1995/06/14 15:20:58 christos Exp $	*/
+/*	$OpenBSD: lstDestroy.c,v 1.3 1996/11/30 21:09:13 millert Exp $	*/
+/*	$NetBSD: lstDestroy.c,v 1.6 1996/11/06 17:59:37 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstDestroy.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstDestroy.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstDestroy.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstDestroy.c,v 1.3 1996/11/30 21:09:13 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@ Lst_Destroy (l, freeProc)
     register ListNode	ln;
     register ListNode	tln = NilListNode;
     register List 	list = (List)l;
-    
+
     if (l == NILLST || ! l) {
 	/*
 	 * Note the check for l == (Lst)0 to catch uninitialized static Lst's.
@@ -104,6 +104,6 @@ Lst_Destroy (l, freeProc)
 	     free ((Address)ln);
 	}
     }
-    
+
     free ((Address)l);
 }
diff --git a/usr.bin/make/lst.lib/lstDupl.c b/usr.bin/make/lst.lib/lstDupl.c
index d509f7e8421..0d2772df449 100644
--- a/usr.bin/make/lst.lib/lstDupl.c
+++ b/usr.bin/make/lst.lib/lstDupl.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstDupl.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $	*/
-/*	$NetBSD: lstDupl.c,v 1.5 1995/06/14 15:21:02 christos Exp $	*/
+/*	$OpenBSD: lstDupl.c,v 1.3 1996/11/30 21:09:13 millert Exp $	*/
+/*	$NetBSD: lstDupl.c,v 1.6 1996/11/06 17:59:37 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstDupl.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstDupl.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstDupl.c,v 1.2 1996/06/26 05:36:46 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstDupl.c,v 1.3 1996/11/30 21:09:13 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -75,7 +75,7 @@ Lst_Duplicate (l, copyProc)
     register Lst 	nl;
     register ListNode  	ln;
     register List 	list = (List)l;
-    
+
     if (!LstValid (l)) {
 	return (NILLST);
     }
@@ -101,6 +101,6 @@ Lst_Duplicate (l, copyProc)
 	    ln = ln->nextPtr;
 	}
     }
-	
+
     return (nl);
 }
diff --git a/usr.bin/make/lst.lib/lstEnQueue.c b/usr.bin/make/lst.lib/lstEnQueue.c
index 657dfb66c3e..1ba605b9637 100644
--- a/usr.bin/make/lst.lib/lstEnQueue.c
+++ b/usr.bin/make/lst.lib/lstEnQueue.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstEnQueue.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $	*/
-/*	$NetBSD: lstEnQueue.c,v 1.4 1995/06/14 15:21:04 christos Exp $	*/
+/*	$OpenBSD: lstEnQueue.c,v 1.3 1996/11/30 21:09:14 millert Exp $	*/
+/*	$NetBSD: lstEnQueue.c,v 1.5 1996/11/06 17:59:38 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstEnQueue.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstEnQueue.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstEnQueue.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstEnQueue.c,v 1.3 1996/11/30 21:09:14 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -74,7 +74,7 @@ Lst_EnQueue (l, d)
     if (LstValid (l) == FALSE) {
 	return (FAILURE);
     }
-    
+
     return (Lst_Append (l, Lst_Last(l), d));
 }
 
diff --git a/usr.bin/make/lst.lib/lstFind.c b/usr.bin/make/lst.lib/lstFind.c
index 76e7ea8e36d..5b8a28b6335 100644
--- a/usr.bin/make/lst.lib/lstFind.c
+++ b/usr.bin/make/lst.lib/lstFind.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstFind.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $	*/
-/*	$NetBSD: lstFind.c,v 1.5 1995/06/14 15:21:07 christos Exp $	*/
+/*	$OpenBSD: lstFind.c,v 1.3 1996/11/30 21:09:14 millert Exp $	*/
+/*	$NetBSD: lstFind.c,v 1.6 1996/11/06 17:59:39 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstFind.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstFind.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstFind.c,v 1.2 1996/06/26 05:36:47 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstFind.c,v 1.3 1996/11/30 21:09:14 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstFindFrom.c b/usr.bin/make/lst.lib/lstFindFrom.c
index 6a2dcc3bd1f..b96765265c1 100644
--- a/usr.bin/make/lst.lib/lstFindFrom.c
+++ b/usr.bin/make/lst.lib/lstFindFrom.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstFindFrom.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $	*/
-/*	$NetBSD: lstFindFrom.c,v 1.5 1995/06/14 15:21:09 christos Exp $	*/
+/*	$OpenBSD: lstFindFrom.c,v 1.3 1996/11/30 21:09:15 millert Exp $	*/
+/*	$NetBSD: lstFindFrom.c,v 1.6 1996/11/06 17:59:40 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -38,8 +38,11 @@
  */
 
 #ifndef lint
-/* from: static char sccsid[] = "@(#)lstFindFrom.c	5.3 (Berkeley) 6/1/90"; */
-static char *rcsid = "$OpenBSD: lstFindFrom.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $";
+#if 0
+static char sccsid[] = "@(#)lstFindFrom.c	8.1 (Berkeley) 6/6/93";
+#else
+static char *rcsid = "$OpenBSD: lstFindFrom.c,v 1.3 1996/11/30 21:09:15 millert Exp $";
+#endif
 #endif /* not lint */
 
 /*-
@@ -73,13 +76,13 @@ Lst_FindFrom (l, ln, d, cProc)
 {
     register ListNode	tln;
     Boolean		found = FALSE;
-    
+
     if (!LstValid (l) || LstIsEmpty (l) || !LstNodeValid (ln, l)) {
 	return (NILLNODE);
     }
-    
+
     tln = (ListNode)ln;
-    
+
     do {
 	if ((*cProc) (tln->datum, d) == 0) {
 	    found = TRUE;
@@ -88,7 +91,7 @@ Lst_FindFrom (l, ln, d, cProc)
 	    tln = tln->nextPtr;
 	}
     } while (tln != (ListNode)ln && tln != NilListNode);
-    
+
     if (found) {
 	return ((LstNode)tln);
     } else {
diff --git a/usr.bin/make/lst.lib/lstFirst.c b/usr.bin/make/lst.lib/lstFirst.c
index 3e50796cfaf..c1991800932 100644
--- a/usr.bin/make/lst.lib/lstFirst.c
+++ b/usr.bin/make/lst.lib/lstFirst.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstFirst.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $	*/
-/*	$NetBSD: lstFirst.c,v 1.4 1995/06/14 15:21:12 christos Exp $	*/
+/*	$OpenBSD: lstFirst.c,v 1.3 1996/11/30 21:09:15 millert Exp $	*/
+/*	$NetBSD: lstFirst.c,v 1.5 1996/11/06 17:59:41 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstFirst.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstFirst.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstFirst.c,v 1.2 1996/06/26 05:36:48 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstFirst.c,v 1.3 1996/11/30 21:09:15 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstForEach.c b/usr.bin/make/lst.lib/lstForEach.c
index 05c1b0872c3..981b8ca550c 100644
--- a/usr.bin/make/lst.lib/lstForEach.c
+++ b/usr.bin/make/lst.lib/lstForEach.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstForEach.c,v 1.2 1996/06/26 05:36:49 deraadt Exp $	*/
-/*	$NetBSD: lstForEach.c,v 1.5 1995/06/14 15:21:14 christos Exp $	*/
+/*	$OpenBSD: lstForEach.c,v 1.3 1996/11/30 21:09:16 millert Exp $	*/
+/*	$NetBSD: lstForEach.c,v 1.6 1996/11/06 17:59:41 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstForEach.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstForEach.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstForEach.c,v 1.2 1996/06/26 05:36:49 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstForEach.c,v 1.3 1996/11/30 21:09:16 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstForEachFrom.c b/usr.bin/make/lst.lib/lstForEachFrom.c
index 5b62fab89e1..6e6ffff6d6a 100644
--- a/usr.bin/make/lst.lib/lstForEachFrom.c
+++ b/usr.bin/make/lst.lib/lstForEachFrom.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstForEachFrom.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $	*/
-/*	$NetBSD: lstForEachFrom.c,v 1.4 1995/06/14 15:21:16 christos Exp $	*/
+/*	$OpenBSD: lstForEachFrom.c,v 1.3 1996/11/30 21:09:16 millert Exp $	*/
+/*	$NetBSD: lstForEachFrom.c,v 1.5 1996/11/06 17:59:42 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstForEachFrom.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstForEachFrom.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstForEachFrom.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstForEachFrom.c,v 1.3 1996/11/30 21:09:16 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -58,7 +58,7 @@ static char rcsid[] = "$OpenBSD: lstForEachFrom.c,v 1.2 1996/06/26 05:36:50 dera
  * Lst_ForEachFrom --
  *	Apply the given function to each element of the given list. The
  *	function should return 0 if traversal should continue and non-
- *	zero if it should abort. 
+ *	zero if it should abort.
  *
  * Results:
  *	None.
@@ -73,7 +73,7 @@ void
 Lst_ForEachFrom (l, ln, proc, d)
     Lst	    	    	l;
     LstNode    	  	ln;
-    register int	(*proc)();
+    register int	(*proc) __P((ClientData, ClientData));
     register ClientData	d;
 {
     register ListNode	tln = (ListNode)ln;
@@ -81,19 +81,19 @@ Lst_ForEachFrom (l, ln, proc, d)
     register ListNode	next;
     Boolean 	    	done;
     int     	    	result;
-    
+
     if (!LstValid (list) || LstIsEmpty (list)) {
 	return;
     }
-    
+
     do {
 	/*
 	 * Take care of having the current element deleted out from under
 	 * us.
 	 */
-	
+
 	next = tln->nextPtr;
-	
+
 	(void) tln->useCount++;
 	result = (*proc) (tln->datum, d);
 	(void) tln->useCount--;
@@ -106,7 +106,7 @@ Lst_ForEachFrom (l, ln, proc, d)
 	 */
 	done = (next == tln->nextPtr &&
 		(next == NilListNode || next == list->firstPtr));
-	
+
 	next = tln->nextPtr;
 
 	if (tln->flags & LN_DELETED) {
@@ -114,6 +114,6 @@ Lst_ForEachFrom (l, ln, proc, d)
 	}
 	tln = next;
     } while (!result && !LstIsEmpty(list) && !done);
-    
+
 }
 
diff --git a/usr.bin/make/lst.lib/lstInit.c b/usr.bin/make/lst.lib/lstInit.c
index f1ea3687c29..bbead4bf4c6 100644
--- a/usr.bin/make/lst.lib/lstInit.c
+++ b/usr.bin/make/lst.lib/lstInit.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstInit.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $	*/
-/*	$NetBSD: lstInit.c,v 1.4 1995/06/14 15:21:18 christos Exp $	*/
+/*	$OpenBSD: lstInit.c,v 1.3 1996/11/30 21:09:17 millert Exp $	*/
+/*	$NetBSD: lstInit.c,v 1.5 1996/11/06 17:59:43 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstInit.c	5.4 (Berkeley) 12/28/90";
+static char sccsid[] = "@(#)lstInit.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstInit.c,v 1.2 1996/06/26 05:36:50 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstInit.c,v 1.3 1996/11/30 21:09:17 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -70,14 +70,14 @@ Lst_Init(circ)
     Boolean		circ;	/* TRUE if the list should be made circular */
 {
     register List	nList;
-    
+
     PAlloc (nList, List);
-    
+
     nList->firstPtr = NilListNode;
     nList->lastPtr = NilListNode;
     nList->isOpen = FALSE;
     nList->isCirc = circ;
     nList->atEnd = Unknown;
-    
+
     return ((Lst)nList);
 }
diff --git a/usr.bin/make/lst.lib/lstInsert.c b/usr.bin/make/lst.lib/lstInsert.c
index 95e9a0ddc35..194f65b0bb5 100644
--- a/usr.bin/make/lst.lib/lstInsert.c
+++ b/usr.bin/make/lst.lib/lstInsert.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstInsert.c,v 1.2 1996/06/26 05:36:51 deraadt Exp $	*/
-/*	$NetBSD: lstInsert.c,v 1.4 1995/06/14 15:21:21 christos Exp $	*/
+/*	$OpenBSD: lstInsert.c,v 1.3 1996/11/30 21:09:17 millert Exp $	*/
+/*	$NetBSD: lstInsert.c,v 1.5 1996/11/06 17:59:44 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstInsert.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstInsert.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstInsert.c,v 1.2 1996/06/26 05:36:51 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstInsert.c,v 1.3 1996/11/30 21:09:17 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -83,17 +83,17 @@ Lst_Insert (l, ln, d)
      */
     if (LstValid (l) && (LstIsEmpty (l) && ln == NILLNODE))
 	goto ok;
-    
+
     if (!LstValid (l) || LstIsEmpty (l) || !LstNodeValid (ln, l)) {
 	return (FAILURE);
     }
-    
+
     ok:
     PAlloc (nLNode, ListNode);
-    
+
     nLNode->datum = d;
     nLNode->useCount = nLNode->flags = 0;
-    
+
     if (ln == NILLNODE) {
 	if (list->isCirc) {
 	    nLNode->prevPtr = nLNode->nextPtr = nLNode;
@@ -104,17 +104,17 @@ Lst_Insert (l, ln, d)
     } else {
 	nLNode->prevPtr = lNode->prevPtr;
 	nLNode->nextPtr = lNode;
-	
+
 	if (nLNode->prevPtr != NilListNode) {
 	    nLNode->prevPtr->nextPtr = nLNode;
 	}
 	lNode->prevPtr = nLNode;
-	
+
 	if (lNode == list->firstPtr) {
 	    list->firstPtr = nLNode;
 	}
     }
-    
+
     return (SUCCESS);
 }
-	
+
diff --git a/usr.bin/make/lst.lib/lstInt.h b/usr.bin/make/lst.lib/lstInt.h
index d770d6f3711..aa4cba2c419 100644
--- a/usr.bin/make/lst.lib/lstInt.h
+++ b/usr.bin/make/lst.lib/lstInt.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstInt.h,v 1.3 1996/06/26 05:36:51 deraadt Exp $	*/
-/*	$NetBSD: lstInt.h,v 1.6 1995/11/10 21:27:27 cgd Exp $	*/
+/*	$OpenBSD: lstInt.h,v 1.4 1996/11/30 21:09:18 millert Exp $	*/
+/*	$NetBSD: lstInt.h,v 1.7 1996/11/06 17:59:44 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -36,7 +36,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)lstInt.h	5.4 (Berkeley) 12/28/90
+ *	from: @(#)lstInt.h	8.1 (Berkeley) 6/6/93
  */
 
 /*-
diff --git a/usr.bin/make/lst.lib/lstIsAtEnd.c b/usr.bin/make/lst.lib/lstIsAtEnd.c
index 3505bac30c6..296d6ddd505 100644
--- a/usr.bin/make/lst.lib/lstIsAtEnd.c
+++ b/usr.bin/make/lst.lib/lstIsAtEnd.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstIsAtEnd.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $	*/
-/*	$NetBSD: lstIsAtEnd.c,v 1.4 1995/06/14 15:21:25 christos Exp $	*/
+/*	$OpenBSD: lstIsAtEnd.c,v 1.3 1996/11/30 21:09:18 millert Exp $	*/
+/*	$NetBSD: lstIsAtEnd.c,v 1.5 1996/11/06 17:59:45 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstIsAtEnd.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstIsAtEnd.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstIsAtEnd.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstIsAtEnd.c,v 1.3 1996/11/30 21:09:18 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstIsEmpty.c b/usr.bin/make/lst.lib/lstIsEmpty.c
index 4d50401c191..907adba101b 100644
--- a/usr.bin/make/lst.lib/lstIsEmpty.c
+++ b/usr.bin/make/lst.lib/lstIsEmpty.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstIsEmpty.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $	*/
-/*	$NetBSD: lstIsEmpty.c,v 1.4 1995/06/14 15:21:27 christos Exp $	*/
+/*	$OpenBSD: lstIsEmpty.c,v 1.3 1996/11/30 21:09:19 millert Exp $	*/
+/*	$NetBSD: lstIsEmpty.c,v 1.5 1996/11/06 17:59:47 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstIsEmpty.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstIsEmpty.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstIsEmpty.c,v 1.2 1996/06/26 05:36:52 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstIsEmpty.c,v 1.3 1996/11/30 21:09:19 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstLast.c b/usr.bin/make/lst.lib/lstLast.c
index f9012cc14e9..87feb544384 100644
--- a/usr.bin/make/lst.lib/lstLast.c
+++ b/usr.bin/make/lst.lib/lstLast.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstLast.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $	*/
-/*	$NetBSD: lstLast.c,v 1.4 1995/06/14 15:21:29 christos Exp $	*/
+/*	$OpenBSD: lstLast.c,v 1.3 1996/11/30 21:09:19 millert Exp $	*/
+/*	$NetBSD: lstLast.c,v 1.5 1996/11/06 17:59:48 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstLast.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstLast.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstLast.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstLast.c,v 1.3 1996/11/30 21:09:19 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstMember.c b/usr.bin/make/lst.lib/lstMember.c
index 9cf2a98831b..679d04ae417 100644
--- a/usr.bin/make/lst.lib/lstMember.c
+++ b/usr.bin/make/lst.lib/lstMember.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstMember.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $	*/
-/*	$NetBSD: lstMember.c,v 1.4 1995/06/14 15:21:32 christos Exp $	*/
+/*	$OpenBSD: lstMember.c,v 1.3 1996/11/30 21:09:20 millert Exp $	*/
+/*	$NetBSD: lstMember.c,v 1.5 1996/11/06 17:59:48 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstMember.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstMember.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstMember.c,v 1.2 1996/06/26 05:36:53 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstMember.c,v 1.3 1996/11/30 21:09:20 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -64,7 +64,7 @@ Lst_Member (l, d)
     if (lNode == NilListNode) {
 	return NILLNODE;
     }
-    
+
     do {
 	if (lNode->datum == d) {
 	    return (LstNode)lNode;
diff --git a/usr.bin/make/lst.lib/lstNext.c b/usr.bin/make/lst.lib/lstNext.c
index 90e7e49d7c7..0fc297e4d01 100644
--- a/usr.bin/make/lst.lib/lstNext.c
+++ b/usr.bin/make/lst.lib/lstNext.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstNext.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $	*/
-/*	$NetBSD: lstNext.c,v 1.4 1995/06/14 15:21:35 christos Exp $	*/
+/*	$OpenBSD: lstNext.c,v 1.3 1996/11/30 21:09:20 millert Exp $	*/
+/*	$NetBSD: lstNext.c,v 1.5 1996/11/06 17:59:49 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstNext.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstNext.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstNext.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstNext.c,v 1.3 1996/11/30 21:09:20 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -78,14 +78,14 @@ Lst_Next (l)
 {
     register ListNode	tln;
     register List 	list = (List)l;
-    
+
     if ((LstValid (l) == FALSE) ||
 	(list->isOpen == FALSE)) {
 	    return (NILLNODE);
     }
-    
+
     list->prevPtr = list->curPtr;
-    
+
     if (list->curPtr == NilListNode) {
 	if (list->atEnd == Unknown) {
 	    /*
@@ -115,7 +115,7 @@ Lst_Next (l)
 	    list->atEnd = Middle;
 	}
     }
-    
+
     return ((LstNode)tln);
 }
 
diff --git a/usr.bin/make/lst.lib/lstOpen.c b/usr.bin/make/lst.lib/lstOpen.c
index 532c833d298..ef7d44d764d 100644
--- a/usr.bin/make/lst.lib/lstOpen.c
+++ b/usr.bin/make/lst.lib/lstOpen.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstOpen.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $	*/
-/*	$NetBSD: lstOpen.c,v 1.4 1995/06/14 15:21:37 christos Exp $	*/
+/*	$OpenBSD: lstOpen.c,v 1.3 1996/11/30 21:09:21 millert Exp $	*/
+/*	$NetBSD: lstOpen.c,v 1.5 1996/11/06 17:59:50 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstOpen.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstOpen.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstOpen.c,v 1.2 1996/06/26 05:36:54 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstOpen.c,v 1.3 1996/11/30 21:09:21 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstRemove.c b/usr.bin/make/lst.lib/lstRemove.c
index 4e8ffce1814..3efdbc5760b 100644
--- a/usr.bin/make/lst.lib/lstRemove.c
+++ b/usr.bin/make/lst.lib/lstRemove.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstRemove.c,v 1.2 1996/06/26 05:36:55 deraadt Exp $	*/
-/*	$NetBSD: lstRemove.c,v 1.4 1995/06/14 15:21:39 christos Exp $	*/
+/*	$OpenBSD: lstRemove.c,v 1.3 1996/11/30 21:09:21 millert Exp $	*/
+/*	$NetBSD: lstRemove.c,v 1.5 1996/11/06 17:59:50 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstRemove.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstRemove.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstRemove.c,v 1.2 1996/06/26 05:36:55 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstRemove.c,v 1.3 1996/11/30 21:09:21 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -79,7 +79,7 @@ Lst_Remove (l, ln)
 	!LstNodeValid (ln, l)) {
 	    return (FAILURE);
     }
-    
+
     /*
      * unlink it from the list
      */
@@ -89,7 +89,7 @@ Lst_Remove (l, ln)
     if (lNode->prevPtr != NilListNode) {
 	lNode->prevPtr->nextPtr = lNode->nextPtr;
     }
-    
+
     /*
      * if either the firstPtr or lastPtr of the list point to this node,
      * adjust them accordingly
@@ -122,7 +122,7 @@ Lst_Remove (l, ln)
     if (list->firstPtr == lNode) {
 	list->firstPtr = NilListNode;
     }
-    
+
     /*
      * note that the datum is unmolested. The caller must free it as
      * necessary and as expected.
@@ -132,7 +132,7 @@ Lst_Remove (l, ln)
     } else {
 	lNode->flags |= LN_DELETED;
     }
-    
+
     return (SUCCESS);
 }
 
diff --git a/usr.bin/make/lst.lib/lstReplace.c b/usr.bin/make/lst.lib/lstReplace.c
index 8c8ce83741f..122a68c5541 100644
--- a/usr.bin/make/lst.lib/lstReplace.c
+++ b/usr.bin/make/lst.lib/lstReplace.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstReplace.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $	*/
-/*	$NetBSD: lstReplace.c,v 1.4 1995/06/14 15:21:41 christos Exp $	*/
+/*	$OpenBSD: lstReplace.c,v 1.3 1996/11/30 21:09:22 millert Exp $	*/
+/*	$NetBSD: lstReplace.c,v 1.5 1996/11/06 17:59:51 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstReplace.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstReplace.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstReplace.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstReplace.c,v 1.3 1996/11/30 21:09:22 millert Exp $";
 #endif
 #endif /* not lint */
 
diff --git a/usr.bin/make/lst.lib/lstSucc.c b/usr.bin/make/lst.lib/lstSucc.c
index be0ceaaa4d7..435720957bf 100644
--- a/usr.bin/make/lst.lib/lstSucc.c
+++ b/usr.bin/make/lst.lib/lstSucc.c
@@ -1,9 +1,9 @@
-/*	$OpenBSD: lstSucc.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $	*/
-/*	$NetBSD: lstSucc.c,v 1.4 1995/06/14 15:21:42 christos Exp $	*/
+/*	$OpenBSD: lstSucc.c,v 1.3 1996/11/30 21:09:22 millert Exp $	*/
+/*	$NetBSD: lstSucc.c,v 1.5 1996/11/06 17:59:52 christos Exp $	*/
 
 /*
- * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1988, 1989, 1990, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Adam de Boor.
@@ -39,9 +39,9 @@
 
 #ifndef lint
 #if 0
-static char sccsid[] = "@(#)lstSucc.c	5.3 (Berkeley) 6/1/90";
+static char sccsid[] = "@(#)lstSucc.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: lstSucc.c,v 1.2 1996/06/26 05:36:56 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: lstSucc.c,v 1.3 1996/11/30 21:09:22 millert Exp $";
 #endif
 #endif /* not lint */