Update to version 2.26.

Lots of changes and bug fixes since last packaged version,
see installed $PREFIX/share/doc/html/ns/CHANGES.html.

Provided in PR pkg/22633 by Min Sik Kim <minskim at bawi dot org>.
Minor tuning by myself.

11 files changed, 66 insertions, 83 deletions

diff --git a/net/ns/Makefile b/net/ns/Makefile
index b509e8ade4a..c7b5eae70b1 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:51:29 grant Exp $
+# $NetBSD: Makefile,v 1.8 2003/09/01 18:21:12 seb Exp $
 
-DISTNAME=	ns-src-2.1b9a
-PKGREVISION=	1
-PKGNAME=	${DISTNAME:S/b/rc/:S/-src//}
+DISTNAME=	ns-src-2.26
+PKGNAME=	${DISTNAME:S/-src//}
 WRKSRC=		${WRKDIR}/${DISTNAME:S/-src//}
 CATEGORIES=	net
 MASTER_SITES=	http://www.isi.edu/nsnam/dist/
@@ -26,19 +25,14 @@ CONFIGURE_ARGS+=	--with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
 
 MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
 
-# Yes there is object files and executables in the source tarball.
+# Remove a left over executable in the source tarball.
 post-extract:
 	${_PKG_SILENT}${_PKG_DEBUG}			\
-	cd ${WRKSRC} &&					\
-	${FIND} . -name "*.o" -exec ${RM} {} \;
-	${_PKG_SILENT}${_PKG_DEBUG}			\
-	cd ${WRKSRC}/indep-utils &&			\
-	${RM} cmu-scen-gen/setdest/setdest		\
-	   cmu-scen-gen/setdest/calcdest		\
-	   webtrace-conv/dec/dec-tr-stat		\
-	   webtrace-conv/epa/epa-tr-stat		\
-	   webtrace-conv/nlanr/nlanr-tr-stat		\
-	   webtrace-conv/ucb/ucb-tr-stat
+	${RM} ${WRKSRC}/indep-utils/cmu-scen-gen/setdest/calcdest
+
+post-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/ns
+	${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${PREFIX}/share/doc/html/ns
 
 .include  "../../net/libpcap/buildlink2.mk"
 .include  "../../devel/tcl-tclcl/buildlink2.mk"
diff --git a/net/ns/PLIST b/net/ns/PLIST
index 525d8798d04..0a9c85127d2 100644
--- a/net/ns/PLIST
+++ b/net/ns/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/09/01 18:21:12 seb Exp $
 bin/calcdest
 bin/dec-tr-stat
 bin/epa-tr-stat
@@ -7,3 +7,5 @@ bin/ns
 bin/setdest
 bin/ucb-tr-stat
 man/man1/ns.1
+share/doc/html/ns/CHANGES.html
+@dirrm share/doc/html/ns
diff --git a/net/ns/distinfo b/net/ns/distinfo
index 1a5bde1a08e..8fc53af9ac7 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -1,20 +1,19 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$NetBSD: distinfo,v 1.2 2003/09/01 18:21:12 seb Exp $
 
-SHA1 (ns-src-2.1b9a.tar.gz) = c1c5103ca67856800b2c8c3eaf5267d7ec62202e
-Size (ns-src-2.1b9a.tar.gz) = 39952700 bytes
-SHA1 (patch-aa) = 9fb0cccfedf034e0bff4cd3569aec8b58cebeaf5
+SHA1 (ns-src-2.26.tar.gz) = 23da69b5e23356a14e4e1825b7f434731bdc5f68
+Size (ns-src-2.26.tar.gz) = 41592248 bytes
+SHA1 (patch-aa) = 7acec0349ee60265655a633da659a12393b9fbc2
 SHA1 (patch-ab) = 123d9110ac20063ffd32466dfa630bcbb76eff6d
 SHA1 (patch-ac) = 28cda4d9f68e031725016d2c06925394c76e5152
 SHA1 (patch-ad) = 43dbf7d17c22c300ab3e9ea7057b1cd8ff805958
 SHA1 (patch-ae) = af6c1937b07d7328d8949f27f0821cec75f2dae7
-SHA1 (patch-af) = 7e4862411dfe54ca38ab3646ce8767d86816c3c3
-SHA1 (patch-ag) = 680c16651358ac3d79dc2cc357a4190323916a63
+SHA1 (patch-af) = 9668b346c700d889f635f9368f5512bbceeebdda
 SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd
 SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
-SHA1 (patch-aj) = e527edb6e684e5dc4d06efa3919f975c62fe62a0
-SHA1 (patch-ak) = 259dd2ceeacf63e17aa02c4c097f7d1871ef286b
-SHA1 (patch-al) = 8e20a8108926e22e9753174f1e94a96df092ce42
-SHA1 (patch-am) = dccc31a0da4984c2cd9fadaea836eb872b3194ac
+SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
+SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef
+SHA1 (patch-al) = e51a85e698ad9b107cdb8865ae4007faa6412b29
+SHA1 (patch-am) = d2f30afe70777f03486e606a076df95c52b18939
 SHA1 (patch-an) = 610ab5dd26a4f232af52662a373995378c12c58d
-SHA1 (patch-ao) = ce520023b7652024cb4224410d49b1f639e5f977
+SHA1 (patch-ao) = 2c319518185002b15d9b00d46d8257be9ff47984
 SHA1 (patch-ap) = 78e14fbc682f3fc87f3812773a9e12f17ec549a5
diff --git a/net/ns/patches/patch-aa b/net/ns/patches/patch-aa
index 4b5d0fdc2d3..a8bcfcf2fc5 100644
--- a/net/ns/patches/patch-aa
+++ b/net/ns/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$NetBSD: patch-aa,v 1.2 2003/09/01 18:21:12 seb Exp $
 
 --- Makefile.in.orig	Thu Jun  6 22:37:57 2002
 +++ Makefile.in
-@@ -54,7 +54,7 @@ PERL	= @PERL@
+@@ -54,7 +54,7 @@
  
  CCOPT	= @V_CCOPT@
  STATIC	= @V_STATIC@
@@ -10,4 +10,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
 +LDFLAGS	= @LDFLAGS@
  LDOUT	= -o $(BLANK)
  
- DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK -DNIXVECTOR @V_DEFINE@ @V_DEFINES@ @DEFS@ -DPGM -DPGM_DEBUG -DNS_DIFFUSION
+ DEFINE	= -DTCP_DELAY_BIND_ALL -DNO_TK @V_DEFINE@ @V_DEFINES@ @DEFS@ -DNS_DIFFUSION -DSMAC_NO_SYNC -DSTL_NAMESPACE=@STL_NAMESPACE@ -DUSE_SINGLE_ADDRESS_SPACE
diff --git a/net/ns/patches/patch-af b/net/ns/patches/patch-af
index 4cb78a0ff02..f1b5fbd50f0 100644
--- a/net/ns/patches/patch-af
+++ b/net/ns/patches/patch-af
@@ -1,26 +1,26 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$NetBSD: patch-af,v 1.2 2003/09/01 18:21:12 seb Exp $
 
 --- configure.orig	Sat Apr 13 00:34:24 2002
 +++ configure
-@@ -4082,7 +4082,7 @@ TCLCL_PROG_PLACES="\
+@@ -2939,7 +2939,7 @@
                  /usr/src/local/Tcl \
                  /usr/src/local/Tcl-1.0 \
                  "
 -TCLCL_PROG_PLACES_D="$d"
 +TCLCL_PROG_PLACES_D="$d/bin"
  
- NS_PACKAGE_tclcl_UNDERWAY=false
- NS_PACKAGE_tclcl_COMPLETE=true
-@@ -5422,7 +5422,7 @@ EOF
+ 
+ 
+@@ -4154,7 +4154,7 @@
  fi
  done
  
--for ac_header in arpa/inet.h netinet/in.h string.h strings.h time.h unistd.h net/ethernet.h
-+for ac_header in arpa/inet.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
+-for ac_hdr in arpa/inet.h netinet/in.h string.h strings.h time.h unistd.h net/ethernet.h
++for ac_hdr in arpa/inet.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`
- echo "$as_me:5428: checking for $ac_header" >&5
-@@ -6509,7 +6509,24 @@ cat >conftest.$ac_ext <<_ACEOF
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+@@ -4798,7 +4798,24 @@
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -43,9 +43,9 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
 +#include <netinet/if_ether.h>
 +#endif
  
- int
- main ()
-@@ -6563,7 +6580,24 @@ cat >conftest.$ac_ext <<_ACEOF
+ int main() {
+ 
+@@ -4838,7 +4855,24 @@ cat >conftest.$ac_ext <<EOF
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -68,9 +68,9 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
 +#include <netinet/if_ether.h>
 +#endif
  
- int
- main ()
-@@ -6783,6 +6817,9 @@ cat >conftest.$ac_ext <<_ACEOF
+ int main() {
+ 
+@@ -4967,7 +5001,10 @@ cat >conftest.$ac_ext <<_ACEOF
  #include "confdefs.h"
  
  #include <stdio.h>
@@ -79,15 +79,18 @@ $NetBSD: patch-af,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
 +#endif
  #include <netinet/tcp.h>
  
- int
-@@ -6874,9 +6911,7 @@ if test $ac_cv_lib_pcap_main = yes; then
-   V_LIB="$V_LIB -lpcap" pcap=yes
+ int main() {
+ 
+@@ -5111,11 +5148,8 @@ if test $ac_cv_lib_pcap_main = yes; then
+   echo "$ac_t""no" 1>&6
  fi
  
 -V_INCLUDES="$V_INCLUDES -I/usr/include/pcap"
 -
--echo "$as_me:6879: checking to make nse" >&5
-+echo "$as_me:6914: checking to make nse" >&5
- echo $ECHO_N "checking to make nse... $ECHO_C" >&6
+-
+ echo $ac_n "checking to make nse""... $ac_c" 1>&6
+-echo "configure:5119: checking to make nse" >&5
++echo "configure:5153: checking to make nse" >&5
  if test $tcphdr = yes && test $pcap = yes; then
  		build_nse="nse"
+ 		echo "$ac_t""yes" 1>&6
diff --git a/net/ns/patches/patch-ag b/net/ns/patches/patch-ag
deleted file mode 100644
index d1746da5453..00000000000
--- a/net/ns/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
-
---- dsr/dsragent.cc.orig	Fri Jun 21 21:16:01 2002
-+++ dsr/dsragent.cc
-@@ -310,7 +310,7 @@ public:

- /*===========================================================================

-   DSRAgent methods

- ---------------------------------------------------------------------------*/

--DSRAgent::DSRAgent(): Agent(PT_DSR), request_table(128), route_cache(NULL), \

-+DSRAgent::DSRAgent(): Agent(PT_DSR), request_table(128), route_cache(NULL), 

- send_buf_timer(this), flow_table(), ars_table()

- {

-   int c;

diff --git a/net/ns/patches/patch-aj b/net/ns/patches/patch-aj
index 9e59099307e..84a8d5ab301 100644
--- a/net/ns/patches/patch-aj
+++ b/net/ns/patches/patch-aj
@@ -1,13 +1,12 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$NetBSD: patch-aj,v 1.2 2003/09/01 18:21:13 seb Exp $
 
 --- emulate/iptap.h.orig	Fri Jan 11 22:06:09 2002
 +++ emulate/iptap.h
-@@ -37,6 +37,8 @@
- #define iptap_h
+@@ -38,6 +38,7 @@
  
  #include "tap.h"
+ 
 +#include <sys/types.h>
-+#include <netinet/in_systm.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
- #include <netinet/tcp.h>
diff --git a/net/ns/patches/patch-ak b/net/ns/patches/patch-ak
index c2a05baf9b1..169d8264148 100644
--- a/net/ns/patches/patch-ak
+++ b/net/ns/patches/patch-ak
@@ -1,13 +1,12 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$NetBSD: patch-ak,v 1.2 2003/09/01 18:21:13 seb Exp $
 
 --- emulate/tcptap.h.orig	Fri Jan 11 22:06:09 2002
 +++ emulate/tcptap.h
-@@ -37,6 +37,8 @@
+@@ -37,6 +37,7 @@
  #define tcptap_h
  
  #include "tap.h"
 +#include <sys/types.h>
-+#include <netinet/in_systm.h>
  #include <netinet/in.h>
+ #include <netinet/in_systm.h>
  #include <netinet/ip.h>
- #include <netinet/tcp.h>
diff --git a/net/ns/patches/patch-al b/net/ns/patches/patch-al
index 68c3412540a..3ad24ea0407 100644
--- a/net/ns/patches/patch-al
+++ b/net/ns/patches/patch-al
@@ -1,10 +1,10 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$netbsd: patch-al,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
 
 --- indep-utils/cmu-scen-gen/setdest/Makefile.in.orig	Fri Jan 11 22:06:09 2002
 +++ indep-utils/cmu-scen-gen/setdest/Makefile.in
 @@ -38,7 +38,7 @@ MKDEP	= ../../../conf/mkdep
- 
- DEFINE = -Dstand_alone
+ # when including files from ns, we need to take care STL_NAMESPACE
+ DEFINE = -Dstand_alone -DSTL_NAMESPACE=@STL_NAMESPACE@
  CFLAGS = @V_CCOPT@ 
 -LDFLAGS = @V_STATIC@
 +LDFLAGS = @LDFLAGS@
diff --git a/net/ns/patches/patch-am b/net/ns/patches/patch-am
index 28d5f6f4182..a4c9c613325 100644
--- a/net/ns/patches/patch-am
+++ b/net/ns/patches/patch-am
@@ -1,11 +1,11 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$NetBSD: patch-am,v 1.2 2003/09/01 18:21:13 seb Exp $
 
 --- indep-utils/webtrace-conv/dec/Makefile.in.orig	Wed Feb 16 18:08:26 2000
 +++ indep-utils/webtrace-conv/dec/Makefile.in
-@@ -38,7 +38,7 @@ BINDEST = @prefix@/bin
+@@ -39,7 +39,7 @@ BINDEST = @prefix@/bin
  CC = @CXX@
  INCLUDE = -I. @V_INCLUDES@
- CFLAGS = @V_CCOPT@
+ CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
 -LDFLAGS = @V_STATIC@
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
diff --git a/net/ns/patches/patch-ao b/net/ns/patches/patch-ao
index d8b6a660f6b..1b6533a5dfa 100644
--- a/net/ns/patches/patch-ao
+++ b/net/ns/patches/patch-ao
@@ -1,11 +1,11 @@
-$NetBSD: patch-ao,v 1.1.1.1 2002/08/27 08:07:07 seb Exp $
+$NetBSD: patch-ao,v 1.2 2003/09/01 18:21:13 seb Exp $
 
 --- indep-utils/webtrace-conv/nlanr/Makefile.in.orig	Wed Feb 16 18:08:27 2000
 +++ indep-utils/webtrace-conv/nlanr/Makefile.in
-@@ -35,7 +35,7 @@ BINDEST = @prefix@/bin
+@@ -36,7 +36,7 @@ BINDEST = @prefix@/bin
  CC = @CXX@
  INCLUDE = -I. -I../../.. @V_INCLUDES@
- CFLAGS = @V_CCOPT@
+ CFLAGS = @V_CCOPT@ -DSTL_NAMESPACE=@STL_NAMESPACE@
 -LDFLAGS = @V_STATIC@
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@