From f397d0268364854784f585137fdf56d00e854595 Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Thu, 8 Apr 2004 19:17:04 +0000
Subject: Remove build dependency on gmake by not using "-C".  Fixes a build
 problem on Linux, which was caused by hardcoded "gmake".

---
 games/xtux/Makefile         |  3 +--
 games/xtux/distinfo         |  4 ++--
 games/xtux/patches/patch-aa | 37 ++++++++++++++++++++++++++++++++-----
 3 files changed, 35 insertions(+), 9 deletions(-)

(limited to 'games/xtux')

diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index 5d45d7e1f47..d2b24b580fd 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/03/09 21:19:01 snj Exp $
+# $NetBSD: Makefile,v 1.13 2004/04/08 19:17:04 minskim Exp $
 
 DISTNAME=	xtux-arena-src-nov-15
 PKGNAME=	xtux-0.2000.11.15
@@ -12,7 +12,6 @@ COMMENT=	2D multi-player shootout using images from the Open Software scene
 
 WRKSRC=		${WRKDIR}/xtux
 USE_BUILDLINK3=	YES
-USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 do-install:
diff --git a/games/xtux/distinfo b/games/xtux/distinfo
index 75e342d42cf..499857b0175 100644
--- a/games/xtux/distinfo
+++ b/games/xtux/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2001/12/19 10:04:06 tron Exp $
+$NetBSD: distinfo,v 1.4 2004/04/08 19:17:04 minskim Exp $
 
 SHA1 (xtux-arena-src-nov-15.tar.gz) = f8141f0d0c190adfd79b23137ffd632688b539bd
 Size (xtux-arena-src-nov-15.tar.gz) = 1278142 bytes
-SHA1 (patch-aa) = fe14a4bdba903e18ede0874629515ccd286d70aa
+SHA1 (patch-aa) = 797c86e26852d8280598e0e8a7e19af7842977ee
 SHA1 (patch-ab) = a2cd15c9bc6f51ddadf22cc7a205f7763b83bc0b
 SHA1 (patch-ac) = aada5a97d3304b99c5ab3905e4e7c5003e642be0
 SHA1 (patch-ad) = ca59e7827e87d8e7f01384906ae9ff9f52d02b5e
diff --git a/games/xtux/patches/patch-aa b/games/xtux/patches/patch-aa
index 7d2542cdc6f..c9d71046046 100644
--- a/games/xtux/patches/patch-aa
+++ b/games/xtux/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2000/11/17 06:45:11 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 2004/04/08 19:17:04 minskim Exp $
 
---- Makefile.orig	Wed Nov  8 15:38:09 2000
+--- Makefile.orig	2000-11-08 08:38:09.000000000 -0600
 +++ Makefile
 @@ -5,7 +5,7 @@
  #============================================================#
@@ -11,12 +11,39 @@ $NetBSD: patch-aa,v 1.1.1.1 2000/11/17 06:45:11 hubertf Exp $
  #Eg you might want to put the data files here......
  #DATADIR = /usr/share/games/xtux
  
-@@ -14,7 +14,7 @@
+@@ -14,29 +14,27 @@ CM_SRC_DIR = src/common
  SV_SRC_DIR = src/server
  CL_SRC_DIR = src/client
  
 -MAKE = @make -C
-+MAKE = @gmake -C
- 
+-
  all:	common client server
  
+ clean:
+-	$(MAKE) $(CM_SRC_DIR) clean
+-	$(MAKE) $(SV_SRC_DIR) clean
+-	$(MAKE) $(CL_SRC_DIR) clean
++	cd ${CM_SRC_DIR} && ${MAKE} clean
++	cd ${SV_SRC_DIR} && ${MAKE} clean
++	cd ${CL_SRC_DIR} && ${MAKE} clean
+ 
+ #Apps
+ common:
+ 	@echo
+ 	@echo "    ************* Building COMMON lib *************"
+ 	@echo
+-	$(MAKE) $(CM_SRC_DIR) $(MFLAGS)
++	cd ${CM_SRC_DIR} && ${MAKE} $(MFLAGS)
+ server:
+ 	@echo
+ 	@echo "    *************   Building SERVER   *************"
+ 	@echo
+-	$(MAKE) $(SV_SRC_DIR) $(MFLAGS)
++	cd ${SV_SRC_DIR} && ${MAKE} $(MFLAGS)
+ 
+ client:
+ 	@echo
+ 	@echo "    *************   Building CLIENT   *************"
+ 	@echo
+-	$(MAKE) $(CL_SRC_DIR) $(MFLAGS)
++	cd ${CL_SRC_DIR} && ${MAKE} $(MFLAGS)
-- 
cgit v1.2.3