From 8e762b90215c5de9f2261d14a0b4e125d2c2546e Mon Sep 17 00:00:00 2001 From: adam Date: Fri, 8 Apr 2005 11:54:04 +0000 Subject: Changes 5.43.0: * Fixed bug in ExpOutputProc that caused misbehavior during partial writes. * Noted that expect_background ignores timeouts. Added to documentation. * Patch for "mkpasswd -vo". --- lang/tcl-expect/Makefile | 9 +++++---- lang/tcl-expect/Makefile.common | 21 +++++++++++---------- lang/tcl-expect/PLIST | 8 ++++---- lang/tcl-expect/distinfo | 10 +++++----- lang/tcl-expect/patches/patch-ac | 6 +++--- lang/tk-expect/Makefile | 13 ++++++------- 6 files changed, 34 insertions(+), 33 deletions(-) (limited to 'lang') diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile index a8e42a9e53a..0ae1e6d6d85 100644 --- a/lang/tcl-expect/Makefile +++ b/lang/tcl-expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2004/11/30 20:30:19 adam Exp $ +# $NetBSD: Makefile,v 1.21 2005/04/08 11:54:04 adam Exp $ .include "Makefile.common" @@ -10,9 +10,10 @@ COMMENT= Extensions to Tcl to support scripting of interactive programs CONFLICTS+= expect-[0-9]* -CONFIGURE_ARGS= --enable-shared --without-x \ - --with-tclconfig=${PREFIX}/lib \ - --with-tclinclude=${PREFIX}/include/tcl +CONFIGURE_ARGS+= --enable-shared +CONFIGURE_ARGS+= --with-tclconfig=${PREFIX}/lib +CONFIGURE_ARGS+= --with-tclinclude=${PREFIX}/include/tcl +CONFIGURE_ARGS+= --without-x .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/tcl-expect/Makefile.common b/lang/tcl-expect/Makefile.common index 0e3202c001d..a7e2ca07643 100644 --- a/lang/tcl-expect/Makefile.common +++ b/lang/tcl-expect/Makefile.common @@ -1,21 +1,22 @@ -# $NetBSD: Makefile.common,v 1.5 2005/03/01 21:05:46 schwarz Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/04/08 11:54:05 adam Exp $ DISTNAME= expect-${EXPECT_VERSION} MASTER_SITES= http://expect.nist.gov/src/ HOMEPAGE= http://expect.nist.gov/ -EXPECT_VERSION= 5.42.1 +EXPECT_VERSION= 5.43.0 -WRKSRC= ${WRKDIR}/expect-5.42 -USE_BUILDLINK3= yes -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -TEST_TARGET= test +WRKSRC= ${WRKDIR}/expect-5.43 +USE_BUILDLINK3= yes +USE_LIBTOOL= yes +GNU_CONFIGURE= yes +TEST_TARGET= test .include "../../mk/bsd.prefs.mk" -.if $(OPSYS) == "IRIX" && $(OS_VERSION) == 5.3 -# on IRIX 5.3 inttypes.h and sys/types.h are known to conflict. -CONFIGURE_ENV+= ac_cv_header_inttypes_h="no" + +# on IRIX 5.3 inttypes.h and sys/types.h are known to conflict +.if ${OPSYS} == "IRIX" && ${OS_VERSION} == 5.3 +CONFIGURE_ENV+= ac_cv_header_inttypes_h="no" .endif DISTINFO_FILE= ${.CURDIR}/../../lang/tcl-expect/distinfo diff --git a/lang/tcl-expect/PLIST b/lang/tcl-expect/PLIST index 2525e687f4a..dd741df0b2e 100644 --- a/lang/tcl-expect/PLIST +++ b/lang/tcl-expect/PLIST @@ -1,11 +1,11 @@ -@comment $NetBSD: PLIST,v 1.8 2004/11/18 16:47:19 adam Exp $ +@comment $NetBSD: PLIST,v 1.9 2005/04/08 11:54:05 adam Exp $ bin/expect include/expect.h include/expect_comm.h include/expect_tcl.h include/tcldbg.h -lib/tcl/expect5.42/pkgIndex.tcl -lib/libexpect542.la +lib/libexpect543.la +lib/tcl/expect5.43/pkgIndex.tcl 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.42 +@dirrm lib/tcl/expect5.43 @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 3e201a79374..fb9486b16fa 100644 --- a/lang/tcl-expect/distinfo +++ b/lang/tcl-expect/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.11 2005/02/24 09:03:12 agc Exp $ +$NetBSD: distinfo,v 1.12 2005/04/08 11:54:05 adam Exp $ -SHA1 (expect-5.42.1.tar.gz) = 84ca72f0abd2b7a31ee332049b34575a286e8f27 -RMD160 (expect-5.42.1.tar.gz) = d354d5d3ffa941d89e668fb4ad1ccbb59be4f341 -Size (expect-5.42.1.tar.gz) = 524882 bytes +SHA1 (expect-5.43.0.tar.gz) = 4da64b7c50cea22ac87fcf0f8f98f786793ee785 +RMD160 (expect-5.43.0.tar.gz) = 223b78f39dca8cc7900d82230cf7db91e6770389 +Size (expect-5.43.0.tar.gz) = 525570 bytes SHA1 (patch-aa) = 81f45deba61affb5d2e0d3d0f91a67217e543b8e SHA1 (patch-ab) = 642e714e58bfe72b332cb89559e1f55df9b6052f -SHA1 (patch-ac) = 68db32e76105d3719ea0809b99af0305e5100596 +SHA1 (patch-ac) = 85702dac9cbc55875110cbed6ec3e73b7c66d07f SHA1 (patch-ad) = 460fcc04e6f1936fbb2669c80be91e790173b0a3 SHA1 (patch-ae) = 308035226466d3fc0fa0a625365a817172842a69 diff --git a/lang/tcl-expect/patches/patch-ac b/lang/tcl-expect/patches/patch-ac index fd02c008215..e0502ce4bff 100644 --- a/lang/tcl-expect/patches/patch-ac +++ b/lang/tcl-expect/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.2 2004/11/18 16:47:19 adam Exp $ +$NetBSD: patch-ac,v 1.3 2005/04/08 11:54:05 adam Exp $ ---- exp_command.c.orig 2004-07-02 01:03:04.000000000 +0000 +--- exp_command.c.orig 2004-08-20 17:18:01.000000000 +0000 +++ exp_command.c -@@ -784,7 +784,7 @@ when trapping, see below in child half o +@@ -790,7 +790,7 @@ when trapping, see below in child half o * process "-open $channel" */ int mode; diff --git a/lang/tk-expect/Makefile b/lang/tk-expect/Makefile index 82c3d9e99df..ade1a7155c6 100644 --- a/lang/tk-expect/Makefile +++ b/lang/tk-expect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/11/18 16:47:59 adam Exp $ +# $NetBSD: Makefile,v 1.18 2005/04/08 11:54:15 adam Exp $ .include "../../lang/tcl-expect/Makefile.common" @@ -10,16 +10,15 @@ COMMENT= Tcl interpreter with both the expect and tk extensions built in DEPENDS+= tcl-expect>=${EXPECT_VERSION}:../../lang/tcl-expect -CONFIGURE_ARGS= --enable-shared \ - --with-tclconfig=${PREFIX}/lib \ - --with-tkconfig=${PREFIX}/lib \ - --with-tclinclude=${PREFIX}/include/tcl \ - --with-tkinclude=${PREFIX}/include/tk \ +CONFIGURE_ARGS+= --enable-shared +CONFIGURE_ARGS+= --with-tclconfig=${PREFIX}/lib +CONFIGURE_ARGS+= --with-tclinclude=${PREFIX}/include/tcl +CONFIGURE_ARGS+= --with-tkconfig=${PREFIX}/lib +CONFIGURE_ARGS+= --with-tkinclude=${PREFIX}/include/tk do-install: ${INSTALL_PROGRAM} ${WRKSRC}/expectk ${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/expectk.man ${PREFIX}/man/man1/expectk.1 -.include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" -- cgit v1.2.3