From 615dfed04568aef231723e8e0017f0af387ce23d Mon Sep 17 00:00:00 2001
From: kristerw <kristerw>
Date: Sun, 18 Jul 2004 16:06:59 +0000
Subject: Modify the patch so that it does not break build on NetBSD 1.6.

---
 games/xfreecell/distinfo         |  4 ++--
 games/xfreecell/patches/patch-ac | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'games')

diff --git a/games/xfreecell/distinfo b/games/xfreecell/distinfo
index 18fb4135bbe..52d76006f98 100644
--- a/games/xfreecell/distinfo
+++ b/games/xfreecell/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2004/07/10 23:03:47 wiz Exp $
+$NetBSD: distinfo,v 1.3 2004/07/18 16:06:59 kristerw Exp $
 
 SHA1 (xfreecell-1.0.5b.tgz) = b0453b09ea2211822a5f03f532097c9eb14db2a6
 Size (xfreecell-1.0.5b.tgz) = 49367 bytes
 SHA1 (patch-aa) = 9ae72142536bac8feb8e1ae1576cf56c2f30ae55
 SHA1 (patch-ab) = 74326c5b4e731a32a404210cdc13b87a5b15119a
-SHA1 (patch-ac) = 38f7fccb36b841662d1f4682dbdee41e3c35f17f
+SHA1 (patch-ac) = 4fcb28840a4619c8ceb06dd86ffea351d1b8a2c5
 SHA1 (patch-ad) = ab39728f9cb2f9cfb8b55c87185546e93ae5a231
diff --git a/games/xfreecell/patches/patch-ac b/games/xfreecell/patches/patch-ac
index 4072db57d95..8b82504a98c 100644
--- a/games/xfreecell/patches/patch-ac
+++ b/games/xfreecell/patches/patch-ac
@@ -1,16 +1,18 @@
-$NetBSD: patch-ac,v 1.1 2004/07/10 23:03:47 wiz Exp $
+$NetBSD: patch-ac,v 1.2 2004/07/18 16:06:59 kristerw Exp $
 
---- gnmanager.h.orig	1999-03-29 15:07:19.000000000 +0200
-+++ gnmanager.h
-@@ -2,7 +2,10 @@
+--- gnmanager.h.orig	Mon Mar 29 15:07:19 1999
++++ gnmanager.h	Sun Jul 18 18:01:51 2004
+@@ -2,7 +2,13 @@
  #define GNManager_H
  
  #include <string>
--#include <hash_set>
++#if __GNUC__ < 3
+ #include <hash_set>
++#else
 +#include <ext/hash_set>
-+
 +using namespace __gnu_cxx;
 +using namespace std;
++#endif
  
  class GameNumberManager {
  public:
-- 
cgit v1.2.3