From 4d5ccb65e2b43cb42e02db2203e0a2e253f60b30 Mon Sep 17 00:00:00 2001
From: tron <tron>
Date: Wed, 19 Dec 2001 10:04:06 +0000
Subject: Make this package build on systems with XFree86 3.3.x and the
 "xpkwedge" package installed. This fixes PR pkg/14923 by Robert Elz.

---
 games/xtux/Makefile         |  7 ++++---
 games/xtux/distinfo         |  4 ++--
 games/xtux/patches/patch-ad | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'games/xtux')

diff --git a/games/xtux/Makefile b/games/xtux/Makefile
index d6be5ba90d6..2ed88071a5f 100644
--- a/games/xtux/Makefile
+++ b/games/xtux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2001/11/14 14:47:54 agc Exp $
+# $NetBSD: Makefile,v 1.4 2001/12/19 10:04:06 tron Exp $
 #
 
 DISTNAME=	xtux-arena-src-nov-15
@@ -11,9 +11,10 @@ MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://xtux.sourceforge.net/
 COMMENT=	2D multi-player shootout using images from the Open Software scene
 
-USE_XPM=	yes
-USE_GMAKE=	yes
+USE_XPM=	YES
+USE_GMAKE=	YES
 
+CFLAGS+=	-I${PREFIX}/include
 WRKSRC=		${WRKDIR}/xtux
 
 do-install:
diff --git a/games/xtux/distinfo b/games/xtux/distinfo
index f1e75dc1d2d..75e342d42cf 100644
--- a/games/xtux/distinfo
+++ b/games/xtux/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 02:08:43 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/12/19 10:04:06 tron 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-ab) = a2cd15c9bc6f51ddadf22cc7a205f7763b83bc0b
 SHA1 (patch-ac) = aada5a97d3304b99c5ab3905e4e7c5003e642be0
-SHA1 (patch-ad) = 852dd838d0baca64258c77033bdf81b1c85523e7
+SHA1 (patch-ad) = ca59e7827e87d8e7f01384906ae9ff9f52d02b5e
diff --git a/games/xtux/patches/patch-ad b/games/xtux/patches/patch-ad
index 441676db9c9..4ae689b3f12 100644
--- a/games/xtux/patches/patch-ad
+++ b/games/xtux/patches/patch-ad
@@ -1,13 +1,21 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/11/17 06:45:11 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2001/12/19 10:04:06 tron Exp $
 
---- src/client/Makefile.orig	Thu Nov 16 07:40:42 2000
-+++ src/client/Makefile
-@@ -23,7 +23,7 @@
+--- src/client/Makefile.orig	Wed Aug 30 08:59:29 2000
++++ src/client/Makefile	Wed Dec 19 11:00:51 2001
+@@ -16,14 +16,14 @@
+ BINARY = $(TOPLEVEL_PATH)/xtux
+ 
+ # Flags used when compiling
+-CFLAGS = -g -Wall -O -DDATADIR=\"$(DATADIR)\"
++CFLAGS = -g -Wall -O -DDATADIR=\"$(DATADIR)\" -I$(PREFIX)/include
+ 
+ # Paths to header files
+ X11_INC = -I$(X11_PATH)/include
  COMMON_INC = -I$(COMMON_PATH)
  
  # Libraries used in linking
 -X11LIB = -L$(X11_PATH)/lib -lX11
-+X11LIB = -Wl,-R${X11_PATH}/lib -L$(X11_PATH)/lib -lX11
++X11LIB = -Wl,-R$(X11_PATH)/lib -L$(X11_PATH)/lib -Wl,-R$(PREFIX)/lib -L$(PREFIX)/lib -lX11
  XPMLIB = -lXpm
  MATHLIB = -lm
  
-- 
cgit v1.2.3