summaryrefslogtreecommitdiff
path: root/net/ns
diff options
context:
space:
mode:
Diffstat (limited to 'net/ns')
-rw-r--r--net/ns/Makefile6
-rw-r--r--net/ns/distinfo13
-rw-r--r--net/ns/patches/patch-af32
-rw-r--r--net/ns/patches/patch-ar15
-rw-r--r--net/ns/patches/patch-as18
-rw-r--r--net/ns/patches/patch-linkstate_ls.h15
6 files changed, 44 insertions, 55 deletions
diff --git a/net/ns/Makefile b/net/ns/Makefile
index ab9dd6f5218..36ea1066b5e 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.36 2012/10/23 17:18:42 asau Exp $
+# $NetBSD: Makefile,v 1.37 2012/12/15 22:07:32 markd Exp $
-DISTNAME= ns-2.33
-PKGREVISION= 1
+DISTNAME= ns-src-2.35
+PKGNAME= ns-2.35
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nsnam/}
diff --git a/net/ns/distinfo b/net/ns/distinfo
index 4a78c4fed6b..e169ecc2abf 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -1,13 +1,13 @@
-$NetBSD: distinfo,v 1.17 2012/09/29 06:17:29 dholland Exp $
+$NetBSD: distinfo,v 1.18 2012/12/15 22:07:32 markd Exp $
-SHA1 (ns-2.33.tar.gz) = 0efd6aed45b504fcf3f125b0be00a60b87516a03
-RMD160 (ns-2.33.tar.gz) = 54326b8ff4e63c0a9712c517c7ad4d9327a41d39
-Size (ns-2.33.tar.gz) = 41649114 bytes
+SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980
+RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21
+Size (ns-src-2.35.tar.gz) = 43897172 bytes
SHA1 (patch-aa) = 3b25eab34d7bdad7d370cea8450eb3c09c18c640
SHA1 (patch-ab) = 7c93e4540faa1b16a9e40bd063ffce510f5bc063
SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969
SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2
-SHA1 (patch-af) = da5772371dd4d754fa8aeb904bdcf29c41552276
+SHA1 (patch-af) = bc29b20fd017d81a5459f6603b4b4013ec5139dd
SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd
SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
@@ -18,9 +18,8 @@ SHA1 (patch-an) = c6dd6b93332a6c6dd169975836df9ef802bfc206
SHA1 (patch-ao) = 2a1fd71686ff206fe2212605f91b8167b998d6e2
SHA1 (patch-ap) = f130c112d7dfe114e637e190750d9caad55e4703
SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e
-SHA1 (patch-ar) = 64dafe254cfd28723422047aecb8086028d9f69e
-SHA1 (patch-as) = 5fdd4418db3ee4b189913f1110fb260af710f746
SHA1 (patch-common_packet.cc) = 74835d281febc195c5d1118bc5ceb40107597876
SHA1 (patch-common_packet.h) = 2b8289ee47206f7201ea225d23318202c7b370c5
SHA1 (patch-common_ptypes2tcl.cc) = 2354e030fef92d28c2c4049be30dcb365302068a
+SHA1 (patch-linkstate_ls.h) = 5f0fb99db398cf39e9853e7d8e8cd6536d29e44b
SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84
diff --git a/net/ns/patches/patch-af b/net/ns/patches/patch-af
index 162bf59d0ec..6c8fcbfad68 100644
--- a/net/ns/patches/patch-af
+++ b/net/ns/patches/patch-af
@@ -1,11 +1,19 @@
-$NetBSD: patch-af,v 1.10 2012/09/29 06:17:30 dholland Exp $
+$NetBSD: patch-af,v 1.11 2012/12/15 22:07:32 markd Exp $
- provide pkgsrc's X11 dirs
- check for more ethernet headers
---- configure.orig 2008-04-01 02:00:25.000000000 +0000
+--- configure.orig 2011-11-04 17:29:46.000000000 +0000
+++ configure
-@@ -5836,7 +5836,7 @@ powerpc-apple-darwin*)
+@@ -5548,6 +5548,7 @@ TCL_H_PLACES_D="$d/generic \
+ $d/include/tcl$TCL_VERS \
+ $d/include/tcl$TCL_ALT_VERS \
+ $d/include \
++ $d/include/tcl/generic \
+ /usr/local/include \
+ "
+ TCL_H_PLACES=" \
+@@ -7003,7 +7004,7 @@ powerpc-apple-darwin*)
esac
@@ -14,8 +22,8 @@ $NetBSD: patch-af,v 1.10 2012/09/29 06:17:30 dholland Exp $
/usr/openwin/lib \
/usr/X11R6/lib \
/usr/lib/X11R6 \
-@@ -5851,7 +5851,7 @@ xlibdirs="\
- /Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib \
+@@ -7020,7 +7021,7 @@ xlibdirs="\
+ /Developer/SDKs/MacOSX10.6.sdk/usr/X11R6/lib \
/import/X11R4/usr/lib"
-xincdirs="\
@@ -23,16 +31,16 @@ $NetBSD: patch-af,v 1.10 2012/09/29 06:17:30 dholland Exp $
/usr/openwin/include \
/usr/X11R6/include \
/usr/include/X11R6 \
-@@ -6906,7 +6906,7 @@ fi
-
+@@ -7899,7 +7900,7 @@ $as_echo "#define STDC_HEADERS 1" >>conf
+ fi
-for ac_header in arpa/inet.h fenv.h netinet/in.h string.h strings.h time.h unistd.h net/ethernet.h
+for ac_header in arpa/inet.h fenv.h netinet/in.h string.h strings.h time.h unistd.h net/if.h net/ethernet.h netinet/if_ether.h sys/socket.h
- do
- as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
- if eval "test \"\${$as_ac_Header+set}\" = set"; then
-@@ -9667,7 +9667,24 @@ cat >>conftest.$ac_ext <<_ACEOF
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+@@ -8838,7 +8839,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* end confdefs.h. */
#include <stdio.h>
@@ -57,7 +65,7 @@ $NetBSD: patch-af,v 1.10 2012/09/29 06:17:30 dholland Exp $
int
main ()
-@@ -9736,7 +9753,24 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -8877,7 +8895,24 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
/* end confdefs.h. */
#include <stdio.h>
diff --git a/net/ns/patches/patch-ar b/net/ns/patches/patch-ar
deleted file mode 100644
index 345e9b77890..00000000000
--- a/net/ns/patches/patch-ar
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ar,v 1.4 2011/01/29 22:16:51 markd Exp $
-
-Fix build with gcc4.5
-
---- tools/ranvar.cc.orig 2008-04-01 02:00:25.000000000 +0000
-+++ tools/ranvar.cc
-@@ -216,7 +216,7 @@ double GammaRandomVariable::value()
- // ACM Transactions on mathematical software, Vol. 26, No. 3, Sept. 2000
- if (alpha_ < 1) {
- double u = rng_->uniform(1.0);
-- return GammaRandomVariable::GammaRandomVariable(1.0 + alpha_, beta_).value() * pow (u, 1.0 / alpha_);
-+ return GammaRandomVariable(1.0 + alpha_, beta_).value() * pow (u, 1.0 / alpha_);
- }
-
- double x, v, u;
diff --git a/net/ns/patches/patch-as b/net/ns/patches/patch-as
deleted file mode 100644
index 454dadc3d43..00000000000
--- a/net/ns/patches/patch-as
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-as,v 1.1 2011/01/29 22:16:51 markd Exp $
-
-Fix build with gcc4.5
-
---- mobile/nakagami.cc.orig 2008-04-01 02:00:24.000000000 +0000
-+++ mobile/nakagami.cc
-@@ -180,9 +180,9 @@ double Nakagami::Pr(PacketStamp *t, Pack
- double resultPower;
-
- if (int_m == m) {
-- resultPower = ErlangRandomVariable::ErlangRandomVariable(Pr/m, int_m).value();
-+ resultPower = ErlangRandomVariable(Pr/m, int_m).value();
- } else {
-- resultPower = GammaRandomVariable::GammaRandomVariable(m, Pr/m).value();
-+ resultPower = GammaRandomVariable(m, Pr/m).value();
- }
- return resultPower;
- }
diff --git a/net/ns/patches/patch-linkstate_ls.h b/net/ns/patches/patch-linkstate_ls.h
new file mode 100644
index 00000000000..5872f5e1567
--- /dev/null
+++ b/net/ns/patches/patch-linkstate_ls.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-linkstate_ls.h,v 1.1 2012/12/15 22:07:32 markd Exp $
+
+gcc4.7 fix.
+
+--- linkstate/ls.h.orig 2010-03-08 05:54:51.000000000 +0000
++++ linkstate/ls.h
+@@ -134,7 +134,7 @@ public:
+ return ib.second ? ib.first : baseMap::end();
+ }
+
+- void eraseAll() { erase(baseMap::begin(), baseMap::end()); }
++ void eraseAll() { this->erase(baseMap::begin(), baseMap::end()); }
+ T* findPtr(Key key) {
+ iterator it = baseMap::find(key);
+ return (it == baseMap::end()) ? (T *)NULL : &((*it).second);
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-13 21:07:01 +0000