From ad601444a6e091435e7ca7f6cc170493a97e83af Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Thu, 8 Sep 2005 17:19:13 +0000
Subject: Make this package compile with gcc-4 by initializing const static
 data members outside their class.

---
 net/ns/distinfo         |  4 +++-
 net/ns/patches/patch-ag | 36 ++++++++++++++++++++++++++++++++++++
 net/ns/patches/patch-ar | 18 ++++++++++++++++++
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 net/ns/patches/patch-ag
 create mode 100644 net/ns/patches/patch-ar

diff --git a/net/ns/distinfo b/net/ns/distinfo
index 165ba814e90..b85d11cc1ac 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2005/09/08 02:50:58 minskim Exp $
+$NetBSD: distinfo,v 1.8 2005/09/08 17:19:13 minskim Exp $
 
 SHA1 (ns-src-2.28.tar.gz) = ecad96f69bb32420c0a9ee698c7289e66001febf
 RMD160 (ns-src-2.28.tar.gz) = f2ec76b7dc96bbfb75d8485ef2822ebdf50b8ed1
@@ -9,6 +9,7 @@ SHA1 (patch-ac) = 28cda4d9f68e031725016d2c06925394c76e5152
 SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969
 SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2
 SHA1 (patch-af) = 94ab6d8a0cb9d43f9d440712880fe9a2be24ccd4
+SHA1 (patch-ag) = 7a1c7919a7d8effe16f30399d486a4af9afba4db
 SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd
 SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
 SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
@@ -18,3 +19,4 @@ SHA1 (patch-am) = 882ea61b7f6909336f72f637b041f373830197e8
 SHA1 (patch-an) = c6dd6b93332a6c6dd169975836df9ef802bfc206
 SHA1 (patch-ao) = 2a1fd71686ff206fe2212605f91b8167b998d6e2
 SHA1 (patch-ap) = f130c112d7dfe114e637e190750d9caad55e4703
+SHA1 (patch-ar) = d726d8362717f0474040f3ec97ee3c2c6d9a817c
diff --git a/net/ns/patches/patch-ag b/net/ns/patches/patch-ag
new file mode 100644
index 00000000000..8e091df0b48
--- /dev/null
+++ b/net/ns/patches/patch-ag
@@ -0,0 +1,36 @@
+$NetBSD: patch-ag,v 1.3 2005/09/08 17:19:14 minskim Exp $
+
+--- xcp/xcpq.h.orig	2005-02-03 10:29:20.000000000 -0800
++++ xcp/xcpq.h
+@@ -113,11 +113,11 @@ protected:
+ 	XCPTimer*        rtt_timer_;
+ 	double           link_capacity_bps_;
+ 
+-	static const double	ALPHA_		= 0.4;
+-	static const double	BETA_		= 0.226;
+-	static const double	GAMMA_		= 0.1;
+-	static const double	XCP_MAX_INTERVAL= 1.0;
+-	static const double	XCP_MIN_INTERVAL= .001;
++	static const double	ALPHA_;
++	static const double	BETA_;
++	static const double	GAMMA_;
++	static const double	XCP_MAX_INTERVAL;
++	static const double	XCP_MIN_INTERVAL;
+ 
+ 	double          Te_;       // control interval
+ 	double          Tq_;    
+@@ -141,7 +141,7 @@ protected:
+ 	double			b_[BSIZE];
+ 	double			t_[BSIZE];
+ 	int			maxb_;
+-	static const double	BWIDTH = 0.01;
++	static const double	BWIDTH;
+ 	int			min_queue_ci_;
+ 	int			max_queue_ci_;
+   
+@@ -158,5 +158,4 @@ protected:
+   
+ };
+ 
+-
+ #endif //NS_XCPQ_H
diff --git a/net/ns/patches/patch-ar b/net/ns/patches/patch-ar
new file mode 100644
index 00000000000..2b5b3838bd9
--- /dev/null
+++ b/net/ns/patches/patch-ar
@@ -0,0 +1,18 @@
+$NetBSD: patch-ar,v 1.1 2005/09/08 17:19:14 minskim Exp $
+
+--- xcp/xcpq.cc.orig	2005-02-03 10:29:20.000000000 -0800
++++ xcp/xcpq.cc
+@@ -24,6 +24,13 @@
+ #include "xcp.h"
+ #include "random.h"
+ 
++const double XCPQueue::ALPHA_ = 0.4;
++const double XCPQueue::BETA_ = 0.226;
++const double XCPQueue::GAMMA_ = 0.1;
++const double XCPQueue::XCP_MAX_INTERVAL = 1.0;
++const double XCPQueue::XCP_MIN_INTERVAL = .001;
++const double XCPQueue::BWIDTH = 0.01;
++
+ static class XCPQClass : public TclClass {
+ public:
+ 	XCPQClass() : TclClass("Queue/DropTail/XCPQ") {}
-- 
cgit v1.2.3