5 files changed, 48 insertions, 41 deletions
diff --git a/games/xtux/files/patch-aa b/games/xtux/files/patch-aa
index c06b409340eb..ccf272f92490 100644
--- a/games/xtux/files/patch-aa
+++ b/games/xtux/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig	Sun Nov 19 12:52:12 2000
-+++ Makefile	Tue Feb  6 09:35:36 2001
+--- Makefile.orig	Wed Feb  5 00:59:01 2003
++++ Makefile	Thu May 15 19:59:20 2003
 @@ -5,7 +5,7 @@
  #============================================================#
  
@@ -9,11 +9,49 @@
  #Eg you might want to put the data files here......
  #DATADIR = /usr/share/games/xtux
  
-@@ -14,7 +14,7 @@
- SV_SRC_DIR = src/server
+@@ -15,36 +15,36 @@
  CL_SRC_DIR = src/client
+ GZ_SRC_DIR = src/ggz
  
 -MAKE = @make -C
-+MAKE = @gmake -C
++#MAKE = @make -C
+ 
+ all:	common ggz client server
+ 
+ clean:
+-	$(MAKE) $(CM_SRC_DIR) clean
+-	$(MAKE) $(SV_SRC_DIR) clean
+-	$(MAKE) $(CL_SRC_DIR) clean
+-	$(MAKE) $(GZ_SRC_DIR) clean
++	$(MAKE) -C $(CM_SRC_DIR) clean
++	$(MAKE) -C $(SV_SRC_DIR) clean
++	$(MAKE) -C $(CL_SRC_DIR) clean
++	$(MAKE) -C $(GZ_SRC_DIR) clean
+ 
+ common:
+ 	@echo
+ 	@echo "    ************* Building COMMON lib *************"
+ 	@echo
+-	$(MAKE) $(CM_SRC_DIR) $(MFLAGS)
++	$(MAKE) -C $(CM_SRC_DIR) $(MFLAGS)
+ server:
+ 	@echo
+ 	@echo "    *************   Building SERVER   *************"
+ 	@echo
+-	$(MAKE) $(SV_SRC_DIR) $(MFLAGS)
++	$(MAKE) -C $(SV_SRC_DIR) $(MFLAGS)
+ 
+ client:
+ 	@echo
+ 	@echo "    *************   Building CLIENT   *************"
+ 	@echo
+-	$(MAKE) $(CL_SRC_DIR) $(MFLAGS)
++	$(MAKE) -C $(CL_SRC_DIR) $(MFLAGS)
+ 
+ ggz:
+ 	@echo
+ 	@echo "    *************   Building GGZ   *************"
+ 	@echo
+-	$(MAKE) $(GZ_SRC_DIR) $(MFLAGS)
++	$(MAKE) -C $(GZ_SRC_DIR) $(MFLAGS)
  
- all:	common client server
diff --git a/games/xtux/files/patch-ac b/games/xtux/files/patch-ac
deleted file mode 100644
index c8d2079ff050..000000000000
--- a/games/xtux/files/patch-ac
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/common/Makefile.orig	Sun Feb  4 11:57:32 2001
-+++ src/common/Makefile	Tue Feb  6 09:42:15 2001
-@@ -1,7 +1,6 @@
- # Makefile for stuff that's common between server & client.
- 
- CC	= gcc
--CFLAGS	= -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
- AR	= ar
- RANLIB	= ranlib
diff --git a/games/xtux/files/patch-ad b/games/xtux/files/patch-ad
deleted file mode 100644
index d3905d579de9..000000000000
--- a/games/xtux/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/client/Makefile.orig	Sun Nov 19 12:53:00 2000
-+++ src/client/Makefile	Sat Dec 23 07:53:09 2000
-@@ -20,9 +20,6 @@
- # Where to put the XTux client binary.
- BINARY = $(TOPLEVEL_PATH)/xtux
- 
--# Flags used when compiling
--CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
--
- # Paths to header files
- X11_INC = -I$(X11_PATH)/include
- COMMON_INC = -I$(COMMON_PATH)
diff --git a/games/xtux/files/patch-ae b/games/xtux/files/patch-ae
deleted file mode 100644
index 0fa151df6d66..000000000000
--- a/games/xtux/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/server/Makefile.orig	Sun Nov 19 12:51:56 2000
-+++ src/server/Makefile	Sat Dec 23 07:53:27 2000
-@@ -16,9 +16,6 @@
- # Where to put the XTux client binary.
- BINARY = $(TOPLEVEL_PATH)/tux_serv
- 
--# Flags used when compiling
--CFLAGS = -g -Wall -O2 -DDATADIR=\"$(DATADIR)\"
--
- # Paths to header files
- COMMON_INC = -I$(COMMON_PATH)
diff --git a/games/xtux/files/patch-af b/games/xtux/files/patch-af
index 422a5c3738dd..43177909f8ed 100644
--- a/games/xtux/files/patch-af
+++ b/games/xtux/files/patch-af
@@ -1,8 +1,9 @@
---- src/common/timing.c.orig	Fri May  9 15:21:25 2003
-+++ src/common/timing.c	Fri May  9 15:35:10 2003
-@@ -1,6 +1,11 @@
+--- src/common/timing.c.orig	Mon Feb 17 12:10:07 2003
++++ src/common/timing.c	Thu May 15 20:03:11 2003
+@@ -1,6 +1,12 @@
  #include <sys/time.h>
  #include <unistd.h>
++#include <sys/param.h>
 +#if __FreeBSD_version >= 500000
  #include <stdint.h>
 +#else