5 files changed, 7 insertions, 53 deletions

diff --git a/net/ns2/Makefile b/net/ns2/Makefile
index 048394a7da2a..811e530d9e01 100644
--- a/net/ns2/Makefile
+++ b/net/ns2/Makefile
@@ -6,10 +6,10 @@
 #
 
 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
@@ -20,22 +20,17 @@ 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>
diff --git a/net/ns2/distinfo b/net/ns2/distinfo
index cbf395be937d..9bfbef58a81c 100644
--- a/net/ns2/distinfo
+++ b/net/ns2/distinfo
@@ -1 +1 @@
-MD5 (ns-src-2.1b9.tar.gz) = 77bb2c3cde1551dc6e97efb945d08ccd
+MD5 (ns-src-2.26.tar.gz) = c75aa2047fa3e13ed2a43881c50e4c65
diff --git a/net/ns2/files/patch-aa b/net/ns2/files/patch-aa
deleted file mode 100644
index b8119d7daa46..000000000000
--- a/net/ns2/files/patch-aa
+++ /dev/null
@@ -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 ****************
diff --git a/net/ns2/files/patch-ab b/net/ns2/files/patch-ab
deleted file mode 100644
index 54be008b310b..000000000000
--- a/net/ns2/files/patch-ab
+++ /dev/null
@@ -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)
diff --git a/net/ns2/pkg-plist b/net/ns2/pkg-plist
index bc2f4fa6c7cc..dea92aaf2bc6 100644
--- a/net/ns2/pkg-plist
+++ b/net/ns2/pkg-plist
@@ -57,6 +57,7 @@ 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