author: Bill Fumerola <billf@FreeBSD.org> 1999-11-30 03:50:02 +0000
committer: Bill Fumerola <billf@FreeBSD.org> 1999-11-30 03:50:02 +0000
commit: 7b216475bfdc24758a850dba744e947fc6173e68 (patch)
tree: 3ae574978e74559dfce75bd93019aa6294c63377 /games
parent: 4805de8700a2ad81e00b56a3d8089669d4982283 (diff)
229 files changed, 944 insertions, 355 deletions
diff --git a/games/adventure/crc.c b/games/adventure/crc.c
index 952d102343e01..1bbec1e60c4ec 100644
--- a/games/adventure/crc.c
+++ b/games/adventure/crc.c
@@ -32,13 +32,15 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)crc.c	8.1 (Berkeley) 5/31/93";
 static char ORIGINAL_sccsid[] = "@(#)crc.c	5.2 (Berkeley) 4/4/91";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/adventure/done.c b/games/adventure/done.c
index 9cb25bf87eb16..7baa5d71f1266 100644
--- a/games/adventure/done.c
+++ b/games/adventure/done.c
@@ -34,12 +34,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)done.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*      Re-coding of advent in C: termination routines                  */
diff --git a/games/adventure/init.c b/games/adventure/init.c
index 893e3039413ef..352aa6194d971 100644
--- a/games/adventure/init.c
+++ b/games/adventure/init.c
@@ -34,12 +34,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 6/2/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*      Re-coding of advent in C: data initialization                   */
diff --git a/games/adventure/io.c b/games/adventure/io.c
index 7b929f6745158..302e7445cd9ba 100644
--- a/games/adventure/io.c
+++ b/games/adventure/io.c
@@ -34,12 +34,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*      Re-coding of advent in C: file i/o and user i/o                 */
diff --git a/games/adventure/main.c b/games/adventure/main.c
index 39a90c436da03..290ba9318fe3a 100644
--- a/games/adventure/main.c
+++ b/games/adventure/main.c
@@ -34,18 +34,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/2/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*      Re-coding of advent in C: main program                          */
diff --git a/games/adventure/save.c b/games/adventure/save.c
index 907d5bff25f42..7612c1d127dc3 100644
--- a/games/adventure/save.c
+++ b/games/adventure/save.c
@@ -37,7 +37,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/adventure/setup.c b/games/adventure/setup.c
index c67d4c77a3a78..aadfd2bd784f0 100644
--- a/games/adventure/setup.c
+++ b/games/adventure/setup.c
@@ -35,13 +35,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/adventure/subr.c b/games/adventure/subr.c
index ffac61a1b547b..7579fe51c6275 100644
--- a/games/adventure/subr.c
+++ b/games/adventure/subr.c
@@ -34,12 +34,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)subr.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*      Re-coding of advent in C: subroutines from main                 */
diff --git a/games/adventure/vocab.c b/games/adventure/vocab.c
index 84d558b45e0bd..03d61026851f8 100644
--- a/games/adventure/vocab.c
+++ b/games/adventure/vocab.c
@@ -34,12 +34,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)vocab.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*      Re-coding of advent in C: data structure routines               */
diff --git a/games/adventure/wizard.c b/games/adventure/wizard.c
index b02c9004bc31b..c4ac3c8ed5eb8 100644
--- a/games/adventure/wizard.c
+++ b/games/adventure/wizard.c
@@ -34,12 +34,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)wizard.c	8.1 (Berkeley) 6/2/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*      Re-coding of advent in C: privileged operations                 */
diff --git a/games/arithmetic/arithmetic.c b/games/arithmetic/arithmetic.c
index 4e8efef9d5661..86db15042081c 100644
--- a/games/arithmetic/arithmetic.c
+++ b/games/arithmetic/arithmetic.c
@@ -32,18 +32,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)arithmetic.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/atc/extern.c b/games/atc/extern.c
index ea34434c87ba1..2976b0c82eceb 100644
--- a/games/atc/extern.c
+++ b/games/atc/extern.c
@@ -44,7 +44,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "include.h"
diff --git a/games/atc/graphics.c b/games/atc/graphics.c
index 91aa975bec3ff..8b521a39f13d2 100644
--- a/games/atc/graphics.c
+++ b/games/atc/graphics.c
@@ -32,8 +32,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 /*
@@ -46,7 +44,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)graphics.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/atc/input.c b/games/atc/input.c
index a913f1fbdea0c..0becdf6f8f0d2 100644
--- a/games/atc/input.c
+++ b/games/atc/input.c
@@ -44,7 +44,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)input.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif not lint
 
 #include <stdlib.h>
diff --git a/games/atc/list.c b/games/atc/list.c
index 19f605cda7bc7..af5788fae8aba 100644
--- a/games/atc/list.c
+++ b/games/atc/list.c
@@ -44,7 +44,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)list.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/games/atc/log.c b/games/atc/log.c
index a713e590cc15b..0bf6958a5b704 100644
--- a/games/atc/log.c
+++ b/games/atc/log.c
@@ -44,7 +44,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)log.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif not lint
 
 #include <string.h>
diff --git a/games/atc/main.c b/games/atc/main.c
index cffe42cba2ed8..6319a7aad75c1 100644
--- a/games/atc/main.c
+++ b/games/atc/main.c
@@ -44,13 +44,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1990, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/atc/tunable.c b/games/atc/tunable.c
index e817a66b10267..7c7105984f513 100644
--- a/games/atc/tunable.c
+++ b/games/atc/tunable.c
@@ -44,7 +44,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)tunable.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/atc/update.c b/games/atc/update.c
index 725c3b991f018..139ea4e46d43d 100644
--- a/games/atc/update.c
+++ b/games/atc/update.c
@@ -44,7 +44,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)update.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif not lint
 
 #include <string.h>
diff --git a/games/backgammon/backgammon/extra.c b/games/backgammon/backgammon/extra.c
index 86170eec79a04..0b2406e01b058 100644
--- a/games/backgammon/backgammon/extra.c
+++ b/games/backgammon/backgammon/extra.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)extra.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/backgammon/main.c b/games/backgammon/backgammon/main.c
index c6abfab0edda2..fc88b65195f73 100644
--- a/games/backgammon/backgammon/main.c
+++ b/games/backgammon/backgammon/main.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/backgammon/backgammon/move.c b/games/backgammon/backgammon/move.c
index bf8ab86fb3200..8b85dad1f27e1 100644
--- a/games/backgammon/backgammon/move.c
+++ b/games/backgammon/backgammon/move.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/games/backgammon/backgammon/text.c b/games/backgammon/backgammon/text.c
index 3ec45f1d4551b..740367c6006d5 100644
--- a/games/backgammon/backgammon/text.c
+++ b/games/backgammon/backgammon/text.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)text.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/backgammon/version.c b/games/backgammon/backgammon/version.c
index e6465a818ed08..12016e0f64d64 100644
--- a/games/backgammon/backgammon/version.c
+++ b/games/backgammon/backgammon/version.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)version.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 const char	*const message[] = {
diff --git a/games/backgammon/common_source/allow.c b/games/backgammon/common_source/allow.c
index d2848b1d5948b..7c9f593b267f9 100644
--- a/games/backgammon/common_source/allow.c
+++ b/games/backgammon/common_source/allow.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)allow.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/common_source/board.c b/games/backgammon/common_source/board.c
index b7c365c90a64c..792b042075627 100644
--- a/games/backgammon/common_source/board.c
+++ b/games/backgammon/common_source/board.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)board.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/backgammon/common_source/check.c b/games/backgammon/common_source/check.c
index 78433b79fb01e..70b9c62efed38 100644
--- a/games/backgammon/common_source/check.c
+++ b/games/backgammon/common_source/check.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)check.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/common_source/fancy.c b/games/backgammon/common_source/fancy.c
index 6ddb464a4ff4d..7663a7502f094 100644
--- a/games/backgammon/common_source/fancy.c
+++ b/games/backgammon/common_source/fancy.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)fancy.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdlib.h>
diff --git a/games/backgammon/common_source/init.c b/games/backgammon/common_source/init.c
index d0cf548c98ae0..24ee2a0a936bf 100644
--- a/games/backgammon/common_source/init.c
+++ b/games/backgammon/common_source/init.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/cdefs.h>
diff --git a/games/backgammon/common_source/odds.c b/games/backgammon/common_source/odds.c
index d3e21e42442e9..f840376d8319f 100644
--- a/games/backgammon/common_source/odds.c
+++ b/games/backgammon/common_source/odds.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)odds.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/common_source/one.c b/games/backgammon/common_source/one.c
index e62a59fdf184f..e94c183f0d812 100644
--- a/games/backgammon/common_source/one.c
+++ b/games/backgammon/common_source/one.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)one.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/common_source/save.c b/games/backgammon/common_source/save.c
index 674c1926758f1..fe3475d99a1db 100644
--- a/games/backgammon/common_source/save.c
+++ b/games/backgammon/common_source/save.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/games/backgammon/common_source/subs.c b/games/backgammon/common_source/subs.c
index d60bf4a129f75..15af00861a8ce 100644
--- a/games/backgammon/common_source/subs.c
+++ b/games/backgammon/common_source/subs.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)subs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/backgammon/common_source/table.c b/games/backgammon/common_source/table.c
index b64f09b5e0889..572cba30eab05 100644
--- a/games/backgammon/common_source/table.c
+++ b/games/backgammon/common_source/table.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/teachgammon/data.c b/games/backgammon/teachgammon/data.c
index 70136279fffc6..4f9151a2aabc6 100644
--- a/games/backgammon/teachgammon/data.c
+++ b/games/backgammon/teachgammon/data.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)data.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "tutor.h"
diff --git a/games/backgammon/teachgammon/teach.c b/games/backgammon/teachgammon/teach.c
index 64e7aa76af567..308bc608eeecd 100644
--- a/games/backgammon/teachgammon/teach.c
+++ b/games/backgammon/teachgammon/teach.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)teach.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/backgammon/teachgammon/ttext1.c b/games/backgammon/teachgammon/ttext1.c
index b4b160a5d3c74..89cb306e626d4 100644
--- a/games/backgammon/teachgammon/ttext1.c
+++ b/games/backgammon/teachgammon/ttext1.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)ttext1.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/teachgammon/ttext2.c b/games/backgammon/teachgammon/ttext2.c
index aaaf84a821ad9..f6ca2c3426e34 100644
--- a/games/backgammon/teachgammon/ttext2.c
+++ b/games/backgammon/teachgammon/ttext2.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)ttext2.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/backgammon/teachgammon/tutor.c b/games/backgammon/teachgammon/tutor.c
index 4b3370b371682..68124ced1ae0d 100644
--- a/games/backgammon/teachgammon/tutor.c
+++ b/games/backgammon/teachgammon/tutor.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)tutor.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "back.h"
diff --git a/games/battlestar/battlestar.c b/games/battlestar/battlestar.c
index 4cbbefd912bff..eb35e289acaf6 100644
--- a/games/battlestar/battlestar.c
+++ b/games/battlestar/battlestar.c
@@ -32,13 +32,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)battlestar.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/battlestar/com1.c b/games/battlestar/com1.c
index 6dd600ae2e057..c14f941e31c73 100644
--- a/games/battlestar/com1.c
+++ b/games/battlestar/com1.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)com1.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/com2.c b/games/battlestar/com2.c
index 4f2dc1d5d0f68..faf5c52af3a8e 100644
--- a/games/battlestar/com2.c
+++ b/games/battlestar/com2.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)com2.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/com3.c b/games/battlestar/com3.c
index e0184d2fa6107..a141adf8571f9 100644
--- a/games/battlestar/com3.c
+++ b/games/battlestar/com3.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)com3.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/com4.c b/games/battlestar/com4.c
index ab610fd56e2cb..c3b378d406c98 100644
--- a/games/battlestar/com4.c
+++ b/games/battlestar/com4.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)com4.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/battlestar/com5.c b/games/battlestar/com5.c
index f3cb6a8ba2340..0531f7f83cada 100644
--- a/games/battlestar/com5.c
+++ b/games/battlestar/com5.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)com5.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/com6.c b/games/battlestar/com6.c
index a22b0fb7fa438..91bd6a87762d5 100644
--- a/games/battlestar/com6.c
+++ b/games/battlestar/com6.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)com6.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/com7.c b/games/battlestar/com7.c
index 6ae8f1474a74f..a37995dd9efb3 100644
--- a/games/battlestar/com7.c
+++ b/games/battlestar/com7.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)com7.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/cypher.c b/games/battlestar/cypher.c
index f15d81643b6bc..e933e8b513225 100644
--- a/games/battlestar/cypher.c
+++ b/games/battlestar/cypher.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)cypher.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/dayfile.c b/games/battlestar/dayfile.c
index 796b698c1a250..7f1b40aca290b 100644
--- a/games/battlestar/dayfile.c
+++ b/games/battlestar/dayfile.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dayfile.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/dayobjs.c b/games/battlestar/dayobjs.c
index 300dbbde5ccf7..c96710684ec46 100644
--- a/games/battlestar/dayobjs.c
+++ b/games/battlestar/dayobjs.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dayobjs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/fly.c b/games/battlestar/fly.c
index 80f23b7c1f84b..e33901b4befbf 100644
--- a/games/battlestar/fly.c
+++ b/games/battlestar/fly.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)fly.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/getcom.c b/games/battlestar/getcom.c
index f2772bfe1a055..fbb5b05aca2cc 100644
--- a/games/battlestar/getcom.c
+++ b/games/battlestar/getcom.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)getcom.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/battlestar/globals.c b/games/battlestar/globals.c
index 885ca823d175d..f5ae78adf2954 100644
--- a/games/battlestar/globals.c
+++ b/games/battlestar/globals.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)globals.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/init.c b/games/battlestar/init.c
index afe692f2d4faf..b0de840839812 100644
--- a/games/battlestar/init.c
+++ b/games/battlestar/init.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/battlestar/misc.c b/games/battlestar/misc.c
index 45e9ec27805f7..e55e347033b8f 100644
--- a/games/battlestar/misc.c
+++ b/games/battlestar/misc.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/nightfile.c b/games/battlestar/nightfile.c
index 8d0f161efc352..51bd268d14d49 100644
--- a/games/battlestar/nightfile.c
+++ b/games/battlestar/nightfile.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)nightfile.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/nightobjs.c b/games/battlestar/nightobjs.c
index 0b9fcd4e26041..92bd191c478f8 100644
--- a/games/battlestar/nightobjs.c
+++ b/games/battlestar/nightobjs.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)nightobjs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/parse.c b/games/battlestar/parse.c
index abab858cd9c02..5e761b7ad95d2 100644
--- a/games/battlestar/parse.c
+++ b/games/battlestar/parse.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)parse.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/room.c b/games/battlestar/room.c
index d78cc00bb0958..8ff4e8f7bab52 100644
--- a/games/battlestar/room.c
+++ b/games/battlestar/room.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)room.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/battlestar/save.c b/games/battlestar/save.c
index 627f82197357a..f1031630c9b0b 100644
--- a/games/battlestar/save.c
+++ b/games/battlestar/save.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/battlestar/words.c b/games/battlestar/words.c
index bc7390bc6c410..bba1d05260dff 100644
--- a/games/battlestar/words.c
+++ b/games/battlestar/words.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)words.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/bcd/bcd.c b/games/bcd/bcd.c
index 3e0595376fd13..a3968a46d5cd3 100644
--- a/games/bcd/bcd.c
+++ b/games/bcd/bcd.c
@@ -32,18 +32,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)bcd.c	8.2 (Berkeley) 3/20/94";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/canfield/canfield/canfield.c b/games/canfield/canfield/canfield.c
index b8a938e713d65..a0d0790b96357 100644
--- a/games/canfield/canfield/canfield.c
+++ b/games/canfield/canfield/canfield.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)canfield.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/canfield/cfscores/cfscores.c b/games/canfield/cfscores/cfscores.c
index 1883696b61df6..ce51437a7d1a3 100644
--- a/games/canfield/cfscores/cfscores.c
+++ b/games/canfield/cfscores/cfscores.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)cfscores.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/cribbage/cards.c b/games/cribbage/cards.c
index 9b678d43e8000..ba846aed63985 100644
--- a/games/cribbage/cards.c
+++ b/games/cribbage/cards.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)cards.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <curses.h>
diff --git a/games/cribbage/crib.c b/games/cribbage/crib.c
index 620651015c789..9fccc6335e743 100644
--- a/games/cribbage/crib.c
+++ b/games/cribbage/crib.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)crib.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <curses.h>
diff --git a/games/cribbage/extern.c b/games/cribbage/extern.c
index 9083cc86fe907..97516df9d9fe7 100644
--- a/games/cribbage/extern.c
+++ b/games/cribbage/extern.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <curses.h>
diff --git a/games/cribbage/instr.c b/games/cribbage/instr.c
index a0414d80e0dfc..2e310b9136d74 100644
--- a/games/cribbage/instr.c
+++ b/games/cribbage/instr.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)instr.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/cribbage/io.c b/games/cribbage/io.c
index 96b92dbb89fe3..9384354dc1c57 100644
--- a/games/cribbage/io.c
+++ b/games/cribbage/io.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)io.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <ctype.h>
diff --git a/games/cribbage/score.c b/games/cribbage/score.c
index d81ebcea6aa80..a2a7d0b66e364 100644
--- a/games/cribbage/score.c
+++ b/games/cribbage/score.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <curses.h>
diff --git a/games/cribbage/support.c b/games/cribbage/support.c
index 60d9f5bc3280b..639151b81bbaa 100644
--- a/games/cribbage/support.c
+++ b/games/cribbage/support.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)support.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <curses.h>
diff --git a/games/dm/dm.c b/games/dm/dm.c
index d20de608d99d9..97ce0695790fc 100644
--- a/games/dm/dm.c
+++ b/games/dm/dm.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1987, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dm.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/param.h>
diff --git a/games/factor/factor.c b/games/factor/factor.c
index aa64dd50686da..ae2555b0508d4 100644
--- a/games/factor/factor.c
+++ b/games/factor/factor.c
@@ -35,13 +35,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)factor.c	8.4 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/fish/fish.c b/games/fish/fish.c
index a447c0f18e13f..08a6e0240d1ba 100644
--- a/games/fish/fish.c
+++ b/games/fish/fish.c
@@ -37,13 +37,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1990, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)fish.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/fortune/fortune/fortune.c b/games/fortune/fortune/fortune.c
index ea10c03c8b9d9..bbd06eda313da 100644
--- a/games/fortune/fortune/fortune.c
+++ b/games/fortune/fortune/fortune.c
@@ -42,7 +42,11 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)fortune.c   8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	<sys/param.h>
diff --git a/games/hack/hack.tty.c b/games/hack/hack.tty.c
index 5ad41cd2b1c5b..df49cfc3dadd3 100644
--- a/games/hack/hack.tty.c
+++ b/games/hack/hack.tty.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)hack.tty.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
diff --git a/games/hangman/endgame.c b/games/hangman/endgame.c
index 2839cce67081d..4e13559f7e837 100644
--- a/games/hangman/endgame.c
+++ b/games/hangman/endgame.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)endgame.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"hangman.h"
diff --git a/games/hangman/extern.c b/games/hangman/extern.c
index ecc7155fdd878..5561adc997b93 100644
--- a/games/hangman/extern.c
+++ b/games/hangman/extern.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"hangman.h"
diff --git a/games/hangman/getguess.c b/games/hangman/getguess.c
index e25697ec71020..a338e5ca2fa07 100644
--- a/games/hangman/getguess.c
+++ b/games/hangman/getguess.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)getguess.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/ttydefaults.h>
diff --git a/games/hangman/getword.c b/games/hangman/getword.c
index 0cd63d39f11bd..041c686611152 100644
--- a/games/hangman/getword.c
+++ b/games/hangman/getword.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)getword.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "hangman.h"
diff --git a/games/hangman/main.c b/games/hangman/main.c
index cbf02724acca8..1c48871285152 100644
--- a/games/hangman/main.c
+++ b/games/hangman/main.c
@@ -32,13 +32,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"hangman.h"
diff --git a/games/hangman/playgame.c b/games/hangman/playgame.c
index 4d82ea49ea82c..0857a8ceef6ba 100644
--- a/games/hangman/playgame.c
+++ b/games/hangman/playgame.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)playgame.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"hangman.h"
diff --git a/games/hangman/prdata.c b/games/hangman/prdata.c
index a59da6c929bae..3cfe61e287ef8 100644
--- a/games/hangman/prdata.c
+++ b/games/hangman/prdata.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)prdata.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"hangman.h"
diff --git a/games/hangman/prman.c b/games/hangman/prman.c
index 6e38515e295b6..431d310232d33 100644
--- a/games/hangman/prman.c
+++ b/games/hangman/prman.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)prman.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"hangman.h"
diff --git a/games/hangman/prword.c b/games/hangman/prword.c
index a24cea6f72a92..5841586b6bef3 100644
--- a/games/hangman/prword.c
+++ b/games/hangman/prword.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)prword.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"hangman.h"
diff --git a/games/hangman/setup.c b/games/hangman/setup.c
index 3f9f767f1d72c..b9cd644ca980e 100644
--- a/games/hangman/setup.c
+++ b/games/hangman/setup.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include       <stdlib.h>
diff --git a/games/larn/bill.c b/games/larn/bill.c
index 59eb96ea8daa4..eff826df9febf 100644
--- a/games/larn/bill.c
+++ b/games/larn/bill.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)bill.c	5.2 (Berkeley) 5/28/91";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/file.h>
diff --git a/games/larn/data.c b/games/larn/data.c
index 1e6fcdf46672e..a09d55cccff41 100644
--- a/games/larn/data.c
+++ b/games/larn/data.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)data.c	5.3 (Berkeley) 5/13/91";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*	data.c		Larn is copyrighted 1986 by Noah Morgan. */
diff --git a/games/larn/fortune.c b/games/larn/fortune.c
index f5cff64fab38c..798aa2eecf04e 100644
--- a/games/larn/fortune.c
+++ b/games/larn/fortune.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)fortune.c	5.5 (Berkeley) 6/10/91";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /* fortune.c		 Larn is copyrighted 1986 by Noah Morgan. */
diff --git a/games/larn/main.c b/games/larn/main.c
index 7aa5697f50f43..cb500d3bc72d4 100644
--- a/games/larn/main.c
+++ b/games/larn/main.c
@@ -4,7 +4,7 @@
 #include <sys/stat.h>
 #include "header.h"
 #include <pwd.h>
-static char copyright[]="\nLarn is copyrighted 1986 by Noah Morgan.\n";
+static const char copyright[]="\nLarn is copyrighted 1986 by Noah Morgan.\n";
 int srcount=0;	/* line counter for showstr()	*/
 int dropflag=0; /* if 1 then don't lookforobject() next round */
 int rmst=80;	/*	random monster creation counter		*/
diff --git a/games/larn/store.c b/games/larn/store.c
index 9f64c95c60f25..0036c875f81ee 100644
--- a/games/larn/store.c
+++ b/games/larn/store.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)store.c	5.4 (Berkeley) 5/13/91";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*	store.c		Larn is copyrighted 1986 by Noah Morgan. */
diff --git a/games/mille/comp.c b/games/mille/comp.c
index 798dce8fba770..6c504572274b3 100644
--- a/games/mille/comp.c
+++ b/games/mille/comp.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)comp.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/end.c b/games/mille/end.c
index 4fb5f9fef3509..9c80521dd4008 100644
--- a/games/mille/end.c
+++ b/games/mille/end.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)end.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/extern.c b/games/mille/extern.c
index 1f82bc6a253fb..aae29d2deb158 100644
--- a/games/mille/extern.c
+++ b/games/mille/extern.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/init.c b/games/mille/init.c
index d5e64f7da1766..3a89a69ace61d 100644
--- a/games/mille/init.c
+++ b/games/mille/init.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/mille.c b/games/mille/mille.c
index ca6e12cfea49a..eb6f6ff34ddf8 100644
--- a/games/mille/mille.c
+++ b/games/mille/mille.c
@@ -42,9 +42,10 @@ static const char copyright[] =
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)mille.c	8.1 (Berkeley) 5/31/93";
-#endif
+#else
 static const char rcsid[] =
   "$FreeBSD$";
+#endif
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/misc.c b/games/mille/misc.c
index 86e6b101ec8f2..ebedd22f7ab76 100644
--- a/games/mille/misc.c
+++ b/games/mille/misc.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/file.h>
diff --git a/games/mille/move.c b/games/mille/move.c
index b3741eee213cf..117e7a63cc23a 100644
--- a/games/mille/move.c
+++ b/games/mille/move.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <termios.h>
diff --git a/games/mille/print.c b/games/mille/print.c
index 9a227bcf5477f..8cc271aa2e82d 100644
--- a/games/mille/print.c
+++ b/games/mille/print.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/roll.c b/games/mille/roll.c
index 017ac3fb77e54..6a99fb932a2aa 100644
--- a/games/mille/roll.c
+++ b/games/mille/roll.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)roll.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/save.c b/games/mille/save.c
index 728bc1c124107..3bd18870ef030 100644
--- a/games/mille/save.c
+++ b/games/mille/save.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/mille/table.c b/games/mille/table.c
index b488f314ac1e7..75240b9c47d15 100644
--- a/games/mille/table.c
+++ b/games/mille/table.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1982, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # define	DEBUG
diff --git a/games/mille/types.c b/games/mille/types.c
index 52f4baf9e648b..ec51694ab23fd 100644
--- a/games/mille/types.c
+++ b/games/mille/types.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)types.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"mille.h"
diff --git a/games/mille/varpush.c b/games/mille/varpush.c
index 8257c7a3b505d..70bf17a8aefd6 100644
--- a/games/mille/varpush.c
+++ b/games/mille/varpush.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)varpush.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	<paths.h>
diff --git a/games/morse/morse.c b/games/morse/morse.c
index ba89ec96667b6..e9156594b649d 100644
--- a/games/morse/morse.c
+++ b/games/morse/morse.c
@@ -29,8 +29,6 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 /*
@@ -39,13 +37,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)morse.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/number/number.c b/games/number/number.c
index eefb3d2fd6d36..e6ef2910163b6 100644
--- a/games/number/number.c
+++ b/games/number/number.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993, 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)number.c	8.3 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/pig/pig.c b/games/pig/pig.c
index f0d113f76c5d5..627fab02c0ed9 100644
--- a/games/pig/pig.c
+++ b/games/pig/pig.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1992, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pig.c	8.2 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/pom/pom.c b/games/pom/pom.c
index 26cd9e46a5287..240791141d8c1 100644
--- a/games/pom/pom.c
+++ b/games/pom/pom.c
@@ -40,7 +40,11 @@ static const char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static const char sccsid[] = "@(#)pom.c       8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/ppt/ppt.c b/games/ppt/ppt.c
index 6d878216d82b4..ac30eba8273b3 100644
--- a/games/ppt/ppt.c
+++ b/games/ppt/ppt.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)ppt.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <stdio.h>
diff --git a/games/primes/pattern.c b/games/primes/pattern.c
index 14eb7210e7a61..7bfe0ddd2193a 100644
--- a/games/primes/pattern.c
+++ b/games/primes/pattern.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pattern.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/pr_tbl.c b/games/primes/pr_tbl.c
index dcad3aa66ec8d..3aa5b961ae6cf 100644
--- a/games/primes/pr_tbl.c
+++ b/games/primes/pr_tbl.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pr_tbl.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/primes/primes.c b/games/primes/primes.c
index 5d78945214390..b7f0c602497c3 100644
--- a/games/primes/primes.c
+++ b/games/primes/primes.c
@@ -32,18 +32,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)primes.c	8.5 (Berkeley) 5/10/95";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/quiz/quiz.c b/games/quiz/quiz.c
index c5e9dd1e47db5..9c4f00f584eac 100644
--- a/games/quiz/quiz.c
+++ b/games/quiz/quiz.c
@@ -33,18 +33,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1991, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)quiz.c	8.3 (Berkeley) 5/4/95";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/quiz/rxp.c b/games/quiz/rxp.c
index 21180cdc9e07d..8addbef001133 100644
--- a/games/quiz/rxp.c
+++ b/games/quiz/rxp.c
@@ -33,12 +33,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rxp.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rain/rain.c b/games/rain/rain.c
index 99c1ea6dc2dad..b801a9a033b48 100644
--- a/games/rain/rain.c
+++ b/games/rain/rain.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rain.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/random/random.c b/games/random/random.c
index c3ba51c2033b8..8c61588b7af7c 100644
--- a/games/random/random.c
+++ b/games/random/random.c
@@ -35,13 +35,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1994\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)random.c	8.5 (Berkeley) 4/5/94";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/robots/extern.c b/games/robots/extern.c
index 28c7bd7c68c12..07a8ce0bfcb87 100644
--- a/games/robots/extern.c
+++ b/games/robots/extern.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)extern.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"robots.h"
diff --git a/games/robots/flush_in.c b/games/robots/flush_in.c
index 09721adfc3a94..894185c85975f 100644
--- a/games/robots/flush_in.c
+++ b/games/robots/flush_in.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)flush_in.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	<curses.h>
diff --git a/games/robots/init_field.c b/games/robots/init_field.c
index 43bf89beebbdf..5ba646649707b 100644
--- a/games/robots/init_field.c
+++ b/games/robots/init_field.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)init_field.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/robots/main.c b/games/robots/main.c
index 0be84098ead2a..837d608eff315 100644
--- a/games/robots/main.c
+++ b/games/robots/main.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"robots.h"
diff --git a/games/robots/make_level.c b/games/robots/make_level.c
index 06e908e1445fe..4aca2f584a051 100644
--- a/games/robots/make_level.c
+++ b/games/robots/make_level.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)make_level.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"robots.h"
diff --git a/games/robots/move.c b/games/robots/move.c
index 6c274b27ecea9..fe18ed61567c9 100644
--- a/games/robots/move.c
+++ b/games/robots/move.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/ttydefaults.h>
diff --git a/games/robots/move_robs.c b/games/robots/move_robs.c
index 560a1b4fcb8c7..21bf0ba2150c1 100644
--- a/games/robots/move_robs.c
+++ b/games/robots/move_robs.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)move_robs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"robots.h"
diff --git a/games/robots/play_level.c b/games/robots/play_level.c
index ee33190230a90..6361d9b580a5c 100644
--- a/games/robots/play_level.c
+++ b/games/robots/play_level.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)play_level.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"robots.h"
diff --git a/games/robots/query.c b/games/robots/query.c
index 8f794997b490b..bc6590cf67855 100644
--- a/games/robots/query.c
+++ b/games/robots/query.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)query.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/robots/rnd_pos.c b/games/robots/rnd_pos.c
index 933d765e89703..13be7cac90eef 100644
--- a/games/robots/rnd_pos.c
+++ b/games/robots/rnd_pos.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rnd_pos.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include       <stdlib.h>
diff --git a/games/robots/score.c b/games/robots/score.c
index 35e6167ba0dc6..21fadf5f1c1a0 100644
--- a/games/robots/score.c
+++ b/games/robots/score.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"robots.h"
diff --git a/games/rogue/curses.c b/games/rogue/curses.c
index 6aa548e7c601a..246072d19d83d 100644
--- a/games/rogue/curses.c
+++ b/games/rogue/curses.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)curses.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/hit.c b/games/rogue/hit.c
index ee74e6b3858b4..aef546cf6829f 100644
--- a/games/rogue/hit.c
+++ b/games/rogue/hit.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)hit.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/init.c b/games/rogue/init.c
index fea5831baec87..3c214cbcd99a8 100644
--- a/games/rogue/init.c
+++ b/games/rogue/init.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/inventory.c b/games/rogue/inventory.c
index da321de5ee9a5..0923aa1fb232b 100644
--- a/games/rogue/inventory.c
+++ b/games/rogue/inventory.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)inventory.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/level.c b/games/rogue/level.c
index 7209ca8e4f3ff..1fb0e05252a31 100644
--- a/games/rogue/level.c
+++ b/games/rogue/level.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)level.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/machdep.c b/games/rogue/machdep.c
index 9e770fc71b442..a66bdb3be4394 100644
--- a/games/rogue/machdep.c
+++ b/games/rogue/machdep.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)machdep.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/main.c b/games/rogue/main.c
index 2687e345b1784..781c61859e712 100644
--- a/games/rogue/main.c
+++ b/games/rogue/main.c
@@ -35,13 +35,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1988, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/message.c b/games/rogue/message.c
index 10751c44387e3..d9e2456512dd1 100644
--- a/games/rogue/message.c
+++ b/games/rogue/message.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)message.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/monster.c b/games/rogue/monster.c
index da16eaaa04e00..e436f862dd03e 100644
--- a/games/rogue/monster.c
+++ b/games/rogue/monster.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)monster.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/move.c b/games/rogue/move.c
index b892a0ad11870..b989bf6bc56d1 100644
--- a/games/rogue/move.c
+++ b/games/rogue/move.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/object.c b/games/rogue/object.c
index 3315972570e58..9056c54bce74b 100644
--- a/games/rogue/object.c
+++ b/games/rogue/object.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)object.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/pack.c b/games/rogue/pack.c
index 9aab305ac464e..5ce3520172add 100644
--- a/games/rogue/pack.c
+++ b/games/rogue/pack.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pack.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/play.c b/games/rogue/play.c
index 1eea292aa691e..13b319dbc5c33 100644
--- a/games/rogue/play.c
+++ b/games/rogue/play.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/random.c b/games/rogue/random.c
index 19102a2e7cdc4..8105e6528cf56 100644
--- a/games/rogue/random.c
+++ b/games/rogue/random.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)random.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "rogue.h"
diff --git a/games/rogue/ring.c b/games/rogue/ring.c
index 9516b5fe78abc..4a4bb531a9201 100644
--- a/games/rogue/ring.c
+++ b/games/rogue/ring.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)ring.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/room.c b/games/rogue/room.c
index 7cc1b1e25473e..08e8b68110f68 100644
--- a/games/rogue/room.c
+++ b/games/rogue/room.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)room.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/save.c b/games/rogue/save.c
index 04c9652e1caf6..938217bbe80c7 100644
--- a/games/rogue/save.c
+++ b/games/rogue/save.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/score.c b/games/rogue/score.c
index 73fdda4d1d2b6..b1c9ccd10dfd1 100644
--- a/games/rogue/score.c
+++ b/games/rogue/score.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/spec_hit.c b/games/rogue/spec_hit.c
index d0b99f5f951de..bfcdc04cd7fec 100644
--- a/games/rogue/spec_hit.c
+++ b/games/rogue/spec_hit.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)spec_hit.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/throw.c b/games/rogue/throw.c
index 3a0205d2fb29b..037beb2368efa 100644
--- a/games/rogue/throw.c
+++ b/games/rogue/throw.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)throw.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/trap.c b/games/rogue/trap.c
index 861120d82a168..dd8cfedf94057 100644
--- a/games/rogue/trap.c
+++ b/games/rogue/trap.c
@@ -32,12 +32,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)trap.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/use.c b/games/rogue/use.c
index 62edc7143e687..3c5f62b4abc9f 100644
--- a/games/rogue/use.c
+++ b/games/rogue/use.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)use.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/rogue/zap.c b/games/rogue/zap.c
index 29bbbade5db87..d4f991cd45f74 100644
--- a/games/rogue/zap.c
+++ b/games/rogue/zap.c
@@ -35,7 +35,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)zap.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/sail/assorted.c b/games/sail/assorted.c
index 60566325f1b3b..390f28f252937 100644
--- a/games/sail/assorted.c
+++ b/games/sail/assorted.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)assorted.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/dr_1.c b/games/sail/dr_1.c
index 9874a0aadc64b..02551f9df6282 100644
--- a/games/sail/dr_1.c
+++ b/games/sail/dr_1.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dr_1.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "driver.h"
diff --git a/games/sail/dr_2.c b/games/sail/dr_2.c
index 8f4549d1262dc..942b7686c9ffc 100644
--- a/games/sail/dr_2.c
+++ b/games/sail/dr_2.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dr_2.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/sail/dr_3.c b/games/sail/dr_3.c
index f08014d38fcfc..845a707860fc0 100644
--- a/games/sail/dr_3.c
+++ b/games/sail/dr_3.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dr_3.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "driver.h"
diff --git a/games/sail/dr_4.c b/games/sail/dr_4.c
index df77cb61a0db4..e75d6b40715ac 100644
--- a/games/sail/dr_4.c
+++ b/games/sail/dr_4.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dr_4.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/dr_5.c b/games/sail/dr_5.c
index 893d7cca62a06..a801dbde7cd25 100644
--- a/games/sail/dr_5.c
+++ b/games/sail/dr_5.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dr_5.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/dr_main.c b/games/sail/dr_main.c
index ed5378e7c434d..6ada54fe90521 100644
--- a/games/sail/dr_main.c
+++ b/games/sail/dr_main.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dr_main.c	8.2 (Berkeley) 4/16/94";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "driver.h"
diff --git a/games/sail/game.c b/games/sail/game.c
index 646340a49483f..8ff3c9055c512 100644
--- a/games/sail/game.c
+++ b/games/sail/game.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)game.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/globals.c b/games/sail/globals.c
index 61ac18a316212..e9ccc07d519dd 100644
--- a/games/sail/globals.c
+++ b/games/sail/globals.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)globals.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/lo_main.c b/games/sail/lo_main.c
index 0194211742ef0..0615bcc6c7780 100644
--- a/games/sail/lo_main.c
+++ b/games/sail/lo_main.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lo_main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/sail/main.c b/games/sail/main.c
index 79d0c719bc257..e5deb9b75dbdf 100644
--- a/games/sail/main.c
+++ b/games/sail/main.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1983, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/misc.c b/games/sail/misc.c
index 5e57a23ffc34a..4808f844be990 100644
--- a/games/sail/misc.c
+++ b/games/sail/misc.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)misc.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/parties.c b/games/sail/parties.c
index f3d5061a654b9..5fe0538699bb4 100644
--- a/games/sail/parties.c
+++ b/games/sail/parties.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)parties.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/pl_1.c b/games/sail/pl_1.c
index 4687b1f963d1b..e51f4f90a1b9b 100644
--- a/games/sail/pl_1.c
+++ b/games/sail/pl_1.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_1.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "player.h"
diff --git a/games/sail/pl_2.c b/games/sail/pl_2.c
index 1512443974986..529b527de4f17 100644
--- a/games/sail/pl_2.c
+++ b/games/sail/pl_2.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_2.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "player.h"
diff --git a/games/sail/pl_3.c b/games/sail/pl_3.c
index d4e79e9f25eb8..83486bea407f0 100644
--- a/games/sail/pl_3.c
+++ b/games/sail/pl_3.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_3.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "player.h"
diff --git a/games/sail/pl_4.c b/games/sail/pl_4.c
index db979d91b6e64..6e78b44b3d06e 100644
--- a/games/sail/pl_4.c
+++ b/games/sail/pl_4.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_4.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "player.h"
diff --git a/games/sail/pl_5.c b/games/sail/pl_5.c
index 5623bba2db6b3..19876d1d9b363 100644
--- a/games/sail/pl_5.c
+++ b/games/sail/pl_5.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_5.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <string.h>
diff --git a/games/sail/pl_6.c b/games/sail/pl_6.c
index 6d30f7262e4e7..b91589ff07930 100644
--- a/games/sail/pl_6.c
+++ b/games/sail/pl_6.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_6.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "player.h"
diff --git a/games/sail/pl_7.c b/games/sail/pl_7.c
index 1de3141c715fb..02cd5f2389431 100644
--- a/games/sail/pl_7.c
+++ b/games/sail/pl_7.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_7.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/ttydefaults.h>
diff --git a/games/sail/pl_main.c b/games/sail/pl_main.c
index 6eb85b068667a..becf6bf2b777d 100644
--- a/games/sail/pl_main.c
+++ b/games/sail/pl_main.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)pl_main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "player.h"
diff --git a/games/sail/sync.c b/games/sail/sync.c
index 81117b62a16c2..46f93cee20f8f 100644
--- a/games/sail/sync.c
+++ b/games/sail/sync.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)sync.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include "externs.h"
diff --git a/games/sail/version.c b/games/sail/version.c
index 94f8aabbe507a..ceb59df7797f6 100644
--- a/games/sail/version.c
+++ b/games/sail/version.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)version.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 char version[] = "Wooden Ships and Iron Men, Version 8.1 (93/05/31)";
diff --git a/games/snake/snake/move.c b/games/snake/snake/move.c
index a4c35ed7f6be9..1ac60f28ea1a2 100644
--- a/games/snake/snake/move.c
+++ b/games/snake/snake/move.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 7/19/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*************************************************************************
diff --git a/games/snake/snake/snake.c b/games/snake/snake/snake.c
index 684dcc321b486..93c06cb982b83 100644
--- a/games/snake/snake/snake.c
+++ b/games/snake/snake/snake.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)snake.c	8.2 (Berkeley) 1/7/94";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/snake/snscore/snscore.c b/games/snake/snscore/snscore.c
index c184294bd2a99..47a0d5c310294 100644
--- a/games/snake/snscore/snscore.c
+++ b/games/snake/snscore/snscore.c
@@ -32,13 +32,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)snscore.c	8.1 (Berkeley) 7/19/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <sys/types.h>
diff --git a/games/trek/abandon.c b/games/trek/abandon.c
index 3be1770a74484..a156e493a5942 100644
--- a/games/trek/abandon.c
+++ b/games/trek/abandon.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)abandon.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/attack.c b/games/trek/attack.c
index 92dc164835342..70682284458ef 100644
--- a/games/trek/attack.c
+++ b/games/trek/attack.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)attack.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/autover.c b/games/trek/autover.c
index 9fdaa261106b8..ac01d273bb28c 100644
--- a/games/trek/autover.c
+++ b/games/trek/autover.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)autover.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/capture.c b/games/trek/capture.c
index db1b0b9b571dd..7e66dd413dd87 100644
--- a/games/trek/capture.c
+++ b/games/trek/capture.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)capture.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/cgetc.c b/games/trek/cgetc.c
index e3120600bb60d..3d25b1603a565 100644
--- a/games/trek/cgetc.c
+++ b/games/trek/cgetc.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)cgetc.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	<stdio.h>
diff --git a/games/trek/check_out.c b/games/trek/check_out.c
index c50af43b92712..02978583a93e8 100644
--- a/games/trek/check_out.c
+++ b/games/trek/check_out.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)check_out.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/checkcond.c b/games/trek/checkcond.c
index 42700275def45..894be5041d8fd 100644
--- a/games/trek/checkcond.c
+++ b/games/trek/checkcond.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)checkcond.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/compkl.c b/games/trek/compkl.c
index 68ab951b11e26..90bf951a290d7 100644
--- a/games/trek/compkl.c
+++ b/games/trek/compkl.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)compkl.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/computer.c b/games/trek/computer.c
index e6d2bae682c43..d374c0f6960c4 100644
--- a/games/trek/computer.c
+++ b/games/trek/computer.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)computer.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/damage.c b/games/trek/damage.c
index eaff84f162c71..8d312eb641cef 100644
--- a/games/trek/damage.c
+++ b/games/trek/damage.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)damage.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/damaged.c b/games/trek/damaged.c
index 301a12f6a6f4a..3ba0d9736d74c 100644
--- a/games/trek/damaged.c
+++ b/games/trek/damaged.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)damaged.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/dcrept.c b/games/trek/dcrept.c
index 258fbd1e0fb5d..1cd1ad03bc7f0 100644
--- a/games/trek/dcrept.c
+++ b/games/trek/dcrept.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dcrept.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/destruct.c b/games/trek/destruct.c
index ae123f00a4454..afa4a7568e944 100644
--- a/games/trek/destruct.c
+++ b/games/trek/destruct.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)destruct.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/dock.c b/games/trek/dock.c
index f190e46c38d1a..42515b74dda42 100644
--- a/games/trek/dock.c
+++ b/games/trek/dock.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dock.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/dumpgame.c b/games/trek/dumpgame.c
index 8406f11b4299b..d9f935e8acf6e 100644
--- a/games/trek/dumpgame.c
+++ b/games/trek/dumpgame.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dumpgame.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 #include <fcntl.h>
diff --git a/games/trek/dumpme.c b/games/trek/dumpme.c
index 4d2ff373d5bd8..cb4c9d262c0ec 100644
--- a/games/trek/dumpme.c
+++ b/games/trek/dumpme.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dumpme.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/dumpssradio.c b/games/trek/dumpssradio.c
index 4a57ffd392b25..79d95efcfb41e 100644
--- a/games/trek/dumpssradio.c
+++ b/games/trek/dumpssradio.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)dumpssradio.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/events.c b/games/trek/events.c
index f2aa111ba5fb1..97b98fb1b8561 100644
--- a/games/trek/events.c
+++ b/games/trek/events.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)events.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/externs.c b/games/trek/externs.c
index 170dd60da7bc0..428eaf4c5e7ce 100644
--- a/games/trek/externs.c
+++ b/games/trek/externs.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)externs.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/getcodi.c b/games/trek/getcodi.c
index e16f5e733b461..ae47d1a19d962 100644
--- a/games/trek/getcodi.c
+++ b/games/trek/getcodi.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)getcodi.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"getpar.h"
diff --git a/games/trek/getpar.c b/games/trek/getpar.c
index 7cb2fc8ddedac..488af3f512de4 100644
--- a/games/trek/getpar.c
+++ b/games/trek/getpar.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)getpar.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	<stdio.h>
diff --git a/games/trek/help.c b/games/trek/help.c
index b6f967c9bb525..89aff5bf20750 100644
--- a/games/trek/help.c
+++ b/games/trek/help.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)help.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/impulse.c b/games/trek/impulse.c
index bde44da5cf072..d76a401c29db6 100644
--- a/games/trek/impulse.c
+++ b/games/trek/impulse.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)impulse.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/initquad.c b/games/trek/initquad.c
index 72dc83bdde06d..dc300d4a9126f 100644
--- a/games/trek/initquad.c
+++ b/games/trek/initquad.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)initquad.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/kill.c b/games/trek/kill.c
index 6bae9d1a73b32..86f412234b4da 100644
--- a/games/trek/kill.c
+++ b/games/trek/kill.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)kill.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/klmove.c b/games/trek/klmove.c
index 783195f7c1458..d98acd68a9f0e 100644
--- a/games/trek/klmove.c
+++ b/games/trek/klmove.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)klmove.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/lose.c b/games/trek/lose.c
index 7f0d5b31faa1d..60c89adc561e6 100644
--- a/games/trek/lose.c
+++ b/games/trek/lose.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lose.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/lrscan.c b/games/trek/lrscan.c
index 16793370a98f8..65f31a3cd97ff 100644
--- a/games/trek/lrscan.c
+++ b/games/trek/lrscan.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)lrscan.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/main.c b/games/trek/main.c
index 16f19b7ca1f63..bf1580731cf70 100644
--- a/games/trek/main.c
+++ b/games/trek/main.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/move.c b/games/trek/move.c
index 6aa0072147cc7..6e413c7c2be96 100644
--- a/games/trek/move.c
+++ b/games/trek/move.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/nova.c b/games/trek/nova.c
index a327b0d43a395..8aef4c0ed49a1 100644
--- a/games/trek/nova.c
+++ b/games/trek/nova.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)nova.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/out.c b/games/trek/out.c
index 21b50583ff4ea..99d910d5d9e6b 100644
--- a/games/trek/out.c
+++ b/games/trek/out.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)out.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/phaser.c b/games/trek/phaser.c
index 45d2285918227..a4ed5354c1373 100644
--- a/games/trek/phaser.c
+++ b/games/trek/phaser.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)phaser.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/play.c b/games/trek/play.c
index b4865ba954e9b..c735afaaf7f36 100644
--- a/games/trek/play.c
+++ b/games/trek/play.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)play.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/ram.c b/games/trek/ram.c
index 9d5d177e58586..0407a3060a314 100644
--- a/games/trek/ram.c
+++ b/games/trek/ram.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)ram.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/ranf.c b/games/trek/ranf.c
index b6cdeae5aab6d..29e7fcc1c7401 100644
--- a/games/trek/ranf.c
+++ b/games/trek/ranf.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)ranf.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	<stdio.h>
diff --git a/games/trek/rest.c b/games/trek/rest.c
index 09f3f58193215..b6c6ee78abf39 100644
--- a/games/trek/rest.c
+++ b/games/trek/rest.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)rest.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/schedule.c b/games/trek/schedule.c
index e66ead7c4906c..22972427f9754 100644
--- a/games/trek/schedule.c
+++ b/games/trek/schedule.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)schedule.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/score.c b/games/trek/score.c
index 6e858955cc0b7..4ed647818a34c 100644
--- a/games/trek/score.c
+++ b/games/trek/score.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)score.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/setup.c b/games/trek/setup.c
index d06f9e87e0275..54b3900a91e02 100644
--- a/games/trek/setup.c
+++ b/games/trek/setup.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)setup.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include       <stdlib.h>
diff --git a/games/trek/setwarp.c b/games/trek/setwarp.c
index fac51023016ee..3b341aaf06b0f 100644
--- a/games/trek/setwarp.c
+++ b/games/trek/setwarp.c
@@ -32,7 +32,11 @@
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)setwarp.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/shield.c b/games/trek/shield.c
index 5f2a486920557..c4a3bc2dba291 100644
--- a/games/trek/shield.c
+++ b/games/trek/shield.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)shield.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/snova.c b/games/trek/snova.c
index 587108445b86c..6c206cb0aff8a 100644
--- a/games/trek/snova.c
+++ b/games/trek/snova.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)snova.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/srscan.c b/games/trek/srscan.c
index d4a16ace48db3..2ec1e177c8a06 100644
--- a/games/trek/srscan.c
+++ b/games/trek/srscan.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)srscan.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/systemname.c b/games/trek/systemname.c
index e5d0e5d5ae227..80c842f89f69d 100644
--- a/games/trek/systemname.c
+++ b/games/trek/systemname.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)systemname.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/torped.c b/games/trek/torped.c
index 68df0e9e83b20..9eead45991309 100644
--- a/games/trek/torped.c
+++ b/games/trek/torped.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)torped.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	<stdio.h>
diff --git a/games/trek/utility.c b/games/trek/utility.c
index f876ac252e70c..e1835a1a0c381 100644
--- a/games/trek/utility.c
+++ b/games/trek/utility.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)utility.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/trek/visual.c b/games/trek/visual.c
index 758a4b5717593..5d00f6bc1c307 100644
--- a/games/trek/visual.c
+++ b/games/trek/visual.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)visual.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/warp.c b/games/trek/warp.c
index c9012d798e8a6..cead28ba5e7fe 100644
--- a/games/trek/warp.c
+++ b/games/trek/warp.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)warp.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/trek/win.c b/games/trek/win.c
index 83c7c27600986..0920f75731663 100644
--- a/games/trek/win.c
+++ b/games/trek/win.c
@@ -29,12 +29,14 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)win.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 # include	"trek.h"
diff --git a/games/worm/worm.c b/games/worm/worm.c
index a4084747acfdd..e89a89c03cdf1 100644
--- a/games/worm/worm.c
+++ b/games/worm/worm.c
@@ -29,18 +29,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)worm.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/worms/worms.c b/games/worms/worms.c
index ca0658ee435b9..6dec61ec69a4e 100644
--- a/games/worms/worms.c
+++ b/games/worms/worms.c
@@ -32,13 +32,17 @@
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1980, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)worms.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
diff --git a/games/wump/wump.c b/games/wump/wump.c
index dc7010ec8403a..7036c4cb4be35 100644
--- a/games/wump/wump.c
+++ b/games/wump/wump.c
@@ -33,18 +33,20 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
 #ifndef lint
-static char copyright[] =
+static const char copyright[] =
 "@(#) Copyright (c) 1989, 1993\n\
 	The Regents of the University of California.  All rights reserved.\n";
 #endif /* not lint */
 
 #ifndef lint
+#if 0
 static char sccsid[] = "@(#)wump.c	8.1 (Berkeley) 5/31/93";
+#endif
+static const char rcsid[] =
+ "$FreeBSD$";
 #endif /* not lint */
 
 /*
author	Bill Fumerola <billf@FreeBSD.org>	1999-11-30 03:50:02 +0000
committer	Bill Fumerola <billf@FreeBSD.org>	1999-11-30 03:50:02 +0000
commit	7b216475bfdc24758a850dba744e947fc6173e68 (patch)
tree	3ae574978e74559dfce75bd93019aa6294c63377 /games
parent	4805de8700a2ad81e00b56a3d8089669d4982283 (diff)