*** ns-allinone-2.35/install.orig	2015-07-21 02:04:02.796613200 +0900
--- ns-allinone-2.35/install	2015-07-21 03:40:45.544292000 +0900
***************
*** 204,210 ****
  fi
  
  # A Cygwin install requires these packages:
! packages_base="gcc4 gcc4-g++ gawk tar gzip make patch perl w32api"
  packages_xorg="xorg-server xinit libX11-devel libXmu-devel"
  
  # Check if we are using Cygwin, and if so, if it is a good install
--- 204,210 ----
  fi
  
  # A Cygwin install requires these packages:
! packages_base="gcc-core gcc-g++ gawk tar gzip make patch perl w32api-headers w32api-runtime tcl tcl-devel tcl-tk tcl-tk-devel"
  packages_xorg="xorg-server xinit libX11-devel libXmu-devel"
  
  # Check if we are using Cygwin, and if so, if it is a good install
***************
*** 267,272 ****
--- 267,273 ----
  echo "* Build XGraph-$XGRAPHVER"
  echo "============================================================"
  
+ if [ -d ./xgraph-$XGRAPHVER ] ; then
  cd ./xgraph-$XGRAPHVER
  ./configure --prefix=../
  if  [ "${test_cygwin}" = "true" ]; then
***************
*** 280,285 ****
--- 281,287 ----
  fi
  
  cd ../
+ fi
  
  # Compile and install cweb and sgblib
  
***************
*** 399,404 ****
--- 401,407 ----
  echo "* Build tcl$TCLVER"
  echo "============================================================"
  
+ if [ -d ./tcl$TCLVER ] ; then
  cd ./tcl$TCLVER/unix
  if [ -f Makefile ] ; then 
  	make distclean
***************
*** 422,427 ****
--- 425,431 ----
  fi
  
  cd ../../
+ fi
  
  # compile and install tk
  
***************
*** 429,434 ****
--- 433,439 ----
  echo "* Build Tk$TKVER"
  echo "============================================================"
  
+ if [ -d ./tk$TKVER ] ; then
  cd ./tk$TKVER/unix
  if [ -f Makefile ] ; then
  	make distclean
***************
*** 451,456 ****
--- 456,462 ----
  fi
  
  cd ../../
+ fi
  
  #
  # Since our configures search for tclsh in $PATH, the following 
*** ns-allinone-2.35/otcl-1.14/configure.orig	2015-07-21 03:12:47.543719900 +0900
--- ns-allinone-2.35/otcl-1.14/configure	2015-07-21 03:51:28.973713000 +0900
***************
*** 4791,4797 ****
  if test "${with_tcl+set}" = set; then
    withval=$with_tcl; d=$withval
  else
!   d=""
  fi
  
  
--- 4791,4797 ----
  if test "${with_tcl+set}" = set; then
    withval=$with_tcl; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 4896,4903 ****
--- 4896,4906 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \
  		"
***************
*** 5406,5412 ****
  if test "${with_tk+set}" = set; then
    withval=$with_tk; d=$withval
  else
!   d=""
  fi
  
  
--- 5409,5415 ----
  if test "${with_tk+set}" = set; then
    withval=$with_tk; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 5503,5510 ****
--- 5506,5516 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/otcl-1.14/conf/configure.in.tcl.orig	2015-07-21 03:10:53.753678700 +0900
--- ns-allinone-2.35/otcl-1.14/conf/configure.in.tcl	2015-07-21 03:11:49.462671500 +0900
***************
*** 1,7 ****
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tcl,v 1.49 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
--- 1,7 ----
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tcl,v 1.49 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="/usr")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
***************
*** 102,109 ****
--- 102,112 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \ 
  		"
*** ns-allinone-2.35/otcl-1.14/conf/configure.in.tk.orig	2015-07-21 03:49:25.300319900 +0900
--- ns-allinone-2.35/otcl-1.14/conf/configure.in.tk	2015-07-21 03:50:01.208701600 +0900
***************
*** 2,8 ****
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tk,v 1.34 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
--- 2,8 ----
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tk,v 1.34 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="/usr")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
***************
*** 94,101 ****
--- 94,104 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/tclcl-1.20/configure.orig	2015-07-21 03:14:14.446092200 +0900
--- ns-allinone-2.35/tclcl-1.20/configure	2015-07-21 03:53:02.443585700 +0900
***************
*** 5914,5920 ****
  if test "${with_tcl+set}" = set; then
    withval=$with_tcl; d=$withval
  else
!   d=""
  fi
  
  
--- 5914,5920 ----
  if test "${with_tcl+set}" = set; then
    withval=$with_tcl; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 6019,6026 ****
--- 6019,6029 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \
  		"
***************
*** 6529,6535 ****
  if test "${with_tk+set}" = set; then
    withval=$with_tk; d=$withval
  else
!   d=""
  fi
  
  
--- 6532,6538 ----
  if test "${with_tk+set}" = set; then
    withval=$with_tk; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 6626,6633 ****
--- 6629,6639 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/tclcl-1.20/conf/configure.in.tcl.orig	2015-07-21 03:09:30.267029700 +0900
--- ns-allinone-2.35/tclcl-1.20/conf/configure.in.tcl	2015-07-21 03:10:31.902085400 +0900
***************
*** 1,7 ****
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tcl,v 1.49 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
--- 1,7 ----
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tcl,v 1.49 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="/usr")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
***************
*** 102,109 ****
--- 102,112 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \ 
  		"
*** ns-allinone-2.35/tclcl-1.20/conf/configure.in.tk.orig	2015-07-21 03:51:45.184152700 +0900
--- ns-allinone-2.35/tclcl-1.20/conf/configure.in.tk	2015-07-21 03:52:20.950493900 +0900
***************
*** 2,8 ****
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tk,v 1.34 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
--- 2,8 ----
  dnl $Header: /cvsroot/otcl-tclcl/conf/configure.in.tk,v 1.34 2009/12/30 19:36:09 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="/usr")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
***************
*** 94,101 ****
--- 94,104 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/ns-2.35/configure.orig	2015-07-21 03:17:29.999773500 +0900
--- ns-allinone-2.35/ns-2.35/configure	2015-07-21 03:48:58.323859700 +0900
***************
*** 5441,5447 ****
  if test "${with_tcl+set}" = set; then :
    withval=$with_tcl; d=$withval
  else
!   d=""
  fi
  
  
--- 5441,5447 ----
  if test "${with_tcl+set}" = set; then :
    withval=$with_tcl; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 5545,5552 ****
--- 5545,5555 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \
  		"
***************
*** 6043,6049 ****
  if test "${with_tk+set}" = set; then :
    withval=$with_tk; d=$withval
  else
!   d=""
  fi
  
  
--- 6046,6052 ----
  if test "${with_tk+set}" = set; then :
    withval=$with_tk; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 6138,6145 ****
--- 6141,6151 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/ns-2.35/conf/configure.in.tcl.orig	2015-07-21 03:06:55.594503300 +0900
--- ns-allinone-2.35/ns-2.35/conf/configure.in.tcl	2015-07-21 03:08:34.978028700 +0900
***************
*** 1,7 ****
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tcl,v 1.52 2009/12/30 22:05:31 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
--- 1,7 ----
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tcl,v 1.52 2009/12/30 22:05:31 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="/usr")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
***************
*** 101,108 ****
--- 101,111 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \ 
  		"
*** ns-allinone-2.35/ns-2.35/conf/configure.in.tk.orig	2015-07-21 03:47:27.760621900 +0900
--- ns-allinone-2.35/ns-2.35/conf/configure.in.tk	2015-07-21 03:48:05.238142900 +0900
***************
*** 2,8 ****
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tk,v 1.40 2009/12/30 22:05:32 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
--- 2,8 ----
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tk,v 1.40 2009/12/30 22:05:32 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="/usr")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
***************
*** 92,99 ****
--- 92,102 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/nam-1.15/configure.orig	2015-07-21 03:20:57.794244500 +0900
--- ns-allinone-2.35/nam-1.15/configure	2015-07-21 03:47:09.294121000 +0900
***************
*** 5642,5648 ****
  if test "${with_tcl+set}" = set; then :
    withval=$with_tcl; d=$withval
  else
!   d=""
  fi
  
  
--- 5642,5648 ----
  if test "${with_tcl+set}" = set; then :
    withval=$with_tcl; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 5746,5753 ****
--- 5746,5756 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \
  		"
***************
*** 6244,6250 ****
  if test "${with_tk+set}" = set; then :
    withval=$with_tk; d=$withval
  else
!   d=""
  fi
  
  
--- 6247,6253 ----
  if test "${with_tk+set}" = set; then :
    withval=$with_tk; d=$withval
  else
!   d="/usr"
  fi
  
  
***************
*** 6339,6346 ****
--- 6342,6352 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/nam-1.15/conf/configure.in.tcl.orig	2015-07-21 03:06:21.060265100 +0900
--- ns-allinone-2.35/nam-1.15/conf/configure.in.tcl	2015-07-21 03:05:07.416254200 +0900
***************
*** 1,7 ****
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tcl,v 1.52 2009/12/30 22:05:31 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
--- 1,7 ----
  dnl autoconf rules to find tcl
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tcl,v 1.52 2009/12/30 22:05:31 tom_henderson Exp $ (LBL)
  
! AC_ARG_WITH(tcl,	--with-tcl=path	specify a pathname for tcl, d=$withval, d="/usr")
  
  dnl cant easily escape brackets in M4/autoconf-- must use quadigraphs below
  AC_ARG_WITH(tcl-ver, --with-tcl-ver=path specify the version of tcl/tk, TCL_VERS=$withval, TCL_VERS=`echo "puts @<:@info patchlevel@:>@" | tclsh`)
***************
*** 101,108 ****
--- 101,111 ----
  TCL_H_PLACES_D="$d/generic \
  		$d/unix \
  		$d/include/tcl$TCL_HI_VERS \
+ 		$d/include/tcl$TCL_HI_VERS/generic \
  		$d/include/tcl$TCL_VERS \
+ 		$d/include/tcl$TCL_VERS/generic \
  		$d/include/tcl$TCL_ALT_VERS \
+ 		$d/include/tcl$TCL_ALT_VERS/generic \
  		$d/include \
  		/usr/local/include \ 
  		"
*** ns-allinone-2.35/nam-1.15/conf/configure.in.tk.orig	2015-07-21 03:45:03.745348200 +0900
--- ns-allinone-2.35/nam-1.15/conf/configure.in.tk	2015-07-21 03:46:01.823637300 +0900
***************
*** 2,8 ****
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tk,v 1.40 2009/12/30 22:05:32 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
--- 2,8 ----
  dnl $Header: /cvsroot/nsnam/conf/configure.in.tk,v 1.40 2009/12/30 22:05:32 tom_henderson Exp $ (LBL)
  
  
! AC_ARG_WITH(tk,	--with-tk=path	specify a pathname for tk, d=$withval, d="/usr")
  
  dnl library version defaults to 8.0
  AC_ARG_WITH(tk-ver, --with-tk-ver=path specify the version of tcl/tk, TK_VERS=$withval, TK_VERS=$TCL_VERS)
***************
*** 92,99 ****
--- 92,102 ----
                  $d/../include/tk$TK_HI_VERS \
                  $d/../include/tk$TK_OLD_VERS \
  		$d/include/tk$TK_VERS \
+ 		$d/include/tk$TK_VERS/generic \
  		$d/include/tk$TK_HI_VERS \
+ 		$d/include/tk$TK_HI_VERS/generic \
  		$d/include/tk$TK_OLD_VERS \
+ 		$d/include/tk$TK_OLD_VERS/generic \
                  $d/include"
  TK_H_PLACES=" \
  		../include \
*** ns-allinone-2.35/ns-2.35/linkstate/ls.h.orig	2015-07-21 03:18:51.412380300 +0900
--- ns-allinone-2.35/ns-2.35/linkstate/ls.h	2015-07-21 03:19:16.196984500 +0900
***************
*** 134,140 ****
  		return ib.second ? ib.first : baseMap::end();
  	}
  
! 	void eraseAll() { erase(baseMap::begin(), baseMap::end()); }
  	T* findPtr(Key key) {
  		iterator it = baseMap::find(key);
  		return (it == baseMap::end()) ? (T *)NULL : &((*it).second);
--- 134,140 ----
  		return ib.second ? ib.first : baseMap::end();
  	}
  
! 	void eraseAll() { baseMap::erase(baseMap::begin(), baseMap::end()); }
  	T* findPtr(Key key) {
  		iterator it = baseMap::find(key);
  		return (it == baseMap::end()) ? (T *)NULL : &((*it).second);
*** ns-allinone-2.35/ns-2.35/tcl/test/test-all-template1.orig	2015-07-30 17:08:59.818949200 +0900
--- ns-allinone-2.35/ns-2.35/tcl/test/test-all-template1	2015-07-30 17:10:12.597709600 +0900
***************
*** 123,129 ****
  	else
              # OLD: gzip -dc $directory/$t.gz | cmp -s - $datafile
              # Deleted because it is not supported in Mac OS X, for "cmp".
! 	    gzip -dc $directory/$t.gz > temp.randsgz
              cmp -s temp.randsgz $datafile
  	    if [ $? = 0 ]; then
  		echo Test output agrees with reference output
--- 123,129 ----
  	else
              # OLD: gzip -dc $directory/$t.gz | cmp -s - $datafile
              # Deleted because it is not supported in Mac OS X, for "cmp".
! 	    gzip -dc $directory/$t.gz | perl -ne 'print $_;' > temp.randsgz
              cmp -s temp.randsgz $datafile
  	    if [ $? = 0 ]; then
  		echo Test output agrees with reference output
*** ns-allinone-2.35/ns-2.35/bin/raw2xg.orig	2015-07-30 17:59:08.355943800 +0900
--- ns-allinone-2.35/ns-2.35/bin/raw2xg	2015-07-30 18:13:52.090026100 +0900
***************
*** 1,7 ****
  eval 'exec perl -S $0 ${1+"$@"}'		# -*-perl-*-
      if 0;
  
! require 5.001;
  
  ($progname) = ($0 =~ m!([^/]+)$!);
  sub usage {
--- 1,8 ----
  eval 'exec perl -S $0 ${1+"$@"}'		# -*-perl-*-
      if 0;
  
! require 5.12.0;
! use Getopt::Std;
  
  ($progname) = ($0 =~ m!([^/]+)$!);
  sub usage {
***************
*** 34,41 ****
  };
  $usage = "usage: $progname [-a] [trace files...]\n";
  
! require 'getopts.pl';
! &Getopts('acefgds:m:n:qrplvt:xy') || usage;
  
  $c = 0;
  @p = @pc = @pg = @a = @ac = @ae = @d = @lu = @ld = ();
--- 35,43 ----
  };
  $usage = "usage: $progname [-a] [trace files...]\n";
  
! #require 'getopts.pl';
! #&Getopts('acefgds:m:n:qrplvt:xy') || usage;
! getopts('acefgds:m:n:qrplvt:xy') || usage;
  
  $c = 0;
  @p = @pc = @pg = @a = @ac = @ae = @d = @lu = @ld = ();