Update to version 2.1.b7.

PR:		23144
Submitted by:	Eoin Lawless <eoin@maths.tcd.ie>
Approved by:	maintainer

5 files changed, 46 insertions, 18 deletions

diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index c92ee9e5ffa5..b5f998397712 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	ns
-PORTVERSION=	2.1.b5
+PORTVERSION=	2.1.b7
 CATEGORIES=	net
-MASTER_SITES=	http://www-mash.cs.berkeley.edu/dist/vint/
-DISTNAME=	ns-src-2.1b5
+MASTER_SITES=	http://www.isi.edu/nsnam/dist/
+DISTNAME=	ns-src-2.1b7
 
 MAINTAINER=	obonilla@fisicc-ufm.edu
 
@@ -19,7 +19,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.2:${PORTSDIR}/lang/tcl82
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/ns-2.1b5
+WRKSRC=		${WRKDIR}/ns-2.1b7
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.2 --with-tk-ver=8.2
diff --git a/net/ns2/distinfo b/net/ns2/distinfo
index ddaed37a3634..2207471521d4 100644
--- a/net/ns2/distinfo
+++ b/net/ns2/distinfo
@@ -1 +1 @@
-MD5 (ns-src-2.1b5.tar.gz) = 6aae46016418c0f5dc54b9b7398c4fc0
+MD5 (ns-src-2.1b7.tar.gz) = 6416e3e3f329997c407113e8cb2773b98
diff --git a/net/ns2/files/patch-aa b/net/ns2/files/patch-aa
deleted file mode 100644
index d95a0b774e29..000000000000
--- a/net/ns2/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Apr 26 09:36:25 1999
-+++ configure	Mon Apr 26 09:36:48 1999
-@@ -1898,7 +1898,7 @@
- # $d/unix works if $d is the 8.0 distribution
- # $d/bin is for the ns-allinone distribution (kind of hacky, isn't it?)
- PATH=$PATH:$d/unix:$d/bin
--for ac_prog in tclsh$TCL_VERS tclsh tclsh$TCL_OLD_VERS
-+for ac_prog in tclsh$TCL_VERS tclsh8.2 tclsh$TCL_OLD_VERS
- do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
- set dummy $ac_prog; ac_word=$2
diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr
index 2b4aa1905c71..458652a19b35 100644
--- a/net/ns2/pkg-descr
+++ b/net/ns2/pkg-descr
@@ -2,6 +2,6 @@ NS is a discrete event simulator targeted at networking research.
 Ns provides substantial support for simulation of TCP, routing, and multicast
 protocols. 
 
-WWW: http://www-mash.cs.berkeley.edu/ns/
+WWW: http://www.isi.edu/nsnam/ns/
 
 -Oscar <obonilla@fisicc-ufm.edu>
diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist
index c9bf970db0d1..08f74e2d19eb 100644
--- a/net/ns2/pkg-plist
+++ b/net/ns2/pkg-plist
@@ -2,36 +2,61 @@ bin/ns
 share/examples/ns2/agent-gen-script.tcl
 share/examples/ns2/agent-gen.tcl
 share/examples/ns2/callback_demo.tcl
+share/examples/ns2/diffusion-prob-run.tcl
+share/examples/ns2/diffusion-rate-run.tcl
+share/examples/ns2/dumbbell.tcl
+share/examples/ns2/flooding-run.tcl
 share/examples/ns2/fq-cbr.tcl
 share/examples/ns2/fq.tcl
+share/examples/ns2/grid2.tcl
+share/examples/ns2/gridkeeper.tcl
 share/examples/ns2/hier-rtg-10.tcl
 share/examples/ns2/hier-rtg-100.tcl
 share/examples/ns2/hts100-0.tcl
 share/examples/ns2/lantest.tcl
+share/examples/ns2/large-scale-web-traffic-old.tcl
+share/examples/ns2/large-scale-web-traffic.tcl
 share/examples/ns2/mac-test.tcl
 share/examples/ns2/many_tcp.tcl
 share/examples/ns2/manytcp_trmodel.tcl
 share/examples/ns2/mcast.tcl
+share/examples/ns2/miptest.tcl
+share/examples/ns2/nam-example-em.tcl
 share/examples/ns2/nam-example.tcl
+share/examples/ns2/nam-large-flowid.tcl
 share/examples/ns2/nam-separate-trace.tcl
 share/examples/ns2/nam-simplexlink.tcl
+share/examples/ns2/omni-run.tcl
 share/examples/ns2/ranvar.tcl
 share/examples/ns2/rbp_demo.tcl
 share/examples/ns2/rc.tcl
+share/examples/ns2/route-gen.tcl
+share/examples/ns2/sat-aloha.tcl
+share/examples/ns2/sat-iridium-links.tcl
+share/examples/ns2/sat-iridium-nodes.tcl
+share/examples/ns2/sat-iridium.tcl
+share/examples/ns2/sat-mixed.tcl
+share/examples/ns2/sat-repeater.tcl
+share/examples/ns2/sat-teledesic-links.tcl
+share/examples/ns2/sat-teledesic-nodes.tcl
+share/examples/ns2/sat-teledesic.tcl
 share/examples/ns2/shuttle-mcast.tcl
 share/examples/ns2/shuttle.tcl
 share/examples/ns2/simple-dyn.tcl
 share/examples/ns2/simple-eqp.tcl
 share/examples/ns2/simple-eqp1.tcl
+share/examples/ns2/simple-fsm-tcp.tcl
 share/examples/ns2/simple-heap.tcl
+share/examples/ns2/simple-plm.tcl
 share/examples/ns2/simple-rtg.tcl
 share/examples/ns2/simple-rtp.tcl
 share/examples/ns2/simple-webcache-comp.tcl
 share/examples/ns2/simple-webcache-trace.tcl
 share/examples/ns2/simple-webcache.tcl
+share/examples/ns2/simple-wireless.tcl
 share/examples/ns2/simple.tcl
-share/examples/ns2/srm-adapt-rep-session.tcl
 share/examples/ns2/srm-adapt-rep.tcl
+share/examples/ns2/srm-adapt-rep-session.tcl
 share/examples/ns2/srm-adapt-req-session.tcl
 share/examples/ns2/srm-adapt-req.tcl
 share/examples/ns2/srm-chain-session.tcl
@@ -57,9 +82,23 @@ share/examples/ns2/tg.tcl
 share/examples/ns2/topo-gen-script.tcl
 share/examples/ns2/topo-gen.tcl
 share/examples/ns2/topo-view.tcl
+share/examples/ns2/trace-driven.tcl
+share/examples/ns2/varybell.tcl
 share/examples/ns2/virtual-classifier.tcl
 share/examples/ns2/vlantest-flat.tcl
 share/examples/ns2/vlantest-hier.tcl
 share/examples/ns2/vlantest-mcst.tcl
+share/examples/ns2/web-traffic-embobj.tcl
+share/examples/ns2/web-traffic.tcl
+share/examples/ns2/wired-cum-wireless-sim.tcl
+share/examples/ns2/wireless-demo-csci694.tcl
+share/examples/ns2/wireless-dsdv-newnode.tcl
+share/examples/ns2/wireless-landmark.tcl
+share/examples/ns2/wireless-mip-test.tcl
+share/examples/ns2/wireless-mitf.tcl
+share/examples/ns2/wireless-newnode-energy.tcl
+share/examples/ns2/wireless-pkt-demo.tcl
+share/examples/ns2/wireless-shadowing-test.tcl
+share/examples/ns2/wireless-test.tcl
 share/examples/ns2/wireless.tcl
 @dirrm share/examples/ns2