clean up import. NetBSD RCS IDs

diff --git a/rain/Makefile b/rain/Makefile
index 14b8514c8be1e6c1d071b855b0fde3fad69cd95c..8cbbac537ecf804c6fc2777ca7e054a7f26ab5d4 100644 (file)
--- a/rain/Makefile
+++ b/rain/Makefile
@@ -1,5 +1,5 @@
-#      from: @(#)Makefile      5.3 (Berkeley) 5/11/90
-#      $Id: Makefile,v 1.5 1994/12/22 09:35:48 cgd Exp $
+#      $NetBSD: Makefile,v 1.6 1995/04/22 08:23:28 cgd Exp $
+#      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  rain
 MAN=   rain.6

diff --git a/rain/rain.6 b/rain/rain.6
index c85910cbef6ad9bf3383dcb397b7379c48b45dad..55ed23371255fcebacb0099b3f7e19d59afe50ff 100644 (file)
--- a/rain/rain.6
+++ b/rain/rain.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1989 The Regents of the University of California.
-.\" All rights reserved.
+.\"    $NetBSD: rain.6,v 1.4 1995/04/22 08:23:33 cgd Exp $
+.\"
+.\" Copyright (c) 1989, 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: @(#)rain.6        6.3 (Berkeley) 6/23/90
-.\"    $Id: rain.6,v 1.3 1993/08/05 01:47:01 jtc Exp $
+.\"    @(#)rain.6      8.1 (Berkeley) 5/31/93
 .\"
-.Dd June 23, 1990
+.Dd May 31, 1993
 .Dt RAIN 6
 .Os
 .Sh NAME

diff --git a/rain/rain.c b/rain/rain.c
index 8ad61be21171fbbad62d4b2ea7b270ca61828fcc..0f01a6b17c4539213e519f661bdfdea3e26b3ecf 100644 (file)
--- a/rain/rain.c
+++ b/rain/rain.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: rain.c,v 1.5 1995/04/22 08:23:37 cgd 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: @(#)rain.c     5.6 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: rain.c,v 1.4 1994/04/05 23:35:16 deraadt Exp $";
+#if 0
+static char sccsid[] = "@(#)rain.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: rain.c,v 1.5 1995/04/22 08:23:37 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*
@@ -250,9 +255,9 @@ onsig()
        exit(0);
 }
 
-static void
+int
 fputchar(c)
-       char c;
+       int c;
 {
        putchar(c);
 }

diff --git a/wump/Makefile b/wump/Makefile
index 71255b9163d93eb67d7372f70306f7bcf02e04be..58c65e7c0ba42654d7283d4e3c03526bdc5b38c4 100644 (file)
--- a/wump/Makefile
+++ b/wump/Makefile
@@ -1,5 +1,5 @@
-#      from: @(#)Makefile      5.4 (Berkeley) 5/11/90
-#      $Id: Makefile,v 1.3 1994/12/22 09:36:38 cgd Exp $
+#      $NetBSD: Makefile,v 1.4 1995/04/22 08:19:45 cgd Exp $
+#      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  wump
 MAN=   wump.6

diff --git a/wump/pathnames.h b/wump/pathnames.h
index 262ab2d3b03f074e5bcc548a7355eecb9a4640b2..8f534830e9dae690fe301498711424caf5c83f19 100644 (file)
--- a/wump/pathnames.h
+++ b/wump/pathnames.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: pathnames.h,v 1.3 1995/04/22 08:19:48 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.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,8 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     from: @(#)pathnames.h   5.1 (Berkeley) 6/1/90
- *     $Id: pathnames.h,v 1.2 1993/08/01 18:49:22 mycroft Exp $
+ *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
 #define        _PATH_PAGER     "/usr/bin/more"

diff --git a/wump/wump.6 b/wump/wump.6
index d28b5900a40e73dc79ac2715cc399f68ace962b0..4a5c26e7fa1bb35889ba1e726d2fccaef90120c4 100644 (file)
--- a/wump/wump.6
+++ b/wump/wump.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1989 The Regents of the University of California.
-.\" All rights reserved.
+.\"    $NetBSD: wump.6,v 1.4 1995/04/22 08:19:49 cgd Exp $
+.\"
+.\" Copyright (c) 1989, 1993
+.\"    The Regents of the University of California.  All rights reserved.
 .\"
 .\" This code is derived from software contributed to Berkeley by
 .\" Dave Taylor, of Intuitive Systems.
@@ -32,10 +34,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"    from: @(#)wump.6        6.3 (Berkeley) 6/23/90
-.\"    $Id: wump.6,v 1.3 1993/08/05 01:47:28 jtc Exp $
+.\"    @(#)wump.6      8.1 (Berkeley) 5/31/93
 .\"
-.Dd June 23, 1990
+.Dd May 31, 1993
 .Dt WUMP 6
 .Os
 .Sh NAME

diff --git a/wump/wump.c b/wump/wump.c
index d316cf41edecb499627009df696eae405b95cd67..18e8401ccb485713e5db22d4c493650c4d846726 100644 (file)
--- a/wump/wump.c
+++ b/wump/wump.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: wump.c,v 1.3 1995/04/22 08:19:51 cgd Exp $     */
+
 /*
- * Copyright (c) 1989 The Regents of the University of California.
- * Copyright (c) 1989 Dave Taylor, Intuitive Systems.
+ * Copyright (c) 1989, 1993
+ *     The Regents of the University of California.  All rights reserved.
  * All rights reserved.
  *
  * This code is derived from software contributed to Berkeley by
@@ -36,14 +38,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: @(#)wump.c     4.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: wump.c,v 1.2 1993/08/01 18:49:20 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)wump.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: wump.c,v 1.3 1995/04/22 08:19:51 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*