Fix build with tcl8.6. Bump PKGREVISION

8 files changed, 53 insertions, 17 deletions

diff --git a/net/ns/Makefile b/net/ns/Makefile
index 94f6eea04ed..cc94f412c2d 100644
--- a/net/ns/Makefile
+++ b/net/ns/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2014/01/11 14:42:05 adam Exp $
+# $NetBSD: Makefile,v 1.44 2014/02/01 08:04:04 markd Exp $
 
 DISTNAME=	ns-src-2.35
 PKGNAME=	ns-2.35
-PKGREVISION=	6
+PKGREVISION=	7
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=nsnam/}
 
@@ -22,9 +22,9 @@ PTHREAD_OPTS+=	require
 
 CONFIGURE_ARGS+=	LIBS="`${CONFIG_SHELL} -c '. ${TCLCONFIG_SH}; ${ECHO} $$TCL_LIBS'`"
 CONFIGURE_ARGS+=	--with-tcl=${BUILDLINK_PREFIX.tcl}
-CONFIGURE_ARGS+=	--with-tcl-ver=8.5
+CONFIGURE_ARGS+=	--with-tcl-ver=8.6
 CONFIGURE_ARGS+=	--with-tk=${BUILDLINK_PREFIX.tk}
-CONFIGURE_ARGS+=	--with-tk-ver=8.5
+CONFIGURE_ARGS+=	--with-tk-ver=8.6
 CONFIGURE_ARGS+=	--with-otcl=${BUILDLINK_PREFIX.tcl-otcl}
 CONFIGURE_ARGS+=	--with-tclcl=${BUILDLINK_PREFIX.tcl-tclcl}
 CONFIGURE_ENV+=		X11LIBDIR=${X11PREFIX}/lib${LIBABISUFFIX}
diff --git a/net/ns/distinfo b/net/ns/distinfo
index 9b16bcb304e..9b61e9c1f3b 100644
--- a/net/ns/distinfo
+++ b/net/ns/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.20 2013/09/17 21:13:45 joerg Exp $
+$NetBSD: distinfo,v 1.21 2014/02/01 08:04:04 markd Exp $
 
 SHA1 (ns-src-2.35.tar.gz) = 785d4045711d92c0042a6f8f5620d5eb74732980
 RMD160 (ns-src-2.35.tar.gz) = 197e6874b97c56819ce9a722ffab9fe80a5cfe21
@@ -13,10 +13,10 @@ SHA1 (patch-ai) = b75f36f986ca7c833769de09e6e79f6b87c5564a
 SHA1 (patch-aj) = 533fa4f1bd1f8bf83882ed5ed2717511283d5ddc
 SHA1 (patch-ak) = ea478696cdddc44ba7a76d1f31d4a6a97a88aaef
 SHA1 (patch-al) = 628733a1e9ccf34c677711666e833c1ede27b5b1
-SHA1 (patch-am) = 882ea61b7f6909336f72f637b041f373830197e8
-SHA1 (patch-an) = c6dd6b93332a6c6dd169975836df9ef802bfc206
-SHA1 (patch-ao) = 2a1fd71686ff206fe2212605f91b8167b998d6e2
-SHA1 (patch-ap) = f130c112d7dfe114e637e190750d9caad55e4703
+SHA1 (patch-am) = d721e6187c2ed3f485fbab5bf1235de037453a05
+SHA1 (patch-an) = 05cf59b46305f81195a0bf4542cfbb264a683df6
+SHA1 (patch-ao) = 9c8458bc4f3d168333369255e0e8fc57fcfebe06
+SHA1 (patch-ap) = c5cfb464e5fc196ada34a4367705bcab314ce79f
 SHA1 (patch-aq) = c46339a81f3f0dea9754f733d567c3c93f7dc19e
 SHA1 (patch-common_packet.cc) = 74835d281febc195c5d1118bc5ceb40107597876
 SHA1 (patch-common_packet.h) = 2b8289ee47206f7201ea225d23318202c7b370c5
@@ -29,3 +29,5 @@ SHA1 (patch-mac_mac-802_11Exr.cc) = 93e4112025b6e610e76694c6067723f77cd75b84
 SHA1 (patch-mdart_mdart__adp.cc) = 5cee0a60a5102197363f53f2ebb90ca972bc139c
 SHA1 (patch-mdart_mdart__queue.h) = 1bf4cfec755c80cb5332a234c82c72584e62863c
 SHA1 (patch-nix_nixnode.cc) = d0a1826836f5ce9d40869946e9df29d6b53d4b7f
+SHA1 (patch-pushback_ident-tree.h) = eb7139b078ce3ea7f9627ffe7ae93efd1d27ba45
+SHA1 (patch-webcache_pagepool.cc) = b2f738d9025540731c3a61fd2d6f8ac5a51bdfcf
diff --git a/net/ns/patches/patch-am b/net/ns/patches/patch-am
index b332958346c..74005a9d2b2 100644
--- a/net/ns/patches/patch-am
+++ b/net/ns/patches/patch-am
@@ -1,12 +1,13 @@
-$NetBSD: patch-am,v 1.5 2005/09/08 02:50:58 minskim Exp $
+$NetBSD: patch-am,v 1.6 2014/02/01 08:04:04 markd Exp $
 
 --- indep-utils/webtrace-conv/dec/Makefile.in.orig	2005-01-19 10:23:27.000000000 -0800
 +++ indep-utils/webtrace-conv/dec/Makefile.in
 @@ -38,7 +38,7 @@ BINDEST = @prefix@/bin
  CC = @CXX@
  INCLUDE = -I. @V_INCLUDES@
- CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
 -LDFLAGS = @V_STATIC@
++CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_INTERP_RESULT
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
diff --git a/net/ns/patches/patch-an b/net/ns/patches/patch-an
index b6e935bf7cd..36da9087fb0 100644
--- a/net/ns/patches/patch-an
+++ b/net/ns/patches/patch-an
@@ -1,12 +1,13 @@
-$NetBSD: patch-an,v 1.3 2005/09/08 02:50:58 minskim Exp $
+$NetBSD: patch-an,v 1.4 2014/02/01 08:04:04 markd Exp $
 
 --- indep-utils/webtrace-conv/epa/Makefile.in.orig	2005-01-19 10:23:27.000000000 -0800
 +++ indep-utils/webtrace-conv/epa/Makefile.in
 @@ -35,7 +35,7 @@ MKDEP	= ../../../conf/mkdep
  
  INCLUDE = -I. @V_INCLUDES@
- CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
 -LDFLAGS = @V_STATIC@
++CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_INTERP_RESULT
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
diff --git a/net/ns/patches/patch-ao b/net/ns/patches/patch-ao
index 95dc8350b3f..e967cb8abe7 100644
--- a/net/ns/patches/patch-ao
+++ b/net/ns/patches/patch-ao
@@ -1,12 +1,13 @@
-$NetBSD: patch-ao,v 1.5 2005/09/08 02:50:58 minskim Exp $
+$NetBSD: patch-ao,v 1.6 2014/02/01 08:04:04 markd Exp $
 
 --- indep-utils/webtrace-conv/nlanr/Makefile.in.orig	2005-01-19 10:23:27.000000000 -0800
 +++ indep-utils/webtrace-conv/nlanr/Makefile.in
 @@ -35,7 +35,7 @@ BINDEST = @prefix@/bin
  CC = @CXX@
  INCLUDE = -I. -I../../.. @V_INCLUDES@
- CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
 -LDFLAGS = @V_STATIC@
++CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_INTERP_RESULT
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
diff --git a/net/ns/patches/patch-ap b/net/ns/patches/patch-ap
index 4ad24f8a8a8..112e81f7e77 100644
--- a/net/ns/patches/patch-ap
+++ b/net/ns/patches/patch-ap
@@ -1,12 +1,13 @@
-$NetBSD: patch-ap,v 1.3 2005/09/08 02:50:58 minskim Exp $
+$NetBSD: patch-ap,v 1.4 2014/02/01 08:04:04 markd Exp $
 
 --- indep-utils/webtrace-conv/ucb/Makefile.in.orig	2005-01-19 10:23:28.000000000 -0800
 +++ indep-utils/webtrace-conv/ucb/Makefile.in
 @@ -29,7 +29,7 @@ MKDEP	= ../../../conf/mkdep
  
  INCLUDE = -I. @V_INCLUDES@
- CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
+-CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@
 -LDFLAGS = @V_STATIC@
++CFLAGS = @V_CCOPT@ -DCPP_NAMESPACE=@CPP_NAMESPACE@ -DUSE_INTERP_RESULT
 +LDFLAGS = @LDFLAGS@
  LIBS = @V_LIB_TCL@ @V_LIB@ @LIBS@
  INSTALL = @INSTALL@
diff --git a/net/ns/patches/patch-pushback_ident-tree.h b/net/ns/patches/patch-pushback_ident-tree.h
new file mode 100644
index 00000000000..489ad1f367c
--- /dev/null
+++ b/net/ns/patches/patch-pushback_ident-tree.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-pushback_ident-tree.h,v 1.1 2014/02/01 08:04:04 markd Exp $
+
+Fix invalid conversion from 'void*' to 'char*'
+
+--- pushback/ident-tree.h.orig	2005-09-18 23:33:34.000000000 +0000
++++ pushback/ident-tree.h
+@@ -83,7 +83,7 @@ class DropHashTable {
+     Tcl_HashSearch searchPtr;
+     Tcl_HashEntry * he = Tcl_FirstHashEntry(hashTable_, &searchPtr);
+     while (he != NULL) {
+-      char * key = Tcl_GetHashKey(hashTable_, he);
++      char * key = (char *) Tcl_GetHashKey(hashTable_, he);
+       long value = (long)Tcl_GetHashValue(he);
+       printf("%s = %ld\n", key, value);
+       he = Tcl_NextHashEntry(&searchPtr);
diff --git a/net/ns/patches/patch-webcache_pagepool.cc b/net/ns/patches/patch-webcache_pagepool.cc
new file mode 100644
index 00000000000..0d5b2cac177
--- /dev/null
+++ b/net/ns/patches/patch-webcache_pagepool.cc
@@ -0,0 +1,15 @@
+$NetBSD: patch-webcache_pagepool.cc,v 1.1 2014/02/01 08:04:04 markd Exp $
+
+Fix invalid conversion from 'void*' to 'char*'
+
+--- webcache/pagepool.cc.orig	2011-10-06 00:27:14.000000000 +0000
++++ webcache/pagepool.cc
+@@ -658,7 +658,7 @@ int ClientPagePool::command(int argc, co
+ 			for (he = Tcl_FirstHashEntry(namemap_, &hs); 
+ 			     he != NULL;
+ 			     he = Tcl_NextHashEntry(&hs)) {
+-				char* retVal = Tcl_GetHashKey(namemap_, he);
++				char* retVal = (char *) Tcl_GetHashKey(namemap_, he);
+ 				// Convert name to a PageID
+ 				PageID t1;
+ 				ClientPage::split_name (retVal, t1);