Update to 3.3.2:

3.3.2

This release fixes a few regressions found in Python 3.3.1.
Complete list at
http://docs.python.org/release/3.3.2/whatsnew/changelog.html

3.3.1

This is a 3.3 series bugfix release. It includes hundreds of bugfixes
over 3.3.0.

Complete list at
http://docs.python.org/release/3.3.1/whatsnew/changelog.html

7 files changed, 73 insertions, 50 deletions

diff --git a/lang/python33/Makefile b/lang/python33/Makefile
index 9d363a9a8e3..aa5c61a173b 100644
--- a/lang/python33/Makefile
+++ b/lang/python33/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2013/02/06 23:22:38 jperkin Exp $
+# $NetBSD: Makefile,v 1.7 2013/05/26 17:56:09 wiz Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python33-${PY_DISTVERSION}
-PKGREVISION=	2
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/lang/python33/PLIST b/lang/python33/PLIST
index 428884b8f87..01e6f149f21 100644
--- a/lang/python33/PLIST
+++ b/lang/python33/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/11 00:16:56 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2013/05/26 17:56:09 wiz Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -98,8 +98,8 @@ include/python${PY_VER_SUFFIX}/ucnhash.h
 include/python${PY_VER_SUFFIX}/unicodeobject.h
 include/python${PY_VER_SUFFIX}/warnings.h
 include/python${PY_VER_SUFFIX}/weakrefobject.h
-lib/libpython${PY_VER_SUFFIX}.so.1.0
 lib/libpython${PY_VER_SUFFIX}.so
+lib/libpython${PY_VER_SUFFIX}.so.1.0
 lib/libpython3.so
 lib/pkgconfig/python-${PY_VER_SUFFIX}.pc
 lib/python${PY_VER_SUFFIX}/LICENSE.txt
@@ -623,6 +623,8 @@ lib/python${PY_VER_SUFFIX}/ctypes/test/__pycache__/test_varsize_struct.cpython-3
 lib/python${PY_VER_SUFFIX}/ctypes/test/__pycache__/test_varsize_struct.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/ctypes/test/__pycache__/test_win32.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/ctypes/test/__pycache__/test_win32.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/ctypes/test/__pycache__/test_wintypes.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/ctypes/test/__pycache__/test_wintypes.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/ctypes/test/runtests.py
 lib/python${PY_VER_SUFFIX}/ctypes/test/test_anon.py
 lib/python${PY_VER_SUFFIX}/ctypes/test/test_array_in_pointer.py
@@ -676,6 +678,7 @@ lib/python${PY_VER_SUFFIX}/ctypes/test/test_unicode.py
 lib/python${PY_VER_SUFFIX}/ctypes/test/test_values.py
 lib/python${PY_VER_SUFFIX}/ctypes/test/test_varsize_struct.py
 lib/python${PY_VER_SUFFIX}/ctypes/test/test_win32.py
+lib/python${PY_VER_SUFFIX}/ctypes/test/test_wintypes.py
 lib/python${PY_VER_SUFFIX}/ctypes/util.py
 lib/python${PY_VER_SUFFIX}/ctypes/wintypes.py
 lib/python${PY_VER_SUFFIX}/curses/__init__.py
@@ -2286,6 +2289,10 @@ lib/python${PY_VER_SUFFIX}/test/__pycache__/reperf.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/reperf.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/sample_doctest.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/sample_doctest.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/test/__pycache__/sample_doctest_no_docstrings.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/test/__pycache__/sample_doctest_no_docstrings.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/test/__pycache__/sample_doctest_no_doctests.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/test/__pycache__/sample_doctest_no_doctests.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/script_helper.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/script_helper.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/seq_tests.cpython-33.pyc
@@ -3006,6 +3013,8 @@ lib/python${PY_VER_SUFFIX}/test/__pycache__/test_weakref.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_weakref.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_weakset.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_weakset.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/test/__pycache__/test_webbrowser.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/test/__pycache__/test_webbrowser.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_winreg.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_winreg.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_winsound.cpython-33.pyc
@@ -3016,6 +3025,8 @@ lib/python${PY_VER_SUFFIX}/test/__pycache__/test_wsgiref.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_wsgiref.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_xdrlib.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_xdrlib.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/test/__pycache__/test_xml_dom_minicompat.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/test/__pycache__/test_xml_dom_minicompat.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_xml_etree.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_xml_etree.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/__pycache__/test_xml_etree_c.cpython-33.pyc
@@ -3305,6 +3316,8 @@ lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_separators.cpython-3
 lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_separators.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_speedups.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_speedups.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_tool.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_tool.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_unicode.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/json_tests/__pycache__/test_unicode.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/json_tests/test_decode.py
@@ -3321,6 +3334,7 @@ lib/python${PY_VER_SUFFIX}/test/json_tests/test_recursion.py
 lib/python${PY_VER_SUFFIX}/test/json_tests/test_scanstring.py
 lib/python${PY_VER_SUFFIX}/test/json_tests/test_separators.py
 lib/python${PY_VER_SUFFIX}/test/json_tests/test_speedups.py
+lib/python${PY_VER_SUFFIX}/test/json_tests/test_tool.py
 lib/python${PY_VER_SUFFIX}/test/json_tests/test_unicode.py
 lib/python${PY_VER_SUFFIX}/test/keycert.passwd.pem
 lib/python${PY_VER_SUFFIX}/test/keycert.pem
@@ -3388,6 +3402,8 @@ lib/python${PY_VER_SUFFIX}/test/regrtest.py
 lib/python${PY_VER_SUFFIX}/test/relimport.py
 lib/python${PY_VER_SUFFIX}/test/reperf.py
 lib/python${PY_VER_SUFFIX}/test/sample_doctest.py
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_docstrings.py
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.py
 lib/python${PY_VER_SUFFIX}/test/script_helper.py
 lib/python${PY_VER_SUFFIX}/test/seq_tests.py
 lib/python${PY_VER_SUFFIX}/test/sgml_input.html
@@ -3546,6 +3562,8 @@ lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_generator.cpython-33
 lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_generator.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_headerregistry.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_headerregistry.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_inversion.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_inversion.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_message.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_message.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/test/test_email/__pycache__/test_parser.cpython-33.pyc
@@ -3614,6 +3632,7 @@ lib/python${PY_VER_SUFFIX}/test/test_email/test_defect_handling.py
 lib/python${PY_VER_SUFFIX}/test/test_email/test_email.py
 lib/python${PY_VER_SUFFIX}/test/test_email/test_generator.py
 lib/python${PY_VER_SUFFIX}/test/test_email/test_headerregistry.py
+lib/python${PY_VER_SUFFIX}/test/test_email/test_inversion.py
 lib/python${PY_VER_SUFFIX}/test/test_email/test_message.py
 lib/python${PY_VER_SUFFIX}/test/test_email/test_parser.py
 lib/python${PY_VER_SUFFIX}/test/test_email/test_pickleable.py
@@ -3996,11 +4015,13 @@ lib/python${PY_VER_SUFFIX}/test/test_warnings.py
 lib/python${PY_VER_SUFFIX}/test/test_wave.py
 lib/python${PY_VER_SUFFIX}/test/test_weakref.py
 lib/python${PY_VER_SUFFIX}/test/test_weakset.py
+lib/python${PY_VER_SUFFIX}/test/test_webbrowser.py
 lib/python${PY_VER_SUFFIX}/test/test_winreg.py
 lib/python${PY_VER_SUFFIX}/test/test_winsound.py
 lib/python${PY_VER_SUFFIX}/test/test_with.py
 lib/python${PY_VER_SUFFIX}/test/test_wsgiref.py
 lib/python${PY_VER_SUFFIX}/test/test_xdrlib.py
+lib/python${PY_VER_SUFFIX}/test/test_xml_dom_minicompat.py
 lib/python${PY_VER_SUFFIX}/test/test_xml_etree.py
 lib/python${PY_VER_SUFFIX}/test/test_xml_etree_c.py
 lib/python${PY_VER_SUFFIX}/test/test_xmlrpc.py
@@ -4099,12 +4120,15 @@ lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_font.cpyth
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_font.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_loadtk.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_loadtk.cpython-33.pyo
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_misc.cpython-33.pyc
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_misc.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_text.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_text.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyc
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/__pycache__/test_variables.cpython-33.pyo
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_font.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_loadtk.py
+lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_misc.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_text.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_tkinter/test_variables.py
 lib/python${PY_VER_SUFFIX}/tkinter/test/test_ttk/__init__.py
diff --git a/lang/python33/dist.mk b/lang/python33/dist.mk
index 5ff98ef9b6d..e550b1fa238 100644
--- a/lang/python33/dist.mk
+++ b/lang/python33/dist.mk
@@ -1,6 +1,6 @@
-# $NetBSD: dist.mk,v 1.1 2012/12/10 03:15:48 tsarna Exp $
+# $NetBSD: dist.mk,v 1.2 2013/05/26 17:56:09 wiz Exp $
 
-PY_DISTVERSION=	3.3.0
+PY_DISTVERSION=	3.3.2
 DISTNAME=	Python-${PY_DISTVERSION}
 EXTRACT_SUFX=	.tar.bz2
 DISTINFO_FILE=	${.CURDIR}/../../lang/python33/distinfo
diff --git a/lang/python33/distinfo b/lang/python33/distinfo
index 187289ca317..5f85d3c9605 100644
--- a/lang/python33/distinfo
+++ b/lang/python33/distinfo
@@ -1,16 +1,16 @@
-$NetBSD: distinfo,v 1.2 2012/12/13 18:13:59 jperkin Exp $
+$NetBSD: distinfo,v 1.3 2013/05/26 17:56:09 wiz Exp $
 
-SHA1 (Python-3.3.0.tar.bz2) = 3e1464bc2c1dfa74287bc58da81168f50b0ae5c7
-RMD160 (Python-3.3.0.tar.bz2) = f48265da6491e611056e27bca76565d6e6235770
-Size (Python-3.3.0.tar.bz2) = 13781940 bytes
+SHA1 (Python-3.3.2.tar.bz2) = b28c36a9752b690059dc6df4fb9b4ec9d6c5708a
+RMD160 (Python-3.3.2.tar.bz2) = 7383734cbbd9e15b5d883063e1266abf368fd8e4
+Size (Python-3.3.2.tar.bz2) = 13983134 bytes
 SHA1 (patch-aa) = 99ebcbbfc53b855a32b424dec27012e1e969c3d0
 SHA1 (patch-ab) = 1c0a25bf7ec6ee76e84c799619ec7cd8910f16e1
 SHA1 (patch-ah) = bb43aaab260935a5a0d5e7ce1ccc30f4832cab1d
-SHA1 (patch-al) = 6265d71b7cb5bc6c09ed7f516ef804f5f447cd21
-SHA1 (patch-am) = 25abfb3db95aa10d21a57fbe7ac99595267cabb8
+SHA1 (patch-al) = e5438d1bbc20cc85521b3570710846cf4a070ae1
+SHA1 (patch-am) = a0ed54881b1fbb17fdf7483ef484486aebc2c016
 SHA1 (patch-an) = 933acde107b735931d26ace4eef251000b9f07ba
 SHA1 (patch-ao) = dc524b08634c23c25227bd03e221dab0ff2a03f3
-SHA1 (patch-au) = e70683340e788cdd2a2d0395c22bb11ca426ca0a
+SHA1 (patch-au) = c892f1004eb32e9608f93c08ec6f94e16bdca182
 SHA1 (patch-av) = 9b44f339f65f029b7f17dbc654739a7ae3c12780
 SHA1 (patch-aw) = 598e4710c426110012048946786a6d72f050e0fc
 SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c
diff --git a/lang/python33/patches/patch-al b/lang/python33/patches/patch-al
index 7b8191466bd..96bb737f515 100644
--- a/lang/python33/patches/patch-al
+++ b/lang/python33/patches/patch-al
@@ -1,8 +1,8 @@
-$NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
+$NetBSD: patch-al,v 1.2 2013/05/26 17:56:09 wiz Exp $
 
---- configure.orig	2012-04-11 06:54:08.000000000 +0000
+--- configure.orig	2013-05-15 16:33:00.000000000 +0000
 +++ configure
-@@ -3020,7 +3020,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3332,7 +3332,7 @@ case $ac_sys_system/$ac_sys_release in
    # Reconfirmed for OpenBSD 3.3 by Zachary Hamm, for 3.4 by Jason Ish.
    # In addition, Stefan Krah confirms that issue #1244610 exists through
    # OpenBSD 4.6, but is fixed in 4.7.
@@ -11,7 +11,7 @@ $NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
      define_xopen_source=no
      # OpenBSD undoes our definition of __BSD_VISIBLE if _XOPEN_SOURCE is
      # also defined. This can be overridden by defining _BSD_SOURCE
-@@ -4959,15 +4959,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5594,15 +5594,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  	      PY3LIBRARY=libpython3.so
  	  fi
            ;;
@@ -28,7 +28,7 @@ $NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  if test "$with_pydebug" != yes
            then
-@@ -7626,8 +7621,8 @@ then
+@@ -8465,8 +8460,8 @@ then
  			LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -39,7 +39,7 @@ $NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  			LDCXXSHARED="$LDCXXSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
  		fi ;;
  	Darwin/*)
-@@ -7652,9 +7647,9 @@ then
+@@ -8491,9 +8486,9 @@ then
  				LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -52,7 +52,7 @@ $NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  			fi
  		fi
  		;;
-@@ -7688,9 +7683,15 @@ then
+@@ -8527,9 +8522,15 @@ then
  				   ;;
  				esac
  		fi;;
@@ -68,7 +68,7 @@ $NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes" ; then
  			LDSHARED='$(CC) -shared'
-@@ -7731,7 +7732,8 @@ then
+@@ -8570,7 +8571,8 @@ then
  		 fi;;
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
@@ -78,7 +78,7 @@ $NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -7774,11 +7776,12 @@ then
+@@ -8613,11 +8615,12 @@ then
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
@@ -92,12 +92,12 @@ $NetBSD: patch-al,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  	SunOS/5*) case $CC in
  		  *gcc*)
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
-@@ -12738,8 +12741,6 @@ then
- 		esac
- 		;;
- 	CYGWIN*)   SO=.dll;;
--	Linux*|GNU*)
--		   SO=.${SOABI}.so;;
- 	*)	   SO=.so;;
- 	esac
- else
+@@ -13707,8 +13710,6 @@ $as_echo "$SOABI" >&6; }
+ 
+ 
+ case $ac_sys_system in
+-    Linux*|GNU*)
+-	EXT_SUFFIX=.${SOABI}${SHLIB_SUFFIX};;
+     *)
+ 	EXT_SUFFIX=${SHLIB_SUFFIX};;
+ esac
diff --git a/lang/python33/patches/patch-am b/lang/python33/patches/patch-am
index 50ccb355b97..512fa8de92a 100644
--- a/lang/python33/patches/patch-am
+++ b/lang/python33/patches/patch-am
@@ -1,8 +1,8 @@
-$NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
+$NetBSD: patch-am,v 1.3 2013/05/26 17:56:09 wiz Exp $
 
---- setup.py.orig	2012-09-29 04:00:50.000000000 -0400
-+++ setup.py	2012-12-09 19:06:51.000000000 -0500
-@@ -31,7 +31,8 @@
+--- setup.py.orig	2013-05-15 16:33:00.000000000 +0000
++++ setup.py
+@@ -31,7 +31,8 @@ host_platform = get_platform()
  COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS"))
  
  # This global variable is used to hold the list of modules to be disabled.
@@ -10,9 +10,9 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
 +disabled_module_list = ["_bsddb", "_curses", "_curses_panel", "_elementtree",
 +"_sqlite3", "_tkinter", "_gdbm", "pyexpat", "readline", "xxlimited"]
  
- # File which contains the directory for shared mods (for sys.path fixup
- # when running from the build dir, see Modules/getpath.c)
-@@ -455,15 +456,15 @@
+ def add_dir_to_list(dirlist, dir):
+     """Add the directory 'dir' to the list 'dirlist' (after any relative
+@@ -435,15 +436,15 @@ class PyBuildExt(build_ext):
              os.unlink(tmpfile)
  
      def detect_modules(self):
@@ -37,7 +37,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
          self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -770,9 +771,7 @@
+@@ -753,9 +754,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -48,7 +48,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -1155,6 +1154,30 @@
+@@ -1138,6 +1137,30 @@ class PyBuildExt(build_ext):
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
          if host_platform not in ['cygwin']:
@@ -79,7 +79,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1166,7 +1189,7 @@
+@@ -1149,7 +1172,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
@@ -88,7 +88,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
                          # Some systems have -lndbm, others have -lgdbm_compat,
                          # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-@@ -1476,6 +1499,14 @@
+@@ -1475,6 +1498,14 @@ class PyBuildExt(build_ext):
              macros = dict()
              libraries = []
  
@@ -103,7 +103,7 @@ $NetBSD: patch-am,v 1.2 2012/12/13 18:13:59 jperkin Exp $
          else:                                   # Linux and other unices
              macros = dict()
              libraries = ['rt']
-@@ -2143,7 +2174,7 @@
+@@ -2155,7 +2186,7 @@ def main():
            # If you change the scripts installed here, you also need to
            # check the PyBuildScripts command above, and change the links
            # created by the bininstall target in Makefile.pre.in
diff --git a/lang/python33/patches/patch-au b/lang/python33/patches/patch-au
index ae918842f92..abf1b00af1b 100644
--- a/lang/python33/patches/patch-au
+++ b/lang/python33/patches/patch-au
@@ -1,17 +1,17 @@
-$NetBSD: patch-au,v 1.1 2012/12/10 03:15:49 tsarna Exp $
+$NetBSD: patch-au,v 1.2 2013/05/26 17:56:09 wiz Exp $
 
---- Makefile.pre.in.orig	2012-09-29 04:00:41.000000000 -0400
-+++ Makefile.pre.in	2012-12-09 18:53:09.000000000 -0500
-@@ -77,7 +77,7 @@
+--- Makefile.pre.in.orig	2013-05-15 16:32:57.000000000 +0000
++++ Makefile.pre.in
+@@ -81,7 +81,7 @@ PY_CFLAGS=	$(BASECFLAGS) $(OPT) $(CONFIG
  # be able to build extension modules using the directories specified in the
  # environment variables
- PY_CPPFLAGS=	-I. -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
+ PY_CPPFLAGS=	$(BASECPPFLAGS) -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS)
 -PY_LDFLAGS=	$(CONFIGURE_LDFLAGS) $(LDFLAGS)
 +PY_LDFLAGS=	-L. $(CONFIGURE_LDFLAGS) $(LDFLAGS)
  NO_AS_NEEDED=	@NO_AS_NEEDED@
  LDLAST=		@LDLAST@
  SGI_ABI=	@SGI_ABI@
-@@ -713,7 +713,7 @@
+@@ -744,7 +744,7 @@ Objects/setobject.o: $(srcdir)/Objects/s
  $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
  	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
  
@@ -20,7 +20,7 @@ $NetBSD: patch-au,v 1.1 2012/12/10 03:15:49 tsarna Exp $
  
  Python/formatter_unicode.o: $(srcdir)/Python/formatter_unicode.c \
  				$(BYTESTR_DEPS)
-@@ -926,7 +926,8 @@
+@@ -957,7 +957,8 @@ altbininstall: $(BUILDPYTHON)
  		if test -n "$(PY3LIBRARY)"; then \
  			$(INSTALL_SHARED) $(PY3LIBRARY) $(DESTDIR)$(LIBDIR)/$(PY3LIBRARY); \
  		fi; \