Changes 5.42.1:

* Removed beta designation.
* Daniel A. Steffen <steffen@ics.mq.edu.au> provided patch for
  MacOS to avoid panic-redefinition.

Changes 5.41.0:
* Simon Taylor <simon@unisolve.com.xau> provided fix for
  interact -o which was completely broken by 5.40.1.

Changes 5.40.1:
* Added scroll support to official tkterm.  Copied all fixes
  from/to term_expect to/from tkterm.
* Kiran Madabhushi <maskiran@hotmail.xcom> encountered interact
  diagnostics incorrectly pointing to expect_background.  Also,
  found multiple -o flags behaving unexpectedly.  Added diag.

* Kristoffer Eriksson <ske@pkmab.xse> noted typo in SIMPLE code
  in exp_inter.c.  However, this is extremely unlikely to affect
  any machines.

* Reinhard Max <max@suse.xcom> noted that "make test" failed when
  run in the background.  The log testcase was testing the
  send_tty command.  Added code in both Expect and in the test
  to handle this.

6 files changed, 29 insertions, 32 deletions

diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index ff2b1d6ea5b..f479269b9f7 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2004/10/30 05:21:42 minskim Exp $
-#
+# $NetBSD: Makefile,v 1.19 2004/11/18 16:47:19 adam Exp $
 
 .include "Makefile.common"
 
 PKGNAME=	tcl-expect-${EXPECT_VERSION}
-PKGREVISION=	3
 CATEGORIES=	lang
 
 MAINTAINER=	jwise@NetBSD.org
diff --git a/lang/tcl-expect/Makefile.common b/lang/tcl-expect/Makefile.common
index afd085e09e1..30e6d4c2ce7 100644
--- a/lang/tcl-expect/Makefile.common
+++ b/lang/tcl-expect/Makefile.common
@@ -1,16 +1,15 @@
-# $NetBSD: Makefile.common,v 1.3 2004/03/11 07:16:45 minskim Exp $
-#
+# $NetBSD: Makefile.common,v 1.4 2004/11/18 16:47:19 adam Exp $
 
 DISTNAME=	expect-${EXPECT_VERSION}
 MASTER_SITES=	http://expect.nist.gov/src/
 HOMEPAGE=	http://expect.nist.gov/
 
-EXPECT_VERSION=	5.38.0
+EXPECT_VERSION=	5.42.1
 
-WRKSRC=		${WRKDIR}/expect-5.38
+WRKSRC=		${WRKDIR}/expect-5.42
 USE_BUILDLINK3=	yes
-GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
+GNU_CONFIGURE=	yes
 TEST_TARGET=	test
 
 DISTINFO_FILE=	${.CURDIR}/../../lang/tcl-expect/distinfo
diff --git a/lang/tcl-expect/PLIST b/lang/tcl-expect/PLIST
index d04a118127a..2525e687f4a 100644
--- a/lang/tcl-expect/PLIST
+++ b/lang/tcl-expect/PLIST
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.7 2004/10/30 05:21:42 minskim Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/11/18 16:47:19 adam Exp $
 bin/expect
 include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
 include/tcldbg.h
-lib/tcl/expect5.38/pkgIndex.tcl
-lib/libexpect538.la
+lib/tcl/expect5.42/pkgIndex.tcl
+lib/libexpect542.la
 man/man1/expect.1.gz
 man/man3/libexpect.3.gz
 share/examples/tcl/expect/autoexpect
@@ -40,6 +40,6 @@ share/examples/tcl/expect/weather
 share/examples/tcl/expect/xkibitz
 share/examples/tcl/expect/xkibitz.1
 share/examples/tcl/expect/xpstat
-@dirrm lib/tcl/expect5.38
+@dirrm lib/tcl/expect5.42
 @dirrm share/examples/tcl/expect
 @unexec ${RMDIR} %D/share/examples/tcl 2>/dev/null || ${TRUE}
diff --git a/lang/tcl-expect/distinfo b/lang/tcl-expect/distinfo
index 52396344083..dfd673b96d6 100644
--- a/lang/tcl-expect/distinfo
+++ b/lang/tcl-expect/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2004/06/01 07:40:15 skrll Exp $
+$NetBSD: distinfo,v 1.9 2004/11/18 16:47:19 adam Exp $
 
-SHA1 (expect-5.38.0.tar.gz) = 73a34651f0e45f5208d84ef23d61e40c04deab86
-Size (expect-5.38.0.tar.gz) = 517652 bytes
-SHA1 (patch-aa) = afd6e17ee2d7b05cd79dd10b07d1217b3e0698e3
+SHA1 (expect-5.42.1.tar.gz) = 84ca72f0abd2b7a31ee332049b34575a286e8f27
+Size (expect-5.42.1.tar.gz) = 524882 bytes
+SHA1 (patch-aa) = 6a099ccb398202e309229a16085272bf6d8f8040
 SHA1 (patch-ab) = 642e714e58bfe72b332cb89559e1f55df9b6052f
-SHA1 (patch-ac) = 9b1cf55607cf52f94b2499f7a654a04c93f71739
+SHA1 (patch-ac) = 68db32e76105d3719ea0809b99af0305e5100596
 SHA1 (patch-ad) = 460fcc04e6f1936fbb2669c80be91e790173b0a3
diff --git a/lang/tcl-expect/patches/patch-aa b/lang/tcl-expect/patches/patch-aa
index 61057508058..77aac144cce 100644
--- a/lang/tcl-expect/patches/patch-aa
+++ b/lang/tcl-expect/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
+$NetBSD: patch-aa,v 1.3 2004/11/18 16:47:19 adam Exp $
 
---- Makefile.in.orig	2002-07-18 17:07:41.000000000 +0100
+--- Makefile.in.orig	2004-05-07 18:10:30.000000000 +0000
 +++ Makefile.in
 @@ -57,9 +57,9 @@ X11_PROGS_INSTALLED = @X_PROGS@_installe
  # your Expect scripts.
@@ -53,7 +53,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  
  AR = ar
  ARFLAGS = cr
-@@ -320,14 +322,14 @@ LIB_RUNTIME_DIR = $(tcl_libdir)
+@@ -321,14 +323,14 @@ LIB_RUNTIME_DIR = $(tcl_libdir)
  # I don't understand why Tcl splits these up, but it does.  LIB_RUNTIME_DIR
  # can appear as part of the LD_SEARCH_FLAGS inherited by configure.
  
@@ -76,7 +76,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  
  all: binaries libraries doc
  
-@@ -344,7 +346,7 @@ dvi:
+@@ -345,7 +347,7 @@ dvi:
  # build expect binary that does not depend on Expect's shared libs
  # IFF static Tcl/Tk libraries are available.
  expect:	exp_main_exp.o $(EXP_UNSHARED_LIB_FILE)
@@ -85,7 +85,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  	$(SETUID) expect
  
  # install Expect library
-@@ -359,24 +361,16 @@ expect:	exp_main_exp.o $(EXP_UNSHARED_LI
+@@ -360,24 +362,16 @@ expect:	exp_main_exp.o $(EXP_UNSHARED_LI
  #   is too long for some filesystems, sigh.
  install_shared_lib: $(EXP_LIB_FILES)
  	${srcdir}/mkinstalldirs $(libdir)
@@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  	$(SETUID) expect.tc
  
  # Build an executable with both Expect and Tk
-@@ -387,16 +381,16 @@ expect.tc: exp_main_exp.o $(OFILES) 
+@@ -388,16 +382,16 @@ expect.tc: exp_main_exp.o $(OFILES) 
  # configure) separately for Expectk, but as far as I know, it doesn't hurt
  # anything here, so I'm not worrying about it.
  expectk: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE)
@@ -134,7 +134,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  	$(SETUID) expectk.tc
  
  expect-unshared-lib-file :: $(EXP_UNSHARED_LIB_FILE)
-@@ -412,7 +406,7 @@ $(EXP_UNSHARED_LIB_FILE): $(OFILES)
+@@ -413,7 +407,7 @@ $(EXP_UNSHARED_LIB_FILE): $(OFILES)
  expect-shared-lib-file :: $(EXP_SHARED_LIB_FILE)
  $(EXP_SHARED_LIB_FILE): $(OFILES)
  	-rm -f $(EXP_SHARED_LIB_FILE)
@@ -143,7 +143,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  
  .PHONY: install-info install info
  install-info:
-@@ -450,7 +444,7 @@ install-libraries:
+@@ -451,7 +445,7 @@ install-libraries:
  	${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
  	-for i in $(SCRIPT_LIST) ; do \
  	  if [ -f $$i ] ; then \
@@ -152,7 +152,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  	    rm -f $$i ; \
  	  else true; fi ; \
  	done
-@@ -459,7 +453,7 @@ install-doc:
+@@ -460,7 +454,7 @@ install-doc:
  	${srcdir}/mkinstalldirs $(man1dir) $(man3dir)
  # install Expectk man page if present
  	-if [ -s expectk_installed ] ; then \
@@ -161,7 +161,7 @@ $NetBSD: patch-aa,v 1.2 2004/06/01 07:40:16 skrll Exp $
  	else true; fi
  # install Expect man page
  	$(INSTALL_DATA) $(srcdir)/expect.man $(man1dir)/expect.1
-@@ -467,7 +461,7 @@ install-doc:
+@@ -468,7 +462,7 @@ install-doc:
  	$(INSTALL_DATA) $(srcdir)/libexpect.man $(man3dir)/libexpect.3
  	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
  	  if [ -f $(srcdir)/example/$$i.man ] ; then \
diff --git a/lang/tcl-expect/patches/patch-ac b/lang/tcl-expect/patches/patch-ac
index 8bdea2186f7..fd02c008215 100644
--- a/lang/tcl-expect/patches/patch-ac
+++ b/lang/tcl-expect/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2001/05/16 13:27:55 dillo Exp $
+$NetBSD: patch-ac,v 1.2 2004/11/18 16:47:19 adam Exp $
 
---- exp_command.c.orig	Tue Feb  1 01:38:43 2000
-+++ exp_command.c	Wed May 16 09:17:50 2001
-@@ -780,7 +780,7 @@
+--- exp_command.c.orig	2004-07-02 01:03:04.000000000 +0000
++++ exp_command.c
+@@ -784,7 +784,7 @@ when trapping, see below in child half o
  	 * process "-open $channel"
  	 */
  	int mode;
 -	int rfd, wfd;
 +	long rfd, wfd;
+ 	ClientData rfdc, wfdc;
  	
  	if (echo) {
- 	    expStdoutLogU(argv0,0);