4 files changed, 46 insertions, 24 deletions
diff --git a/devel/py-expect/distinfo b/devel/py-expect/distinfo
index db3ca22143a..4b098c83d85 100644
--- a/devel/py-expect/distinfo
+++ b/devel/py-expect/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.9 2010/07/21 14:11:16 joerg Exp $
+$NetBSD: distinfo,v 1.10 2013/10/27 20:17:40 markd Exp $
 
 SHA1 (ExpectPy-1.9b1.tar.gz) = f43fcd53901f327dc8acf0650dbfe45b274a8d7d
 RMD160 (ExpectPy-1.9b1.tar.gz) = d0e586a987db1c6eb22008519483081f7278be20
 Size (ExpectPy-1.9b1.tar.gz) = 149580 bytes
-SHA1 (patch-aa) = eff544e7290736bebb81b8391848369d630f7b03
-SHA1 (patch-ab) = d95ef8bc2f6c0178de0b05e649d6e2d6aed37335
+SHA1 (patch-ab) = 67a2cf831973fa39b83aea61142c0682de60cd27
 SHA1 (patch-ac) = 0ff7162129a84fbc913a8b1240209387b922c2a8
 SHA1 (patch-ad) = d2809ac63abb65ad59586cc35ffcda1b70088bcb
 SHA1 (patch-ae) = 0f5190724d3b17e7b7f06f6408e1c9e7a3e66868
-SHA1 (patch-af) = 130de0f91370a49db5c9236445d2cb258303b190
+SHA1 (patch-af) = 9ed0f60061d91a04788f8ad6974edc7e4d2e411b
 SHA1 (patch-ag) = 7e43133aeebee5c63716aefba8fd4e0d4b1ff6ce
diff --git a/devel/py-expect/patches/patch-aa b/devel/py-expect/patches/patch-aa
deleted file mode 100644
index ead50bfbb04..00000000000
--- a/devel/py-expect/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/03/21 23:36:07 jwise Exp $
---- expvers.py.orig	Wed Mar 21 00:41:18 2001
-+++ expvers.py	Wed Mar 21 00:42:04 2001
-@@ -105,7 +105,7 @@
-       raise SystemExit, "Cannot find expect interpreter"
-     del d
-     basevers, fullvers = get_version(expect_prog)
--    libdir = pathjoin(basedir, pathjoin('lib', 'expect' + basevers))
-+    libdir = pathjoin(basedir, pathjoin('lib', pathjoin('tcl', 'expect' + basevers)))
-   del f
- 
- else:
diff --git a/devel/py-expect/patches/patch-ab b/devel/py-expect/patches/patch-ab
index ec4f5cd980c..a524c5aaaf9 100644
--- a/devel/py-expect/patches/patch-ab
+++ b/devel/py-expect/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2004/03/11 17:43:50 minskim Exp $
+$NetBSD: patch-ab,v 1.3 2013/10/27 20:17:40 markd Exp $
 
---- configure.orig	2000-11-05 12:07:38.000000000 -0600
+--- configure.orig	2000-11-05 18:07:38.000000000 +0000
 +++ configure
 @@ -1357,7 +1357,7 @@ echo "$ac_t""$PYTH_vers" 1>&6
  # _multiply_ the python version major version by one thousand, but minor
@@ -11,15 +11,41 @@ $NetBSD: patch-ab,v 1.2 2004/03/11 17:43:50 minskim Exp $
    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
+@@ -1395,20 +1395,20 @@ echo "$ac_t""$EXP_vers" 1>&6
+ 
+ echo $ac_n "checking Expect library location""... $ac_c" 1>&6
+ echo "configure:1398: checking Expect library location" >&5
+-if test -n "${EXP_LIB}"; then
+-  if test x${enable_forcea:+X} = xX -a -f "${EXP_LIB}"; then
+-    :
+-  elif test x${enable_forcea:+X} = xX; then
+-    { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
+-  else
+-    f="${EXP_LIBDIR}/lib${EXP_LIB}.*"
+-    if test "`echo $f`" = "$f"; then
+-      { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
+-    fi
+-  fi
+-else
 -  EXP_LIB="expect${EXP_VERS}"
+-fi
++#if test -n "${EXP_LIB}"; then
++#  if test x${enable_forcea:+X} = xX -a -f "${EXP_LIB}"; then
++#    :
++#  elif test x${enable_forcea:+X} = xX; then
++#    { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
++#  else
++#    f="${EXP_LIBDIR}/lib${EXP_LIB}.*"
++#    if test "`echo $f`" = "$f"; then
++#      { echo "configure: error: Cannot find Expect library" 1>&2; exit 1; }
++#    fi
++#  fi
++#else
 +  EXP_LIB="expect`echo ${EXP_VERS} | sed -e 's,\.,,'`"
- fi
++#fi
  echo "$ac_t""$EXP_LIB" 1>&6
  
+ 
 @@ -1542,7 +1542,7 @@ case ${EXP_VERS} in
  esac
  case ${EXP_VERS} in
diff --git a/devel/py-expect/patches/patch-af b/devel/py-expect/patches/patch-af
index 03f396049c8..bf84a4097f8 100644
--- a/devel/py-expect/patches/patch-af
+++ b/devel/py-expect/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2002/06/15 06:54:01 sjg Exp $
+$NetBSD: patch-af,v 1.2 2013/10/27 20:17:40 markd Exp $
 --- expvers.py.~1~	Fri Jun 14 13:09:31 2002
 +++ expvers.py	Fri Jun 14 13:36:32 2002
 @@ -2,7 +2,7 @@
@@ -51,6 +51,15 @@ $NetBSD: patch-af,v 1.1 2002/06/15 06:54:01 sjg Exp $
      return (version[:p], version)
    else:
      return (version, version)
+@@ -105,7 +105,7 @@
+       raise SystemExit, "Cannot find expect interpreter"
+     del d
+     basevers, fullvers = get_version(expect_prog)
+-    libdir = pathjoin(basedir, pathjoin('lib', 'expect' + basevers))
++    libdir = pathjoin(basedir, pathjoin('lib', pathjoin('tcl', 'expect' + basevers)))
+   del f
+ 
+ else:
 @@ -115,7 +115,7 @@ else:
    elif posix.environ.has_key('EXPECT'):
      expect_prog = posix.environ['EXPECT']