Remove badly written up-to-date check for configure that clashes with our

current touch procedure in bsd.pkg.mk.

3 files changed, 29 insertions, 7 deletions

diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index d8c64b69a65..08e739b6a14 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2001/10/25 22:21:52 jwise Exp $
+# $NetBSD: Makefile,v 1.10 2002/01/03 13:42:00 wiz Exp $
 #
 
 DISTNAME=	expect-5.33.0
@@ -22,11 +22,6 @@ CONFIGURE_ARGS= --enable-shared \
 		--with-tclinclude=${PREFIX}/include/tcl \
 		--without-x
 
-.include "../../mk/bsd.prefs.mk"
-
-pre-configure:
-	cd ${WRKSRC} && ${TOUCH} configure
-
 test:
 	@(cd ${WRKSRC}; ${MAKE} test)
 
diff --git a/lang/tcl-expect/distinfo b/lang/tcl-expect/distinfo
index 3a6d1cc774b..972d59d9cb0 100644
--- a/lang/tcl-expect/distinfo
+++ b/lang/tcl-expect/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2001/10/25 22:21:52 jwise Exp $
+$NetBSD: distinfo,v 1.6 2002/01/03 13:42:00 wiz Exp $
 
 SHA1 (expect-5.33.0.tar.gz) = fc84411fc4984e0beea214640ee247c358877aa5
 Size (expect-5.33.0.tar.gz) = 494473 bytes
 SHA1 (patch-aa) = a67976c3d81ae6f933e4e943bc59018961b9f9cd
 SHA1 (patch-ab) = 642e714e58bfe72b332cb89559e1f55df9b6052f
 SHA1 (patch-ac) = 9b1cf55607cf52f94b2499f7a654a04c93f71739
+SHA1 (patch-ad) = 460fcc04e6f1936fbb2669c80be91e790173b0a3
diff --git a/lang/tcl-expect/patches/patch-ad b/lang/tcl-expect/patches/patch-ad
new file mode 100644
index 00000000000..12aa68c9eab
--- /dev/null
+++ b/lang/tcl-expect/patches/patch-ad
@@ -0,0 +1,26 @@
+$NetBSD: patch-ad,v 1.1 2002/01/03 13:47:58 wiz Exp $
+
+--- configure.orig	Tue Oct  2 00:33:45 2001
++++ configure
+@@ -589,21 +589,6 @@
+   echo "$ac_t""no" 1>&6
+ fi
+ 
+-echo $ac_n "checking configure up to date""... $ac_c" 1>&6
+-echo "configure:594: checking configure up to date" >&5
+-for i in `ls -tr ${srcdir}/configure ${srcdir}/configure.in ${srcdir}/Makefile.in` ; do
+-  newest=$i
+-done
+-if test "$srcdir/configure" = "$newest" ; then
+-  echo "$ac_t""yes" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-if test $found = "no" -a "$newest" != "$srcdir/configure" ; then
+-  echo "configure: warning: $srcdir/configure appears to be old ($srcdir/configure.in and/or $srcdir/Makefile.in are newer) and the autoconf program to fix this situation was not found.  If you've no idea what this means, enter the command \"touch $srcdir/configure\" and restart $srcdir/configure." 1>&2
+-  exit
+-fi
+-
+ ac_aux_dir=
+ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
+   if test -f $ac_dir/install-sh; then