3 files changed, 133 insertions, 6 deletions

diff --git a/lang/python30/Makefile b/lang/python30/Makefile
index 9ada0ede362c..d3559fdedb37 100644
--- a/lang/python30/Makefile
+++ b/lang/python30/Makefile
@@ -5,8 +5,7 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTVERSION=	2.4.a0.20040106
-PORTREVISION=	2
+PORTVERSION=	2.4.a0.20040311
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	${PYTHON_MASTER_SITES}
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
@@ -162,7 +161,7 @@ post-install:
 		${PREFIX}/lib
 	cd ${PREFIX}/lib; ${LN} -sf lib${PYTHON_VERSION}.so.1 \
 		lib${PYTHON_VERSION}.so
-	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so ${PYTHON_LIBDIR}/config
+	${LN} -sf ${PREFIX}/lib/lib${PYTHON_VERSION}.so ${PYTHONPREFIX_LIBDIR}/config
 	${INSTALL_PROGRAM} \
 		${SHARED_WRKSRC}/${PYTHON_VERSION:S/thon/thon-shared/} \
 		${PREFIX}/bin
diff --git a/lang/python30/distinfo b/lang/python30/distinfo
index 9fa002f95748..bc902a0cc5f7 100644
--- a/lang/python30/distinfo
+++ b/lang/python30/distinfo
@@ -1 +1,2 @@
-MD5 (python/Python-2.4.a0.20040106.tgz) = cde5962028bcfdb473455c57bbb24c18
+MD5 (python/Python-2.4.a0.20040311.tgz) = 5619b787ce62a1ebac3c973179d36670
+SIZE (python/Python-2.4.a0.20040311.tgz) = 8512702
diff --git a/lang/python30/pkg-plist b/lang/python30/pkg-plist
index 3fdce6a560fa..89a833084ebb 100644
--- a/lang/python30/pkg-plist
+++ b/lang/python30/pkg-plist
@@ -429,7 +429,8 @@ lib/%%PYTHON_VERSION%%/distutils/command/register.pyo
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.py
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.pyc
 lib/%%PYTHON_VERSION%%/distutils/command/sdist.pyo
-lib/%%PYTHON_VERSION%%/distutils/command/wininst.exe
+lib/%%PYTHON_VERSION%%/distutils/command/wininst-6.exe
+lib/%%PYTHON_VERSION%%/distutils/command/wininst-7.1.exe
 lib/%%PYTHON_VERSION%%/distutils/core.py
 lib/%%PYTHON_VERSION%%/distutils/core.pyc
 lib/%%PYTHON_VERSION%%/distutils/core.pyo
@@ -632,6 +633,9 @@ lib/%%PYTHON_VERSION%%/encodings/ascii.pyo
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.py
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyc
 lib/%%PYTHON_VERSION%%/encodings/base64_codec.pyo
+lib/%%PYTHON_VERSION%%/encodings/big5.py
+lib/%%PYTHON_VERSION%%/encodings/big5.pyc
+lib/%%PYTHON_VERSION%%/encodings/big5.pyo
 lib/%%PYTHON_VERSION%%/encodings/bz2_codec.py
 lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyc
 lib/%%PYTHON_VERSION%%/encodings/bz2_codec.pyo
@@ -737,12 +741,60 @@ lib/%%PYTHON_VERSION%%/encodings/cp874.pyo
 lib/%%PYTHON_VERSION%%/encodings/cp875.py
 lib/%%PYTHON_VERSION%%/encodings/cp875.pyc
 lib/%%PYTHON_VERSION%%/encodings/cp875.pyo
+lib/%%PYTHON_VERSION%%/encodings/cp932.py
+lib/%%PYTHON_VERSION%%/encodings/cp932.pyc
+lib/%%PYTHON_VERSION%%/encodings/cp932.pyo
+lib/%%PYTHON_VERSION%%/encodings/cp949.py
+lib/%%PYTHON_VERSION%%/encodings/cp949.pyc
+lib/%%PYTHON_VERSION%%/encodings/cp949.pyo
+lib/%%PYTHON_VERSION%%/encodings/cp950.py
+lib/%%PYTHON_VERSION%%/encodings/cp950.pyc
+lib/%%PYTHON_VERSION%%/encodings/cp950.pyo
+lib/%%PYTHON_VERSION%%/encodings/euc_jisx0213.py
+lib/%%PYTHON_VERSION%%/encodings/euc_jisx0213.pyc
+lib/%%PYTHON_VERSION%%/encodings/euc_jisx0213.pyo
+lib/%%PYTHON_VERSION%%/encodings/euc_jp.py
+lib/%%PYTHON_VERSION%%/encodings/euc_jp.pyc
+lib/%%PYTHON_VERSION%%/encodings/euc_jp.pyo
+lib/%%PYTHON_VERSION%%/encodings/euc_kr.py
+lib/%%PYTHON_VERSION%%/encodings/euc_kr.pyc
+lib/%%PYTHON_VERSION%%/encodings/euc_kr.pyo
+lib/%%PYTHON_VERSION%%/encodings/gb18030.py
+lib/%%PYTHON_VERSION%%/encodings/gb18030.pyc
+lib/%%PYTHON_VERSION%%/encodings/gb18030.pyo
+lib/%%PYTHON_VERSION%%/encodings/gb2312.py
+lib/%%PYTHON_VERSION%%/encodings/gb2312.pyc
+lib/%%PYTHON_VERSION%%/encodings/gb2312.pyo
+lib/%%PYTHON_VERSION%%/encodings/gbk.py
+lib/%%PYTHON_VERSION%%/encodings/gbk.pyc
+lib/%%PYTHON_VERSION%%/encodings/gbk.pyo
 lib/%%PYTHON_VERSION%%/encodings/hex_codec.py
 lib/%%PYTHON_VERSION%%/encodings/hex_codec.pyc
 lib/%%PYTHON_VERSION%%/encodings/hex_codec.pyo
+lib/%%PYTHON_VERSION%%/encodings/hz.py
+lib/%%PYTHON_VERSION%%/encodings/hz.pyc
+lib/%%PYTHON_VERSION%%/encodings/hz.pyo
 lib/%%PYTHON_VERSION%%/encodings/idna.py
 lib/%%PYTHON_VERSION%%/encodings/idna.pyc
 lib/%%PYTHON_VERSION%%/encodings/idna.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_1.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_1.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_1.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_2.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_3.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_3.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_3.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_ext.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_ext.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_jp_ext.pyo
+lib/%%PYTHON_VERSION%%/encodings/iso2022_kr.py
+lib/%%PYTHON_VERSION%%/encodings/iso2022_kr.pyc
+lib/%%PYTHON_VERSION%%/encodings/iso2022_kr.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_1.pyo
@@ -782,6 +834,9 @@ lib/%%PYTHON_VERSION%%/encodings/iso8859_8.pyo
 lib/%%PYTHON_VERSION%%/encodings/iso8859_9.py
 lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyc
 lib/%%PYTHON_VERSION%%/encodings/iso8859_9.pyo
+lib/%%PYTHON_VERSION%%/encodings/johab.py
+lib/%%PYTHON_VERSION%%/encodings/johab.pyc
+lib/%%PYTHON_VERSION%%/encodings/johab.pyo
 lib/%%PYTHON_VERSION%%/encodings/koi8_r.py
 lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyc
 lib/%%PYTHON_VERSION%%/encodings/koi8_r.pyo
@@ -827,6 +882,12 @@ lib/%%PYTHON_VERSION%%/encodings/raw_unicode_escape.pyo
 lib/%%PYTHON_VERSION%%/encodings/rot_13.py
 lib/%%PYTHON_VERSION%%/encodings/rot_13.pyc
 lib/%%PYTHON_VERSION%%/encodings/rot_13.pyo
+lib/%%PYTHON_VERSION%%/encodings/shift_jis.py
+lib/%%PYTHON_VERSION%%/encodings/shift_jis.pyc
+lib/%%PYTHON_VERSION%%/encodings/shift_jis.pyo
+lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.py
+lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyc
+lib/%%PYTHON_VERSION%%/encodings/shift_jisx0213.pyo
 lib/%%PYTHON_VERSION%%/encodings/string_escape.py
 lib/%%PYTHON_VERSION%%/encodings/string_escape.pyc
 lib/%%PYTHON_VERSION%%/encodings/string_escape.pyo
@@ -1119,11 +1180,36 @@ lib/%%PYTHON_VERSION%%/keyword.py
 lib/%%PYTHON_VERSION%%/keyword.pyc
 lib/%%PYTHON_VERSION%%/keyword.pyo
 lib/%%PYTHON_VERSION%%/lib-dynload/_bisect.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_big5.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_cp932.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_cp949.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_cp950.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_euc_jisx0213.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_euc_jp.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_euc_kr.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_gb18030.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_gb2312.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_gbk.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_hz.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_iso2022_jp.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_iso2022_jp_1.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_iso2022_jp_2.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_iso2022_jp_3.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_iso2022_jp_ext.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_iso2022_kr.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_johab.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_mapdata_ja_JP.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_mapdata_ko_KR.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_mapdata_zh_CN.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_mapdata_zh_TW.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jis.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_codecs_shift_jisx0213.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_csv.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_curses.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_curses_panel.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_hotshot.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_locale.so
+lib/%%PYTHON_VERSION%%/lib-dynload/_multibytecodec.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_random.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_socket.so
 lib/%%PYTHON_VERSION%%/lib-dynload/_ssl.so
@@ -1137,6 +1223,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/bz2.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cPickle.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cStringIO.so
 lib/%%PYTHON_VERSION%%/lib-dynload/cmath.so
+lib/%%PYTHON_VERSION%%/lib-dynload/collections.so
 lib/%%PYTHON_VERSION%%/lib-dynload/crypt.so
 lib/%%PYTHON_VERSION%%/lib-dynload/datetime.so
 lib/%%PYTHON_VERSION%%/lib-dynload/dbm.so
@@ -1151,6 +1238,7 @@ lib/%%PYTHON_VERSION%%/lib-dynload/md5.so
 lib/%%PYTHON_VERSION%%/lib-dynload/mmap.so
 lib/%%PYTHON_VERSION%%/lib-dynload/nis.so
 lib/%%PYTHON_VERSION%%/lib-dynload/operator.so
+%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so
 lib/%%PYTHON_VERSION%%/lib-dynload/parser.so
 lib/%%PYTHON_VERSION%%/lib-dynload/pcre.so
 lib/%%PYTHON_VERSION%%/lib-dynload/pwd.so
@@ -1159,7 +1247,6 @@ lib/%%PYTHON_VERSION%%/lib-dynload/readline.so
 lib/%%PYTHON_VERSION%%/lib-dynload/regex.so
 lib/%%PYTHON_VERSION%%/lib-dynload/resource.so
 %%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/rgbimg.so
-%%X86_ONLY%%lib/%%PYTHON_VERSION%%/lib-dynload/ossaudiodev.so
 lib/%%PYTHON_VERSION%%/lib-dynload/rotor.so
 lib/%%PYTHON_VERSION%%/lib-dynload/select.so
 lib/%%PYTHON_VERSION%%/lib-dynload/sha.so
@@ -1571,6 +1658,9 @@ lib/%%PYTHON_VERSION%%/test/badsyntax_future7.py
 lib/%%PYTHON_VERSION%%/test/badsyntax_future8.py
 lib/%%PYTHON_VERSION%%/test/badsyntax_future9.py
 lib/%%PYTHON_VERSION%%/test/badsyntax_nocaret.py
+lib/%%PYTHON_VERSION%%/test/cjkencodings_test.py
+lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyc
+lib/%%PYTHON_VERSION%%/test/cjkencodings_test.pyo
 lib/%%PYTHON_VERSION%%/test/double_const.py
 lib/%%PYTHON_VERSION%%/test/double_const.pyc
 lib/%%PYTHON_VERSION%%/test/double_const.pyo
@@ -1770,6 +1860,30 @@ lib/%%PYTHON_VERSION%%/test/test_cmath.pyo
 lib/%%PYTHON_VERSION%%/test/test_codeccallbacks.py
 lib/%%PYTHON_VERSION%%/test/test_codeccallbacks.pyc
 lib/%%PYTHON_VERSION%%/test/test_codeccallbacks.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_cn.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_cn.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_cn.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_jp.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_jp.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_jp.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_kr.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_kr.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_kr.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_tw.py
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_tw.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecencodings_tw.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_cn.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_cn.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_cn.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_jp.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_jp.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_jp.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_kr.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_kr.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_kr.pyo
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_tw.py
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_tw.pyc
+lib/%%PYTHON_VERSION%%/test/test_codecmaps_tw.pyo
 lib/%%PYTHON_VERSION%%/test/test_codecs.py
 lib/%%PYTHON_VERSION%%/test/test_codecs.pyc
 lib/%%PYTHON_VERSION%%/test/test_codecs.pyo
@@ -1821,6 +1935,9 @@ lib/%%PYTHON_VERSION%%/test/test_datetime.pyo
 lib/%%PYTHON_VERSION%%/test/test_dbm.py
 lib/%%PYTHON_VERSION%%/test/test_dbm.pyc
 lib/%%PYTHON_VERSION%%/test/test_dbm.pyo
+lib/%%PYTHON_VERSION%%/test/test_deque.py
+lib/%%PYTHON_VERSION%%/test/test_deque.pyc
+lib/%%PYTHON_VERSION%%/test/test_deque.pyo
 lib/%%PYTHON_VERSION%%/test/test_descr.py
 lib/%%PYTHON_VERSION%%/test/test_descr.pyc
 lib/%%PYTHON_VERSION%%/test/test_descr.pyo
@@ -2079,6 +2196,12 @@ lib/%%PYTHON_VERSION%%/test/test_module.pyo
 lib/%%PYTHON_VERSION%%/test/test_mpz.py
 lib/%%PYTHON_VERSION%%/test/test_mpz.pyc
 lib/%%PYTHON_VERSION%%/test/test_mpz.pyo
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec.py
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyc
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec.pyo
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec_support.py
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec_support.pyc
+lib/%%PYTHON_VERSION%%/test/test_multibytecodec_support.pyo
 lib/%%PYTHON_VERSION%%/test/test_multifile.py
 lib/%%PYTHON_VERSION%%/test/test_multifile.pyc
 lib/%%PYTHON_VERSION%%/test/test_multifile.pyo
@@ -2322,6 +2445,9 @@ lib/%%PYTHON_VERSION%%/test/test_sys.pyo
 lib/%%PYTHON_VERSION%%/test/test_tarfile.py
 lib/%%PYTHON_VERSION%%/test/test_tarfile.pyc
 lib/%%PYTHON_VERSION%%/test/test_tarfile.pyo
+lib/%%PYTHON_VERSION%%/test/test_tcl.py
+lib/%%PYTHON_VERSION%%/test/test_tcl.pyc
+lib/%%PYTHON_VERSION%%/test/test_tcl.pyo
 lib/%%PYTHON_VERSION%%/test/test_tempfile.py
 lib/%%PYTHON_VERSION%%/test/test_tempfile.pyc
 lib/%%PYTHON_VERSION%%/test/test_tempfile.pyo
@@ -2985,6 +3111,7 @@ lib/%%PYTHON_VERSION%%/zipfile.pyo
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/google.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/gprof2html.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/h2py.py
+%%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/hotshotmain.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/idle
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/ifdef.py
 %%PORTDOCS%%share/%%PYTHON_VERSION%%/Tools/scripts/lfcr.py