Major overhaul and cleanup. Support for .ubi image file installations.grafted

Only compile&install a minimum host Gforth for bootstrapping the target
Gforth, removing strange emacs-dependencies that cropped up earlier.

Image file can now be built on the nanonote using 'gforth-update-image'
command.  Also, Gforth is now run through a wrapper that calls
'gforth-update-image' automatically, if necessary.

Also first attempts at supporting libcc C-interface libraries pre-compiled on
the host.

Tested to compile on amd64 and i386.

4 files changed, 606 insertions, 0 deletions

diff --git a/bsd-games/patches/001-tetris.patch b/bsd-games/patches/001-tetris.patch
new file mode 100644
index 0000000..a23bc16
--- /dev/null
+++ b/bsd-games/patches/001-tetris.patch
@@ -0,0 +1,87 @@
+diff -u bsd-games-2.17/tetris/input.c bsd-games-2.17-p/tetris/input.c
+--- bsd-games-2.17/tetris/input.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/tetris/input.c	2010-07-26 22:04:34.422302192 +0400
+@@ -85,7 +85,7 @@
+ 		endtv = *tvp;
+ 		timeout = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;
+ 	} else
+-		timeout = INFTIM;
++		timeout = -1;
+ again:
+ 	set[0].fd = STDIN_FILENO;
+ 	set[0].events = POLLIN;
+diff -u bsd-games-2.17/tetris/pathnames.h.in bsd-games-2.17-p/tetris/pathnames.h.in
+--- bsd-games-2.17/tetris/pathnames.h.in	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/tetris/pathnames.h.in	2010-07-27 11:42:20.386554141 +0400
+@@ -34,4 +34,4 @@
+  *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
+  */
+ 
+-#define _PATH_SCOREFILE	"@tetris_scorefile@"
++#define _PATH_SCOREFILE	"/usr/share/games/tetris-bsd.scores"
+diff -u bsd-games-2.17/tetris/screen.c bsd-games-2.17-p/tetris/screen.c
+--- bsd-games-2.17/tetris/screen.c	2004-01-27 23:52:07.000000000 +0300
++++ bsd-games-2.17-p/tetris/screen.c	2010-07-26 22:04:34.422151495 +0400
+@@ -73,7 +73,7 @@
+ extern char	PC, *BC, *UP;	/* tgoto requires globals: ugh! */
+ static char BCdefault[] = "\b";
+ #ifndef NCURSES_VERSION
+-short	ospeed;
++speed_t	ospeed;
+ #endif
+ 
+ static char
+@@ -287,6 +287,7 @@
+ 		stop("tcgetattr() fails");
+ 	newtt = oldtt;
+ 	newtt.c_lflag &= ~(ICANON|ECHO);
++#define OXTABS XTABS
+ 	newtt.c_oflag &= ~OXTABS;
+ 	newtt.c_cc[VMIN] = 1;
+ 	newtt.c_cc[VTIME] = 0;
+diff -u bsd-games-2.17/tetris/shapes.c bsd-games-2.17-p/tetris/shapes.c
+--- bsd-games-2.17/tetris/shapes.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/tetris/shapes.c	2010-07-27 09:30:41.267111585 +0400
+@@ -83,7 +83,7 @@
+ 	const struct shape *shape;
+ 	int pos;
+ {
+-	int *o = shape->off;
++	const int *o = shape->off;
+ 
+ 	if (board[pos] || board[pos + *o++] || board[pos + *o++] ||
+ 	    board[pos + *o])
+@@ -100,7 +100,7 @@
+ 	const struct shape *shape;
+ 	int pos, onoff;
+ {
+-	int *o = shape->off;
++	const int *o = shape->off;
+ 
+ 	board[pos] = onoff;
+ 	board[pos + *o++] = onoff;
+diff -u bsd-games-2.17/tetris/tetris.c bsd-games-2.17-p/tetris/tetris.c
+--- bsd-games-2.17/tetris/tetris.c	2004-01-27 23:52:07.000000000 +0300
++++ bsd-games-2.17-p/tetris/tetris.c	2010-08-12 12:21:29.685301361 +0400
+@@ -35,10 +35,10 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ __COPYRIGHT("@(#) Copyright (c) 1992, 1993\n\
+ 	The Regents of the University of California.  All rights reserved.\n");
+-#endif /* not lint */
++#endif*/ /* not lint */
+ 
+ /*
+  * Tetris (or however it is spelled).
+@@ -145,7 +145,7 @@
+ 		exit(1);
+ 	close(fd);
+ 
+-	keys = "jkl pq";
++	keys = "aks pq";
+ 
+ 	while ((ch = getopt(argc, argv, "k:l:ps")) != -1)
+ 		switch(ch) {
diff --git a/bsd-games/patches/002-primes.patch b/bsd-games/patches/002-primes.patch
new file mode 100644
index 0000000..2ad32c6
--- /dev/null
+++ b/bsd-games/patches/002-primes.patch
@@ -0,0 +1,64 @@
+diff -u bsd-games-2.17/primes/pattern.c bsd-games-2.17-p/primes/pattern.c
+--- bsd-games-2.17/primes/pattern.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/primes/pattern.c	2010-07-27 09:07:23.122817978 +0400
+@@ -33,13 +33,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)pattern.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: pattern.c,v 1.6 2003/08/07 09:37:33 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ /*
+  * pattern - the Eratosthenes sieve on odd numbers for 3,5,7,11 and 13
+diff -u bsd-games-2.17/primes/primes.c bsd-games-2.17-p/primes/primes.c
+--- bsd-games-2.17/primes/primes.c	2004-01-27 23:52:07.000000000 +0300
++++ bsd-games-2.17-p/primes/primes.c	2010-07-27 09:07:52.303319233 +0400
+@@ -33,18 +33,18 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ __COPYRIGHT("@(#) Copyright (c) 1989, 1993\n\
+ 	The Regents of the University of California.  All rights reserved.\n");
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+-#ifndef lint
++/*#ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)primes.c	8.5 (Berkeley) 5/10/95";
+ #else
+ __RCSID("$NetBSD: primes.c,v 1.12 2004/01/27 20:30:30 jsm Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ /*
+  * primes - generate a table of primes between two values
+diff -u bsd-games-2.17/primes/pr_tbl.c bsd-games-2.17-p/primes/pr_tbl.c
+--- bsd-games-2.17/primes/pr_tbl.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/primes/pr_tbl.c	2010-07-27 09:08:15.198301714 +0400
+@@ -33,13 +33,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)pr_tbl.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: pr_tbl.c,v 1.7 2003/08/07 09:37:33 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ /*
+  * prime - prime table
diff --git a/bsd-games/patches/003-worm.patch b/bsd-games/patches/003-worm.patch
new file mode 100644
index 0000000..9705c2e
--- /dev/null
+++ b/bsd-games/patches/003-worm.patch
@@ -0,0 +1,26 @@
+diff -u bsd-games-2.17/worm/worm.c bsd-games-2.17-p/worm/worm.c
+--- bsd-games-2.17/worm/worm.c	2004-01-27 23:52:07.000000000 +0300
++++ bsd-games-2.17-p/worm/worm.c	2010-07-31 21:36:08.313419076 +0400
+@@ -30,18 +30,18 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
+ 	The Regents of the University of California.  All rights reserved.\n");
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)worm.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: worm.c,v 1.25 2004/01/27 20:30:31 jsm Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ /*
+  * Worm.  Written by Michael Toy
diff --git a/bsd-games/patches/004-backgammon.patch b/bsd-games/patches/004-backgammon.patch
new file mode 100644
index 0000000..80d1c2a
--- /dev/null
+++ b/bsd-games/patches/004-backgammon.patch
@@ -0,0 +1,429 @@
+diff -ur bsd-games-2.17/backgammon/backgammon/extra.c bsd-games-2.17-p/backgammon/backgammon/extra.c
+--- bsd-games-2.17/backgammon/backgammon/extra.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/backgammon/extra.c	2010-07-31 22:10:07.910053909 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)extra.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: extra.c,v 1.5 2003/08/07 09:36:55 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ #include "backlocal.h"
+diff -ur bsd-games-2.17/backgammon/backgammon/main.c bsd-games-2.17-p/backgammon/backgammon/main.c
+--- bsd-games-2.17/backgammon/backgammon/main.c	2005-02-16 09:24:50.000000000 +0300
++++ bsd-games-2.17-p/backgammon/backgammon/main.c	2010-08-01 11:08:39.969952583 +0400
+@@ -30,18 +30,18 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
+ 	The Regents of the University of California.  All rights reserved.\n");
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: main.c,v 1.21 2005/02/15 12:56:20 jsm Exp $");
+ #endif
+-#endif				/* not lint */
++#endif				*/ /* not lint */
+ 
+ #include <time.h>
+ 
+@@ -49,6 +49,7 @@
+ #include "backlocal.h"
+ 
+ #define MVPAUSE	5		/* time to sleep when stuck */
++#define OXTABS XTABS
+ 
+ extern const char   *const instr[];		/* text of instructions */
+ extern const char   *const message[];		/* update message */
+@@ -124,7 +125,7 @@
+ #ifdef V7
+ 	while (*++argv != 0)	/* process arguments */
+ #else
+-	while (*++argv != -1)	/* process arguments */
++	while (*++argv != 0)	/* process arguments */
+ #endif
+ 		getarg(&argv);
+ 	args[acnt] = '\0';
+diff -ur bsd-games-2.17/backgammon/backgammon/move.c bsd-games-2.17-p/backgammon/backgammon/move.c
+--- bsd-games-2.17/backgammon/backgammon/move.c	2004-01-27 23:52:07.000000000 +0300
++++ bsd-games-2.17-p/backgammon/backgammon/move.c	2010-07-31 22:10:41.854259314 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)move.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: move.c,v 1.8 2004/01/27 20:30:28 jsm Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ #include "backlocal.h"
+diff -ur bsd-games-2.17/backgammon/backgammon/text.c bsd-games-2.17-p/backgammon/backgammon/text.c
+--- bsd-games-2.17/backgammon/backgammon/text.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/backgammon/text.c	2010-07-31 22:10:52.377805941 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)text.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: text.c,v 1.7 2003/08/07 09:36:56 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/backgammon/version.c bsd-games-2.17-p/backgammon/backgammon/version.c
+--- bsd-games-2.17/backgammon/backgammon/version.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/backgammon/version.c	2010-07-31 22:11:05.756426999 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)version.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: version.c,v 1.6 2003/08/07 09:36:56 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ const char   *const message[] = {
+ 	"Last updated on Friday, October 10, 1997.",
+diff -ur bsd-games-2.17/backgammon/common_source/allow.c bsd-games-2.17-p/backgammon/common_source/allow.c
+--- bsd-games-2.17/backgammon/common_source/allow.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/allow.c	2010-07-31 22:07:44.982982743 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)allow.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: allow.c,v 1.5 2003/08/07 09:36:56 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/board.c bsd-games-2.17-p/backgammon/common_source/board.c
+--- bsd-games-2.17/backgammon/common_source/board.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/board.c	2010-07-31 22:08:08.852355705 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)board.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: board.c,v 1.7 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/check.c bsd-games-2.17-p/backgammon/common_source/check.c
+--- bsd-games-2.17/backgammon/common_source/check.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/check.c	2010-07-31 22:08:22.639630328 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)check.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: check.c,v 1.5 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/fancy.c bsd-games-2.17-p/backgammon/common_source/fancy.c
+--- bsd-games-2.17/backgammon/common_source/fancy.c	2004-04-24 20:13:09.000000000 +0400
++++ bsd-games-2.17-p/backgammon/common_source/fancy.c	2010-07-31 22:08:35.011397017 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)fancy.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: fancy.c,v 1.12 2004/04/23 02:58:27 simonb Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/init.c bsd-games-2.17-p/backgammon/common_source/init.c
+--- bsd-games-2.17/backgammon/common_source/init.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/init.c	2010-07-31 22:08:46.900301922 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)init.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: init.c,v 1.8 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include <termios.h>
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/odds.c bsd-games-2.17-p/backgammon/common_source/odds.c
+--- bsd-games-2.17/backgammon/common_source/odds.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/odds.c	2010-07-31 22:09:03.219958336 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)odds.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: odds.c,v 1.5 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/one.c bsd-games-2.17-p/backgammon/common_source/one.c
+--- bsd-games-2.17/backgammon/common_source/one.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/one.c	2010-07-31 22:09:15.025538516 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)one.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: one.c,v 1.5 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/save.c bsd-games-2.17-p/backgammon/common_source/save.c
+--- bsd-games-2.17/backgammon/common_source/save.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/save.c	2010-08-01 00:38:38.876427096 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)save.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: save.c,v 1.10 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include <errno.h>
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/subs.c bsd-games-2.17-p/backgammon/common_source/subs.c
+--- bsd-games-2.17/backgammon/common_source/subs.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/subs.c	2010-08-01 11:10:44.780266356 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)subs.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: subs.c,v 1.14 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/common_source/table.c bsd-games-2.17-p/backgammon/common_source/table.c
+--- bsd-games-2.17/backgammon/common_source/table.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/common_source/table.c	2010-07-31 22:09:54.655414207 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/* #ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)table.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: table.c,v 1.7 2003/08/07 09:36:57 agc Exp $");
+ #endif
+-#endif /* not lint */
++#endif */ /* not lint */
+ 
+ #include "back.h"
+ 
+diff -ur bsd-games-2.17/backgammon/teachgammon/data.c bsd-games-2.17-p/backgammon/teachgammon/data.c
+--- bsd-games-2.17/backgammon/teachgammon/data.c	2004-01-02 21:04:51.000000000 +0300
++++ bsd-games-2.17-p/backgammon/teachgammon/data.c	2010-08-01 11:18:14.579882098 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)data.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: data.c,v 1.7 2004/01/01 15:59:09 jsm Exp $");
+ #endif
+-#endif				/* not lint */
++#endif				*//* not lint */
+ 
+ #include "tutor.h"
+ 
+diff -ur bsd-games-2.17/backgammon/teachgammon/teach.c bsd-games-2.17-p/backgammon/teachgammon/teach.c
+--- bsd-games-2.17/backgammon/teachgammon/teach.c	2005-02-16 09:24:50.000000000 +0300
++++ bsd-games-2.17-p/backgammon/teachgammon/teach.c	2010-08-01 11:39:32.956134539 +0400
+@@ -30,18 +30,18 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ __COPYRIGHT("@(#) Copyright (c) 1980, 1993\n\
+ 	The Regents of the University of California.  All rights reserved.\n");
+-#endif				/* not lint */
++#endif				*//* not lint */
+ 
+-#ifndef lint
++/*#ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)teach.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: teach.c,v 1.16 2005/02/15 12:56:20 jsm Exp $");
+ #endif
+-#endif				/* not lint */
++#endif				*//* not lint */
+ 
+ #include "back.h"
+ #include "tutor.h"
+@@ -59,6 +59,8 @@
+ 	0
+ };
+ 
++#define OXTABS XTABS
++
+ int
+ main(argc, argv)
+ 	int     argc __attribute__((__unused__));
+@@ -81,7 +83,7 @@
+ #ifdef V7
+ 	while (*++argv != 0)
+ #else
+-	while (*++argv != -1)
++	while (*++argv != 0)
+ #endif
+ 		getarg(&argv);
+ 	if (tflag) {
+diff -ur bsd-games-2.17/backgammon/teachgammon/ttext1.c bsd-games-2.17-p/backgammon/teachgammon/ttext1.c
+--- bsd-games-2.17/backgammon/teachgammon/ttext1.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/teachgammon/ttext1.c	2010-08-01 11:18:57.935091377 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)ttext1.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: ttext1.c,v 1.7 2003/08/07 09:36:58 agc Exp $");
+ #endif
+-#endif				/* not lint */
++#endif				*//* not lint */
+ 
+ #include "back.h"
+ #include "tutor.h"
+diff -ur bsd-games-2.17/backgammon/teachgammon/ttext2.c bsd-games-2.17-p/backgammon/teachgammon/ttext2.c
+--- bsd-games-2.17/backgammon/teachgammon/ttext2.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/teachgammon/ttext2.c	2010-08-01 11:19:09.174691288 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)ttext2.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: ttext2.c,v 1.7 2003/08/07 09:36:58 agc Exp $");
+ #endif
+-#endif				/* not lint */
++#endif				*//* not lint */
+ 
+ #include "back.h"
+ #include "tutor.h"
+diff -ur bsd-games-2.17/backgammon/teachgammon/tutor.c bsd-games-2.17-p/backgammon/teachgammon/tutor.c
+--- bsd-games-2.17/backgammon/teachgammon/tutor.c	2003-12-17 05:47:37.000000000 +0300
++++ bsd-games-2.17-p/backgammon/teachgammon/tutor.c	2010-08-01 11:37:12.464301896 +0400
+@@ -30,13 +30,13 @@
+  */
+ 
+ #include <sys/cdefs.h>
+-#ifndef lint
++/*#ifndef lint
+ #if 0
+ static char sccsid[] = "@(#)tutor.c	8.1 (Berkeley) 5/31/93";
+ #else
+ __RCSID("$NetBSD: tutor.c,v 1.6 2003/08/07 09:36:58 agc Exp $");
+ #endif
+-#endif				/* not lint */
++#endif				*//* not lint */
+ 
+ #include "back.h"
+ #include "tutor.h"