merge trunk

12 files changed, 33 insertions, 52 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 500d872..2283c0b 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.306.2.5 2010/12/01 16:42:37 kennykb Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.315 2010/12/17 23:49:37 stwo Exp $
 
 VERSION 		= @TCL_VERSION@
 MAJOR_VERSION		= @TCL_MAJOR_VERSION@
@@ -260,7 +260,6 @@ INSTALL_TZDATA		= @INSTALL_TZDATA@
 #--------------------------------------------------------------------------
 
 GDB			= gdb
-DDD			= ddd
 TRACE			= strace
 TRACE_OPTS		=
 VALGRIND		= valgrind
@@ -738,10 +737,6 @@ shell: ${TCL_EXE}
 gdb: ${TCL_EXE}
 	$(SHELL_ENV) $(GDB) ./${TCL_EXE}
 
-# This target can be used to run tclsh inside ddd
-ddd: ${TCL_EXE}
-	$(SHELL_ENV) $(DDD) ./${TCL_EXE}
-
 valgrind: ${TCL_EXE} ${TCLTEST_EXE}
 	$(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} $(TOP_DIR)/tests/all.tcl -singleproc 1 $(TESTFLAGS)
 
@@ -1877,13 +1872,13 @@ checkexports: $(TCL_LIB_FILE)
 # system.
 #
 
-rpm: all /bin/rpm
+rpm: all
 	rm -f THIS.TCL.SPEC
 	echo "%define _builddir `pwd`" > THIS.TCL.SPEC
 	echo "%define _rpmdir `pwd`/RPMS" >> THIS.TCL.SPEC
 	cat tcl.spec >> THIS.TCL.SPEC
 	mkdir -p RPMS/i386
-	rpm -bb THIS.TCL.SPEC
+	rpmbuild -bb THIS.TCL.SPEC
 	mv RPMS/i386/*.rpm .
 	rm -rf RPMS THIS.TCL.SPEC
 
@@ -2019,33 +2014,11 @@ dist: $(UNIX_DIR)/configure $(UNIX_DIR)/tclConfig.h.in $(UNIX_DIR)/tcl.pc.in $(M
 	    tar -C $(DISTDIR)/pkgs -xzf "$$i"; \
 	done
 
-#
-# The following target can only be used for non-patch releases. Use the
-# "allpatch" target below for patch releases.
-#
-
 alldist: dist
 	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
 	cd $(DISTROOT); tar cf $(DISTNAME)-src.tar $(DISTNAME); \
 		gzip -9 $(DISTNAME)-src.tar; zip -qr8 $(ZIPNAME) $(DISTNAME)
 
-#
-# The target below is similar to "alldist" except it works for patch releases.
-# It is needed because patch releases are peculiar: the patch designation
-# appears in the name of the compressed file (e.g. tcl8.0p1.tar.gz) but the
-# extracted source directory doesn't include the patch designation (e.g.,
-# tcl8.0).
-#
-
-allpatch: dist
-	rm -f $(DISTROOT)/$(DISTNAME)-src.tar.gz $(DISTROOT)/$(ZIPNAME)
-	mv $(DISTROOT)/tcl${VERSION} $(DISTROOT)/old
-	mv $(DISTROOT)/$(DISTNAME) $(DISTROOT)/tcl${VERSION}
-	cd $(DISTROOT); tar cf $(DISTNAME)-src.tar tcl${VERSION}; \
-		gzip -9 $(DISTNAME)-src.tar; zip -r8 $(ZIPNAME) tcl${VERSION}
-	mv $(DISTROOT)/tcl${VERSION} $(DISTROOT)/$(DISTNAME)
-	mv $(DISTROOT)/old $(DISTROOT)/tcl${VERSION}
-
 #--------------------------------------------------------------------------
 # This target creates the HTML folder for Tcl & Tk and places it in
 # DISTDIR/html. It uses the tcltk-man2html.tcl tool from the Tcl group's tool
@@ -2078,14 +2051,16 @@ BUILD_HTML = \
 # 'make' from getting confused when someone makes an error in a rule.
 #--------------------------------------------------------------------------
 
-.PHONY: all binaries libraries doc packages tclLibObjs objs tcltest-real test
-.PHONY: test-tcl gdb-test runtest ro-test shell gdb ddd valgrind valgrindshell
-.PHONY: topDirName gendate gentommath_h install install-strip install-binaries
-.PHONY: install-libraries install-tzdata install-msgs install-doc clean dist
-.PHONY: install-private-headers distclean depend xttest configure-packages rpm
-.PHONY: packages install-packages test-packages clean-packages dist-packages
-.PHONY: distclean-packages genstubs checkstubs checkdoc checkuchar dist html
-.PHONY: checkexports alldist allpatch html-tcl html-tk install-headers
+.PHONY: all binaries libraries objs doc html html-tcl html-tk test runtest
+.PHONY: install install-strip install-binaries install-libraries
+.PHONY: install-headers install-private-headers install-doc
+.PHONY: clean distclean depend genstubs checkstubs checkexports checkuchar
+.PHONY: shell gdb valgrind valgrindshell dist alldist rpm
+.PHONY: tclLibObjs tcltest-real test-tcl gdb-test ro-test trace-test xttest
+.PHONY: topDirName gendate gentommath_h trace-shell checkdoc
+.PHONY: install-tzdata install-msgs
+.PHONY: packages configure-packages test-packages clean-packages
+.PHONY: dist-packages distclean-packages install-packages
 
 #--------------------------------------------------------------------------
 # DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/unix/configure.in b/unix/configure.in
index acf1b65..91ebcf1 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -3,7 +3,7 @@ dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tcl installation
 dnl	to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.214.2.1 2010/09/28 15:43:01 kennykb Exp $
+# RCS: @(#) $Id: configure.in,v 1.215 2010/09/28 15:13:55 rmax Exp $
 
 AC_INIT([tcl],[8.6])
 AC_PREREQ(2.59)
diff --git a/unix/dltest/pkga.c b/unix/dltest/pkga.c
index 3c12289..ec5d75f 100644
--- a/unix/dltest/pkga.c
+++ b/unix/dltest/pkga.c
@@ -9,9 +9,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkga.c,v 1.16 2010/03/28 03:17:50 dgp Exp $
+ * RCS: @(#) $Id: pkga.c,v 1.17 2010/12/31 16:35:26 nijtmans Exp $
  */
 
+#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
diff --git a/unix/dltest/pkgb.c b/unix/dltest/pkgb.c
index df0cde3..9413c73 100644
--- a/unix/dltest/pkgb.c
+++ b/unix/dltest/pkgb.c
@@ -10,9 +10,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgb.c,v 1.13 2010/03/28 03:17:50 dgp Exp $
+ * RCS: @(#) $Id: pkgb.c,v 1.14 2010/12/31 16:35:26 nijtmans Exp $
  */
 
+#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
diff --git a/unix/dltest/pkgc.c b/unix/dltest/pkgc.c
index 3e4c4e6..334644c 100644
--- a/unix/dltest/pkgc.c
+++ b/unix/dltest/pkgc.c
@@ -10,9 +10,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgc.c,v 1.13 2010/03/28 03:17:50 dgp Exp $
+ * RCS: @(#) $Id: pkgc.c,v 1.14 2010/12/31 16:35:26 nijtmans Exp $
  */
 
+#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
diff --git a/unix/dltest/pkgd.c b/unix/dltest/pkgd.c
index d713e2e..9554c4a 100644
--- a/unix/dltest/pkgd.c
+++ b/unix/dltest/pkgd.c
@@ -10,9 +10,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgd.c,v 1.12 2010/03/28 03:17:50 dgp Exp $
+ * RCS: @(#) $Id: pkgd.c,v 1.13 2010/12/31 16:35:26 nijtmans Exp $
  */
 
+#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
diff --git a/unix/dltest/pkge.c b/unix/dltest/pkge.c
index bd0d838..066b485 100644
--- a/unix/dltest/pkge.c
+++ b/unix/dltest/pkge.c
@@ -10,9 +10,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkge.c,v 1.14 2010/03/28 03:17:50 dgp Exp $
+ * RCS: @(#) $Id: pkge.c,v 1.15 2010/12/31 16:35:26 nijtmans Exp $
  */
 
+#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
diff --git a/unix/dltest/pkgua.c b/unix/dltest/pkgua.c
index e431deb..8f7e5cd 100644
--- a/unix/dltest/pkgua.c
+++ b/unix/dltest/pkgua.c
@@ -10,9 +10,10 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: pkgua.c,v 1.11 2010/03/28 03:17:50 dgp Exp $
+ * RCS: @(#) $Id: pkgua.c,v 1.12 2010/12/31 16:35:26 nijtmans Exp $
  */
 
+#undef STATIC_BUILD
 #include "tcl.h"
 
 /*
diff --git a/unix/tclAppInit.c b/unix/tclAppInit.c
index 459f45f..a74fec8 100644
--- a/unix/tclAppInit.c
+++ b/unix/tclAppInit.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclAppInit.c,v 1.22.4.1 2010/09/25 14:51:13 kennykb Exp $
+ * RCS: @(#) $Id: tclAppInit.c,v 1.24 2010/09/23 21:40:46 nijtmans Exp $
  */
 
 #include "tcl.h"
diff --git a/unix/tclUnixChan.c b/unix/tclUnixChan.c
index 36ce4ca..3b0d984 100644
--- a/unix/tclUnixChan.c
+++ b/unix/tclUnixChan.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixChan.c,v 1.106.2.1 2010/09/28 15:43:01 kennykb Exp $
+ * RCS: @(#) $Id: tclUnixChan.c,v 1.107 2010/09/28 15:13:55 rmax Exp $
  */
 
 #include "tclInt.h"	/* Internal definitions for Tcl. */
diff --git a/unix/tclUnixPort.h b/unix/tclUnixPort.h
index 4eefa39..9283d8b 100644
--- a/unix/tclUnixPort.h
+++ b/unix/tclUnixPort.h
@@ -19,7 +19,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixPort.h,v 1.72.2.1 2010/09/28 15:43:01 kennykb Exp $
+ * RCS: @(#) $Id: tclUnixPort.h,v 1.73 2010/09/28 15:13:55 rmax Exp $
  */
 
 #ifndef _TCLUNIXPORT
diff --git a/unix/tclUnixSock.c b/unix/tclUnixSock.c
index 21dd034..db86d61 100644
--- a/unix/tclUnixSock.c
+++ b/unix/tclUnixSock.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclUnixSock.c,v 1.26.2.5 2010/12/16 01:42:19 kennykb Exp $
+ * RCS: @(#) $Id: tclUnixSock.c,v 1.33 2010/12/14 17:22:55 rmax Exp $
  */
 
 #include "tclInt.h"
@@ -523,7 +523,7 @@ TcpCloseProc(
      * handlers are already deleted in the generic IO channel closing code
      * that called this function, so we do not have to delete them here.
      */
-    
+
     for (fds = statePtr->fds; fds != NULL; fds = statePtr->fds) {
 	statePtr->fds = fds->next;
 	Tcl_DeleteFileHandler(fds->fd);
@@ -660,7 +660,7 @@ TcpGetOptionProc(
 		Tcl_DStringAppendElement(dsPtr, "-peername");
 		Tcl_DStringStartSublist(dsPtr);
 	    }
-            
+
 	    getnameinfo(&peername.sa, size, host, sizeof(host), NULL, 0,
                     NI_NUMERICHOST);
 	    Tcl_DStringAppendElement(dsPtr, host);
@@ -1319,7 +1319,7 @@ TcpAccept(
     socklen_t len;		/* For accept interface */
     char channelName[16 + TCL_INTEGER_SPACE];
     char host[NI_MAXHOST], port[NI_MAXSERV];
-    
+
     fds = (TcpFdList *) data;
 
     len = sizeof(addr);