aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorperky <perky@FreeBSD.org>2002-10-17 19:14:17 +0800
committerperky <perky@FreeBSD.org>2002-10-17 19:14:17 +0800
commit45320f7f2da5a94f92884c95d5c04253fc548d5a (patch)
tree21b0b41bfd447acce9ff9e43d9335afce71ac14c
parent7478600944c753e2d9864c65982c8bb59477f519 (diff)
downloadfreebsd-ports-gnome-45320f7f2da5a94f92884c95d5c04253fc548d5a.tar.gz
freebsd-ports-gnome-45320f7f2da5a94f92884c95d5c04253fc548d5a.tar.zst
freebsd-ports-gnome-45320f7f2da5a94f92884c95d5c04253fc548d5a.zip
Upgrade to Python-2.2.2.
Approved by: tg
-rw-r--r--Mk/bsd.python.mk4
-rw-r--r--lang/python-devel/Makefile2
-rw-r--r--lang/python-devel/distinfo2
-rw-r--r--lang/python-devel/files/patch-Lib:urllib.py14
-rw-r--r--lang/python-devel/files/patch-configure10
-rw-r--r--lang/python-devel/pkg-plist46
-rw-r--r--lang/python/Makefile2
-rw-r--r--lang/python/distinfo2
-rw-r--r--lang/python/files/patch-Lib:urllib.py14
-rw-r--r--lang/python/files/patch-configure10
-rw-r--r--lang/python/pkg-plist46
-rw-r--r--lang/python22/Makefile2
-rw-r--r--lang/python22/distinfo2
-rw-r--r--lang/python22/files/patch-Lib:urllib.py14
-rw-r--r--lang/python22/files/patch-configure10
-rw-r--r--lang/python22/pkg-plist46
-rw-r--r--lang/python23/Makefile2
-rw-r--r--lang/python23/distinfo2
-rw-r--r--lang/python23/files/patch-Lib:urllib.py14
-rw-r--r--lang/python23/files/patch-configure10
-rw-r--r--lang/python23/pkg-plist46
-rw-r--r--lang/python24/Makefile2
-rw-r--r--lang/python24/distinfo2
-rw-r--r--lang/python24/files/patch-Lib:urllib.py14
-rw-r--r--lang/python24/files/patch-configure10
-rw-r--r--lang/python24/pkg-plist46
-rw-r--r--lang/python25/Makefile2
-rw-r--r--lang/python25/distinfo2
-rw-r--r--lang/python25/files/patch-Lib:urllib.py14
-rw-r--r--lang/python25/files/patch-configure10
-rw-r--r--lang/python25/pkg-plist46
-rw-r--r--lang/python26/Makefile2
-rw-r--r--lang/python26/distinfo2
-rw-r--r--lang/python26/files/patch-Lib:urllib.py14
-rw-r--r--lang/python26/files/patch-configure10
-rw-r--r--lang/python26/pkg-plist46
-rw-r--r--lang/python27/Makefile2
-rw-r--r--lang/python27/distinfo2
-rw-r--r--lang/python27/files/patch-Lib:urllib.py14
-rw-r--r--lang/python27/files/patch-configure10
-rw-r--r--lang/python27/pkg-plist46
-rw-r--r--lang/python30/Makefile2
-rw-r--r--lang/python30/distinfo2
-rw-r--r--lang/python30/files/patch-Lib:urllib.py14
-rw-r--r--lang/python30/files/patch-configure10
-rw-r--r--lang/python30/pkg-plist46
-rw-r--r--lang/python31/Makefile2
-rw-r--r--lang/python31/distinfo2
-rw-r--r--lang/python31/files/patch-Lib:urllib.py14
-rw-r--r--lang/python31/files/patch-configure10
-rw-r--r--lang/python31/pkg-plist46
-rw-r--r--lang/python32/Makefile2
-rw-r--r--lang/python32/distinfo2
-rw-r--r--lang/python32/files/patch-Lib:urllib.py14
-rw-r--r--lang/python32/files/patch-configure10
-rw-r--r--lang/python32/pkg-plist46
56 files changed, 486 insertions, 332 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index a9e2d38818da..e999b5343d08 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -111,7 +111,7 @@ _PYTHON_VERSION!= (python -c 'import sys; print sys.version[:3]') 2> /dev/null \
|| echo 2.2
.endif
PYTHON_VERSION?= python${_PYTHON_VERSION}
-_PYTHON_PORTVERSION= 2.2.1
+_PYTHON_PORTVERSION= 2.2.2
PYTHON_PORTVERSION!= (${PYTHON_VERSION} -c 'import string, sys; \
print string.split(sys.version)[0]') 2> /dev/null \
|| echo ${_PYTHON_PORTVERSION}
@@ -127,7 +127,7 @@ PYXML= ${PYTHON_SITELIBDIR}/_xmlplus/__init__.py:${PORTSDIR}/textproc/py-xml
PYTHON_DISTFILE= Python-${_PYTHON_PORTVERSION}.tgz
PYTHON_PORTSDIR= ${PORTSDIR}/lang/python
-PYTHON_REL= 221
+PYTHON_REL= 222
PYTHON_SUFFIX= 22
PYTHON_WRKSRC= ${WRKDIR}/Python-${_PYTHON_PORTVERSION}
diff --git a/lang/python-devel/Makefile b/lang/python-devel/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python-devel/Makefile
+++ b/lang/python-devel/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python-devel/distinfo b/lang/python-devel/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python-devel/distinfo
+++ b/lang/python-devel/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python-devel/files/patch-Lib:urllib.py b/lang/python-devel/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python-devel/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python-devel/files/patch-configure b/lang/python-devel/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python-devel/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python-devel/pkg-plist b/lang/python-devel/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python-devel/pkg-plist
+++ b/lang/python-devel/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python/Makefile b/lang/python/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python/Makefile
+++ b/lang/python/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python/distinfo b/lang/python/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python/files/patch-Lib:urllib.py b/lang/python/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python/files/patch-configure b/lang/python/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python/pkg-plist b/lang/python/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python/pkg-plist
+++ b/lang/python/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python22/Makefile b/lang/python22/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python22/Makefile
+++ b/lang/python22/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python22/distinfo b/lang/python22/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python22/distinfo
+++ b/lang/python22/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python22/files/patch-Lib:urllib.py b/lang/python22/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python22/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python22/files/patch-configure b/lang/python22/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python22/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python22/pkg-plist b/lang/python22/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python22/pkg-plist
+++ b/lang/python22/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python23/files/patch-Lib:urllib.py b/lang/python23/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python23/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python23/files/patch-configure b/lang/python23/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python23/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python24/files/patch-Lib:urllib.py b/lang/python24/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python24/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python24/files/patch-configure b/lang/python24/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python24/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python25/Makefile b/lang/python25/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python25/Makefile
+++ b/lang/python25/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python25/distinfo b/lang/python25/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python25/distinfo
+++ b/lang/python25/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python25/files/patch-Lib:urllib.py b/lang/python25/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python25/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python25/files/patch-configure b/lang/python25/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python25/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python25/pkg-plist b/lang/python25/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python25/pkg-plist
+++ b/lang/python25/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python26/Makefile b/lang/python26/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python26/Makefile
+++ b/lang/python26/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python26/distinfo b/lang/python26/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python26/distinfo
+++ b/lang/python26/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python26/files/patch-Lib:urllib.py b/lang/python26/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python26/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python26/files/patch-configure b/lang/python26/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python26/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python26/pkg-plist b/lang/python26/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python26/pkg-plist
+++ b/lang/python26/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python27/files/patch-Lib:urllib.py b/lang/python27/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python27/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python27/files/patch-configure b/lang/python27/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python27/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python27/pkg-plist b/lang/python27/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python27/pkg-plist
+++ b/lang/python27/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python30/files/patch-Lib:urllib.py b/lang/python30/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python30/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python30/files/patch-configure b/lang/python30/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python30/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python31/Makefile b/lang/python31/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python31/Makefile
+++ b/lang/python31/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python31/distinfo b/lang/python31/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python31/distinfo
+++ b/lang/python31/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python31/files/patch-Lib:urllib.py b/lang/python31/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python31/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python31/files/patch-configure b/lang/python31/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python31/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python31/pkg-plist b/lang/python31/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python31/pkg-plist
+++ b/lang/python31/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo
diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index c0af2958abb7..6697e8002170 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= python
-PORTVERSION= 2.2.1
+PORTVERSION= 2.2.2
CATEGORIES= lang python ipv6
MASTER_SITES= http://www.python.org/ftp/python/${PORTVERSION}/ \
${MASTER_SITE_SOURCEFORGE} \
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index efd74537ff1d..34efdb2b946c 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1 +1 @@
-MD5 (python/Python-2.2.1.tgz) = e7012d611602b62e36073c2fd02396a3
+MD5 (python/Python-2.2.2.tgz) = 1c1067396e5aa0299978486eb5bd1a5c
diff --git a/lang/python32/files/patch-Lib:urllib.py b/lang/python32/files/patch-Lib:urllib.py
deleted file mode 100644
index 63830a9475c6..000000000000
--- a/lang/python32/files/patch-Lib:urllib.py
+++ /dev/null
@@ -1,14 +0,0 @@
---- Lib/urllib.py.orig Wed Apr 10 08:19:21 2002
-+++ Lib/urllib.py Wed Apr 10 08:25:58 2002
-@@ -409,7 +409,10 @@
- import mimetypes, mimetools, rfc822, StringIO
- host, file = splithost(url)
- localname = url2pathname(file)
-- stats = os.stat(localname)
-+ try:
-+ stats = os.stat(localname)
-+ except OSError, e:
-+ raise IOError(e.errno, e.strerror, e.filename)
- size = stats[stat.ST_SIZE]
- modified = rfc822.formatdate(stats[stat.ST_MTIME])
- mtype = mimetypes.guess_type(url)[0]
diff --git a/lang/python32/files/patch-configure b/lang/python32/files/patch-configure
deleted file mode 100644
index e40f4ac925e3..000000000000
--- a/lang/python32/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig Sun Jan 20 15:31:22 2002
-+++ configure Sun Jan 20 15:56:58 2002
-@@ -6980,6 +6980,7 @@
- #line 6981 "configure"
- #include "confdefs.h"
- #include <stdio.h>
-+#include <wchar.h>
- main()
- {
- FILE *f=fopen("conftestval", "w");
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index f9e58fd9f9c1..6861662aa790 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -638,6 +638,9 @@ lib/%%PYTHON_VERSION%%/dospath.pyo
lib/%%PYTHON_VERSION%%/dumbdbm.py
lib/%%PYTHON_VERSION%%/dumbdbm.pyc
lib/%%PYTHON_VERSION%%/dumbdbm.pyo
+lib/%%PYTHON_VERSION%%/email/Charset.py
+lib/%%PYTHON_VERSION%%/email/Charset.pyc
+lib/%%PYTHON_VERSION%%/email/Charset.pyo
lib/%%PYTHON_VERSION%%/email/Encoders.py
lib/%%PYTHON_VERSION%%/email/Encoders.pyc
lib/%%PYTHON_VERSION%%/email/Encoders.pyo
@@ -647,6 +650,9 @@ lib/%%PYTHON_VERSION%%/email/Errors.pyo
lib/%%PYTHON_VERSION%%/email/Generator.py
lib/%%PYTHON_VERSION%%/email/Generator.pyc
lib/%%PYTHON_VERSION%%/email/Generator.pyo
+lib/%%PYTHON_VERSION%%/email/Header.py
+lib/%%PYTHON_VERSION%%/email/Header.pyc
+lib/%%PYTHON_VERSION%%/email/Header.pyo
lib/%%PYTHON_VERSION%%/email/Iterators.py
lib/%%PYTHON_VERSION%%/email/Iterators.pyc
lib/%%PYTHON_VERSION%%/email/Iterators.pyo
@@ -662,6 +668,12 @@ lib/%%PYTHON_VERSION%%/email/MIMEImage.pyo
lib/%%PYTHON_VERSION%%/email/MIMEMessage.py
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyc
lib/%%PYTHON_VERSION%%/email/MIMEMessage.pyo
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMEMultipart.pyo
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.py
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyc
+lib/%%PYTHON_VERSION%%/email/MIMENonMultipart.pyo
lib/%%PYTHON_VERSION%%/email/MIMEText.py
lib/%%PYTHON_VERSION%%/email/MIMEText.pyc
lib/%%PYTHON_VERSION%%/email/MIMEText.pyo
@@ -677,6 +689,18 @@ lib/%%PYTHON_VERSION%%/email/Utils.pyo
lib/%%PYTHON_VERSION%%/email/__init__.py
lib/%%PYTHON_VERSION%%/email/__init__.pyc
lib/%%PYTHON_VERSION%%/email/__init__.pyo
+lib/%%PYTHON_VERSION%%/email/_compat21.py
+lib/%%PYTHON_VERSION%%/email/_compat21.pyc
+lib/%%PYTHON_VERSION%%/email/_compat21.pyo
+lib/%%PYTHON_VERSION%%/email/_compat22.py
+lib/%%PYTHON_VERSION%%/email/_compat22.pyc
+lib/%%PYTHON_VERSION%%/email/_compat22.pyo
+lib/%%PYTHON_VERSION%%/email/base64MIME.py
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyc
+lib/%%PYTHON_VERSION%%/email/base64MIME.pyo
+lib/%%PYTHON_VERSION%%/email/quopriMIME.py
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyc
+lib/%%PYTHON_VERSION%%/email/quopriMIME.pyo
lib/%%PYTHON_VERSION%%/encodings/__init__.py
lib/%%PYTHON_VERSION%%/encodings/__init__.pyc
lib/%%PYTHON_VERSION%%/encodings/__init__.pyo
@@ -994,9 +1018,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
-lib/%%PYTHON_VERSION%%/lib-dynload/errno.so
lib/%%PYTHON_VERSION%%/lib-dynload/fcntl.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/fpectl.so
lib/%%PYTHON_VERSION%%/lib-dynload/grp.so
%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/imageop.so
lib/%%PYTHON_VERSION%%/lib-dynload/math.so
@@ -1407,7 +1429,6 @@ lib/%%PYTHON_VERSION%%/test/double_const.pyo
lib/%%PYTHON_VERSION%%/test/greyrgb.uue
lib/%%PYTHON_VERSION%%/test/output/test_MimeWriter
lib/%%PYTHON_VERSION%%/test/output/test_asynchat
-lib/%%PYTHON_VERSION%%/test/output/test_atexit
lib/%%PYTHON_VERSION%%/test/output/test_augassign
lib/%%PYTHON_VERSION%%/test/output/test_bastion
lib/%%PYTHON_VERSION%%/test/output/test_binascii
@@ -1433,7 +1454,6 @@ lib/%%PYTHON_VERSION%%/test/output/test_longexp
lib/%%PYTHON_VERSION%%/test/output/test_math
lib/%%PYTHON_VERSION%%/test/output/test_md5
lib/%%PYTHON_VERSION%%/test/output/test_mimetools
-lib/%%PYTHON_VERSION%%/test/output/test_minidom
lib/%%PYTHON_VERSION%%/test/output/test_mmap
lib/%%PYTHON_VERSION%%/test/output/test_new
lib/%%PYTHON_VERSION%%/test/output/test_nis
@@ -1537,6 +1557,9 @@ lib/%%PYTHON_VERSION%%/test/test_b1.pyo
lib/%%PYTHON_VERSION%%/test/test_b2.py
lib/%%PYTHON_VERSION%%/test/test_b2.pyc
lib/%%PYTHON_VERSION%%/test/test_b2.pyo
+lib/%%PYTHON_VERSION%%/test/test_base64.py
+lib/%%PYTHON_VERSION%%/test/test_base64.pyc
+lib/%%PYTHON_VERSION%%/test/test_base64.pyo
lib/%%PYTHON_VERSION%%/test/test_bastion.py
lib/%%PYTHON_VERSION%%/test/test_bastion.pyc
lib/%%PYTHON_VERSION%%/test/test_bastion.pyo
@@ -1663,6 +1686,9 @@ lib/%%PYTHON_VERSION%%/test/test_dumbdbm.pyo
lib/%%PYTHON_VERSION%%/test/test_email.py
lib/%%PYTHON_VERSION%%/test/test_email.pyc
lib/%%PYTHON_VERSION%%/test/test_email.pyo
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.py
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyc
+lib/%%PYTHON_VERSION%%/test/test_email_codecs.pyo
lib/%%PYTHON_VERSION%%/test/test_errno.py
lib/%%PYTHON_VERSION%%/test/test_errno.pyc
lib/%%PYTHON_VERSION%%/test/test_errno.pyo
@@ -1825,6 +1851,9 @@ lib/%%PYTHON_VERSION%%/test/test_minidom.pyo
lib/%%PYTHON_VERSION%%/test/test_mmap.py
lib/%%PYTHON_VERSION%%/test/test_mmap.pyc
lib/%%PYTHON_VERSION%%/test/test_mmap.pyo
+lib/%%PYTHON_VERSION%%/test/test_multifile.py
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
+lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
lib/%%PYTHON_VERSION%%/test/test_mutants.py
lib/%%PYTHON_VERSION%%/test/test_mutants.pyc
lib/%%PYTHON_VERSION%%/test/test_mutants.pyo
@@ -1903,9 +1932,15 @@ lib/%%PYTHON_VERSION%%/test/test_pyclbr.pyo
lib/%%PYTHON_VERSION%%/test/test_pyexpat.py
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyc
lib/%%PYTHON_VERSION%%/test/test_pyexpat.pyo
+lib/%%PYTHON_VERSION%%/test/test_queue.py
+lib/%%PYTHON_VERSION%%/test/test_queue.pyc
+lib/%%PYTHON_VERSION%%/test/test_queue.pyo
lib/%%PYTHON_VERSION%%/test/test_quopri.py
lib/%%PYTHON_VERSION%%/test/test_quopri.pyc
lib/%%PYTHON_VERSION%%/test/test_quopri.pyo
+lib/%%PYTHON_VERSION%%/test/test_random.py
+lib/%%PYTHON_VERSION%%/test/test_random.pyc
+lib/%%PYTHON_VERSION%%/test/test_random.pyo
lib/%%PYTHON_VERSION%%/test/test_re.py
lib/%%PYTHON_VERSION%%/test/test_re.pyc
lib/%%PYTHON_VERSION%%/test/test_re.pyo
@@ -2008,6 +2043,9 @@ lib/%%PYTHON_VERSION%%/test/test_timing.pyo
lib/%%PYTHON_VERSION%%/test/test_tokenize.py
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyc
lib/%%PYTHON_VERSION%%/test/test_tokenize.pyo
+lib/%%PYTHON_VERSION%%/test/test_trace.py
+lib/%%PYTHON_VERSION%%/test/test_trace.pyc
+lib/%%PYTHON_VERSION%%/test/test_trace.pyo
lib/%%PYTHON_VERSION%%/test/test_traceback.py
lib/%%PYTHON_VERSION%%/test/test_traceback.pyc
lib/%%PYTHON_VERSION%%/test/test_traceback.pyo