Update ns to 2.33. This version contains many new modules, especially

wireless network models, and bug fixes.


Changes since 2.31:

Wireless shadowing bug fix; originally reported by Marcello Caleffi;
suggestion from Nicola Baldo applied

AODV bug fix from Marco Fiore

Add dynamic libraries patch from SIGNET group, University of Padova

Add 80211Ext models from Mercedes-Benz/Karlsruhe team

Add Ilango Purushothaman's 802.11 infrastructure mode support.

Add ns-2 TCP Linux patch and calendar scheduler improvements.

Enable Tk for ns-2.

Several changes to SCTP module, contributed by Nasif Ekiz and Protocol
Engineering Lab at the University of Delaware

4 files changed, 57 insertions, 11 deletions

diff --git a/net/ns/Makefile b/net/ns/Makefile
index 519a46fe1bf..5592a161998 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2007/04/26 16:11:50 minskim Exp $
+# $NetBSD: Makefile,v 1.30 2008/09/18 04:48:12 minskim Exp $
 
-DISTNAME=	ns-src-2.31
-PKGNAME=	${DISTNAME:S/-src//}
+DISTNAME=	ns-2.33
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nsnam/}
 
@@ -16,6 +15,7 @@ BUILDLINK_API_DEPENDS.tk+=	tk>=8.4.12nb2
 
 WRKSRC=		${WRKDIR}/${PKGNAME}
 USE_LANGUAGES=	c c++
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	yes
 PTHREAD_OPTS+=	require
 # Perl is only needed if you want to run the validation tests.
@@ -28,6 +28,8 @@ CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
 CONFIGURE_ARGS+=	--with-tk-ver=8.4
 CONFIGURE_ARGS+=	--with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
 CONFIGURE_ARGS+=	--with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
+CONFIGURE_ENV+=		X11LIBDIR=${X11PREFIX}/lib${LIBABISUFFIX}
+CONFIGURE_ENV+=		X11INCDIR=${X11PREFIX}/include
 
 MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
 
@@ -37,6 +39,8 @@ INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../lang/tcl-otcl/buildlink3.mk"
 .include "../../net/libpcap/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/tk/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/net/ns/distinfo b/net/ns/distinfo
index c47cccb7a58..8226a5c3e70 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.12 2007/04/26 16:11:51 minskim Exp $
+$NetBSD: distinfo,v 1.13 2008/09/18 04:48:12 minskim Exp $
 
-SHA1 (ns-src-2.31.tar.gz) = 095e0b599abb5b1c977320f435175e8d13487b7c
-RMD160 (ns-src-2.31.tar.gz) = ca8b17b241b25127859c89c79110f839982ca4b0
-Size (ns-src-2.31.tar.gz) = 56719360 bytes
+SHA1 (ns-2.33.tar.gz) = 0efd6aed45b504fcf3f125b0be00a60b87516a03
+RMD160 (ns-2.33.tar.gz) = 54326b8ff4e63c0a9712c517c7ad4d9327a41d39
+Size (ns-2.33.tar.gz) = 41649114 bytes
+SHA1 (patch-aa) = 3b25eab34d7bdad7d370cea8450eb3c09c18c640
 SHA1 (patch-ab) = 7c93e4540faa1b16a9e40bd063ffce510f5bc063
 SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969
 SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2
-SHA1 (patch-af) = ad9a85dd6b3f132f1d8632e29922155f82195d53
+SHA1 (patch-af) = ca18b019fc5f3c9aaeb2f8085c73eb7a0afad047
 SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd
 SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
 SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
diff --git a/net/ns/patches/patch-aa b/net/ns/patches/patch-aa
new file mode 100644
index 00000000000..e8618f3f2ce
--- /dev/null
+++ b/net/ns/patches/patch-aa
@@ -0,0 +1,14 @@
+$NetBSD: patch-aa,v 1.6 2008/09/18 04:48:12 minskim Exp $
+
+--- conf/configure.in.x11.orig	2008-03-31 19:00:27.000000000 -0700
++++ conf/configure.in.x11
+@@ -3,3 +3,3 @@ dnl $Header: /cvsroot/nsnam/conf/configu
+ 
+-xlibdirs="\
++xlibdirs="${X11LIBDIR} \
+ 	/usr/openwin/lib \
+@@ -18,3 +18,3 @@ xlibdirs="\
+ 
+-xincdirs="\
++xincdirs="${X11INCDIR} \
+ 	/usr/openwin/include \
diff --git a/net/ns/patches/patch-af b/net/ns/patches/patch-af
index cc48c205575..eb50dedc3b5 100644
--- a/net/ns/patches/patch-af
+++ b/net/ns/patches/patch-af
@@ -1,8 +1,26 @@
-$NetBSD: patch-af,v 1.7 2007/04/26 16:11:51 minskim Exp $
+$NetBSD: patch-af,v 1.8 2008/09/18 04:48:12 minskim Exp $
 
---- configure.orig	2007-04-26 15:39:55.000000000 +0000
+--- configure.orig	2008-03-31 19:00:25.000000000 -0700
 +++ configure
-@@ -6635,7 +6635,7 @@ fi
+@@ -5836,7 +5836,7 @@ powerpc-apple-darwin*)
+ esac
+ 
+ 
+-xlibdirs="\
++xlibdirs="${X11LIBDIR} \
+ 	/usr/openwin/lib \
+ 	/usr/X11R6/lib \
+ 	/usr/lib/X11R6 \
+@@ -5851,7 +5851,7 @@ xlibdirs="\
+ 	/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/lib \
+ 	/import/X11R4/usr/lib"
+ 
+-xincdirs="\
++xincdirs="${X11INCDIR} \
+ 	/usr/openwin/include \
+ 	/usr/X11R6/include \
+ 	/usr/include/X11R6 \
+@@ -6906,7 +6906,7 @@ fi
  
  
  
@@ -11,3 +29,12 @@ $NetBSD: patch-af,v 1.7 2007/04/26 16:11:51 minskim Exp $
  do
  as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
  if eval "test \"\${$as_ac_Header+set}\" = set"; then
+@@ -11052,6 +11052,8 @@ do
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++	: Avoid regenerating within pkgsrc
++	exit 0
+     ac_cs_recheck=: ;;
+   --version | --vers* | -V )
+     echo "$ac_cs_version"; exit 0 ;;