8 files changed, 150 insertions, 188 deletions

diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index 5596c93533f6..8c872b33d613 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	ns
-PORTVERSION=	2.27
-PORTREVISION=	1
+PORTVERSION=	2.28
+#PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
-DISTNAME=	ns-src-2.27
+DISTNAME=	ns-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The UCB/LBNL Network Simulator Version 2
+COMMENT=	Discrete event simulator for networking research
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
@@ -21,7 +21,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.4:${PORTSDIR}/lang/tcl84
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/ns-2.27
+WRKSRC=		${WRKDIR}/ns-${PORTVERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.4 --with-tk-ver=8.4
@@ -30,14 +30,10 @@ ALL_TARGET=
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 500000 || ${ARCH} != "i386"
-BROKEN=		"Does not compile on !i386 or on FreeBSD >= 5.x"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ns ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/ns.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/examples/ns2
-	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${PREFIX}/share/examples/ns2
+	${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/tcl/ex/*.tcl ${EXAMPLESDIR}
 
 .include <bsd.port.post.mk>
diff --git a/net/ns2/distinfo b/net/ns2/distinfo
index eeaad4beaa7a..a26665b630e6 100644
--- a/net/ns2/distinfo
+++ b/net/ns2/distinfo
@@ -1,2 +1,2 @@
-MD5 (ns-src-2.27.tar.gz) = db3a16e450f66a5e4dd881349ccc5dd7
-SIZE (ns-src-2.27.tar.gz) = 44642525
+MD5 (ns-src-2.28.tar.gz) = 45ed7d066236aa981fd6cef6f9f44117
+SIZE (ns-src-2.28.tar.gz) = 46599585
diff --git a/net/ns2/files/patch-Makefile.in b/net/ns2/files/patch-Makefile.in
index ed8faecfd51c..d7ef1d0ff633 100644
--- a/net/ns2/files/patch-Makefile.in
+++ b/net/ns2/files/patch-Makefile.in
@@ -1,21 +1,20 @@
---- Makefile.in.orig	Thu Mar 11 00:22:57 2004
-+++ Makefile.in	Thu Mar 11 00:26:46 2004
-@@ -60,14 +60,15 @@
- DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE -Drng_test
+--- M	Tue Jul 26 11:40:56 2005
++++ Makefile.in	Tue Jul 26 11:41:26 2005
+@@ -54,7 +54,7 @@
+ 
+ CCOPT	= @V_CCOPT@
+ STATIC	= @V_STATIC@
+-LDFLAGS	= $(STATIC)
++LDFLAGS	+= $(STATIC)
+ LDOUT	= -o $(BLANK)
  
- INCLUDES = \
--	-I. @V_INCLUDE_X11@ \
--	@V_INCLUDES@ \
-+	-I. \
- 	-I./tcp -I./sctp -I./common -I./link -I./queue \
- 	-I./adc -I./apps -I./mac -I./mobile -I./trace \
- 	-I./routing -I./tools -I./classifier -I./mcast \
- 	-I./diffusion3/lib/main -I./diffusion3/lib \
- 	-I./diffusion3/lib/nr -I./diffusion3/ns \
--	-I./diffusion3/filter_core -I./asim/ -I./qs
-+	-I./diffusion3/filter_core -I./asim/ -I./qs \
-+	@V_INCLUDE_X11@ \
-+	@V_INCLUDES@ 
+ DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE -Drng_test
+@@ -79,7 +79,7 @@
+ 	-lm @LIBS@
+ #	-L@libdir@ \
  
+-CFLAGS	= $(CCOPT) $(DEFINE)
++CFLAGS	+= $(CCOPT) $(DEFINE)
  
- LIB	= \
+ # Explicitly define compilation rules since SunOS 4's make doesn't like gcc.
+ # Also, gcc does not remove the .o before forking 'as', which can be a
diff --git a/net/ns2/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in b/net/ns2/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in
deleted file mode 100644
index a009fcc0b70f..000000000000
--- a/net/ns2/files/patch-indep-utils::cmu-scen-gen::setdest::Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig	Mon May 24 08:09:36 2004
-+++ indep-utils/cmu-scen-gen/setdest/Makefile.in	Mon May 24 08:10:46 2004
-@@ -37,7 +37,7 @@
- MKDEP	= ../../../conf/mkdep
- 
- # when including files from ns, we need to take care STL_NAMESPACE
--DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@
-+DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
- CFLAGS = @V_CCOPT@ 
- LDFLAGS = @V_STATIC@
- LIBS = @V_LIB@ -lm @LIBS@
-
diff --git a/net/ns2/files/patch-indep-utils::webtrace-conv::dec::Makefile.in b/net/ns2/files/patch-indep-utils::webtrace-conv::dec::Makefile.in
deleted file mode 100644
index 1535cd1256a8..000000000000
--- a/net/ns2/files/patch-indep-utils::webtrace-conv::dec::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- indep-utils/webtrace-conv/dec/Makefile.in.orig	Tue Jan 13 09:58:44 2004
-+++ indep-utils/webtrace-conv/dec/Makefile.in	Sun Jun 13 18:22:22 2004
-@@ -38,7 +38,7 @@
- # when including files from ns, we need to take care STL_NAMESPACE
- CC = @CXX@
- INCLUDE = -I. @V_INCLUDES@
--CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
-+CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
- LDFLAGS = @V_STATIC@
- LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
- INSTALL = @INSTALL@
diff --git a/net/ns2/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in b/net/ns2/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in
deleted file mode 100644
index d845581f9a33..000000000000
--- a/net/ns2/files/patch-indep-utils::webtrace-conv::nlanr::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- indep-utils/webtrace-conv/nlanr/Makefile.in.orig	Tue Jan 13 09:58:48 2004
-+++ indep-utils/webtrace-conv/nlanr/Makefile.in	Sun Jun 13 18:30:51 2004
-@@ -35,7 +35,7 @@
- # when including files from ns, we need to take care STL_NAMESPACE
- CC = @CXX@
- INCLUDE = -I. -I../../.. @V_INCLUDES@
--CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
-+CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
- LDFLAGS = @V_STATIC@
- LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
- INSTALL = @INSTALL@
diff --git a/net/ns2/pkg-descr b/net/ns2/pkg-descr
index 458652a19b35..8fa42f66b1cd 100644
--- a/net/ns2/pkg-descr
+++ b/net/ns2/pkg-descr
@@ -1,7 +1,5 @@
-NS is a discrete event simulator targeted at networking research. 
-Ns provides substantial support for simulation of TCP, routing, and multicast
-protocols. 
+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.isi.edu/nsnam/ns/
-
--Oscar <obonilla@fisicc-ufm.edu>
diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist
index a6d579b2d6fd..0e884a07c452 100644
--- a/net/ns2/pkg-plist
+++ b/net/ns2/pkg-plist
@@ -1,119 +1,122 @@
 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/example.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/large-sim.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/pkts.tcl
-share/examples/ns2/ranvar.tcl
-share/examples/ns2/rbp_demo.tcl
-share/examples/ns2/rc.tcl
-share/examples/ns2/redlight.tcl
-share/examples/ns2/rng-test.tcl
-share/examples/ns2/rng-test2.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/sat-wired.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-tcp.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/src_test.tcl
-share/examples/ns2/srm-adapt-rep-session.tcl
-share/examples/ns2/srm-adapt-rep.tcl
-share/examples/ns2/srm-adapt-req-session.tcl
-share/examples/ns2/srm-adapt-req.tcl
-share/examples/ns2/srm-chain-session.tcl
-share/examples/ns2/srm-chain.tcl
-share/examples/ns2/srm-demo.tcl
-share/examples/ns2/srm-session.tcl
-share/examples/ns2/srm-star-session.tcl
-share/examples/ns2/srm-star.tcl
-share/examples/ns2/srm.tcl
-share/examples/ns2/ss.tcl
-share/examples/ns2/swp.tcl
-share/examples/ns2/t1000.tcl
-share/examples/ns2/tcp-et.tcl
-share/examples/ns2/tcp-int.tcl
-share/examples/ns2/tcpapp.tcl
-share/examples/ns2/tcpecn.tcl
-share/examples/ns2/tcpsrm.tcl
-share/examples/ns2/test-drr.tcl
-share/examples/ns2/test-emulator.tcl
-share/examples/ns2/test-rcvr.tcl
-share/examples/ns2/test-rlm.tcl
-share/examples/ns2/test-suite-intserv.tcl
-share/examples/ns2/test-suite.tcl
-share/examples/ns2/test-tbf.tcl
-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/udpdata.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-shadowing-vis-test.tcl
-share/examples/ns2/wireless-test.tcl
-share/examples/ns2/wireless.tcl
-share/examples/ns2/worm.tcl
-@dirrm share/examples/ns2
+%%EXAMPLESDIR%%/agent-gen-script.tcl
+%%EXAMPLESDIR%%/agent-gen.tcl
+%%EXAMPLESDIR%%/callback_demo.tcl
+%%EXAMPLESDIR%%/diffusion-prob-run.tcl
+%%EXAMPLESDIR%%/diffusion-rate-run.tcl
+%%EXAMPLESDIR%%/dumbbell.tcl
+%%EXAMPLESDIR%%/example.tcl
+%%EXAMPLESDIR%%/flooding-run.tcl
+%%EXAMPLESDIR%%/flooding.tcl
+%%EXAMPLESDIR%%/fq-cbr.tcl
+%%EXAMPLESDIR%%/fq.tcl
+%%EXAMPLESDIR%%/grid2.tcl
+%%EXAMPLESDIR%%/gridkeeper.tcl
+%%EXAMPLESDIR%%/hier-rtg-10.tcl
+%%EXAMPLESDIR%%/hier-rtg-100.tcl
+%%EXAMPLESDIR%%/hts100-0.tcl
+%%EXAMPLESDIR%%/lantest.tcl
+%%EXAMPLESDIR%%/large-scale-web-traffic-old.tcl
+%%EXAMPLESDIR%%/large-scale-web-traffic.tcl
+%%EXAMPLESDIR%%/large-sim.tcl
+%%EXAMPLESDIR%%/mac-test.tcl
+%%EXAMPLESDIR%%/many_tcp.tcl
+%%EXAMPLESDIR%%/manytcp_trmodel.tcl
+%%EXAMPLESDIR%%/mcast.tcl
+%%EXAMPLESDIR%%/miptest.tcl
+%%EXAMPLESDIR%%/nam-example-em.tcl
+%%EXAMPLESDIR%%/nam-example.tcl
+%%EXAMPLESDIR%%/nam-large-flowid.tcl
+%%EXAMPLESDIR%%/nam-separate-trace.tcl
+%%EXAMPLESDIR%%/nam-simplexlink.tcl
+%%EXAMPLESDIR%%/omni-run.tcl
+%%EXAMPLESDIR%%/pkts.tcl
+%%EXAMPLESDIR%%/ranvar.tcl
+%%EXAMPLESDIR%%/rbp_demo.tcl
+%%EXAMPLESDIR%%/rc.tcl
+%%EXAMPLESDIR%%/redlight.tcl
+%%EXAMPLESDIR%%/rng-test.tcl
+%%EXAMPLESDIR%%/rng-test2.tcl
+%%EXAMPLESDIR%%/route-gen.tcl
+%%EXAMPLESDIR%%/sat-aloha.tcl
+%%EXAMPLESDIR%%/sat-iridium-links.tcl
+%%EXAMPLESDIR%%/sat-iridium-nodes.tcl
+%%EXAMPLESDIR%%/sat-iridium.tcl
+%%EXAMPLESDIR%%/sat-mixed.tcl
+%%EXAMPLESDIR%%/sat-repeater.tcl
+%%EXAMPLESDIR%%/sat-teledesic-links.tcl
+%%EXAMPLESDIR%%/sat-teledesic-nodes.tcl
+%%EXAMPLESDIR%%/sat-teledesic.tcl
+%%EXAMPLESDIR%%/sat-wired.tcl
+%%EXAMPLESDIR%%/shuttle-mcast.tcl
+%%EXAMPLESDIR%%/shuttle.tcl
+%%EXAMPLESDIR%%/simple-dyn.tcl
+%%EXAMPLESDIR%%/simple-eqp.tcl
+%%EXAMPLESDIR%%/simple-eqp1.tcl
+%%EXAMPLESDIR%%/simple-fsm-tcp.tcl
+%%EXAMPLESDIR%%/simple-heap.tcl
+%%EXAMPLESDIR%%/simple-plm.tcl
+%%EXAMPLESDIR%%/simple-rtg.tcl
+%%EXAMPLESDIR%%/simple-rtp.tcl
+%%EXAMPLESDIR%%/simple-tcp.tcl
+%%EXAMPLESDIR%%/simple-webcache-comp.tcl
+%%EXAMPLESDIR%%/simple-webcache-trace.tcl
+%%EXAMPLESDIR%%/simple-webcache.tcl
+%%EXAMPLESDIR%%/simple-wireless.tcl
+%%EXAMPLESDIR%%/simple.tcl
+%%EXAMPLESDIR%%/src_test.tcl
+%%EXAMPLESDIR%%/srm-adapt-rep-session.tcl
+%%EXAMPLESDIR%%/srm-adapt-rep.tcl
+%%EXAMPLESDIR%%/srm-adapt-req-session.tcl
+%%EXAMPLESDIR%%/srm-adapt-req.tcl
+%%EXAMPLESDIR%%/srm-chain-session.tcl
+%%EXAMPLESDIR%%/srm-chain.tcl
+%%EXAMPLESDIR%%/srm-demo.tcl
+%%EXAMPLESDIR%%/srm-session.tcl
+%%EXAMPLESDIR%%/srm-star-session.tcl
+%%EXAMPLESDIR%%/srm-star.tcl
+%%EXAMPLESDIR%%/srm.tcl
+%%EXAMPLESDIR%%/ss.tcl
+%%EXAMPLESDIR%%/swp.tcl
+%%EXAMPLESDIR%%/t1000.tcl
+%%EXAMPLESDIR%%/tcp-et.tcl
+%%EXAMPLESDIR%%/tcp-int.tcl
+%%EXAMPLESDIR%%/tcpapp.tcl
+%%EXAMPLESDIR%%/tcpecn.tcl
+%%EXAMPLESDIR%%/tcpsrm.tcl
+%%EXAMPLESDIR%%/test-drr.tcl
+%%EXAMPLESDIR%%/test-emulator.tcl
+%%EXAMPLESDIR%%/test-rcvr.tcl
+%%EXAMPLESDIR%%/test-rlm.tcl
+%%EXAMPLESDIR%%/test-suite-intserv.tcl
+%%EXAMPLESDIR%%/test-suite.tcl
+%%EXAMPLESDIR%%/test-tbf.tcl
+%%EXAMPLESDIR%%/tg.tcl
+%%EXAMPLESDIR%%/topo-gen-script.tcl
+%%EXAMPLESDIR%%/topo-gen.tcl
+%%EXAMPLESDIR%%/topo-view.tcl
+%%EXAMPLESDIR%%/trace-driven.tcl
+%%EXAMPLESDIR%%/udpdata.tcl
+%%EXAMPLESDIR%%/varybell.tcl
+%%EXAMPLESDIR%%/virtual-classifier.tcl
+%%EXAMPLESDIR%%/vlantest-flat.tcl
+%%EXAMPLESDIR%%/vlantest-hier.tcl
+%%EXAMPLESDIR%%/vlantest-mcst.tcl
+%%EXAMPLESDIR%%/web-traffic-embobj.tcl
+%%EXAMPLESDIR%%/web-traffic.tcl
+%%EXAMPLESDIR%%/wired-cum-wireless-sim.tcl
+%%EXAMPLESDIR%%/wireless-demo-csci694.tcl
+%%EXAMPLESDIR%%/wireless-dsdv-newnode.tcl
+%%EXAMPLESDIR%%/wireless-flooding.tcl
+%%EXAMPLESDIR%%/wireless-landmark.tcl
+%%EXAMPLESDIR%%/wireless-mip-test.tcl
+%%EXAMPLESDIR%%/wireless-mitf.tcl
+%%EXAMPLESDIR%%/wireless-newnode-energy.tcl
+%%EXAMPLESDIR%%/wireless-pkt-demo.tcl
+%%EXAMPLESDIR%%/wireless-shadowing-test.tcl
+%%EXAMPLESDIR%%/wireless-shadowing-vis-test.tcl
+%%EXAMPLESDIR%%/wireless-simple-mac.tcl
+%%EXAMPLESDIR%%/wireless-test.tcl
+%%EXAMPLESDIR%%/wireless.tcl
+%%EXAMPLESDIR%%/worm.tcl
+@dirrm %%EXAMPLESDIR%%