merge with Lite, new RCS id conventions, etc.

4 files changed, 27 insertions, 21 deletions

diff --git a/fortune/strfile/Makefile b/fortune/strfile/Makefile
index 8bc08934..a8847445 100644
--- a/fortune/strfile/Makefile
+++ b/fortune/strfile/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.1 (Berkeley) 4/27/91
-#	$Id: Makefile,v 1.4 1994/12/22 09:34:17 cgd Exp $
+#	$NetBSD: Makefile,v 1.5 1995/03/23 08:28:44 cgd Exp $
+#	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
 PROG=	strfile
 MAN=	strfile.8
diff --git a/fortune/strfile/strfile.8 b/fortune/strfile/strfile.8
index 9178f49d..98836103 100644
--- a/fortune/strfile/strfile.8
+++ b/fortune/strfile/strfile.8
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1989, 1991 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: strfile.8,v 1.3 1995/03/23 08:28:45 cgd Exp $
+.\"
+.\" Copyright (c) 1989, 1991, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" 
 .\" This code is derived from software contributed to Berkeley by
@@ -33,10 +35,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)strfile.8	5.9 (Berkeley) 3/16/91
-.\"	$Id: strfile.8,v 1.2 1993/08/01 07:46:52 mycroft Exp $
+.\"     @(#)strfile.8	8.1 (Berkeley) 6/9/93
 .\"
-.Dd March 16, 1991
+.Dd June 9, 1993
 .Dt STRFILE 8
 .Os BSD 4
 .Sh NAME
@@ -143,6 +144,5 @@ default output file.
 .El
 .Sh HISTORY
 The
-.Nm
-command
-.Ud
+.Nm strfile
+utility first appeared in 4.4BSD.
diff --git a/fortune/strfile/strfile.c b/fortune/strfile/strfile.c
index 47246c08..3b8b20d8 100644
--- a/fortune/strfile/strfile.c
+++ b/fortune/strfile/strfile.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: strfile.c,v 1.3 1995/03/23 08:28:47 cgd Exp $	*/
+
 /*-
- * Copyright (c) 1989 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1989, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Ken Arnold.
@@ -35,14 +37,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1989, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)strfile.c	5.12 (Berkeley) 4/8/91";*/
-static char rcsid[] = "$Id: strfile.c,v 1.2 1993/08/01 18:54:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)strfile.c	8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: strfile.c,v 1.3 1995/03/23 08:28:47 cgd Exp $";
+#endif
 #endif /* not lint */
 
 # include	<machine/endian.h>
diff --git a/fortune/strfile/strfile.h b/fortune/strfile/strfile.h
index 1000a886..48efc747 100644
--- a/fortune/strfile/strfile.h
+++ b/fortune/strfile/strfile.h
@@ -1,6 +1,8 @@
+/*	$NetBSD: strfile.h,v 1.3 1995/03/23 08:28:49 cgd Exp $	*/
+
 /*-
- * Copyright (c) 1991 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1991, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
  * Ken Arnold.
@@ -33,8 +35,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)strfile.h	5.8 (Berkeley) 4/8/91
- *	$Id: strfile.h,v 1.2 1993/08/01 18:54:44 mycroft Exp $
+ *	@(#)strfile.h	8.1 (Berkeley) 5/31/93
  */
 
 #define	STR_ENDSTRING(line,tbl) \