4 files changed, 87 insertions, 4 deletions

diff --git a/lang/python32/Makefile b/lang/python32/Makefile
index b9dfc6acf9d9..0b50aca18c5f 100644
--- a/lang/python32/Makefile
+++ b/lang/python32/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	python32
-PORTVERSION=	3.2.3
-PORTREVISION=	2
+PORTVERSION=	3.2.4
 CATEGORIES=	lang python ipv6
 MASTER_SITES=	PYTHON
 MASTER_SITE_SUBDIR=	${PYTHON_MASTER_SITE_SUBDIR}
diff --git a/lang/python32/distinfo b/lang/python32/distinfo
index 043ed0ebe068..e3678bd2d39b 100644
--- a/lang/python32/distinfo
+++ b/lang/python32/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/Python-3.2.3.tar.xz) = 23c16f621f21e54987079765c060196cbe50235c7867147c6126d433054b1754
-SIZE (python/Python-3.2.3.tar.xz) = 8970368
+SHA256 (python/Python-3.2.4.tar.xz) = 0949d92d04f001e51cc0daa4c0e9861f65af94e378ff0e664c239cc78c206ef4
+SIZE (python/Python-3.2.4.tar.xz) = 9223024
diff --git a/lang/python32/files/patch-Makefile.pre.in b/lang/python32/files/patch-Makefile.pre.in
new file mode 100644
index 000000000000..500fb5a736e8
--- /dev/null
+++ b/lang/python32/files/patch-Makefile.pre.in
@@ -0,0 +1,46 @@
+--- ./Makefile.pre.in.orig	2013-04-06 11:38:41.000000000 +0400
++++ ./Makefile.pre.in	2013-04-08 17:48:45.000000000 +0400
+@@ -277,21 +277,21 @@
+ 
+ ##########################################################################
+ # AST
+-AST_H_DIR=	Include
++AST_H_DIR=	$(srcdir)/Include
+ AST_H=		$(AST_H_DIR)/Python-ast.h
+-AST_C_DIR=	Python
++AST_C_DIR=	$(srcdir)/Python
+ AST_C=		$(AST_C_DIR)/Python-ast.c
+ AST_ASDL=	$(srcdir)/Parser/Python.asdl
+ 
+ ASDLGEN_FILES=	$(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py
+ # XXX Note that a build now requires Python exist before the build starts
+-ASDLGEN=	@ASDLGEN@ $(srcdir)/Parser/asdl_c.py
++ASDLGEN=	@DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py
+ 
+ ##########################################################################
+ # Python
+ 
+ OPCODETARGETS_H= \
+-		Python/opcode_targets.h
++		$(srcdir)/Python/opcode_targets.h
+ 
+ OPCODETARGETGEN= \
+ 		$(srcdir)/Python/makeopcodetargets.py
+@@ -676,7 +676,7 @@
+ Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h
+ 
+ $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
+-	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
++#	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
+ 
+ Python/ceval.o: $(OPCODETARGETS_H) Python/ceval_gil.h
+ 
+@@ -686,7 +686,7 @@
+ 
+ Objects/typeobject.o: Objects/typeslots.inc
+ Objects/typeslots.inc: $(srcdir)/Include/typeslots.h $(srcdir)/Objects/typeslots.py
+-	$(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc
++#	$(PYTHON) $(srcdir)/Objects/typeslots.py < $(srcdir)/Include/typeslots.h > Objects/typeslots.inc
+ 
+ ############################################################################
+ # Header files
diff --git a/lang/python32/pkg-plist b/lang/python32/pkg-plist
index 9920aeccb690..5f61780fb49b 100644
--- a/lang/python32/pkg-plist
+++ b/lang/python32/pkg-plist
@@ -128,6 +128,8 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/__pycache__/_dummy_thread.cpython-32.pyo
 %%PYTHON_LIBDIR%%/__pycache__/_markupbase.cpython-32.pyc
 %%PYTHON_LIBDIR%%/__pycache__/_markupbase.cpython-32.pyo
+%%PYTHON_LIBDIR%%/__pycache__/_osx_support.cpython-32.pyc
+%%PYTHON_LIBDIR%%/__pycache__/_osx_support.cpython-32.pyo
 %%PYTHON_LIBDIR%%/__pycache__/_pyio.cpython-32.pyc
 %%PYTHON_LIBDIR%%/__pycache__/_pyio.cpython-32.pyo
 %%PYTHON_LIBDIR%%/__pycache__/_strptime.cpython-32.pyc
@@ -422,6 +424,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/_compat_pickle.py
 %%PYTHON_LIBDIR%%/_dummy_thread.py
 %%PYTHON_LIBDIR%%/_markupbase.py
+%%PYTHON_LIBDIR%%/_osx_support.py
 %%PYTHON_LIBDIR%%/_pyio.py
 %%PYTHON_LIBDIR%%/_strptime.py
 %%PYTHON_LIBDIR%%/_threading_local.py
@@ -2421,6 +2424,8 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/__pycache__/mapping_tests.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/mock_socket.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/mock_socket.cpython-32.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/mp_fork_bomb.cpython-32.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/mp_fork_bomb.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/outstanding_bugs.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/outstanding_bugs.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/pickletester.cpython-32.pyc
@@ -2445,6 +2450,10 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/__pycache__/reperf.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest.cpython-32.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_docstrings.cpython-32.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_docstrings.cpython-32.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_doctests.cpython-32.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/sample_doctest_no_doctests.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/script_helper.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/script_helper.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/seq_tests.cpython-32.pyc
@@ -2463,6 +2472,8 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/__pycache__/test___future__.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test__locale.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test__locale.cpython-32.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/test__osx_support.cpython-32.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/test__osx_support.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_abc.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_abc.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_abstract_numbers.cpython-32.pyc
@@ -2667,6 +2678,8 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_fileinput.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_fileio.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_fileio.cpython-32.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/test_file_eintr.cpython-32.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/test_file_eintr.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_float.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_float.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_flufl.cpython-32.pyc
@@ -3071,6 +3084,8 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_tk.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_tokenize.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_tokenize.cpython-32.pyo
+%%PYTHON_LIBDIR%%/test/__pycache__/test_tools.cpython-32.pyc
+%%PYTHON_LIBDIR%%/test/__pycache__/test_tools.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_trace.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/__pycache__/test_trace.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/__pycache__/test_traceback.cpython-32.pyc
@@ -3435,6 +3450,8 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_separators.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_speedups.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_speedups.cpython-32.pyo
+%%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_tool.cpython-32.pyc
+%%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_tool.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_unicode.cpython-32.pyc
 %%PYTHON_LIBDIR%%/test/json_tests/__pycache__/test_unicode.cpython-32.pyo
 %%PYTHON_LIBDIR%%/test/json_tests/test_decode.py
@@ -3451,6 +3468,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/json_tests/test_scanstring.py
 %%PYTHON_LIBDIR%%/test/json_tests/test_separators.py
 %%PYTHON_LIBDIR%%/test/json_tests/test_speedups.py
+%%PYTHON_LIBDIR%%/test/json_tests/test_tool.py
 %%PYTHON_LIBDIR%%/test/json_tests/test_unicode.py
 %%PYTHON_LIBDIR%%/test/keycert.pem
 %%PYTHON_LIBDIR%%/test/keycert2.pem
@@ -3460,6 +3478,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/mapping_tests.py
 %%PYTHON_LIBDIR%%/test/math_testcases.txt
 %%PYTHON_LIBDIR%%/test/mock_socket.py
+%%PYTHON_LIBDIR%%/test/mp_fork_bomb.py
 %%PYTHON_LIBDIR%%/test/nullcert.pem
 %%PYTHON_LIBDIR%%/test/outstanding_bugs.py
 %%PYTHON_LIBDIR%%/test/pickletester.py
@@ -3477,10 +3496,21 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/relimport.py
 %%PYTHON_LIBDIR%%/test/reperf.py
 %%PYTHON_LIBDIR%%/test/sample_doctest.py
+%%PYTHON_LIBDIR%%/test/sample_doctest_no_docstrings.py
+%%PYTHON_LIBDIR%%/test/sample_doctest_no_doctests.py
 %%PYTHON_LIBDIR%%/test/script_helper.py
 %%PYTHON_LIBDIR%%/test/seq_tests.py
 %%PYTHON_LIBDIR%%/test/sgml_input.html
 %%PYTHON_LIBDIR%%/test/sha256.pem
+%%PYTHON_LIBDIR%%/test/sndhdrdata/README
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.8svx
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.aifc
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.aiff
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.au
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.hcom
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.sndt
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.voc
+%%PYTHON_LIBDIR%%/test/sndhdrdata/sndhdr.wav
 %%PYTHON_LIBDIR%%/test/sortperf.py
 %%PYTHON_LIBDIR%%/test/ssl_cert.pem
 %%PYTHON_LIBDIR%%/test/ssl_key.pem
@@ -3508,6 +3538,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/test___all__.py
 %%PYTHON_LIBDIR%%/test/test___future__.py
 %%PYTHON_LIBDIR%%/test/test__locale.py
+%%PYTHON_LIBDIR%%/test/test__osx_support.py
 %%PYTHON_LIBDIR%%/test/test_abc.py
 %%PYTHON_LIBDIR%%/test/test_abstract_numbers.py
 %%PYTHON_LIBDIR%%/test/test_aifc.py
@@ -3615,6 +3646,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/test_filecmp.py
 %%PYTHON_LIBDIR%%/test/test_fileinput.py
 %%PYTHON_LIBDIR%%/test/test_fileio.py
+%%PYTHON_LIBDIR%%/test/test_file_eintr.py
 %%PYTHON_LIBDIR%%/test/test_float.py
 %%PYTHON_LIBDIR%%/test/test_flufl.py
 %%PYTHON_LIBDIR%%/test/test_fnmatch.py
@@ -3816,6 +3848,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/test_timeout.py
 %%PYTHON_LIBDIR%%/test/test_tk.py
 %%PYTHON_LIBDIR%%/test/test_tokenize.py
+%%PYTHON_LIBDIR%%/test/test_tools.py
 %%PYTHON_LIBDIR%%/test/test_trace.py
 %%PYTHON_LIBDIR%%/test/test_traceback.py
 %%PYTHON_LIBDIR%%/test/test_ttk_guionly.py
@@ -3864,6 +3897,7 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/test/test_zipimport.py
 %%PYTHON_LIBDIR%%/test/test_zipimport_support.py
 %%PYTHON_LIBDIR%%/test/test_zlib.py
+%%PYTHON_LIBDIR%%/test/testbz2_bigmem.bz2
 %%PYTHON_LIBDIR%%/test/testcodec.py
 %%PYTHON_LIBDIR%%/test/testtar.tar
 %%PYTHON_LIBDIR%%/test/tf_inherit_check.py
@@ -3953,10 +3987,13 @@ libdata/pkgconfig/python-3.2.pc
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_font.cpython-32.pyo
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_loadtk.cpython-32.pyc
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_loadtk.cpython-32.pyo
+%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_misc.cpython-32.pyc
+%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_misc.cpython-32.pyo
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_text.cpython-32.pyc
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/__pycache__/test_text.cpython-32.pyo
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_font.py
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_loadtk.py
+%%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_misc.py
 %%PYTHON_LIBDIR%%/tkinter/test/test_tkinter/test_text.py
 %%PYTHON_LIBDIR%%/tkinter/test/test_ttk/__init__.py
 %%PYTHON_LIBDIR%%/tkinter/test/test_ttk/__pycache__/__init__.cpython-32.pyc
@@ -4346,6 +4383,7 @@ libdata/pkgconfig/python-3.2.pc
 @dirrm %%PYTHON_LIBDIR%%/test/encoded_modules
 @dirrm %%PYTHON_LIBDIR%%/test/json_tests/__pycache__
 @dirrm %%PYTHON_LIBDIR%%/test/json_tests
+@dirrm %%PYTHON_LIBDIR%%/test/sndhdrdata
 @dirrm %%PYTHON_LIBDIR%%/test/subprocessdata/__pycache__
 @dirrm %%PYTHON_LIBDIR%%/test/subprocessdata
 @dirrm %%PYTHON_LIBDIR%%/test/tracedmodules/__pycache__