Two patches, so that the package builds with g++4.

3 files changed, 42 insertions, 1 deletions

diff --git a/net/gnugk/distinfo b/net/gnugk/distinfo
index 6bc286aba15..b3ea17f74d2 100644
--- a/net/gnugk/distinfo
+++ b/net/gnugk/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/03/16 12:55:02 rillig Exp $
+$NetBSD: distinfo,v 1.5 2007/12/01 15:54:28 rillig Exp $
 
 SHA1 (gnugk-2.2.0.tgz) = 27bf0fe7f2d7952233eb3522d55618269770a6ef
 RMD160 (gnugk-2.2.0.tgz) = 4484786e84bb2af689f7721935951032ab01a5c4
@@ -6,3 +6,5 @@ Size (gnugk-2.2.0.tgz) = 627215 bytes
 SHA1 (patch-aa) = e7f9f1b31bed309224eac1a84db2207c36e3e3f5
 SHA1 (patch-ab) = e6aca39584c895e8e319ce63eeaf30b43cbb688b
 SHA1 (patch-ac) = 8c00f65da52e93bbbcc5f44a9a50a9f0f9272aff
+SHA1 (patch-ad) = c8f40e735286e5b26de76c1f7c4eb0421f9c78c9
+SHA1 (patch-ae) = 25b1c065b6e116e6bba84a3364c2298927ce0352
diff --git a/net/gnugk/patches/patch-ad b/net/gnugk/patches/patch-ad
new file mode 100644
index 00000000000..4eb01574aec
--- /dev/null
+++ b/net/gnugk/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 2007/12/01 15:54:28 rillig Exp $
+
+This code is unused and contains references to undefined classes.
+
+--- RasTbl.h.orig	2004-10-18 12:39:19.000000000 +0000
++++ RasTbl.h	2007-12-01 14:59:50.000000000 +0000
+@@ -377,19 +377,6 @@ public:
+ 	endptr FindByAliases(const H225_ArrayOf_AliasAddress & alias) const;
+ 	endptr FindEndpoint(const H225_ArrayOf_AliasAddress & alias, bool RoundRobin, bool SearchOuterZone = true);
+ 
+-	template<class MsgType> endptr getMsgDestination(const MsgType & msg, unsigned int & reason,
+-	                                                 bool SearchOuterZone = true)
+-	{
+-	  endptr ep;
+-	  bool ok = getGkDestAnalysisList().getMsgDestination(msg, EndpointList, listLock,
+-	                                                      ep, reason);
+-	  if (!ok && SearchOuterZone) {
+-            ok = getGkDestAnalysisList().getMsgDestination(msg, OuterZoneList, listLock,
+-	                                                   ep, reason);
+-	  }
+-	  return (ok) ? ep : endptr(0);
+-	}
+-
+ 	void ClearTable();
+ 	void CheckEndpoints();
+ 
diff --git a/net/gnugk/patches/patch-ae b/net/gnugk/patches/patch-ae
new file mode 100644
index 00000000000..34d598a6a1b
--- /dev/null
+++ b/net/gnugk/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2007/12/01 15:54:29 rillig Exp $
+
+--- yasocket.h.orig	2004-08-10 08:48:30.000000000 +0000
++++ yasocket.h	2007-12-01 14:44:52.000000000 +0000
+@@ -383,7 +383,7 @@ class TCPListenSocket : public TCPSocket
+ 	PCLASSINFO ( TCPListenSocket, TCPSocket )
+ #endif
+ public:
+-	TCPListenSocket::TCPListenSocket(int seconds = 0);
++	TCPListenSocket(int seconds = 0);
+ 	~TCPListenSocket();
+ 
+ 	bool IsTimeout(const PTime *) const;