pkg://kgames-1.0-2.src.rpm:545037/kgames-1.0.patch  info  downloads

diff --unified --recursive kgames-1.0/Imakefile kgames-1.0new/Imakefile
--- kgames-1.0/Imakefile	Wed Mar 13 07:46:29 1996
+++ kgames-1.0new/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,9 +1,8 @@
 #define IHaveSubdirs
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 
-/* Not building reversi - it was too slow on our machines */
 SUBDIRS = Xkw kspider kcanfield kklondike kmontana xmille \
-	ktowers kthieves kcribbage dominos slyfox mc
+	ktowers kthieves kcribbage dominos slyfox mc reversi
 
 MakeSubdirs($(SUBDIRS))
 DependSubdirs($(SUBDIRS))
diff --unified --recursive kgames-1.0/Xkw/Imakefile kgames-1.0new/Xkw/Imakefile
--- kgames-1.0/Xkw/Imakefile	Tue Apr 14 21:29:24 1998
+++ kgames-1.0new/Xkw/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,15 +1,6 @@
 #define DoNormalLib YES
 #include <Library.tmpl>
 
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
-
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
 /*
 MYTOP=..
 INCLUDES = -I$(MYTOP)
@@ -34,8 +25,8 @@
 LibraryObjectRule()
 /*
 InstallMultiple($(HEADERS),$(INCDIR)/Xkw)
-InstallMultiple($(CARDS_BITMAPS),$(INCDIR)/bitmaps)
 */
+InstallMultiple($(CARDS_BITMAPS),$(INCDIR)/X11/bitmaps)
 
 NormalLibraryTarget(Xkw,$(OBJS))
 
diff --unified --recursive kgames-1.0/Xkw/laylex.l kgames-1.0new/Xkw/laylex.l
--- kgames-1.0/Xkw/laylex.l	Wed Mar 13 07:46:31 1996
+++ kgames-1.0new/Xkw/laylex.l	Fri Dec 25 22:43:54 1998
@@ -1,6 +1,8 @@
 %{
+#ifndef FLEX_SCANNER
 #undef input
 #undef unput
+#endif
 
 #include    <X11/Xlib.h>
 #include    <X11/Xresource.h>
@@ -12,9 +14,14 @@
 #include    "laygram.h"
 static char *yysourcebase, *yysource;
 
+#ifndef FLEX_SCANNER
 #define input() (*yysource++)
 #define unput(c)    (--yysource)
-
+#else
+#include <string.h>
+static void my_yyinput(char *buf, int *result, int max_size);
+#define YY_INPUT(buf, res, max) my_yyinput(buf, &(res), max)
+#endif
 %}
 %%
 vertical		return VERTICAL;
@@ -117,3 +124,16 @@
 	fprintf (stderr, "<EOF>");
     fprintf (stderr, "\n");
 }
+
+#ifdef FLEX_SCANNER
+static void
+my_yyinput(buf, result, max_size)
+    char *buf; int *result; int max_size;
+{
+    int size = max_size < strlen(yysource) ? max_size : strlen(yysource);
+
+    strncpy(buf, yysource, size);
+    yysource += size;
+    *result = size;
+}
+#endif
diff --unified --recursive kgames-1.0/dominos/Dominos-color.ad kgames-1.0new/dominos/Dominos-color.ad
--- kgames-1.0/dominos/Dominos-color.ad	Wed Mar 13 07:46:33 1996
+++ kgames-1.0new/dominos/Dominos-color.ad	Fri Dec 25 22:32:53 1998
@@ -1,4 +1,4 @@
-#include "Dominos.ad"
+#include "Dominos"
 
 *Foreground: black
 *Background: #fffff0
diff --unified --recursive kgames-1.0/dominos/Imakefile kgames-1.0new/dominos/Imakefile
--- kgames-1.0/dominos/Imakefile	Tue Apr 14 21:29:56 1998
+++ kgames-1.0new/dominos/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/kcanfield/Imakefile kgames-1.0new/kcanfield/Imakefile
--- kgames-1.0/kcanfield/Imakefile	Tue Apr 14 21:30:13 1998
+++ kgames-1.0new/kcanfield/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 XMULIB=-lXmu
 XAWLIB=-lXaw
diff --unified --recursive kgames-1.0/kcanfield/KCanfield-color.ad kgames-1.0new/kcanfield/KCanfield-color.ad
--- kgames-1.0/kcanfield/KCanfield-color.ad	Wed Mar 13 07:46:34 1996
+++ kgames-1.0new/kcanfield/KCanfield-color.ad	Fri Dec 25 22:33:07 1998
@@ -1,4 +1,4 @@
-#include "KCanfield.ad"
+#include "KCanfield"
 
 *frame.background: #374
 *tableau.background: #374
diff --unified --recursive kgames-1.0/kcribbage/Imakefile kgames-1.0new/kcribbage/Imakefile
--- kgames-1.0/kcribbage/Imakefile	Tue Apr 14 21:30:29 1998
+++ kgames-1.0new/kcribbage/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/kcribbage/cards.c kgames-1.0new/kcribbage/cards.c
--- kgames-1.0/kcribbage/cards.c	Wed Mar 13 07:46:35 1996
+++ kgames-1.0new/kcribbage/cards.c	Fri Dec 25 22:32:24 1998
@@ -95,7 +95,7 @@
  * remove the card a from the deck d of n cards
  */
 
-remove( a, d, n )
+remove_card( a, d, n )
 
     CARD		a, d[];
     int			n;
diff --unified --recursive kgames-1.0/kcribbage/crib.c kgames-1.0new/kcribbage/crib.c
--- kgames-1.0/kcribbage/crib.c	Wed Mar 13 07:46:35 1996
+++ kgames-1.0new/kcribbage/crib.c	Fri Dec 25 22:32:24 1998
@@ -242,12 +242,12 @@
 	prompt = (quiet ? "Discard --> " : "Discard a card --> ");
 	cdiscard(mycrib);			/* puts best discard at end */
 	crd = phand[UIGetPlayerCard(phand, FULLHAND, prompt)];
-	remove(crd, phand, FULLHAND);
+	remove_card(crd, phand, FULLHAND);
 	UIPrintHand (phand, FULLHAND, PLAYER, FALSE);
 	crib[0] = crd;
 /* next four lines same as last four except for cdiscard() */
 	crd = phand[UIGetPlayerCard(phand, FULLHAND - 1, prompt)];
-	remove(crd, phand, FULLHAND - 1);
+	remove_card(crd, phand, FULLHAND - 1);
 	UIPrintHand (phand, FULLHAND, PLAYER, FALSE);
 	crib[1] = crd;
 	crib[2] = chand[4];
@@ -363,7 +363,7 @@
 		    if (j < 0)				/* if nothing scores */
 			j = cchose(ch, cnum, sum);
 		    crd = ch[j];
-		    remove(crd, ch, cnum--);
+		    remove_card(crd, ch, cnum--);
 		    sum += VAL(crd.rank);
 		    Table[Tcnt++] = crd;
 		    if (k > 0) {
@@ -411,7 +411,7 @@
 				msg("Total > 31 -- try again");
 			}
 		    makeknown(&crd, 1);
-		    remove(crd, ph, pnum--);
+		    remove_card(crd, ph, pnum--);
 		    i = pegscore(crd, Table, Tcnt, sum);
 		    sum += VAL(crd.rank);
 		    Table[Tcnt++] = crd;
diff --unified --recursive kgames-1.0/kcribbage/support.c kgames-1.0new/kcribbage/support.c
--- kgames-1.0/kcribbage/support.c	Wed Mar 13 07:46:36 1996
+++ kgames-1.0new/kcribbage/support.c	Fri Dec 25 22:32:24 1998
@@ -176,7 +176,7 @@
 	makedeck( d );
 	nc = CARDS;
 	for( i = 0; i < knownum; i++ )  {	/* get all other cards */
-	    remove( known[i], d, nc-- );
+	    remove_card( known[i], d, nc-- );
 	}
 	for( i = 0; i < 15; i++ )  sums[i] = 0L;
 	ns = 0;
@@ -185,8 +185,8 @@
 	    for( j = i + 1; j < FULLHAND; j++ )  {
 		cb[1] = chand[j];
 		for( k = 0; k < FULLHAND; k++ )  h[k] = chand[k];
-		remove( chand[i], h, FULLHAND );
-		remove( chand[j], h, FULLHAND - 1 );
+		remove_card( chand[i], h, FULLHAND );
+		remove_card( chand[j], h, FULLHAND - 1 );
 		for( k = 0; k < nc; k++ )  {
 		    sums[ns] += scorehand( h, d[k], CINHAND, TRUE, FALSE );
 		    if( mycrib )  sums[ns] += adjust( cb, d[k] );
@@ -198,8 +198,8 @@
 	j = 0;
 	for( i = 1; i < 15; i++ )  if(  sums[i] > sums[j]  )  j = i;
 	for( k = 0; k < FULLHAND; k++ )  h[k] = chand[k];
-	remove( h[ undo1[j] ], chand, FULLHAND );
-	remove( h[ undo2[j] ], chand, FULLHAND - 1 );
+	remove_card( h[ undo1[j] ], chand, FULLHAND );
+	remove_card( h[ undo2[j] ], chand, FULLHAND - 1 );
 	chand[4] = h[ undo1[j] ];
 	chand[5] = h[ undo2[j] ];
 }
diff --unified --recursive kgames-1.0/kcribbage/test.c kgames-1.0new/kcribbage/test.c
--- kgames-1.0/kcribbage/test.c	Wed Mar 13 07:46:36 1996
+++ kgames-1.0new/kcribbage/test.c	Fri Dec 25 22:32:24 1998
@@ -57,8 +57,8 @@
 		hand[1] = jc;
 		for( k = 0; k < CARDS; k++ )  d[k] = deck[k];
 		n = CARDS;
-		remove( ic, d, n-- );
-		remove( jc, d, n-- );
+		remove_card( ic, d, n-- );
+		remove_card( jc, d, n-- );
 		sum = 0;
 		sum2 = 0;
 		for( k = 0; k < n - 1; k++ )  {			/* 3rd card */
diff --unified --recursive kgames-1.0/kklondike/Imakefile kgames-1.0new/kklondike/Imakefile
--- kgames-1.0/kklondike/Imakefile	Tue Apr 14 21:30:44 1998
+++ kgames-1.0new/kklondike/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 XMULIB=-lXmu
 XAWLIB=-lXaw
diff --unified --recursive kgames-1.0/kmontana/Imakefile kgames-1.0new/kmontana/Imakefile
--- kgames-1.0/kmontana/Imakefile	Tue Apr 14 21:31:00 1998
+++ kgames-1.0new/kmontana/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 XMULIB=-lXmu
 XAWLIB=-lXaw
diff --unified --recursive kgames-1.0/kspider/Imakefile kgames-1.0new/kspider/Imakefile
--- kgames-1.0/kspider/Imakefile	Tue Apr 14 21:31:18 1998
+++ kgames-1.0new/kspider/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/kspider/KSpider-color.ad kgames-1.0new/kspider/KSpider-color.ad
--- kgames-1.0/kspider/KSpider-color.ad	Wed Mar 13 07:46:38 1996
+++ kgames-1.0new/kspider/KSpider-color.ad	Fri Dec 25 22:33:17 1998
@@ -1,4 +1,4 @@
-#include "KSpider.ad"
+#include "KSpider"
 
 *frame.background: gray50
 *Cards.background: gray50
diff --unified --recursive kgames-1.0/kthieves/Imakefile kgames-1.0new/kthieves/Imakefile
--- kgames-1.0/kthieves/Imakefile	Tue Apr 14 21:31:34 1998
+++ kgames-1.0new/kthieves/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/kthieves/KThieves-color.ad kgames-1.0new/kthieves/KThieves-color.ad
--- kgames-1.0/kthieves/KThieves-color.ad	Wed Mar 13 07:46:39 1996
+++ kgames-1.0new/kthieves/KThieves-color.ad	Fri Dec 25 22:33:26 1998
@@ -1,4 +1,4 @@
-#include "KThieves.ad"
+#include "KThieves"
 
 *frame.background: gray50
 *Cards.background: gray50
diff --unified --recursive kgames-1.0/ktowers/Imakefile kgames-1.0new/ktowers/Imakefile
--- kgames-1.0/ktowers/Imakefile	Tue Apr 14 21:31:50 1998
+++ kgames-1.0new/ktowers/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/mc/Imakefile kgames-1.0new/mc/Imakefile
--- kgames-1.0/mc/Imakefile	Tue Apr 14 21:32:03 1998
+++ kgames-1.0new/mc/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/reversi/Imakefile kgames-1.0new/reversi/Imakefile
--- kgames-1.0/reversi/Imakefile	Tue Apr 14 21:32:17 1998
+++ kgames-1.0new/reversi/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,13 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
-
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
@@ -38,6 +30,8 @@
 
 edges.out: genedge makeedge
 	genedge | makeedge > edges.out
+
+edges.c: edges.out
 
 NormalProgramTarget(genedge,genedge.o,/**/,/**/,/**/)
 
diff --unified --recursive kgames-1.0/slyfox/Imakefile kgames-1.0new/slyfox/Imakefile
--- kgames-1.0/slyfox/Imakefile	Tue Apr 14 21:32:31 1998
+++ kgames-1.0new/slyfox/Imakefile	Fri Dec 25 22:32:24 1998
@@ -1,12 +1,5 @@
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/xmille/Imakefile kgames-1.0new/xmille/Imakefile
--- kgames-1.0/xmille/Imakefile	Tue Apr 14 21:32:44 1998
+++ kgames-1.0new/xmille/Imakefile	Fri Dec 25 22:32:24 1998
@@ -9,15 +9,8 @@
 #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
 SUBDIRS =cards
 
-PROJECTROOT=/usr/X11
-BINDIR =$(PROJECTROOT)/bin
-LIBDIR = $(PROJECTROOT)/lib/X11
 MANSUFFIX=6
-MANPATH = $(PROJECTROOT)/man
-
-TEMP_ROOT=/usr/X11/bin
-INSTALL=/bin/install
-MKDIRHIER = /bin/sh $(TEMP_ROOT)/mkdirhier
+MANDIR=$(MANSOURCEPATH)$(MANSUFFIX)
 
 MYTOP=..
 INCLUDES = -I$(MYTOP)
diff --unified --recursive kgames-1.0/xmille/save.c kgames-1.0new/xmille/save.c
--- kgames-1.0/xmille/save.c	Wed Mar 13 07:46:45 1996
+++ kgames-1.0new/xmille/save.c	Fri Dec 25 22:32:24 1998
@@ -21,8 +21,12 @@
 /*
  *	This routine saves the current game for use at a later date
  */
+#ifdef __linux__  /* should be more general */
+#include <errno.h>
+#else
 extern int	errno;
 extern char	*sys_errlist[];
+#endif
 
 save() {
 
diff --unified --recursive kgames-1.0/xmille/varpush.c kgames-1.0new/xmille/varpush.c
--- kgames-1.0/xmille/varpush.c	Wed Mar 13 07:46:45 1996
+++ kgames-1.0new/xmille/varpush.c	Fri Dec 25 22:32:24 1998
@@ -36,7 +36,7 @@
 			char	buf[80];
 over:
 			printf("Debug file:");
-			gets(buf);
+			fgets(buf, sizeof(buf), stdin);
 			if ((outf = fopen(buf, "w")) == NULL) {
 				perror(buf);
 				goto over;