Make this build with python-2.2.1

2 files changed, 64 insertions, 1 deletions

diff --git a/devel/py-expect/distinfo b/devel/py-expect/distinfo
index 00567794ab3..04d4bc91f02 100644
--- a/devel/py-expect/distinfo
+++ b/devel/py-expect/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2002/01/19 15:03:36 drochner Exp $
+$NetBSD: distinfo,v 1.4 2002/06/15 06:54:00 sjg Exp $
 
 SHA1 (ExpectPy-1.9b1.tar.gz) = f43fcd53901f327dc8acf0650dbfe45b274a8d7d
 Size (ExpectPy-1.9b1.tar.gz) = 149580 bytes
@@ -7,3 +7,4 @@ SHA1 (patch-ab) = 751f56a7a71822dbb93530dd9396bc92f9def05b
 SHA1 (patch-ac) = 0ff7162129a84fbc913a8b1240209387b922c2a8
 SHA1 (patch-ad) = 267c2e93f89f786b415c7fa2645913c40541bc38
 SHA1 (patch-ae) = 0f5190724d3b17e7b7f06f6408e1c9e7a3e66868
+SHA1 (patch-af) = 130de0f91370a49db5c9236445d2cb258303b190
diff --git a/devel/py-expect/patches/patch-af b/devel/py-expect/patches/patch-af
new file mode 100644
index 00000000000..03f396049c8
--- /dev/null
+++ b/devel/py-expect/patches/patch-af
@@ -0,0 +1,62 @@
+$NetBSD: patch-af,v 1.1 2002/06/15 06:54:01 sjg Exp $
+--- expvers.py.~1~	Fri Jun 14 13:09:31 2002
++++ expvers.py	Fri Jun 14 13:36:32 2002
+@@ -2,7 +2,7 @@
+ 
+ import sys
+ import posix
+-import strop
++import string
+ 
+ def exists(path):
+   try:
+@@ -27,12 +27,12 @@ def is_executable(path):
+ def pathjoin(dir, base):
+   return '%s/%s' % (dir, base)
+ def pathsplit(path):
+-  p = strop.rfind(path, '/')
++  p = string.rfind(path, '/')
+   if p >= 0:
+     return (path[:p], path[p+1:])
+   return ('', path)
+ def splitext(path):
+-  p = strop.rfind(path, '.')
++  p = string.rfind(path, '.')
+   if p >= 0:
+     return (path[:p], path[p:])
+   return (path, '')
+@@ -64,21 +64,21 @@ def ticks(*cmdargs):
+     wpid = None
+     while wpid != pid:
+       (wpid, wstat) = posix.wait()
+-    v = strop.join(l)[:-1]
++    v = string.join(l)[:-1]
+     if wstat:
+       raise RuntimeError, v
+     return v
+ 
+ def expect_expr(*args):
+   global expect_prog
+-  cmd = 'puts [%s]' % strop.join(map(str, args))
++  cmd = 'puts [%s]' % string.join(map(str, args))
+   result = ticks(expect_prog, '-c', cmd)
+   return result
+ 
+ def get_version(prog):
+   version = expect_expr('exp_version')
+-  if strop.count(version, '.') > 1:
+-    p = strop.rfind(version, '.')
++  if string.count(version, '.') > 1:
++    p = string.rfind(version, '.')
+     return (version[:p], version)
+   else:
+     return (version, version)
+@@ -115,7 +115,7 @@ else:
+   elif posix.environ.has_key('EXPECT'):
+     expect_prog = posix.environ['EXPECT']
+   else:
+-    path = strop.split(posix.environ['PATH'], ':')
++    path = string.split(posix.environ['PATH'], ':')
+     for dir in path:
+       f = pathjoin(dir, 'expect')
+       if is_executable(f):