zap sccsid, okay deraadt@

45 files changed, 45 insertions, 195 deletions

diff --git a/lib/libocurses/addbytes.c b/lib/libocurses/addbytes.c
index e31d3a50c60..413cf60110e 100644
--- a/lib/libocurses/addbytes.c
+++ b/lib/libocurses/addbytes.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: addbytes.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1987, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)addbytes.c	8.4 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 #define	SYNCH_IN	{y = win->cury; x = win->curx;}
diff --git a/lib/libocurses/addch.c b/lib/libocurses/addch.c
index 93e87129dbc..dec9cf31090 100644
--- a/lib/libocurses/addch.c
+++ b/lib/libocurses/addch.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: addch.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)addch.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/addnstr.c b/lib/libocurses/addnstr.c
index 22a52e6eb7b..343f13fb62f 100644
--- a/lib/libocurses/addnstr.c
+++ b/lib/libocurses/addnstr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: addnstr.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)addnstr.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <string.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/box.c b/lib/libocurses/box.c
index 276e1cf9c58..2a7ee9adcbf 100644
--- a/lib/libocurses/box.c
+++ b/lib/libocurses/box.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: box.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)box.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/clear.c b/lib/libocurses/clear.c
index 3d7daa07ae2..8ecacd1ce39 100644
--- a/lib/libocurses/clear.c
+++ b/lib/libocurses/clear.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: clear.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)clear.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/clrtobot.c b/lib/libocurses/clrtobot.c
index 4c8d0106c7d..e4f81ea67f0 100644
--- a/lib/libocurses/clrtobot.c
+++ b/lib/libocurses/clrtobot.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: clrtobot.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)clrtobot.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/clrtoeol.c b/lib/libocurses/clrtoeol.c
index 00285b0c264..45c60137404 100644
--- a/lib/libocurses/clrtoeol.c
+++ b/lib/libocurses/clrtoeol.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: clrtoeol.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)clrtoeol.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/cr_put.c b/lib/libocurses/cr_put.c
index 1e5969f435e..edd8a7ddaa0 100644
--- a/lib/libocurses/cr_put.c
+++ b/lib/libocurses/cr_put.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cr_put.c,v 1.6 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)cr_put.c	8.3 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <string.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/ctrace.c b/lib/libocurses/ctrace.c
index f309ec728ad..abf77bd4520 100644
--- a/lib/libocurses/ctrace.c
+++ b/lib/libocurses/ctrace.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: ctrace.c,v 1.5 2005/08/14 17:15:19 espie Exp $ */
 /*-
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)ctrace.c	8.2 (Berkeley) 10/5/93";
-#endif /* not lint */
-
 #ifdef DEBUG
 #include <stdio.h>
 #include <stdarg.h>
diff --git a/lib/libocurses/cur_hash.c b/lib/libocurses/cur_hash.c
index 5f3d7f6d5c0..97ab438674f 100644
--- a/lib/libocurses/cur_hash.c
+++ b/lib/libocurses/cur_hash.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: cur_hash.c,v 1.4 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1992, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)cur_hash.c	8.1 (Berkeley) 6/4/93";
-#endif	/* not lint */
-
 #include <sys/types.h>
 
 
diff --git a/lib/libocurses/curses.c b/lib/libocurses/curses.c
index 860d3346b79..ce4fd465eb0 100644
--- a/lib/libocurses/curses.c
+++ b/lib/libocurses/curses.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: curses.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)curses.c	8.3 (Berkeley) 5/4/94";
-#endif /* not lint */
-
 #include "curses.h"
 
 /* Private. */
diff --git a/lib/libocurses/delch.c b/lib/libocurses/delch.c
index a5e3fa87761..d8c0471a07c 100644
--- a/lib/libocurses/delch.c
+++ b/lib/libocurses/delch.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: delch.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)delch.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <string.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/deleteln.c b/lib/libocurses/deleteln.c
index a0e925c5e58..a65781ebb65 100644
--- a/lib/libocurses/deleteln.c
+++ b/lib/libocurses/deleteln.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: deleteln.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)deleteln.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <string.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/delwin.c b/lib/libocurses/delwin.c
index 2480ec4c558..addfe54c7dd 100644
--- a/lib/libocurses/delwin.c
+++ b/lib/libocurses/delwin.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: delwin.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)delwin.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <stdlib.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/erase.c b/lib/libocurses/erase.c
index f4768514d39..831457bf65c 100644
--- a/lib/libocurses/erase.c
+++ b/lib/libocurses/erase.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: erase.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)erase.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/fullname.c b/lib/libocurses/fullname.c
index 1a85767cf2e..7ab2de3827b 100644
--- a/lib/libocurses/fullname.c
+++ b/lib/libocurses/fullname.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: fullname.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)fullname.c	8.1 (Berkeley) 6/4/93";
-#endif	/* not lint */
-
 /*
  * fullname --
  *	This routine fills in "def" with the full name of the terminal.
diff --git a/lib/libocurses/getch.c b/lib/libocurses/getch.c
index 77f82fab0c1..9fa8eccecd4 100644
--- a/lib/libocurses/getch.c
+++ b/lib/libocurses/getch.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: getch.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)getch.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/getstr.c b/lib/libocurses/getstr.c
index 75604838726..cc4c351f4f7 100644
--- a/lib/libocurses/getstr.c
+++ b/lib/libocurses/getstr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: getstr.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)getstr.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/id_subwins.c b/lib/libocurses/id_subwins.c
index 638b23ad1b3..8dffd95bda8 100644
--- a/lib/libocurses/id_subwins.c
+++ b/lib/libocurses/id_subwins.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: id_subwins.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)id_subwins.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/idlok.c b/lib/libocurses/idlok.c
index 1d561fabb9f..434a5bf9c6f 100644
--- a/lib/libocurses/idlok.c
+++ b/lib/libocurses/idlok.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: idlok.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)idlok.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/initscr.c b/lib/libocurses/initscr.c
index 6e3ef3d479c..1c4e7e3a5f3 100644
--- a/lib/libocurses/initscr.c
+++ b/lib/libocurses/initscr.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: initscr.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)initscr.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <signal.h>
 #include <stdlib.h>
 
diff --git a/lib/libocurses/insch.c b/lib/libocurses/insch.c
index 6855e7a2540..c4b1702a55d 100644
--- a/lib/libocurses/insch.c
+++ b/lib/libocurses/insch.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: insch.c,v 1.4 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)insch.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <string.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/insertln.c b/lib/libocurses/insertln.c
index c9bded5cd6c..627640fe334 100644
--- a/lib/libocurses/insertln.c
+++ b/lib/libocurses/insertln.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: insertln.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)insertln.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <string.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/longname.c b/lib/libocurses/longname.c
index 08b47b9e2d4..ab679dc6e94 100644
--- a/lib/libocurses/longname.c
+++ b/lib/libocurses/longname.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: longname.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)longname.c	8.1 (Berkeley) 6/4/93";
-#endif	/* not lint */
-
 /*
  * longname --
  *	Fill in "def" with the long name of the terminal.
diff --git a/lib/libocurses/move.c b/lib/libocurses/move.c
index 95723804cd1..3c6b54efce6 100644
--- a/lib/libocurses/move.c
+++ b/lib/libocurses/move.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: move.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)move.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/mvwin.c b/lib/libocurses/mvwin.c
index 0c34d76e6b1..cc12e4cc008 100644
--- a/lib/libocurses/mvwin.c
+++ b/lib/libocurses/mvwin.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: mvwin.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)mvwin.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/newwin.c b/lib/libocurses/newwin.c
index 2c146b92ca8..88480e2c8b2 100644
--- a/lib/libocurses/newwin.c
+++ b/lib/libocurses/newwin.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: newwin.c,v 1.4 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)newwin.c	8.3 (Berkeley) 7/27/94";
-#endif	/* not lint */
-
 #include <stdlib.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/overlay.c b/lib/libocurses/overlay.c
index ad2b54025e0..6e0f473c616 100644
--- a/lib/libocurses/overlay.c
+++ b/lib/libocurses/overlay.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: overlay.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)overlay.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <ctype.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/overwrite.c b/lib/libocurses/overwrite.c
index 45c45a745e6..7441098b31d 100644
--- a/lib/libocurses/overwrite.c
+++ b/lib/libocurses/overwrite.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: overwrite.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)overwrite.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <ctype.h>
 #include <string.h>
 
diff --git a/lib/libocurses/printw.c b/lib/libocurses/printw.c
index 729383a91d5..712b2c06174 100644
--- a/lib/libocurses/printw.c
+++ b/lib/libocurses/printw.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: printw.c,v 1.5 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)printw.c	8.3 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include <stdarg.h>
 
 #include "curses.h"
diff --git a/lib/libocurses/putchar.c b/lib/libocurses/putchar.c
index 3093a774941..09c9eb5e224 100644
--- a/lib/libocurses/putchar.c
+++ b/lib/libocurses/putchar.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: putchar.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)putchar.c	8.2 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 #include "curses.h"
 
 void
diff --git a/lib/libocurses/refresh.c b/lib/libocurses/refresh.c
index 7952f672859..bf64c0525c2 100644
--- a/lib/libocurses/refresh.c
+++ b/lib/libocurses/refresh.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: refresh.c,v 1.6 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)refresh.c	8.7 (Berkeley) 8/13/94";
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <string.h>
 
diff --git a/lib/libocurses/scanw.c b/lib/libocurses/scanw.c
index 3fdb2189f32..a1e1827f1df 100644
--- a/lib/libocurses/scanw.c
+++ b/lib/libocurses/scanw.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: scanw.c,v 1.4 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)scanw.c	8.3 (Berkeley) 5/4/94";
-#endif	/* not lint */
-
 /*
  * scanw and friends.
  */
diff --git a/lib/libocurses/scroll.c b/lib/libocurses/scroll.c
index ef3d8b73b7f..7bae9559cda 100644
--- a/lib/libocurses/scroll.c
+++ b/lib/libocurses/scroll.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: scroll.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)scroll.c	8.3 (Berkeley) 5/4/94";
-#endif /* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/setterm.c b/lib/libocurses/setterm.c
index fb76d183350..488c3916681 100644
--- a/lib/libocurses/setterm.c
+++ b/lib/libocurses/setterm.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: setterm.c,v 1.7 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)setterm.c	8.7 (Berkeley) 7/27/94";
-#endif /* not lint */
-
 #include <sys/ioctl.h>
 
 #include <stdlib.h>
diff --git a/lib/libocurses/standout.c b/lib/libocurses/standout.c
index cbbe7f267e4..c43d0b594be 100644
--- a/lib/libocurses/standout.c
+++ b/lib/libocurses/standout.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: standout.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)standout.c	8.3 (Berkeley) 8/10/94";
-#endif /* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/termcap.c b/lib/libocurses/termcap.c
index 9ee06de037c..a70706fdedc 100644
--- a/lib/libocurses/termcap.c
+++ b/lib/libocurses/termcap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: termcap.c,v 1.8 2003/06/02 20:18:42 millert Exp $	*/
+/*	$OpenBSD: termcap.c,v 1.9 2005/08/14 17:15:19 espie Exp $	*/
 /*	$NetBSD: termcap.c,v 1.7 1995/06/05 19:45:52 pk Exp $	*/
 
 /*
@@ -30,14 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)termcap.c	8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$OpenBSD: termcap.c,v 1.8 2003/06/02 20:18:42 millert Exp $";
-#endif
-#endif /* not lint */
-
 #define	PBUFSIZ		512	/* max length of filename path */
 #define	PVECSIZ		32	/* max number of names in path */
 
diff --git a/lib/libocurses/tgoto.c b/lib/libocurses/tgoto.c
index 459423d8ac1..85c8eb92fef 100644
--- a/lib/libocurses/tgoto.c
+++ b/lib/libocurses/tgoto.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tgoto.c,v 1.3 2003/06/02 20:18:42 millert Exp $	*/
+/*	$OpenBSD: tgoto.c,v 1.4 2005/08/14 17:15:19 espie Exp $	*/
 /*	$NetBSD: tgoto.c,v 1.5 1995/06/05 19:45:54 pk Exp $	*/
 
 /*
@@ -30,14 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tgoto.c	8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$OpenBSD: tgoto.c,v 1.3 2003/06/02 20:18:42 millert Exp $";
-#endif
-#endif /* not lint */
-
 #include <string.h>
 #include <curses.h>
 
diff --git a/lib/libocurses/toucholap.c b/lib/libocurses/toucholap.c
index 260e90947f9..7f1514dd56e 100644
--- a/lib/libocurses/toucholap.c
+++ b/lib/libocurses/toucholap.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: toucholap.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)toucholap.c	8.2 (Berkeley) 5/4/94";
-#endif /* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/touchwin.c b/lib/libocurses/touchwin.c
index 61fd16be6d0..d1eb856550f 100644
--- a/lib/libocurses/touchwin.c
+++ b/lib/libocurses/touchwin.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: touchwin.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)touchwin.c	8.2 (Berkeley) 5/4/94";
-#endif /* not lint */
-
 #include "curses.h"
 
 /*
diff --git a/lib/libocurses/tputs.c b/lib/libocurses/tputs.c
index c0d58e90f72..c0857597fde 100644
--- a/lib/libocurses/tputs.c
+++ b/lib/libocurses/tputs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tputs.c,v 1.3 2003/06/02 20:18:42 millert Exp $	*/
+/*	$OpenBSD: tputs.c,v 1.4 2005/08/14 17:15:19 espie Exp $	*/
 /*	$NetBSD: tputs.c,v 1.5 1995/06/06 08:14:37 pk Exp $	*/
 
 /*
@@ -30,14 +30,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-#if 0
-static char sccsid[] = "@(#)tputs.c	8.1 (Berkeley) 6/4/93";
-#else
-static char rcsid[] = "$OpenBSD: tputs.c,v 1.3 2003/06/02 20:18:42 millert Exp $";
-#endif
-#endif /* not lint */
-
 #include <sgtty.h>
 #include <ctype.h>
 #include <curses.h>
diff --git a/lib/libocurses/tscroll.c b/lib/libocurses/tscroll.c
index d63dbec852c..89bd83e7c25 100644
--- a/lib/libocurses/tscroll.c
+++ b/lib/libocurses/tscroll.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tscroll.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)tscroll.c	8.4 (Berkeley) 7/27/94";
-#endif /* not lint */
-
 #include "curses.h"
 
 #define	MAXRETURNSIZE	64
diff --git a/lib/libocurses/tstp.c b/lib/libocurses/tstp.c
index 478622ad352..d2bb7eb61e9 100644
--- a/lib/libocurses/tstp.c
+++ b/lib/libocurses/tstp.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tstp.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)tstp.c	8.3 (Berkeley) 5/4/94";
-#endif /* not lint */
-
 #include <errno.h>
 #include <signal.h>
 #include <termios.h>
diff --git a/lib/libocurses/tty.c b/lib/libocurses/tty.c
index 8373edc182c..707108e4e49 100644
--- a/lib/libocurses/tty.c
+++ b/lib/libocurses/tty.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: tty.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*-
  * Copyright (c) 1992, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)tty.c	8.5 (Berkeley) 8/13/94";
-#endif /* not lint */
-
 #include <stdlib.h>
 #include <termios.h>
 #include <unistd.h>
diff --git a/lib/libocurses/unctrl.c b/lib/libocurses/unctrl.c
index 1149bd7941b..1be2ef46567 100644
--- a/lib/libocurses/unctrl.c
+++ b/lib/libocurses/unctrl.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: unctrl.c,v 1.3 2005/08/14 17:15:19 espie Exp $ */
 /*
  * Copyright (c) 1981, 1993
  *	The Regents of the University of California.  All rights reserved.
@@ -27,10 +28,6 @@
  * SUCH DAMAGE.
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)unctrl.c	8.1 (Berkeley) 6/4/93";
-#endif /* not lint */
-
 char *__unctrl[256] = {
 	"^@",  "^A",  "^B",  "^C",  "^D",  "^E",  "^F",  "^G",
 	"^H",  "^I",  "^J",  "^K",  "^L",  "^M",  "^N",  "^O",