diff -ruN py-pexpect.old/Makefile py-pexpect/Makefile
--- py-pexpect.old/Makefile	Tue May 11 03:27:15 2004
+++ py-pexpect/Makefile	Wed Jun 14 14:35:02 2006
@@ -7,14 +7,14 @@
 #
 
 PORTNAME=	pexpect
-PORTVERSION=	0.999
+PORTVERSION=	2.1
 CATEGORIES=	misc python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
+		http://dryice.name/computer/FreeBSD/distfiles/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	dryice@dryice.name
 COMMENT=	A Pure Python Expect-like module
 
 USE_PYTHON=	yes
diff -ruN py-pexpect.old/distinfo py-pexpect/distinfo
--- py-pexpect.old/distinfo	Sat Nov 26 00:09:25 2005
+++ py-pexpect/distinfo	Wed Jun 14 14:15:32 2006
@@ -1,3 +1,3 @@
-MD5 (pexpect-0.999.tgz) = e426e5f54d323aaf392008c9eb35131d
-SHA256 (pexpect-0.999.tgz) = 9f0394104d299c1d544b278c22be6cb169c52421257c6a78a0fbdb590f9fd688
-SIZE (pexpect-0.999.tgz) = 20190
+MD5 (pexpect-2.1.tar.gz) = fd3d67ac085332f074cd665424dcd631
+SHA256 (pexpect-2.1.tar.gz) = d986dcbd954435e0ba78aaef391106c71a9b548a1cbd29cfb4eec3cb8c841313
+SIZE (pexpect-2.1.tar.gz) = 116478
diff -ruN py-pexpect.old/files/patch-pexpect.py py-pexpect/files/patch-pexpect.py
--- py-pexpect.old/files/patch-pexpect.py	Tue May 11 03:27:15 2004
+++ py-pexpect/files/patch-pexpect.py	Thu Jan  1 08:00:00 1970
@@ -1,29 +0,0 @@
---- pexpect.py.orig	Mon Apr 26 14:16:08 2004
-+++ pexpect.py	Mon Apr 26 14:19:45 2004
-@@ -498,21 +498,24 @@ class spawn:
-             pid, status = os.waitpid(self.pid, os.WNOHANG)
-         except OSError:
-             return 0
- 
-         # I have to do this twice for Solaris.
-         # I can't even believe that I figured this out...
--        if pid == 0 and status == 0:
-+
-+        # If waitpid() returns 0 it means that no child process wishes to
-+        # report, and the value of status is undefined.
-+        if pid == 0:
-             try:
-                 pid, status = os.waitpid(self.pid, os.WNOHANG)
-                 #print 'Solaris sucks'
-             except OSError: # This is crufty. When does this happen?
-                 return 0
-             # If pid and status is still 0 after two calls to waitpid() then
-             # the process really is alive. This seems to work on all platforms.
--            if pid == 0 and status == 0:
-+            if pid == 0:
-                 return 1
- 
-         # I do not OR this together because I want hooks for debugging.
-         if os.WIFEXITED (status):
-             self.exitstatus = os.WEXITSTATUS(status)
-             return 0
diff -ruN py-pexpect.old/pkg-plist py-pexpect/pkg-plist
--- py-pexpect.old/pkg-plist	Sun Jan 12 00:07:44 2003
+++ py-pexpect/pkg-plist	Wed Jun 14 14:24:33 2006
@@ -1,3 +1,9 @@
+%%PYTHON_SITELIBDIR%%/fdpexpect.py
+%%PYTHON_SITELIBDIR%%/fdpexpect.pyc
+%%PYTHON_SITELIBDIR%%/fdpexpect.pyo
 %%PYTHON_SITELIBDIR%%/pexpect.py
 %%PYTHON_SITELIBDIR%%/pexpect.pyc
 %%PYTHON_SITELIBDIR%%/pexpect.pyo
+%%PYTHON_SITELIBDIR%%/pxssh.py
+%%PYTHON_SITELIBDIR%%/pxssh.pyc
+%%PYTHON_SITELIBDIR%%/pxssh.pyo
--- attached file ends here ---