clean up import, NetBSD RCS IDs

diff --git a/sail/Makefile b/sail/Makefile
index e1e182bb3dde92240f966b7f4696f02308a000ba..025a1003d438502ed4d315c29da61ca2be9d45b5 100644 (file)
--- a/sail/Makefile
+++ b/sail/Makefile
@@ -1,5 +1,5 @@
-#      from: @(#)Makefile      5.10 (Berkeley) 5/11/90
-#      $Id: Makefile,v 1.4 1994/12/22 09:36:08 cgd Exp $
+#      $NetBSD: Makefile,v 1.5 1995/04/22 10:36:43 cgd Exp $
+#      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  sail
 SRCS=  main.c pl_main.c pl_1.c pl_2.c pl_3.c pl_4.c pl_5.c pl_6.c pl_7.c \

diff --git a/sail/assorted.c b/sail/assorted.c
index 9b9c4124b44b8be3328045dd580efe7d95ca8f43..9d6ca9983a9d8c7a18504d345e09419e4771a5a3 100644 (file)
--- a/sail/assorted.c
+++ b/sail/assorted.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $ */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)assorted.c 5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: assorted.c,v 1.2 1993/08/01 18:51:53 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)assorted.c 8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: assorted.c,v 1.3 1995/04/22 10:36:45 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/dr_1.c b/sail/dr_1.c
index 43c8642408f0f7e09668bfefa23c4bf3b3710f6c..75605b37be383f459875efde200f3f5d6f18b8ce 100644 (file)
--- a/sail/dr_1.c
+++ b/sail/dr_1.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dr_1.c,v 1.3 1995/04/22 10:36:46 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_1.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_1.c,v 1.2 1993/08/01 18:51:52 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_1.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_1.c,v 1.3 1995/04/22 10:36:46 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"

diff --git a/sail/dr_2.c b/sail/dr_2.c
index f2f29c6b8ed17ea2de48aac13e86efd52c2e59c2..1e76dc6f1a55b7c3733160a9f3848ec952c3fa48 100644 (file)
--- a/sail/dr_2.c
+++ b/sail/dr_2.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dr_2.c,v 1.3 1995/04/22 10:36:48 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_2.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_2.c,v 1.2 1993/08/01 18:51:51 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_2.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_2.c,v 1.3 1995/04/22 10:36:48 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"

diff --git a/sail/dr_3.c b/sail/dr_3.c
index 5c7e5525d9df5bd832cb07c4d24a8839cc8da147..389d9e92ffe787dce088f5baecd6af91d9fa2d45 100644 (file)
--- a/sail/dr_3.c
+++ b/sail/dr_3.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dr_3.c,v 1.3 1995/04/22 10:36:49 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_3.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_3.c,v 1.2 1993/08/01 18:51:50 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_3.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_3.c,v 1.3 1995/04/22 10:36:49 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"

diff --git a/sail/dr_4.c b/sail/dr_4.c
index 5d1cb5c484ebb7e713c97c5070225148b24d02be..723b10257e7ca7947518d84494093d711eb922af 100644 (file)
--- a/sail/dr_4.c
+++ b/sail/dr_4.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dr_4.c,v 1.3 1995/04/22 10:36:50 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_4.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_4.c,v 1.2 1993/08/01 18:51:49 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_4.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_4.c,v 1.3 1995/04/22 10:36:50 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/dr_5.c b/sail/dr_5.c
index 1c3719d8575038125172a4c055fe2dd88dd3dc19..229577445aeba7ce4ab353668613ccca2e9bdd11 100644 (file)
--- a/sail/dr_5.c
+++ b/sail/dr_5.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dr_5.c,v 1.3 1995/04/22 10:36:51 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_5.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_5.c,v 1.2 1993/08/01 18:51:49 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_5.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: dr_5.c,v 1.3 1995/04/22 10:36:51 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/dr_main.c b/sail/dr_main.c
index f8ddc3a1ac5d25d915b373964d423979c234b2fe..265bdb32e7be0cb11cdb4292e40e7f12cc16b56d 100644 (file)
--- a/sail/dr_main.c
+++ b/sail/dr_main.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: dr_main.c,v 1.4 1995/04/22 10:36:52 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)dr_main.c  5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: dr_main.c,v 1.3 1994/04/08 18:23:31 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)dr_main.c  8.2 (Berkeley) 4/16/94";
+#else
+static char rcsid[] = "$NetBSD: dr_main.c,v 1.4 1995/04/22 10:36:52 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "driver.h"

diff --git a/sail/driver.h b/sail/driver.h
index 3dbd16f168e9bbe5aacadd52a29d02652dc1d71d..34d304e1133431b73815f9d15c632d94c2a5265d 100644 (file)
--- a/sail/driver.h
+++ b/sail/driver.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: driver.h,v 1.3 1995/04/22 10:36:54 cgd Exp $   */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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: @(#)driver.h      5.4 (Berkeley) 6/1/90
- *     $Id: driver.h,v 1.2 1993/08/01 18:51:58 mycroft Exp $
+ *     @(#)driver.h    8.1 (Berkeley) 5/31/93
  */
 
 #include "externs.h"

diff --git a/sail/externs.h b/sail/externs.h
index 2445d095fdaacf6a4a611e92676f1c159cdb1495..0894881dc8c36c55bc8ea30e1b222dc96a11873d 100644 (file)
--- a/sail/externs.h
+++ b/sail/externs.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: externs.h,v 1.3 1995/04/22 10:36:55 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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: @(#)externs.h     5.4 (Berkeley) 6/1/90
- *     $Id: externs.h,v 1.2 1993/08/01 18:51:57 mycroft Exp $
+ *     @(#)externs.h   8.1 (Berkeley) 5/31/93
  */
 
 #include <stdio.h>

diff --git a/sail/game.c b/sail/game.c
index 49eeef635d0fc25bac5d4bc97ef721a215910696..a6ecc4fc090f846059b6ce623d0a6b493350dec6 100644 (file)
--- a/sail/game.c
+++ b/sail/game.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)game.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: game.c,v 1.2 1993/08/01 18:51:47 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)game.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: game.c,v 1.3 1995/04/22 10:36:56 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/globals.c b/sail/globals.c
index dbeb2148eb8917925a08a4b172e5d6fc85d557d0..a9e2fd30ac74c00baacb4e14f57bb092c1bc7582 100644 (file)
--- a/sail/globals.c
+++ b/sail/globals.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: globals.c,v 1.4 1995/04/22 10:36:57 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)globals.c  5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: globals.c,v 1.3 1994/01/13 18:24:40 glass Exp $";
+#if 0
+static char sccsid[] = "@(#)globals.c  8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: globals.c,v 1.4 1995/04/22 10:36:57 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/lo_main.c b/sail/lo_main.c
index 439319aeeb44de916416dac2de30e05b242512af..c4f3a143bb42c947f0e07fb5d6a8377cb2a82660 100644 (file)
--- a/sail/lo_main.c
+++ b/sail/lo_main.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)lo_main.c  5.7 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: lo_main.c,v 1.2 1993/08/01 18:51:45 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)lo_main.c  8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: lo_main.c,v 1.3 1995/04/22 10:36:59 cgd Exp $";
+#endif
 #endif /* not lint */
 
 /*

diff --git a/sail/machdep.h b/sail/machdep.h
index d19a28d3fc4e0a4357543d6aa0109131c56ee730..a67210370923469130b3329b1e0b70c446ea5f4b 100644 (file)
--- a/sail/machdep.h
+++ b/sail/machdep.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: machdep.h,v 1.3 1995/04/22 10:37:00 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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: @(#)machdep.h     5.5 (Berkeley) 6/1/90
- *     $Id: machdep.h,v 1.2 1993/08/01 18:51:56 mycroft Exp $
+ *     @(#)machdep.h   8.1 (Berkeley) 5/31/93
  */
 
 #define TIMEOUT 300                            /* Sync() timeout in seconds */

diff --git a/sail/main.c b/sail/main.c
index 125b75a5dcf57d5df97a1d8b371f1254251d1db5..9f8b0f4624da61da2b19d446f4f018d23d5ad5fa 100644 (file)
--- a/sail/main.c
+++ b/sail/main.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: main.c,v 1.3 1995/04/22 10:37:01 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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) 1983 Regents of the University of California.\n\
- All rights reserved.\n";
+static char copyright[] =
+"@(#) Copyright (c) 1983, 1993\n\
+       The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)main.c     5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: main.c,v 1.2 1993/08/01 18:51:44 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)main.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: main.c,v 1.3 1995/04/22 10:37:01 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/misc.c b/sail/misc.c
index 7b0c465e16275ad5d1222037a8c1a643937ba55f..6dc18c728bc7fe8f6a05ba75cd8799db6157b8a9 100644 (file)
--- a/sail/misc.c
+++ b/sail/misc.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: misc.c,v 1.3 1995/04/22 10:37:03 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)misc.c     5.5 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: misc.c,v 1.2 1993/08/01 18:51:43 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)misc.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: misc.c,v 1.3 1995/04/22 10:37:03 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/parties.c b/sail/parties.c
index 756877203594ef2b4ebf0c4b1bff33c22759c6c5..7cfe13bac2db665ab0067ab6016d652e130e7191 100644 (file)
--- a/sail/parties.c
+++ b/sail/parties.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)parties.c  5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: parties.c,v 1.2 1993/08/01 18:51:42 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)parties.c  8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: parties.c,v 1.3 1995/04/22 10:37:04 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/pathnames.h b/sail/pathnames.h
index 25cb44a7b5075f41cae3e6d9da8e428253d30fca..ab17358f80c8d8b361a113f666cc913b7554fb3e 100644 (file)
--- a/sail/pathnames.h
+++ b/sail/pathnames.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: pathnames.h,v 1.3 1995/04/22 10:37:06 cgd Exp $        */
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 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
@@ -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:51:55 mycroft Exp $
+ *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
 #define        _PATH_LOGFILE   "/var/games/saillog"

diff --git a/sail/pl_1.c b/sail/pl_1.c
index 8d01b5347046a91b860e8de98cfa01a549ec9b78..0abd1ac3a7bcb1e85c0377c7c64e67981c1c44e1 100644 (file)
--- a/sail/pl_1.c
+++ b/sail/pl_1.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_1.c     5.5 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: pl_1.c,v 1.2 1993/08/01 18:51:41 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_1.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_1.c,v 1.3 1995/04/22 10:37:07 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"

diff --git a/sail/pl_2.c b/sail/pl_2.c
index 7f583b3d6acdeaed278eacb934ce7808b5d82589..e1b975f1165fbb64e2f98e0ec01adcb126d0c788 100644 (file)
--- a/sail/pl_2.c
+++ b/sail/pl_2.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_2.c,v 1.3 1995/04/22 10:37:08 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_2.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_2.c,v 1.2 1993/08/01 18:51:40 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_2.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_2.c,v 1.3 1995/04/22 10:37:08 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"

diff --git a/sail/pl_3.c b/sail/pl_3.c
index d31a9e8c650bd86c5c7a01adef424abe4fca4566..c860ec7ca5535012998f70d36fd4e00692d50fe3 100644 (file)
--- a/sail/pl_3.c
+++ b/sail/pl_3.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_3.c,v 1.3 1995/04/22 10:37:09 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_3.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_3.c,v 1.2 1993/08/01 18:51:39 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_3.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_3.c,v 1.3 1995/04/22 10:37:09 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"

diff --git a/sail/pl_4.c b/sail/pl_4.c
index 05eef2b2d6d7d1d29f90f527296ca389616c42ed..b5ea560eafa0a7a0d375c328657b4b3d4fca2d32 100644 (file)
--- a/sail/pl_4.c
+++ b/sail/pl_4.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_4.c,v 1.3 1995/04/22 10:37:10 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_4.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_4.c,v 1.2 1993/08/01 18:51:38 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_4.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_4.c,v 1.3 1995/04/22 10:37:10 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"

diff --git a/sail/pl_5.c b/sail/pl_5.c
index 49980ddc78bf13695b3c6b566bc1a7434a83e2ef..938f0e87ba2285f89eb17a727ca018724a01c4bf 100644 (file)
--- a/sail/pl_5.c
+++ b/sail/pl_5.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_5.c,v 1.3 1995/04/22 10:37:12 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_5.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_5.c,v 1.2 1993/08/01 18:51:37 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_5.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_5.c,v 1.3 1995/04/22 10:37:12 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"

diff --git a/sail/pl_6.c b/sail/pl_6.c
index a3fcc0201b655cfbaa276cc3a1c4a9df0f96d57d..03f339bd3bab839f5acbf3c75d5fede9dbb749af 100644 (file)
--- a/sail/pl_6.c
+++ b/sail/pl_6.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_6.c,v 1.3 1995/04/22 10:37:15 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_6.c     5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: pl_6.c,v 1.2 1993/08/01 18:51:36 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_6.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_6.c,v 1.3 1995/04/22 10:37:15 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"

diff --git a/sail/pl_7.c b/sail/pl_7.c
index b1e0b2fe00dc7402fd66d0d24b0045cd1659c28d..1268c1fe89ac8394f0bf91566d945f254b5e80c6 100644 (file)
--- a/sail/pl_7.c
+++ b/sail/pl_7.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_7.c,v 1.6 1995/04/22 10:37:17 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,12 +34,17 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_7.c     5.7 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: pl_7.c,v 1.5 1993/11/10 15:59:04 cgd Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_7.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_7.c,v 1.6 1995/04/22 10:37:17 cgd Exp $";
+#endif
 #endif /* not lint */
 
+#include <sys/ttydefaults.h>
 #include "player.h"
 
+
 /*
  * Display interface
  */

diff --git a/sail/pl_main.c b/sail/pl_main.c
index c4b7cad11b8962ca7d3efe17ba3ad5aa34e74200..f31ef33e6617f6a85890fd560d2fa55846f2f547 100644 (file)
--- a/sail/pl_main.c
+++ b/sail/pl_main.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: pl_main.c,v 1.4 1995/04/22 10:37:20 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)pl_main.c  5.5 (Berkeley) 2/28/91";*/
-static char rcsid[] = "$Id: pl_main.c,v 1.3 1994/01/13 19:22:29 glass Exp $";
+#if 0
+static char sccsid[] = "@(#)pl_main.c  8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: pl_main.c,v 1.4 1995/04/22 10:37:20 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "player.h"

diff --git a/sail/player.h b/sail/player.h
index e63fc8290baa2c0031898edc8f058b8eab11ebab..15c2fd43653f1f8e1fc774c8b5e5479c33cdd48f 100644 (file)
--- a/sail/player.h
+++ b/sail/player.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: player.h,v 1.4 1995/04/22 10:37:22 cgd Exp $   */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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: @(#)player.h      5.4 (Berkeley) 6/1/90
- *     $Id: player.h,v 1.3 1993/08/01 18:51:54 mycroft Exp $
+ *     @(#)player.h    8.1 (Berkeley) 5/31/93
  */
 
 #include <curses.h>

diff --git a/sail/sail.6 b/sail/sail.6
index bd7410948a20efba7864744e080b250b249abaf8..6cb4638caed61ae3ee3a748cd74c6d32ab37f7ec 100644 (file)
--- a/sail/sail.6
+++ b/sail/sail.6
@@ -1,5 +1,7 @@
-.\" Copyright (c) 1988 Regents of the University of California.
-.\" All rights reserved.
+.\"    $NetBSD: sail.6,v 1.4 1995/04/22 10:37:24 cgd Exp $
+.\"
+.\" Copyright (c) 1988, 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: @(#)sail.6        5.6 (Berkeley) 6/23/90
-.\"    $Id: sail.6,v 1.3 1994/01/13 18:24:43 glass Exp $
+.\"    @(#)sail.6      8.2 (Berkeley) 12/30/93
 .\"
-.TH SAIL 6 "June 23, 1990"
+.TH SAIL 6 "December 30, 1993"
 .UC 4
 .SH NAME
 sail \- multi-user wooden ships and iron men
@@ -385,7 +386,7 @@ full allowance printed in the "move" prompt.
 Old sailing captains had to keep an eye constantly on the wind.  Captains
 in 
 .I Sail
-are no different.  A ship's ability to move depends on its attitide to the
+are no different.  A ship's ability to move depends on its attitude to the
 wind.  The best angle possible is to have the wind off your quarter, that is,
 just off the stern.  The direction rose on the side of the screen gives the
 possible movements for your ship at all positions to the wind.  Battle
@@ -540,7 +541,7 @@ Commands are given to
 .I Sail
 by typing a single character.  You will then be prompted for further
 input.  A brief summary of the commands follows.
-.bp
+.br
 .SH COMMAND SUMMARY
 .nf
 
@@ -604,7 +605,7 @@ Wind from the N, blowing a gale.
 (b) London            98 gun 3 Decker SOL (crack crew) (28 pts)
 (b) Royal Oak         74 gun Ship of the Line (crack crew) (26 pts)
 (f) Neptune           74 gun Ship of the Line (average crew) (24 pts)
-(f) Duc Bougogne      80 gun 3 Decker SOL (average crew) (27 pts)
+(f) Duc de Bourgogne  80 gun 3 Decker SOL (average crew) (27 pts)
 (f) Conquerant        74 gun Ship of the Line (average crew) (24 pts)
 (f) Provence          64 gun Ship of the Line (average crew) (18 pts)
 (f) Romulus           44 gun Ship of the Line (average crew) (10 pts)

diff --git a/sail/sync.c b/sail/sync.c
index ea2bac04b3cbfa012469ec8fa81d2f253be773f7..ec4fc61dc9bfbc073d6d6d19a3dfb7e34eafc9d9 100644 (file)
--- a/sail/sync.c
+++ b/sail/sync.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: sync.c,v 1.3 1995/04/22 10:37:26 cgd Exp $     */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)sync.c     5.6 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: sync.c,v 1.2 1993/08/01 18:51:33 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)sync.c     8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: sync.c,v 1.3 1995/04/22 10:37:26 cgd Exp $";
+#endif
 #endif /* not lint */
 
 #include "externs.h"

diff --git a/sail/version.c b/sail/version.c
index a389182ec9d33aa8a2db51f6f4dc5c2247adf0ae..f1d818ab94beaa034dfc6cba36b58a552890292d 100644 (file)
--- a/sail/version.c
+++ b/sail/version.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: version.c,v 1.3 1995/04/22 10:37:27 cgd Exp $  */
+
 /*
- * Copyright (c) 1983 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1983, 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,8 +34,11 @@
  */
 
 #ifndef lint
-/*static char sccsid[] = "from: @(#)version.c  5.4 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: version.c,v 1.2 1993/08/01 18:51:32 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)version.c  8.1 (Berkeley) 5/31/93";
+#else
+static char rcsid[] = "$NetBSD: version.c,v 1.3 1995/04/22 10:37:27 cgd Exp $";
+#endif
 #endif /* not lint */
 
-char version[] = "Wooden Ships and Iron Men, Version 5.4 (90/06/01)";
+char version[] = "Wooden Ships and Iron Men, Version 8.1 (93/05/31)";