From 83c2f18c0cfe1592842f2a0348140ef7ac837e6b Mon Sep 17 00:00:00 2001
From: rillig <rillig@pkgsrc.org>
Date: Wed, 10 Oct 2007 11:36:40 +0000
Subject: Fixed "extra qualification" errors.

---
 games/glaxium/distinfo         |  6 ++++--
 games/glaxium/patches/patch-ab | 11 +----------
 games/glaxium/patches/patch-ac | 13 +++++++++++++
 games/glaxium/patches/patch-ad | 13 +++++++++++++
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 games/glaxium/patches/patch-ac
 create mode 100644 games/glaxium/patches/patch-ad

(limited to 'games/glaxium')

diff --git a/games/glaxium/distinfo b/games/glaxium/distinfo
index 18045515424..7ec9ba92dd9 100644
--- a/games/glaxium/distinfo
+++ b/games/glaxium/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2006/09/25 14:15:25 joerg Exp $
+$NetBSD: distinfo,v 1.4 2007/10/10 11:36:40 rillig Exp $
 
 SHA1 (glaxium_0.5.tar.gz) = 42526a009a377a6fede7b7d343a0cd57c2f8e23e
 RMD160 (glaxium_0.5.tar.gz) = 5c988c53d4205ac80e0011a893a80daecf096c1f
 Size (glaxium_0.5.tar.gz) = 1692219 bytes
 SHA1 (patch-aa) = 9b8299ed10aaea1e862c929b6f20eef0811cae35
-SHA1 (patch-ab) = a7bb7f076f5ea92073ade0fa6c31029589d5c8e7
+SHA1 (patch-ab) = e8f2abea9053d73090fdb9ec92806fe21b68d3ce
+SHA1 (patch-ac) = ac0a11ca229865eb637425d6065729d1c8fc3da2
+SHA1 (patch-ad) = 3572e6f5c97f342d5b68024c7ebb17aeedb8b667
diff --git a/games/glaxium/patches/patch-ab b/games/glaxium/patches/patch-ab
index 2167f61e57b..1815583119a 100644
--- a/games/glaxium/patches/patch-ab
+++ b/games/glaxium/patches/patch-ab
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2006/09/25 14:15:25 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2007/10/10 11:36:40 rillig Exp $
 
 --- configure.orig	2002-10-20 18:32:19.000000000 +0000
 +++ configure
@@ -20,12 +20,3 @@ $NetBSD: patch-ab,v 1.1 2006/09/25 14:15:25 joerg Exp $
  
  fi
  
-@@ -4723,6 +4723,8 @@ do
- _ACEOF
- cat >>$CONFIG_STATUS <<_ACEOF
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+	: Avoid regenerating within pkgsrc
-+	exit 0
-     echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion"
-     exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;;
- _ACEOF
diff --git a/games/glaxium/patches/patch-ac b/games/glaxium/patches/patch-ac
new file mode 100644
index 00000000000..d45056b6382
--- /dev/null
+++ b/games/glaxium/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2007/10/10 11:36:41 rillig Exp $
+
+--- tank.hpp.orig	2002-10-04 20:05:22.000000000 +0200
++++ tank.hpp	2007-10-10 13:33:11.000000000 +0200
+@@ -61,7 +61,7 @@
+ 
+ class TankFire : public Sprite {
+ public:
+-    TankFire::TankFire(List *list, Tank *tank, float x, float y, float z,float dx, float dz,float rotated);
++    TankFire(List *list, Tank *tank, float x, float y, float z,float dx, float dz,float rotated);
+     void draw();
+ 	void drawShadowable();
+     void move();
diff --git a/games/glaxium/patches/patch-ad b/games/glaxium/patches/patch-ad
new file mode 100644
index 00000000000..8843f9ba7d2
--- /dev/null
+++ b/games/glaxium/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2007/10/10 11:36:41 rillig Exp $
+
+--- scratcher.hpp.orig	2002-10-04 20:05:22.000000000 +0200
++++ scratcher.hpp	2007-10-10 13:34:57.000000000 +0200
+@@ -34,7 +34,7 @@
+             UNDEF
+     } ;
+     
+-    Scratcher:: Scratcher(List *list, float x, float z, int bench=0);
++    Scratcher(List *list, float x, float z, int bench=0);
+     void draw();
+     void drawShadowable();
+     void move();
-- 
cgit v1.2.3