[pkgsrc/trunk]: pkgsrc/net/ns Update ns to 2.28.

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2a96b4e0bebc
branches:  trunk
changeset: 499034:2a96b4e0bebc
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Thu Sep 08 02:50:58 2005 +0000

description:
Update ns to 2.28.

Changes:
  - Added code for mac802.15.4.
  - Improve Cygwin compatibility.
  - Bug fixes.

diffstat:

 net/ns/Makefile         |     9 +-
 net/ns/PLIST            |     6 +-
 net/ns/distinfo         |    24 +-
 net/ns/patches/patch-ab |     8 +-
 net/ns/patches/patch-ae |    18 +-
 net/ns/patches/patch-af |  1275 +++++++++++++++++++++++-----------------------
 net/ns/patches/patch-al |    15 +-
 net/ns/patches/patch-am |    16 +-
 net/ns/patches/patch-an |     8 +-
 net/ns/patches/patch-ao |    16 +-
 net/ns/patches/patch-ap |     8 +-
 11 files changed, 688 insertions(+), 715 deletions(-)

diffs (truncated from 2985 to 300 lines):

diff -r 6e4926e9644d -r 2a96b4e0bebc net/ns/Makefile
--- a/net/ns/Makefile   Thu Sep 08 00:35:11 2005 +0000
+++ b/net/ns/Makefile   Thu Sep 08 02:50:58 2005 +0000
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:16 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/09/08 02:50:58 minskim Exp $
 
-DISTNAME=      ns-src-2.27
+DISTNAME=      ns-src-2.28
 PKGNAME=       ${DISTNAME:S/-src//}
-PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://www.isi.edu/nsnam/dist/
 
@@ -44,7 +43,7 @@
        ${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
+       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ns
+       ${INSTALL_DATA} ${WRKSRC}/CHANGES.html ${PREFIX}/share/doc/ns
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6e4926e9644d -r 2a96b4e0bebc net/ns/PLIST
--- a/net/ns/PLIST      Thu Sep 08 00:35:11 2005 +0000
+++ b/net/ns/PLIST      Thu Sep 08 02:50:58 2005 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2003/09/01 18:21:12 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/09/08 02:50:58 minskim Exp $
 bin/calcdest
 bin/dec-tr-stat
 bin/epa-tr-stat
@@ -7,5 +7,5 @@
 bin/setdest
 bin/ucb-tr-stat
 man/man1/ns.1
-share/doc/html/ns/CHANGES.html
-@dirrm share/doc/html/ns
+share/doc/ns/CHANGES.html
+@dirrm share/doc/ns
diff -r 6e4926e9644d -r 2a96b4e0bebc net/ns/distinfo
--- a/net/ns/distinfo   Thu Sep 08 00:35:11 2005 +0000
+++ b/net/ns/distinfo   Thu Sep 08 02:50:58 2005 +0000
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.6 2005/02/24 12:13:57 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/09/08 02:50:58 minskim Exp $
 
-SHA1 (ns-src-2.27.tar.gz) = 63c3fbf6dd8772e9b0fa30b5127cc32da4b63e0c
-RMD160 (ns-src-2.27.tar.gz) = 7155d58623618cc726c7d6d196e77646864b96f5
-Size (ns-src-2.27.tar.gz) = 44642525 bytes
+SHA1 (ns-src-2.28.tar.gz) = ecad96f69bb32420c0a9ee698c7289e66001febf
+RMD160 (ns-src-2.28.tar.gz) = f2ec76b7dc96bbfb75d8485ef2822ebdf50b8ed1
+Size (ns-src-2.28.tar.gz) = 46599585 bytes
 SHA1 (patch-aa) = 49acbf12598245262286f0717b2b8efeb03792d2
-SHA1 (patch-ab) = 6c30337ed419553751eb8d1286e00c03ac0244b6
+SHA1 (patch-ab) = 7c93e4540faa1b16a9e40bd063ffce510f5bc063
 SHA1 (patch-ac) = 28cda4d9f68e031725016d2c06925394c76e5152
 SHA1 (patch-ad) = 5f35152de976c2195dcff20abbe8610321dd9969
-SHA1 (patch-ae) = fb6a737a177447fd077fb4e70c51fa0f3bec9929
-SHA1 (patch-af) = d227406ec73324fd78bbe6314b47cc3950c2887e
+SHA1 (patch-ae) = c971d28448ae1b495119e3ec2c8de185468b9be2
+SHA1 (patch-af) = 94ab6d8a0cb9d43f9d440712880fe9a2be24ccd4
 SHA1 (patch-ah) = 51c36d73309d135f89f7d2362835052b304b88bd
 SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
 SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
 SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef
-SHA1 (patch-al) = b305fc29f962d2bef8575afdbf3c401352fc57ea
-SHA1 (patch-am) = 298c41171cb7daa6b3a59287e9cb7a0ad37b6f44
-SHA1 (patch-an) = c5a672c47c554cd7a1970c732f1a9da76b6c7090
-SHA1 (patch-ao) = 7598b01a11352e602aa3e8013b518c656d6aae85
-SHA1 (patch-ap) = f59ca64a44c251104cd5cec173dbaad9c4e4756b
+SHA1 (patch-al) = 628733a1e9ccf34c677711666e833c1ede27b5b1
+SHA1 (patch-am) = 882ea61b7f6909336f72f637b041f373830197e8
+SHA1 (patch-an) = c6dd6b93332a6c6dd169975836df9ef802bfc206
+SHA1 (patch-ao) = 2a1fd71686ff206fe2212605f91b8167b998d6e2
+SHA1 (patch-ap) = f130c112d7dfe114e637e190750d9caad55e4703
diff -r 6e4926e9644d -r 2a96b4e0bebc net/ns/patches/patch-ab
--- a/net/ns/patches/patch-ab   Thu Sep 08 00:35:11 2005 +0000
+++ b/net/ns/patches/patch-ab   Thu Sep 08 02:50:58 2005 +0000
@@ -1,14 +1,14 @@
-$NetBSD: patch-ab,v 1.2 2004/03/08 23:55:24 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2005/09/08 02:50:58 minskim Exp $
 
---- autoconf.h.in.orig Mon Jan 12 18:59:20 2004
+--- autoconf.h.in.orig 2005-01-19 10:23:17.000000000 -0800
 +++ autoconf.h.in
-@@ -66,6 +66,9 @@
+@@ -69,6 +69,9 @@
  #undef HAVE_ARPA_INET_H
  #undef HAVE_NETINET_IN_H
  #undef HAVE_NET_ETHERNET_H
 +#undef HAVE_NET_IF_H
 +#undef HAVE_NETINET_IF_ETHER_H
 +#undef HAVE_SYS_SOCKET_H
+ #undef HAVE_FENV_H
  
  /* structures */
- #undef HAVE_ETHER_HEADER_STRUCT
diff -r 6e4926e9644d -r 2a96b4e0bebc net/ns/patches/patch-ae
--- a/net/ns/patches/patch-ae   Thu Sep 08 00:35:11 2005 +0000
+++ b/net/ns/patches/patch-ae   Thu Sep 08 02:50:58 2005 +0000
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.2 2004/03/08 23:55:24 minskim Exp $
+$NetBSD: patch-ae,v 1.3 2005/09/08 02:50:58 minskim Exp $
 
---- configure.in.orig  Mon Jan 12 18:59:18 2004
+--- configure.in.orig  2005-01-19 10:23:17.000000000 -0800
 +++ configure.in
-@@ -37,7 +37,7 @@ AC_HEADER_STDC
+@@ -39,7 +39,7 @@ fi
+ AC_HEADER_STDC
  
  dnl AC_CHECK_FUNCS will place -D's in @DEFS@
- AC_CHECK_FUNCS(bcopy bzero fesetprecision getrusage sbrk snprintf)
--AC_CHECK_HEADERS(arpa/inet.h netinet/in.h string.h strings.h time.h unistd.h net/ethernet.h)
-+AC_CHECK_HEADERS(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)
- 
- dnl
- dnl figure out random return type
+-AC_CHECK_HEADERS(arpa/inet.h fenv.h netinet/in.h string.h strings.h time.h unistd.h net/ethernet.h)
++AC_CHECK_HEADERS(arpa/inet.h fenv.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)
+ dnl check for libm is needed for subseq checks
+ AC_CHECK_LIB(m, main, , AC_MSG_ERROR(Could not find math library, cannot continue.))
+ AC_CHECK_FUNCS(bcopy bzero fesetprecision feenableexcept getrusage sbrk snprintf)
diff -r 6e4926e9644d -r 2a96b4e0bebc net/ns/patches/patch-af
--- a/net/ns/patches/patch-af   Thu Sep 08 00:35:11 2005 +0000
+++ b/net/ns/patches/patch-af   Thu Sep 08 02:50:58 2005 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-af,v 1.4 2004/03/08 23:55:24 minskim Exp $
+$NetBSD: patch-af,v 1.5 2005/09/08 02:50:58 minskim Exp $
 
---- configure.orig     2004-03-08 17:19:35.000000000 -0600
+--- configure.orig     2005-01-24 15:37:44.000000000 -0800
 +++ configure
 @@ -1,9 +1,8 @@
  #! /bin/sh
@@ -264,7 +264,7 @@
        fi;;
    esac
    # Pass precious variables to config.status.
-@@ -1813,7 +1846,6 @@ ac_compiler=`set X $ac_compile; echo $2`
+@@ -1820,7 +1853,6 @@ ac_compiler=`set X $ac_compile; echo $2`
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
@@ -272,7 +272,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -1833,8 +1865,8 @@ ac_clean_files="$ac_clean_files a.out a.
+@@ -1840,8 +1872,8 @@ ac_clean_files="$ac_clean_files a.out a.
  # Try to create an executable without -o first, disregard a.out.
  # It will help us diagnose broken compilers, and finding out an intuition
  # of exeext.
@@ -283,7 +283,7 @@
  ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
  if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
    (eval $ac_link_default) 2>&5
-@@ -1854,23 +1886,23 @@ do
+@@ -1861,23 +1893,23 @@ do
    test -f "$ac_file" || continue
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
@@ -320,7 +320,7 @@
    esac
  done
  else
-@@ -1944,8 +1976,8 @@ for ac_file in conftest.exe conftest con
+@@ -1951,8 +1983,8 @@ for ac_file in conftest.exe conftest con
    case $ac_file in
      *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
      *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
@@ -331,7 +331,7 @@
      * ) break;;
    esac
  done
-@@ -1970,7 +2002,6 @@ if test "${ac_cv_objext+set}" = set; the
+@@ -1977,7 +2009,6 @@ if test "${ac_cv_objext+set}" = set; the
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -339,7 +339,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2021,7 +2052,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = 
+@@ -2028,7 +2059,6 @@ if test "${ac_cv_c_compiler_gnu+set}" = 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -347,7 +347,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2041,11 +2071,21 @@ main ()
+@@ -2048,11 +2078,21 @@ main ()
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -371,7 +371,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2058,7 +2098,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2065,7 +2105,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  ac_compiler_gnu=no
  fi
@@ -380,7 +380,7 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
-@@ -2074,7 +2114,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; 
+@@ -2081,7 +2121,6 @@ if test "${ac_cv_prog_cc_g+set}" = set; 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    cat >conftest.$ac_ext <<_ACEOF
@@ -388,7 +388,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2091,11 +2130,21 @@ main ()
+@@ -2098,11 +2137,21 @@ main ()
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -412,7 +412,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2108,7 +2157,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
+@@ -2115,7 +2164,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
  
  ac_cv_prog_cc_g=no
  fi
@@ -421,7 +421,7 @@
  fi
  echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
  echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-@@ -2135,7 +2184,6 @@ else
+@@ -2142,7 +2191,6 @@ else
    ac_cv_prog_cc_stdc=no
  ac_save_CC=$CC
  cat >conftest.$ac_ext <<_ACEOF
@@ -429,7 +429,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -2163,6 +2211,16 @@ static char *f (char * (*g) (char **, in
+@@ -2170,6 +2218,16 @@ static char *f (char * (*g) (char **, in
    va_end (v);
    return s;
  }
@@ -446,7 +446,7 @@
  int test (int i, double x);
  struct s1 {int (*f) (int a);};
  struct s2 {int (*f) (double a);};
-@@ -2189,11 +2247,21 @@ do
+@@ -2196,11 +2254,21 @@ do
    CC="$ac_save_CC $ac_arg"
    rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -470,7 +470,7 @@
    { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
    (eval $ac_try) 2>&5
    ac_status=$?
-@@ -2206,7 +2274,7 @@ else
+@@ -2213,7 +2281,7 @@ else
  sed 's/^/| /' conftest.$ac_ext >&5
  
  fi
@@ -479,7 +479,7 @@
  done
  rm -f conftest.$ac_ext conftest.$ac_objext
  CC=$ac_save_CC
-@@ -2234,19 +2302,28 @@ cat >conftest.$ac_ext <<_ACEOF
+@@ -2241,19 +2309,28 @@ cat >conftest.$ac_ext <<_ACEOF
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -512,7 +512,7 @@
     'extern "C" void std::exit (int) throw (); using std::exit;' \
     'extern "C" void std::exit (int); using std::exit;' \
     'extern "C" void exit (int) throw ();' \
-@@ -2254,14 +2331,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -2261,14 +2338,13 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
     'void exit (int);'
  do
    cat >conftest.$ac_ext <<_ACEOF
@@ -528,7 +528,7 @@
  int
  main ()
  {
-@@ -2272,11 +2348,21 @@ exit (42);
+@@ -2279,11 +2355,21 @@ exit (42);
  _ACEOF
  rm -f conftest.$ac_objext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
@@ -552,7 +552,7 @@