Make this package build with pthread-enabled Python. It will close

PR pkg/24748.

While here, bl3ify and switch to Tcl 8.4.  Bump PKGREVISION.

3 files changed, 25 insertions, 12 deletions

diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile
index 3392fb27de0..e1298fa3d28 100644
--- a/devel/py-expect/Makefile
+++ b/devel/py-expect/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:33:26 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/03/11 17:43:50 minskim Exp $
 #
 
 DISTNAME=	ExpectPy-1.9b1
 PKGNAME=	${PYPKGPREFIX}-expect-1.9b1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pub/sourceforge/expectpy/}
 
@@ -10,14 +11,14 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.sourceforge.net/projects/expectpy/
 COMMENT=	Expect module for Python
 
-DEPENDS+=	tcl-expect>=5.32.1:../../lang/tcl-expect
-
+USE_BUILDLINK3=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=	--with-python=${LOCALBASE} \
-			--with-expect=${LOCALBASE} \
+CONFIGURE_ARGS+=	--with-python=${BUILDLINK_PREFIX.${PYPACKAGE}} \
+			--with-expect=${BUILDLINK_PREFIX.tcl-expect} \
 			--with-tcl --enable-shared
 CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
+CONFIGURE_ENV+=	PYTH_CONFIGDIR=${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/config
 INSTALL_TARGET=	installshared
 PY_PATCHPLIST=	yes
 PLIST_SUBST+=	PYLIB=${PYLIB} PYPKGPREFIX=${PYPKGPREFIX}
@@ -31,5 +32,7 @@ post-install:
 		${INSTALL_DATA} ${WRKSRC}/examples/$f ${EXAMPLESDIR}
 .endfor
 
+.include "../../lang/tcl/buildlink3.mk"
+.include "../../lang/tcl-expect/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-expect/distinfo b/devel/py-expect/distinfo
index 04d4bc91f02..516153f9754 100644
--- a/devel/py-expect/distinfo
+++ b/devel/py-expect/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2002/06/15 06:54:00 sjg Exp $
+$NetBSD: distinfo,v 1.5 2004/03/11 17:43:50 minskim Exp $
 
 SHA1 (ExpectPy-1.9b1.tar.gz) = f43fcd53901f327dc8acf0650dbfe45b274a8d7d
 Size (ExpectPy-1.9b1.tar.gz) = 149580 bytes
 SHA1 (patch-aa) = eff544e7290736bebb81b8391848369d630f7b03
-SHA1 (patch-ab) = 751f56a7a71822dbb93530dd9396bc92f9def05b
+SHA1 (patch-ab) = d95ef8bc2f6c0178de0b05e649d6e2d6aed37335
 SHA1 (patch-ac) = 0ff7162129a84fbc913a8b1240209387b922c2a8
 SHA1 (patch-ad) = 267c2e93f89f786b415c7fa2645913c40541bc38
 SHA1 (patch-ae) = 0f5190724d3b17e7b7f06f6408e1c9e7a3e66868
diff --git a/devel/py-expect/patches/patch-ab b/devel/py-expect/patches/patch-ab
index a73bfe46f15..ec4f5cd980c 100644
--- a/devel/py-expect/patches/patch-ab
+++ b/devel/py-expect/patches/patch-ab
@@ -1,7 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/03/21 23:36:07 jwise Exp $
---- configure.orig	Sun Nov  5 10:07:38 2000
-+++ configure	Wed Mar 21 11:54:56 2001
-@@ -1407,7 +1407,7 @@
+$NetBSD: patch-ab,v 1.2 2004/03/11 17:43:50 minskim Exp $
+
+--- configure.orig	2000-11-05 12:07:38.000000000 -0600
++++ configure
+@@ -1357,7 +1357,7 @@ echo "$ac_t""$PYTH_vers" 1>&6
+ # _multiply_ the python version major version by one thousand, but minor
+ # version is only multiplied by one hundred (not really, but for m.n.p
+ # version numbers, it works)
+-PYTH_versnum=`echo $PYTH_vers | sed 's/b[0-9]//' |
++PYTH_versnum=`echo $PYTH_vers | sed 's/b[0-9]//;s/p/\./' |
+   sed 's/^[0-9]\./0&/;s/\.\([0-9]\)\./.0\1./g;s/\.\([0-9]\)$/\.0\1/;s/\.//g' |
+   sed 's/^\(....\)$/\100/'`
+ 
+@@ -1407,7 +1407,7 @@ if test -n "${EXP_LIB}"; then
      fi
    fi
  else
@@ -10,7 +20,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/03/21 23:36:07 jwise Exp $
  fi
  echo "$ac_t""$EXP_LIB" 1>&6
  
-@@ -1542,7 +1542,7 @@
+@@ -1542,7 +1542,7 @@ case ${EXP_VERS} in
  esac
  case ${EXP_VERS} in
    5.31*|5.32*)