From 0d3d818683855a5b3e004a55425d437edd89a838 Mon Sep 17 00:00:00 2001
From: tls <tls@NetBSD.org>
Date: Thu, 28 Sep 1995 06:22:18 +0000
Subject: [PATCH] Sync with 4.4BSD-Lite2

---
 usr.bin/mkstr/Makefile |  4 ++--
 usr.bin/mkstr/mkstr.1  | 11 ++++++-----
 usr.bin/mkstr/mkstr.c  | 19 ++++++++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/usr.bin/mkstr/Makefile b/usr.bin/mkstr/Makefile
index 6dcf05b4679c..35fb6049ef21 100644
--- a/usr.bin/mkstr/Makefile
+++ b/usr.bin/mkstr/Makefile
@@ -1,5 +1,5 @@
-#	from: @(#)Makefile	5.3 (Berkeley) 5/11/90
-#	$Id: Makefile,v 1.2 1993/07/31 15:18:54 mycroft Exp $
+#	$NetBSD: Makefile,v 1.3 1995/09/28 06:22:18 tls Exp $
+#	@(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	mkstr
 
diff --git a/usr.bin/mkstr/mkstr.1 b/usr.bin/mkstr/mkstr.1
index e1cd0c0b1c43..1202cd2b5216 100644
--- a/usr.bin/mkstr/mkstr.1
+++ b/usr.bin/mkstr/mkstr.1
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1980, 1990 The Regents of the University of California.
-.\" All rights reserved.
+.\"	$NetBSD: mkstr.1,v 1.3 1995/09/28 06:22:19 tls Exp $
+.\"
+.\" Copyright (c) 1980, 1990, 1993
+.\"	The Regents of the University of California.  All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
 .\" modification, are permitted provided that the following conditions
@@ -29,10 +31,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"     from: @(#)mkstr.1	6.6 (Berkeley) 5/9/91
-.\"	$Id: mkstr.1,v 1.2 1993/08/01 07:30:37 mycroft Exp $
+.\"     @(#)mkstr.1	8.1 (Berkeley) 6/6/93
 .\"
-.Dd May 9, 1991
+.Dd June 6, 1993
 .Dt MKSTR 1
 .Os
 .Sh NAME
diff --git a/usr.bin/mkstr/mkstr.c b/usr.bin/mkstr/mkstr.c
index d3f039bea968..44de631785ef 100644
--- a/usr.bin/mkstr/mkstr.c
+++ b/usr.bin/mkstr/mkstr.c
@@ -1,6 +1,8 @@
+/*	$NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $	*/
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *	The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -32,14 +34,17 @@
  */
 
 #ifndef lint
-char copyright[] =
-"@(#) Copyright (c) 1980 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1980, 1993\n\
+	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)mkstr.c	5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: mkstr.c,v 1.3 1994/12/24 16:55:10 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)mkstr.c	8.1 (Berkeley) 6/6/93";
+#else
+static char rcsid[] = "$NetBSD: mkstr.c,v 1.4 1995/09/28 06:22:20 tls Exp $";
+#endif
 #endif /* not lint */
 
 #include <stdio.h>