Update python23 to Python 2.3.6 and python24 to Python 2.4.5.

8 files changed, 18 insertions, 36 deletions

diff --git a/lang/python/distinfo b/lang/python/distinfo
index f365273bcb17..8f8b2b1d6ea1 100644
--- a/lang/python/distinfo
+++ b/lang/python/distinfo
@@ -11,11 +11,13 @@ MD5 (python/Python-2.3.2.tgz) = f54d7a529d444994b4b33429bbb45479
 MD5 (python/Python-2.3.3.tgz) = 4d16732b1cfccc0ed250956d41463c61
 MD5 (python/Python-2.3.4.tgz) = b6cf0b19226861a38689d2fabd0931b3
 MD5 (python/Python-2.3.5.tgz) = 7a1ecc1196c5c0e9d4eef90ba684c4e9
+MD5 (python/Python-2.3.6.tgz) = 357c79f9c914b671c9401f70853ebf3b
 MD5 (python/Python-2.3.tgz) = 595620a4769073a812e353597585c4e8
 MD5 (python/Python-2.4.1.tgz) = 7bb2416a4f421c3452d306694d3efbba
 MD5 (python/Python-2.4.2.tgz) = 07cfc759546f6723bb367be5b1ce9875
 MD5 (python/Python-2.4.3.tgz) = edf994473a8c1a963aaa71e442b285b7
 MD5 (python/Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58
+MD5 (python/Python-2.4.5.tgz) = 750b652bfdd12675e102bbe25e5e9893
 MD5 (python/Python-2.4.tgz) = 149ad508f936eccf669d52682cf8e606
 MD5 (python/Python-2.5.1.tgz) = cca695828df8adc3e69b637af07522e1
 MD5 (python/Python-2.5.2.tgz) = 3f7ca8aa86c6bd275426d63b46e07992
@@ -33,11 +35,13 @@ SHA256 (python/Python-2.3.2.tgz) = daf11ff034eddaca6288d652bf6137df91e731189f7cb
 SHA256 (python/Python-2.3.3.tgz) = 5f43aa519f337616b7d4f86c79c075d2409f6b38569824aef52bec169e22c3d1
 SHA256 (python/Python-2.3.4.tgz) = 5a667e58cbbe20bcd3897be3e2051530ec2589734402ceaaca8cdf2f337dba46
 SHA256 (python/Python-2.3.5.tgz) = 7c122deff7700f04fb9daa5b5b3a885b19a73da05c2a264403666817c7631977
+SHA256 (python/Python-2.3.6.tgz) = f5e99d5b007bb28b6f035c556bdb5f1dcb4a70813d2deaf1cc754465e9836a59
 SHA256 (python/Python-2.3.tgz) = 20ea7faad43e1993f5c9292c5864671cf9de68eda1a0579e6be7dc5428b3ff1e
 SHA256 (python/Python-2.4.1.tgz) = f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00
 SHA256 (python/Python-2.4.2.tgz) = 2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf
 SHA256 (python/Python-2.4.3.tgz) = 985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5
 SHA256 (python/Python-2.4.4.tgz) = 92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e
+SHA256 (python/Python-2.4.5.tgz) = 6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1
 SHA256 (python/Python-2.4.tgz) = ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9
 SHA256 (python/Python-2.5.1.tgz) = 1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8
 SHA256 (python/Python-2.5.2.tgz) = 834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3
@@ -55,11 +59,13 @@ SIZE (python/Python-2.3.2.tgz) = 8459427
 SIZE (python/Python-2.3.3.tgz) = 8491380
 SIZE (python/Python-2.3.4.tgz) = 8502738
 SIZE (python/Python-2.3.5.tgz) = 8535749
+SIZE (python/Python-2.3.6.tgz) = 8610359
 SIZE (python/Python-2.3.tgz) = 8436880
 SIZE (python/Python-2.4.1.tgz) = 9219882
 SIZE (python/Python-2.4.2.tgz) = 9239975
 SIZE (python/Python-2.4.3.tgz) = 9348239
 SIZE (python/Python-2.4.4.tgz) = 9531474
+SIZE (python/Python-2.4.5.tgz) = 9625509
 SIZE (python/Python-2.4.tgz) = 9198035
 SIZE (python/Python-2.5.1.tgz) = 11060830
 SIZE (python/Python-2.5.2.tgz) = 11583114
diff --git a/lang/python23/Makefile b/lang/python23/Makefile
index fb8e16970208..ae0a12bc3809 100644
--- a/lang/python23/Makefile
+++ b/lang/python23/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	python23
-PORTVERSION=	2.3.5
-PORTREVISION=	3
+PORTVERSION=	2.3.6
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -32,8 +31,8 @@ PYTHON_VERSION=	python2.3
 PYTHON_NO_DEPENDS=	yes
 LATEST_LINK?=	${PYTHON_VERSION:S/.//}
 
-PLATFORMS=	plat-freebsd4 plat-freebsd5 plat-freebsd6 plat-freebsd7 \
-		plat-freebsd8
+PLATFORMS=	plat-freebsd4 plat-freebsd5 plat-freebsd6 \
+		plat-freebsd7 plat-freebsd8
 SHARED_WRKSRC=	${WRKSRC}/build.shared
 PLIST_SUB=	PYVER=${PYTHON_VERSION:S/python//}
 DEMODIR=	${PREFIX}/share/examples/${PYTHON_VERSION}
diff --git a/lang/python23/distinfo b/lang/python23/distinfo
index b9f414f5a110..2971d56750b8 100644
--- a/lang/python23/distinfo
+++ b/lang/python23/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.3.5.tgz) = 7a1ecc1196c5c0e9d4eef90ba684c4e9
-SHA256 (python/Python-2.3.5.tgz) = 7c122deff7700f04fb9daa5b5b3a885b19a73da05c2a264403666817c7631977
-SIZE (python/Python-2.3.5.tgz) = 8535749
+MD5 (python/Python-2.3.6.tgz) = 357c79f9c914b671c9401f70853ebf3b
+SHA256 (python/Python-2.3.6.tgz) = f5e99d5b007bb28b6f035c556bdb5f1dcb4a70813d2deaf1cc754465e9836a59
+SIZE (python/Python-2.3.6.tgz) = 8610359
diff --git a/lang/python23/files/patch-Lib::email::Charset.py b/lang/python23/files/patch-Lib::email::Charset.py
deleted file mode 100644
index 31063a951a80..000000000000
--- a/lang/python23/files/patch-Lib::email::Charset.py
+++ /dev/null
@@ -1,23 +0,0 @@
---- Lib/email/Charset.py.orig	Sat Dec 20 15:16:29 2003
-+++ Lib/email/Charset.py	Sat Dec 20 15:16:54 2003
-@@ -99,13 +99,13 @@
- # of stability and useability.
- 
- CODEC_MAP = {
--    'euc-jp':      'japanese.euc-jp',
--    'iso-2022-jp': 'japanese.iso-2022-jp',
--    'shift_jis':   'japanese.shift_jis',
--    'euc-kr':      'korean.euc-kr',
--    'ks_c_5601-1987': 'korean.cp949',
--    'iso-2022-kr': 'korean.iso-2022-kr',
--    'johab':       'korean.johab',
-+    'euc-jp':      'euc-jp',
-+    'iso-2022-jp': 'iso-2022-jp',
-+    'shift_jis':   'shift_jis',
-+    'euc-kr':      'euc-kr',
-+    'ks_c_5601-1987': 'cp949',
-+    'iso-2022-kr': 'iso-2022-kr',
-+    'johab':       'johab',
-     'gb2132':      'eucgb2312_cn',
-     'big5':        'big5_tw',
-     'utf-8':       'utf-8',
diff --git a/lang/python23/pkg-plist b/lang/python23/pkg-plist
index 1c0a9898658a..e9fbbe3bbd29 100644
--- a/lang/python23/pkg-plist
+++ b/lang/python23/pkg-plist
@@ -6,6 +6,7 @@ bin/pydoc%%PYVER%%
 bin/python%%PYVER%%
 %%IF_DEFAULT%%bin/python-shared
 bin/python-shared%%PYVER%%
+include/%%PYTHON_VERSION%%/Python-ast.h
 include/%%PYTHON_VERSION%%/Python.h
 include/%%PYTHON_VERSION%%/abstract.h
 include/%%PYTHON_VERSION%%/bitset.h
@@ -615,6 +616,7 @@ lib/%%PYTHON_VERSION%%/email/test/data/msg_33.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_34.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_35.txt
 lib/%%PYTHON_VERSION%%/email/test/data/msg_40.txt
+lib/%%PYTHON_VERSION%%/email/test/data/msg_41.txt
 lib/%%PYTHON_VERSION%%/email/test/test_email.py
 lib/%%PYTHON_VERSION%%/email/test/test_email.pyc
 lib/%%PYTHON_VERSION%%/email/test/test_email.pyo
diff --git a/lang/python24/Makefile b/lang/python24/Makefile
index ad880fd83963..7103949945ff 100644
--- a/lang/python24/Makefile
+++ b/lang/python24/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	python24
-PORTVERSION=	2.4.4
-PORTREVISION=	2
+PORTVERSION=	2.4.5
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python24/distinfo b/lang/python24/distinfo
index a6abe7330f7b..a4db350b7aa3 100644
--- a/lang/python24/distinfo
+++ b/lang/python24/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/Python-2.4.4.tgz) = 82d000617baaef269ad5795c595fdc58
-SHA256 (python/Python-2.4.4.tgz) = 92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e
-SIZE (python/Python-2.4.4.tgz) = 9531474
+MD5 (python/Python-2.4.5.tgz) = 750b652bfdd12675e102bbe25e5e9893
+SHA256 (python/Python-2.4.5.tgz) = 6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1
+SIZE (python/Python-2.4.5.tgz) = 9625509
diff --git a/lang/python24/pkg-plist b/lang/python24/pkg-plist
index 608b45ba4009..0078ddddb10a 100644
--- a/lang/python24/pkg-plist
+++ b/lang/python24/pkg-plist
@@ -9,7 +9,6 @@ bin/python-shared%%PYVER%%
 %%IF_DEFAULT%%bin/smtpd.py
 bin/smtpd%%PYVER%%.py
 %%PYTHON_INCLUDEDIR%%/Python.h
-%%PYTHON_INCLUDEDIR%%/Python-ast.h
 %%PYTHON_INCLUDEDIR%%/abstract.h
 %%PYTHON_INCLUDEDIR%%/bitset.h
 %%PYTHON_INCLUDEDIR%%/boolobject.h