Index: head/net/ns/files/patch-aa
===================================================================
--- head/net/ns/files/patch-aa	(revision 84469)
+++ head/net/ns/files/patch-aa	(nonexistent)
@@ -1,10 +0,0 @@
---- indep-utils/webtrace-conv/ucb/utils.h.orig	Tue May 28 17:13:35 2002
-+++ indep-utils/webtrace-conv/ucb/utils.h	Tue May 28 17:13:44 2002
-@@ -107,7 +107,6 @@
- 
- /************* A really dumb implementation of strnstr and strcasestr ***********/
- char *dumb_strnstr(char *str, char *substr, int n);
--const char *strcasestr(const char *string, const char *substr);
- 
- /*
-  ***************** Socket convenience utilities ****************

Property changes on: head/net/ns/files/patch-aa
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/net/ns/files/patch-ab
===================================================================
--- head/net/ns/files/patch-ab	(revision 84469)
+++ head/net/ns/files/patch-ab	(nonexistent)
@@ -1,32 +0,0 @@
---- indep-utils/webtrace-conv/ucb/utils.cc.orig	Tue May 28 17:14:30 2002
-+++ indep-utils/webtrace-conv/ucb/utils.cc	Tue May 28 17:14:39 2002
-@@ -56,29 +56,6 @@
- #include "utils.h"
- 
- /*
-- *  Case-insensitive version of strstr()
-- */
--
--
--const char *
--strcasestr(const char *string, const char *substr)
--{
--  int str_len, substr_len, cmplen, i;
--  const char *ptr;
--
--  str_len = strlen(string);
--  substr_len = strlen(substr);
--  cmplen = str_len - substr_len + 1;
--
--  for (ptr = string, i=0; i<cmplen; i++, ptr++) {
--    if (strncasecmp(ptr, substr, substr_len) == 0)
--      return ptr;
--  }
--  return NULL;
--}
--
--
--/*
-  ************* Dump out the hexification of the buffer ***********
-  */
- void dump_buf(FILE *std, char *buf, int retlen)

Property changes on: head/net/ns/files/patch-ab
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/net/ns/Makefile
===================================================================
--- head/net/ns/Makefile	(revision 84469)
+++ head/net/ns/Makefile	(revision 84470)
@@ -1,41 +1,36 @@
 # New ports collection makefile for: ns-2
 # Date created:		26 April 1999
 # Whom:			obonilla
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ns
-PORTVERSION=	2.1.b9
+PORTVERSION=	2.26
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
-DISTNAME=	ns-src-2.1b9
+DISTNAME=	ns-src-2.26
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The UCB/LBNL Network Simulator Version 2
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83
 
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/ns-2.1b9
+WRKSRC=		${WRKDIR}/ns-2.26
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
 
 ALL_TARGET=
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.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
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>

Property changes on: head/net/ns/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/net/ns/distinfo
===================================================================
--- head/net/ns/distinfo	(revision 84469)
+++ head/net/ns/distinfo	(revision 84470)
@@ -1 +1 @@
-MD5 (ns-src-2.1b9.tar.gz) = 77bb2c3cde1551dc6e97efb945d08ccd
+MD5 (ns-src-2.26.tar.gz) = c75aa2047fa3e13ed2a43881c50e4c65

Property changes on: head/net/ns/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/ns/pkg-plist
===================================================================
--- head/net/ns/pkg-plist	(revision 84469)
+++ head/net/ns/pkg-plist	(revision 84470)
@@ -1,117 +1,118 @@
 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
 @dirrm share/examples/ns2

Property changes on: head/net/ns/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/ns2/files/patch-aa
===================================================================
--- head/net/ns2/files/patch-aa	(revision 84469)
+++ head/net/ns2/files/patch-aa	(nonexistent)
@@ -1,10 +0,0 @@
---- indep-utils/webtrace-conv/ucb/utils.h.orig	Tue May 28 17:13:35 2002
-+++ indep-utils/webtrace-conv/ucb/utils.h	Tue May 28 17:13:44 2002
-@@ -107,7 +107,6 @@
- 
- /************* A really dumb implementation of strnstr and strcasestr ***********/
- char *dumb_strnstr(char *str, char *substr, int n);
--const char *strcasestr(const char *string, const char *substr);
- 
- /*
-  ***************** Socket convenience utilities ****************

Property changes on: head/net/ns2/files/patch-aa
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/net/ns2/files/patch-ab
===================================================================
--- head/net/ns2/files/patch-ab	(revision 84469)
+++ head/net/ns2/files/patch-ab	(nonexistent)
@@ -1,32 +0,0 @@
---- indep-utils/webtrace-conv/ucb/utils.cc.orig	Tue May 28 17:14:30 2002
-+++ indep-utils/webtrace-conv/ucb/utils.cc	Tue May 28 17:14:39 2002
-@@ -56,29 +56,6 @@
- #include "utils.h"
- 
- /*
-- *  Case-insensitive version of strstr()
-- */
--
--
--const char *
--strcasestr(const char *string, const char *substr)
--{
--  int str_len, substr_len, cmplen, i;
--  const char *ptr;
--
--  str_len = strlen(string);
--  substr_len = strlen(substr);
--  cmplen = str_len - substr_len + 1;
--
--  for (ptr = string, i=0; i<cmplen; i++, ptr++) {
--    if (strncasecmp(ptr, substr, substr_len) == 0)
--      return ptr;
--  }
--  return NULL;
--}
--
--
--/*
-  ************* Dump out the hexification of the buffer ***********
-  */
- void dump_buf(FILE *std, char *buf, int retlen)

Property changes on: head/net/ns2/files/patch-ab
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/net/ns2/Makefile
===================================================================
--- head/net/ns2/Makefile	(revision 84469)
+++ head/net/ns2/Makefile	(revision 84470)
@@ -1,41 +1,36 @@
 # New ports collection makefile for: ns-2
 # Date created:		26 April 1999
 # Whom:			obonilla
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ns
-PORTVERSION=	2.1.b9
+PORTVERSION=	2.26
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
-DISTNAME=	ns-src-2.1b9
+DISTNAME=	ns-src-2.26
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The UCB/LBNL Network Simulator Version 2
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libtclcl.a:${PORTSDIR}/devel/tclcl
 RUN_DEPENDS=	${LOCALBASE}/bin/tclsh8.3:${PORTSDIR}/lang/tcl83
 
 MAN1=		ns.1
 MANCOMPRESSED=	no
 
-WRKSRC=		${WRKDIR}/ns-2.1b9
+WRKSRC=		${WRKDIR}/ns-2.26
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl-ver=8.3 --with-tk-ver=8.3
 
 ALL_TARGET=
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=         "Does not compile (bad C++ code)"
-.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
-.include <bsd.port.post.mk>
+
+.include <bsd.port.mk>

Property changes on: head/net/ns2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.14
\ No newline at end of property
+1.15
\ No newline at end of property
Index: head/net/ns2/distinfo
===================================================================
--- head/net/ns2/distinfo	(revision 84469)
+++ head/net/ns2/distinfo	(revision 84470)
@@ -1 +1 @@
-MD5 (ns-src-2.1b9.tar.gz) = 77bb2c3cde1551dc6e97efb945d08ccd
+MD5 (ns-src-2.26.tar.gz) = c75aa2047fa3e13ed2a43881c50e4c65

Property changes on: head/net/ns2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/net/ns2/pkg-plist
===================================================================
--- head/net/ns2/pkg-plist	(revision 84469)
+++ head/net/ns2/pkg-plist	(revision 84470)
@@ -1,117 +1,118 @@
 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
 @dirrm share/examples/ns2

Property changes on: head/net/ns2/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property