Changes 2.7.4:

This is a 2.7 series bugfix release.
It includes hundreds of bugfixes over 2.7.3.

15 files changed, 109 insertions, 308 deletions

diff --git a/lang/python27/Makefile b/lang/python27/Makefile
index 0d8ee1f878e..f299198369c 100644
--- a/lang/python27/Makefile
+++ b/lang/python27/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2013/02/08 12:23:24 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2013/04/12 09:03:41 adam Exp $
 
 .include "dist.mk"
 
 PKGNAME=	python27-${PY_DISTVERSION}
-PKGREVISION=	3
 CATEGORIES=	lang python
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -54,9 +53,9 @@ PLIST_SRC+=	${.CURDIR}/../../lang/python27/PLIST.${OPSYS}
 PLIST_SRC+=	${.CURDIR}/../../lang/python27/PLIST.common_end
 
 .if ${OPSYS} == "NetBSD"
-.if !defined(USE_DESTDIR) || empty(USE_DESTDIR:M[Yy][Ee][Ss])
+.  if !defined(USE_DESTDIR) || empty(USE_DESTDIR:M[Yy][Ee][Ss])
 PRIVILEGED_STAGES+=	clean
-.endif
+.  endif
 # XXX work around a botched autoconf check which ignores libintl
 CONFIGURE_ENV+=		ac_cv_func_bind_textdomain_codeset=yes
 .endif
diff --git a/lang/python27/PLIST.common b/lang/python27/PLIST.common
index 69c453ec6a1..5697d0d8133 100644
--- a/lang/python27/PLIST.common
+++ b/lang/python27/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.3 2012/04/13 18:47:27 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.4 2013/04/12 09:03:41 adam Exp $
 bin/2to3-${PY_VER_SUFFIX}
 bin/pydoc${PY_VER_SUFFIX}
 bin/python${PY_VER_SUFFIX}
@@ -163,6 +163,9 @@ lib/python${PY_VER_SUFFIX}/__phello__.foo.pyo
 lib/python${PY_VER_SUFFIX}/_abcoll.py
 lib/python${PY_VER_SUFFIX}/_abcoll.pyc
 lib/python${PY_VER_SUFFIX}/_abcoll.pyo
+lib/python${PY_VER_SUFFIX}/_osx_support.py
+lib/python${PY_VER_SUFFIX}/_osx_support.pyc
+lib/python${PY_VER_SUFFIX}/_osx_support.pyo
 lib/python${PY_VER_SUFFIX}/_pyio.py
 lib/python${PY_VER_SUFFIX}/_pyio.pyc
 lib/python${PY_VER_SUFFIX}/_pyio.pyo
@@ -1779,6 +1782,9 @@ lib/python${PY_VER_SUFFIX}/json/tests/test_separators.pyo
 lib/python${PY_VER_SUFFIX}/json/tests/test_speedups.py
 lib/python${PY_VER_SUFFIX}/json/tests/test_speedups.pyc
 lib/python${PY_VER_SUFFIX}/json/tests/test_speedups.pyo
+lib/python${PY_VER_SUFFIX}/json/tests/test_tool.py
+lib/python${PY_VER_SUFFIX}/json/tests/test_tool.pyc
+lib/python${PY_VER_SUFFIX}/json/tests/test_tool.pyo
 lib/python${PY_VER_SUFFIX}/json/tests/test_unicode.py
 lib/python${PY_VER_SUFFIX}/json/tests/test_unicode.pyc
 lib/python${PY_VER_SUFFIX}/json/tests/test_unicode.pyo
@@ -2799,6 +2805,9 @@ lib/python${PY_VER_SUFFIX}/test/mapping_tests.py
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/mapping_tests.pyo
 lib/python${PY_VER_SUFFIX}/test/math_testcases.txt
+lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.py
+lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyc
+lib/python${PY_VER_SUFFIX}/test/mp_fork_bomb.pyo
 lib/python${PY_VER_SUFFIX}/test/nokia.pem
 lib/python${PY_VER_SUFFIX}/test/nullcert.pem
 lib/python${PY_VER_SUFFIX}/test/outstanding_bugs.py
@@ -2840,6 +2849,12 @@ lib/python${PY_VER_SUFFIX}/test/reperf.pyo
 lib/python${PY_VER_SUFFIX}/test/sample_doctest.py
 lib/python${PY_VER_SUFFIX}/test/sample_doctest.pyc
 lib/python${PY_VER_SUFFIX}/test/sample_doctest.pyo
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_docstrings.py
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_docstrings.pyc
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_docstrings.pyo
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.py
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.pyc
+lib/python${PY_VER_SUFFIX}/test/sample_doctest_no_doctests.pyo
 lib/python${PY_VER_SUFFIX}/test/script_helper.py
 lib/python${PY_VER_SUFFIX}/test/script_helper.pyc
 lib/python${PY_VER_SUFFIX}/test/script_helper.pyo
@@ -2851,14 +2866,15 @@ lib/python${PY_VER_SUFFIX}/test/sha256.pem
 lib/python${PY_VER_SUFFIX}/test/sortperf.py
 lib/python${PY_VER_SUFFIX}/test/sortperf.pyc
 lib/python${PY_VER_SUFFIX}/test/sortperf.pyo
-lib/python${PY_VER_SUFFIX}/test/ssl_cert.pem
-lib/python${PY_VER_SUFFIX}/test/ssl_key.pem
 lib/python${PY_VER_SUFFIX}/test/string_tests.py
 lib/python${PY_VER_SUFFIX}/test/string_tests.pyc
 lib/python${PY_VER_SUFFIX}/test/string_tests.pyo
 lib/python${PY_VER_SUFFIX}/test/subprocessdata/sigchild_ignore.py
 lib/python${PY_VER_SUFFIX}/test/subprocessdata/sigchild_ignore.pyc
 lib/python${PY_VER_SUFFIX}/test/subprocessdata/sigchild_ignore.pyo
+lib/python${PY_VER_SUFFIX}/test/symlink_support.py
+lib/python${PY_VER_SUFFIX}/test/symlink_support.pyc
+lib/python${PY_VER_SUFFIX}/test/symlink_support.pyo
 lib/python${PY_VER_SUFFIX}/test/test_MimeWriter.py
 lib/python${PY_VER_SUFFIX}/test/test_MimeWriter.pyc
 lib/python${PY_VER_SUFFIX}/test/test_MimeWriter.pyo
@@ -2877,6 +2893,9 @@ lib/python${PY_VER_SUFFIX}/test/test___future__.pyo
 lib/python${PY_VER_SUFFIX}/test/test__locale.py
 lib/python${PY_VER_SUFFIX}/test/test__locale.pyc
 lib/python${PY_VER_SUFFIX}/test/test__locale.pyo
+lib/python${PY_VER_SUFFIX}/test/test__osx_support.py
+lib/python${PY_VER_SUFFIX}/test/test__osx_support.pyc
+lib/python${PY_VER_SUFFIX}/test/test__osx_support.pyo
 lib/python${PY_VER_SUFFIX}/test/test_abc.py
 lib/python${PY_VER_SUFFIX}/test/test_abc.pyc
 lib/python${PY_VER_SUFFIX}/test/test_abc.pyo
@@ -3239,6 +3258,9 @@ lib/python${PY_VER_SUFFIX}/test/test_file.pyo
 lib/python${PY_VER_SUFFIX}/test/test_file2k.py
 lib/python${PY_VER_SUFFIX}/test/test_file2k.pyc
 lib/python${PY_VER_SUFFIX}/test/test_file2k.pyo
+lib/python${PY_VER_SUFFIX}/test/test_file_eintr.py
+lib/python${PY_VER_SUFFIX}/test/test_file_eintr.pyc
+lib/python${PY_VER_SUFFIX}/test/test_file_eintr.pyo
 lib/python${PY_VER_SUFFIX}/test/test_filecmp.py
 lib/python${PY_VER_SUFFIX}/test/test_filecmp.pyc
 lib/python${PY_VER_SUFFIX}/test/test_filecmp.pyo
@@ -3884,6 +3906,9 @@ lib/python${PY_VER_SUFFIX}/test/test_tk.pyo
 lib/python${PY_VER_SUFFIX}/test/test_tokenize.py
 lib/python${PY_VER_SUFFIX}/test/test_tokenize.pyc
 lib/python${PY_VER_SUFFIX}/test/test_tokenize.pyo
+lib/python${PY_VER_SUFFIX}/test/test_tools.py
+lib/python${PY_VER_SUFFIX}/test/test_tools.pyc
+lib/python${PY_VER_SUFFIX}/test/test_tools.pyo
 lib/python${PY_VER_SUFFIX}/test/test_trace.py
 lib/python${PY_VER_SUFFIX}/test/test_trace.pyc
 lib/python${PY_VER_SUFFIX}/test/test_trace.pyo
@@ -4043,6 +4068,7 @@ lib/python${PY_VER_SUFFIX}/test/test_zlib.pyo
 lib/python${PY_VER_SUFFIX}/test/testall.py
 lib/python${PY_VER_SUFFIX}/test/testall.pyc
 lib/python${PY_VER_SUFFIX}/test/testall.pyo
+lib/python${PY_VER_SUFFIX}/test/testbz2_bigmem.bz2
 lib/python${PY_VER_SUFFIX}/test/testcodec.py
 lib/python${PY_VER_SUFFIX}/test/testcodec.pyc
 lib/python${PY_VER_SUFFIX}/test/testcodec.pyo
@@ -4319,3 +4345,4 @@ lib/python${PY_VER_SUFFIX}/xmlrpclib.pyo
 lib/python${PY_VER_SUFFIX}/zipfile.py
 lib/python${PY_VER_SUFFIX}/zipfile.pyc
 lib/python${PY_VER_SUFFIX}/zipfile.pyo
+man/man1/python${PY_VER_SUFFIX}.1
diff --git a/lang/python27/dist.mk b/lang/python27/dist.mk
index d7b1aff968f..138b449f04a 100644
--- a/lang/python27/dist.mk
+++ b/lang/python27/dist.mk
@@ -1,8 +1,8 @@
-# $NetBSD: dist.mk,v 1.3 2012/04/13 18:47:27 adam Exp $
+# $NetBSD: dist.mk,v 1.4 2013/04/12 09:03:41 adam Exp $
 
-PY_DISTVERSION=	2.7.3
+PY_DISTVERSION=	2.7.4
 DISTNAME=	Python-${PY_DISTVERSION}
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 DISTINFO_FILE=	${.CURDIR}/../../lang/python27/distinfo
 PATCHDIR=	${.CURDIR}/../../lang/python27/patches
 MASTER_SITES=	http://www.python.org/ftp/python/${PY_DISTVERSION}/
diff --git a/lang/python27/distinfo b/lang/python27/distinfo
index 80d5ca21063..fb794c96d59 100644
--- a/lang/python27/distinfo
+++ b/lang/python27/distinfo
@@ -1,24 +1,21 @@
-$NetBSD: distinfo,v 1.21 2012/12/21 20:26:42 dholland Exp $
+$NetBSD: distinfo,v 1.22 2013/04/12 09:03:41 adam Exp $
 
-SHA1 (Python-2.7.3.tar.bz2) = 842c4e2aff3f016feea3c6e992c7fa96e49c9aa0
-RMD160 (Python-2.7.3.tar.bz2) = bfc511d54080898d7008d4b84d49f957859d66c3
-Size (Python-2.7.3.tar.bz2) = 11793433 bytes
-SHA1 (patch-Mac_Modules_fm___Fmmodule.c) = b9314bccb51b4fe672b81559068f7a79d2965f94
-SHA1 (patch-Mac_Modules_qd___Qdmodule.c) = 45c748b15b9436d45ba137460389638aa7108c8d
-SHA1 (patch-Mac_Modules_qdoffs___Qdoffsmodule.c) = 9994f0c1a908f18f1f3df3f05b184f082c018365
+SHA1 (Python-2.7.4.tar.xz) = 08e78ebeb6d9c799644f6d787ca424291c0fe03e
+RMD160 (Python-2.7.4.tar.xz) = 9d1a6db9a5373599afd509e1abb675a3dc5bdf58
+Size (Python-2.7.4.tar.xz) = 10250644 bytes
 SHA1 (patch-aa) = 990e4025bb6a37715e1f5df1831499f0ab08acfa
 SHA1 (patch-ab) = 0d0ae9802dfe3b85659adb16793affd8c4ffce43
 SHA1 (patch-ad) = de730b9f5a5efb56afa8bed05824b5f6579242ec
 SHA1 (patch-ae) = ff6d8c6164fe3c6dc4fb33d88eb8a49d5c5442f6
-SHA1 (patch-ah) = 8e9ee44c7a054f1387b6d8ef8dbe9c1b8dc8d891
-SHA1 (patch-al) = e28c7b31560523528a824241e6782b7561223aa7
-SHA1 (patch-am) = f56a53eb9f4694913d317c09e162bdd413f8f38f
+SHA1 (patch-ah) = ae3ce0656d890ca34292920bf0185f94ba847139
+SHA1 (patch-al) = bb492863afae88d1627b3caba13b73759adb2d15
+SHA1 (patch-am) = d1950d0b85e16d60b6a60e823884427e6e8d0984
 SHA1 (patch-an) = 6098fbf0fc31422196cc40d3a227934523db11ca
-SHA1 (patch-ao) = e14c3ddb136611835905fbe13c0b7ea2df8b6709
-SHA1 (patch-au) = 51b263d908db13c639fb275a5e58abe83f4d7324
+SHA1 (patch-ao) = 3a1cd2b255340fd23fc1fce8680e692581ffcec1
+SHA1 (patch-au) = 2a2a988ac92553d17eb898870d1adb3c30a59b66
 SHA1 (patch-av) = a14eaf4d5db6fc3b79ed896fbfcc34ca98051af2
 SHA1 (patch-aw) = 15652e241f371a22c7300f46771825ea74514fa0
-SHA1 (patch-ax) = 962fc8059867f55aaba2d32a53f25f4007658e0d
-SHA1 (patch-az) = 303f7b95494780b8fa54192663f0a192e3d46b59
-SHA1 (patch-pyconfig.h.in) = 7ebc0ed9ca9a37c5a6c8e04cc3f7fca4a5c90e8c
+SHA1 (patch-ax) = be7498a37a89c86d278d07c38666237215308498
+SHA1 (patch-az) = 56a3adedfc87cbbb0307ccb4b452665f79bde582
+SHA1 (patch-pyconfig.h.in) = c4544178ecceffb6ed911df39d3a64bff665cb34
 SHA1 (patch-xa) = 25f02b03f1c5534e1d839a5489d5a046071f32c0
diff --git a/lang/python27/patches/patch-Mac_Modules_fm___Fmmodule.c b/lang/python27/patches/patch-Mac_Modules_fm___Fmmodule.c
deleted file mode 100644
index 0334d57deed..00000000000
--- a/lang/python27/patches/patch-Mac_Modules_fm___Fmmodule.c
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-Mac_Modules_fm___Fmmodule.c,v 1.1 2011/09/30 08:37:24 yyamano Exp $
-
-Fix build errors on Mac OS XLion.
-
---- Mac/Modules/fm/_Fmmodule.c.orig	2010-05-09 15:15:40.000000000 +0000
-+++ Mac/Modules/fm/_Fmmodule.c
-@@ -3,8 +3,14 @@
- 
- #include "Python.h"
- 
--#ifndef __LP64__
-+#include <AvailabilityMacros.h>
-+#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) || defined(__LP64__)
-+#undef HAVE_CARBON
-+#else
-+#define HAVE_CARBON
-+#endif
- 
-+#ifdef HAVE_CARBON
- 
- #include "pymactoolbox.h"
- 
-@@ -336,32 +342,32 @@ static PyMethodDef Fm_methods[] = {
-     {NULL, NULL, 0}
- };
- 
--#else  /* __LP64__ */
-+#else  /* HAVE_CARBON */
- 
- static PyMethodDef Fm_methods[] = {
-     {NULL, NULL, 0}
- };
- 
--#endif  /* __LP64__ */
-+#endif  /* HAVE_CARBON */
- 
- void init_Fm(void)
- {
-     PyObject *m;
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     PyObject *d;
--#endif  /* __LP64__ */
-+#endif  /* HAVE_CARBON */
- 
- 
- 
- 
-     m = Py_InitModule("_Fm", Fm_methods);
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     d = PyModule_GetDict(m);
-     Fm_Error = PyMac_GetOSErrException();
-     if (Fm_Error == NULL ||
-         PyDict_SetItemString(d, "Error", Fm_Error) != 0)
-         return;
--#endif  /* __LP64__ */
-+#endif  /* HAVE_CARBON */
- }
- 
- /* ========================= End module _Fm ========================= */
diff --git a/lang/python27/patches/patch-Mac_Modules_qd___Qdmodule.c b/lang/python27/patches/patch-Mac_Modules_qd___Qdmodule.c
deleted file mode 100644
index 23f612c147d..00000000000
--- a/lang/python27/patches/patch-Mac_Modules_qd___Qdmodule.c
+++ /dev/null
@@ -1,88 +0,0 @@
-$NetBSD: patch-Mac_Modules_qd___Qdmodule.c,v 1.1 2011/09/30 08:37:24 yyamano Exp $
-
-Fix build errors on Mac OS XLion.
-
---- Mac/Modules/qd/_Qdmodule.c.orig	2010-05-09 15:15:40.000000000 +0000
-+++ Mac/Modules/qd/_Qdmodule.c
-@@ -3,8 +3,14 @@
- 
- #include "Python.h"
- 
-+#include <AvailabilityMacros.h>
-+#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) || defined(__LP64__)
-+#undef HAVE_CARBON
-+#else
-+#define HAVE_CARBON
-+#endif
- 
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
- 
- #include "pymactoolbox.h"
- 
-@@ -6545,10 +6551,10 @@ static PyObject *Qd_RawBitMap(PyObject *
-     return _res;
- 
- }
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
- 
- static PyMethodDef Qd_methods[] = {
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     {"GetPort", (PyCFunction)Qd_GetPort, 1,
-      PyDoc_STR("() -> (GrafPtr port)")},
-     {"GrafDevice", (PyCFunction)Qd_GrafDevice, 1,
-@@ -7083,12 +7089,12 @@ static PyMethodDef Qd_methods[] = {
-      PyDoc_STR("Take (string, int, Rect) argument and create BitMap")},
-     {"RawBitMap", (PyCFunction)Qd_RawBitMap, 1,
-      PyDoc_STR("Take string BitMap and turn into BitMap object")},
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
-     {NULL, NULL, 0}
- };
- 
- 
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
- 
- /* Like BMObj_New, but the original bitmap data structure is copied (and
- ** released when the object is released)
-@@ -7106,13 +7112,13 @@ PyObject *BMObj_NewCopied(BitMapPtr itse
-     return (PyObject *)it;
- }
- 
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
- 
- 
- void init_Qd(void)
- {
-     PyObject *m;
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     PyObject *d;
- 
- 
-@@ -7124,10 +7130,10 @@ void init_Qd(void)
-         PyMac_INIT_TOOLBOX_OBJECT_NEW(RGBColorPtr, QdRGB_New);
-         PyMac_INIT_TOOLBOX_OBJECT_CONVERT(RGBColor, QdRGB_Convert);
- 
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
- 
-     m = Py_InitModule("_Qd", Qd_methods);
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     d = PyModule_GetDict(m);
-     Qd_Error = PyMac_GetOSErrException();
-     if (Qd_Error == NULL ||
-@@ -7147,7 +7153,7 @@ void init_Qd(void)
-     /* Backward-compatible name */
-     Py_INCREF(&BitMap_Type);
-     PyModule_AddObject(m, "BitMapType", (PyObject *)&BitMap_Type);
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
- }
- 
- /* ========================= End module _Qd ========================= */
diff --git a/lang/python27/patches/patch-Mac_Modules_qdoffs___Qdoffsmodule.c b/lang/python27/patches/patch-Mac_Modules_qdoffs___Qdoffsmodule.c
deleted file mode 100644
index 7403b6a0486..00000000000
--- a/lang/python27/patches/patch-Mac_Modules_qdoffs___Qdoffsmodule.c
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-Mac_Modules_qdoffs___Qdoffsmodule.c,v 1.1 2011/09/30 08:37:24 yyamano Exp $
-
-Fix build errors on Mac OS XLion.
-
---- Mac/Modules/qdoffs/_Qdoffsmodule.c.orig	2010-05-09 15:15:40.000000000 +0000
-+++ Mac/Modules/qdoffs/_Qdoffsmodule.c
-@@ -3,8 +3,14 @@
- 
- #include "Python.h"
- 
-+#include <AvailabilityMacros.h>
-+#if (__MAC_OS_X_VERSION_MAX_ALLOWED >= 1070) || defined(__LP64__)
-+#undef HAVE_CARBON
-+#else
-+#define HAVE_CARBON
-+#endif
- 
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
- 
- #include "pymactoolbox.h"
- 
-@@ -631,10 +637,10 @@ static PyObject *Qdoffs_PutPixMapBytes(P
-     return _res;
- 
- }
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
- 
- static PyMethodDef Qdoffs_methods[] = {
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     {"NewGWorld", (PyCFunction)Qdoffs_NewGWorld, 1,
-      PyDoc_STR("(short PixelDepth, Rect boundsRect, CTabHandle cTable, GDHandle aGDevice, GWorldFlags flags) -> (GWorldPtr offscreenGWorld)")},
-     {"LockPixels", (PyCFunction)Qdoffs_LockPixels, 1,
-@@ -681,7 +687,7 @@ static PyMethodDef Qdoffs_methods[] = {
-      PyDoc_STR("(pixmap, int start, int size) -> string. Return bytes from the pixmap")},
-     {"PutPixMapBytes", (PyCFunction)Qdoffs_PutPixMapBytes, 1,
-      PyDoc_STR("(pixmap, int start, string data). Store bytes into the pixmap")},
--#endif /* __LP64__ */
-+#endif /* CARBON */
-     {NULL, NULL, 0}
- };
- 
-@@ -691,7 +697,7 @@ static PyMethodDef Qdoffs_methods[] = {
- void init_Qdoffs(void)
- {
-     PyObject *m;
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     PyObject *d;
- 
- 
-@@ -699,10 +705,10 @@ void init_Qdoffs(void)
-         PyMac_INIT_TOOLBOX_OBJECT_NEW(GWorldPtr, GWorldObj_New);
-         PyMac_INIT_TOOLBOX_OBJECT_CONVERT(GWorldPtr, GWorldObj_Convert);
- 
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
- 
-     m = Py_InitModule("_Qdoffs", Qdoffs_methods);
--#ifndef __LP64__
-+#ifdef HAVE_CARBON
-     d = PyModule_GetDict(m);
-     Qdoffs_Error = PyMac_GetOSErrException();
-     if (Qdoffs_Error == NULL ||
-@@ -715,7 +721,7 @@ void init_Qdoffs(void)
-     /* Backward-compatible name */
-     Py_INCREF(&GWorld_Type);
-     PyModule_AddObject(m, "GWorldType", (PyObject *)&GWorld_Type);
--#endif /* __LP64__ */
-+#endif /* HAVE_CARBON */
- }
- 
- /* ======================= End module _Qdoffs ======================= */
diff --git a/lang/python27/patches/patch-ah b/lang/python27/patches/patch-ah
index aabec946fa3..71a2e542506 100644
--- a/lang/python27/patches/patch-ah
+++ b/lang/python27/patches/patch-ah
@@ -1,6 +1,6 @@
-$NetBSD: patch-ah,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
+$NetBSD: patch-ah,v 1.2 2013/04/12 09:03:41 adam Exp $
 
---- Modules/_cursesmodule.c.orig	2010-05-15 22:19:27.000000000 +0000
+--- Modules/_cursesmodule.c.orig	2013-04-06 14:02:36.000000000 +0000
 +++ Modules/_cursesmodule.c
 @@ -322,17 +322,9 @@ Window_NoArg2TupleReturnFunction(getpary
  
@@ -20,7 +20,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
  Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
  Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-@@ -2108,7 +2100,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
+@@ -2110,7 +2102,6 @@ PyCurses_Is_Term_Resized(PyObject *self,
  }
  #endif /* HAVE_CURSES_IS_TERM_RESIZED */
  
@@ -28,7 +28,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
  static PyObject *
  PyCurses_KeyName(PyObject *self, PyObject *args)
  {
-@@ -2127,7 +2118,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
+@@ -2129,7 +2120,6 @@ PyCurses_KeyName(PyObject *self, PyObjec
  
      return PyString_FromString((knp == NULL) ? "" : (char *)knp);
  }
@@ -36,7 +36,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
  
  static PyObject *
  PyCurses_KillChar(PyObject *self)
-@@ -2672,9 +2662,7 @@ static PyMethodDef PyCurses_methods[] = 
+@@ -2674,9 +2664,7 @@ static PyMethodDef PyCurses_methods[] = 
  #ifdef HAVE_CURSES_IS_TERM_RESIZED
      {"is_term_resized",     (PyCFunction)PyCurses_Is_Term_Resized, METH_VARARGS},
  #endif
@@ -46,7 +46,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
      {"killchar",            (PyCFunction)PyCurses_KillChar, METH_NOARGS},
      {"longname",            (PyCFunction)PyCurses_longname, METH_NOARGS},
      {"meta",                (PyCFunction)PyCurses_Meta, METH_VARARGS},
-@@ -2783,9 +2771,7 @@ init_curses(void)
+@@ -2785,9 +2773,7 @@ init_curses(void)
      SetDictInt("A_DIM",                 A_DIM);
      SetDictInt("A_BOLD",                A_BOLD);
      SetDictInt("A_ALTCHARSET",          A_ALTCHARSET);
@@ -56,7 +56,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
      SetDictInt("A_PROTECT",         A_PROTECT);
      SetDictInt("A_CHARTEXT",        A_CHARTEXT);
      SetDictInt("A_COLOR",           A_COLOR);
-@@ -2857,7 +2843,6 @@ init_curses(void)
+@@ -2859,7 +2845,6 @@ init_curses(void)
          int key;
          char *key_n;
          char *key_n2;
@@ -64,7 +64,7 @@ $NetBSD: patch-ah,v 1.1.1.1 2011/02/22 08:52:01 obache Exp $
          for (key=KEY_MIN;key < KEY_MAX; key++) {
              key_n = (char *)keyname(key);
              if (key_n == NULL || strcmp(key_n,"UNKNOWN KEY")==0)
-@@ -2885,7 +2870,6 @@ init_curses(void)
+@@ -2887,7 +2872,6 @@ init_curses(void)
              if (key_n2 != key_n)
                  free(key_n2);
          }
diff --git a/lang/python27/patches/patch-al b/lang/python27/patches/patch-al
index 14e2fddeff5..7af26c2b51f 100644
--- a/lang/python27/patches/patch-al
+++ b/lang/python27/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland Exp $
+$NetBSD: patch-al,v 1.10 2013/04/12 09:03:41 adam Exp $
 
 - recognize MirBSD, Interix
 - remove special-case library version hack for FreeBSD
 - honor pkgsrc LDFLAGS
 - other stuff not previously commented (XXX)
 
---- configure.orig	2012-04-09 23:07:36.000000000 +0000
+--- configure.orig	2013-04-06 14:02:41.000000000 +0000
 +++ configure
-@@ -3019,7 +3019,7 @@ case $ac_sys_system/$ac_sys_release in
+@@ -3243,7 +3243,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.
@@ -16,7 +16,7 @@ $NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland 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
-@@ -4920,15 +4920,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
+@@ -5342,15 +5342,10 @@ $as_echo "#define Py_ENABLE_SHARED 1" >>
  	  RUNSHARED=LD_LIBRARY_PATH=`pwd`:${LD_LIBRARY_PATH}
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
            ;;
@@ -33,7 +33,7 @@ $NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland Exp $
  	  INSTSONAME="$LDLIBRARY".$SOVERSION
  	  ;;
      hp*|HP*)
-@@ -7648,9 +7643,9 @@ then
+@@ -8214,9 +8209,9 @@ then
  			LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  		else
  			# No framework, use the Python app as bundle-loader
@@ -46,7 +46,7 @@ $NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland Exp $
  		fi ;;
  	Darwin/*)
  		# Use -undefined dynamic_lookup whenever possible (10.3 and later).
-@@ -7674,15 +7669,15 @@ then
+@@ -8240,15 +8235,15 @@ then
  				LDCXXSHARED="$LDCXXSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
  			else
  				# No framework, use the Python app as bundle-loader
@@ -66,7 +66,7 @@ $NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland Exp $
  	BSD/OS*/4*)
  		LDSHARED="gcc -shared"
  		LDCXXSHARED="g++ -shared";;
-@@ -7710,9 +7705,15 @@ then
+@@ -8276,9 +8271,15 @@ then
  				   ;;
  				esac
  		fi;;
@@ -82,7 +82,7 @@ $NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes" ; then
  			LDSHARED='$(CC) -shared'
-@@ -7756,7 +7757,8 @@ then
+@@ -8322,7 +8323,8 @@ then
  		 fi;;
  	Linux*|GNU*) CCSHARED="-fPIC";;
  	BSD/OS*/4*) CCSHARED="-fpic";;
@@ -92,7 +92,7 @@ $NetBSD: patch-al,v 1.9 2012/12/21 20:26:42 dholland Exp $
  	OpenUNIX*|UnixWare*)
  		if test "$GCC" = "yes"
  		then CCSHARED="-fPIC"
-@@ -7808,11 +7810,12 @@ then
+@@ -8374,11 +8376,12 @@ then
  	OpenUNIX*|UnixWare*) LINKFORSHARED="-Wl,-Bexport";;
  	SCO_SV*) LINKFORSHARED="-Wl,-Bexport";;
  	ReliantUNIX*) LINKFORSHARED="-W1 -Blargedynsym";;
diff --git a/lang/python27/patches/patch-am b/lang/python27/patches/patch-am
index 97055821166..8260dcfa420 100644
--- a/lang/python27/patches/patch-am
+++ b/lang/python27/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.7 2011/11/08 07:30:08 sbd Exp $
+$NetBSD: patch-am,v 1.8 2013/04/12 09:03:41 adam Exp $
 
 Disabled modules for normal build:
 bsddb
@@ -19,10 +19,10 @@ headers and libraries from the system.
 
 Build the 1.85 compat module all the time against the BDB version of choice.
 
---- setup.py.orig	2011-06-11 15:46:28.000000000 +0000
+--- setup.py.orig	2013-04-06 14:02:41.000000000 +0000
 +++ setup.py
-@@ -21,7 +21,7 @@ from distutils.spawn import find_executa
- COMPILED_WITH_PYDEBUG = hasattr(sys, 'gettotalrefcount')
+@@ -33,7 +33,7 @@ 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.
 -disabled_module_list = []
@@ -30,7 +30,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
  
  def add_dir_to_list(dirlist, dir):
      """Add the directory 'dir' to the list 'dirlist' (at the front) if
-@@ -368,9 +368,15 @@ class PyBuildExt(build_ext):
+@@ -436,9 +436,15 @@ class PyBuildExt(build_ext):
              os.unlink(tmpfile)
  
      def detect_modules(self):
@@ -49,7 +49,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
          self.add_multiarch_paths()
  
          # Add paths specified in the environment variables LDFLAGS and
-@@ -715,9 +721,7 @@ class PyBuildExt(build_ext):
+@@ -794,9 +800,7 @@ class PyBuildExt(build_ext):
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -60,7 +60,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
  
          if (ssl_incs is not None and
              ssl_libs is not None):
-@@ -832,172 +836,6 @@ class PyBuildExt(build_ext):
+@@ -915,175 +919,6 @@ class PyBuildExt(build_ext):
              else:
                  raise ValueError("unknown major BerkeleyDB version", major)
  
@@ -95,6 +95,9 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 -            db_inc_paths.append('/pkg/db-3.%d/include' % x)
 -            db_inc_paths.append('/opt/db-3.%d/include' % x)
 -
+-        if cross_compiling:
+-            db_inc_paths = []
+-
 -        # Add some common subdirectories for Sleepycat DB to the list,
 -        # based on the standard include directories. This way DB3/4 gets
 -        # picked up when it is installed in a non-standard prefix and
@@ -115,7 +118,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 -
 -        db_ver_inc_map = {}
 -
--        if sys.platform == 'darwin':
+-        if host_platform == 'darwin':
 -            sysroot = macosx_sdk_root()
 -
 -        class db_found(Exception): pass
@@ -125,7 +128,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 -            for d in inc_dirs + db_inc_paths:
 -                f = os.path.join(d, "db.h")
 -
--                if sys.platform == 'darwin' and is_macosx_sdk_path(d):
+-                if host_platform == 'darwin' and is_macosx_sdk_path(d):
 -                    f = os.path.join(sysroot, d[1:], "db.h")
 -
 -                if db_setup_debug: print "db: looking for db.h in", f
@@ -175,7 +178,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 -                    db_incdir.replace("include", 'lib'),
 -                ]
 -
--                if sys.platform != 'darwin':
+-                if host_platform != 'darwin':
 -                    db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
 -
 -                else:
@@ -233,13 +236,13 @@ Build the 1.85 compat module all the time against the BDB version of choice.
          # The sqlite interface
          sqlite_setup_debug = False   # verbose debug prints from this script?
  
-@@ -1113,35 +951,40 @@ class PyBuildExt(build_ext):
+@@ -1201,35 +1036,39 @@ class PyBuildExt(build_ext):
          # we do not build this one.  Otherwise this build will pick up
          # the more recent berkeleydb's db.h file first in the include path
          # when attempting to compile and it will fail.
 -        f = "/usr/include/db.h"
 -
--        if sys.platform == 'darwin':
+-        if host_platform == 'darwin':
 -            if is_macosx_sdk_path(f):
 -                sysroot = macosx_sdk_root()
 -                f = os.path.join(sysroot, f[1:])
@@ -252,7 +255,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
 -                ### XXX this should be fixed to not be platform-dependent
 -                ### but I don't have direct access to an osf1 platform and
 -                ### seemed to be muffing the search somehow
--                libraries = platform == "osf1" and ['db'] or None
+-                libraries = host_platform == "osf1" and ['db'] or None
 -                if libraries is not None:
 -                    exts.append(Extension('bsddb185', ['bsddbmodule.c'],
 -                                          libraries=libraries))
@@ -270,8 +273,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
  
          dbm_order = ['gdbm']
          # The standard Unix dbm module:
-         if platform not in ['cygwin']:
-+
+         if host_platform not in ['cygwin']:
 +            ## Top half based on find_file
 +            def find_ndbm_h(dirs):
 +                ret = None
@@ -298,16 +300,16 @@ Build the 1.85 compat module all the time against the BDB version of choice.
              config_args = [arg.strip("'")
                             for arg in sysconfig.get_config_var("CONFIG_ARGS").split()]
              dbm_args = [arg for arg in config_args
-@@ -1153,7 +996,7 @@ class PyBuildExt(build_ext):
+@@ -1241,7 +1080,7 @@ class PyBuildExt(build_ext):
              dbmext = None
              for cand in dbm_order:
                  if cand == "ndbm":
 -                    if find_file("ndbm.h", inc_dirs, []) is not None:
 +                    if find_ndbm_h(inc_dirs) is not None:
-                         # Some systems have -lndbm, others don't
+                         # Some systems have -lndbm, others have -lgdbm_compat,
+                         # others don't have either
                          if self.compiler.find_library_file(lib_dirs,
-                                                                'ndbm'):
-@@ -1193,18 +1036,14 @@ class PyBuildExt(build_ext):
+@@ -1285,18 +1124,14 @@ class PyBuildExt(build_ext):
                                  libraries = gdbm_libs)
                              break
                  elif cand == "bdb":
@@ -334,7 +336,7 @@ Build the 1.85 compat module all the time against the BDB version of choice.
              if dbmext is not None:
                  exts.append(dbmext)
              else:
-@@ -2066,9 +1905,9 @@ def main():
+@@ -2176,9 +2011,9 @@ def main():
            ext_modules=[Extension('_struct', ['_struct.c'])],
  
            # Scripts to install
diff --git a/lang/python27/patches/patch-ao b/lang/python27/patches/patch-ao
index 46db7f47c85..60ae2c23bd5 100644
--- a/lang/python27/patches/patch-ao
+++ b/lang/python27/patches/patch-ao
@@ -1,11 +1,11 @@
-$NetBSD: patch-ao,v 1.3 2012/04/13 18:47:31 adam Exp $
+$NetBSD: patch-ao,v 1.4 2013/04/12 09:03:41 adam Exp $
 
---- Lib/distutils/util.py.orig	2011-06-11 15:46:24.000000000 +0000
+--- Lib/distutils/util.py.orig	2013-04-06 14:02:26.000000000 +0000
 +++ Lib/distutils/util.py
-@@ -181,6 +181,8 @@ def get_platform ():
-                 # See 'i386' case
-                 if sys.maxint >= 2**32:
-                     machine = 'ppc64'
+@@ -101,6 +101,8 @@ def get_platform ():
+         osname, release, machine = _osx_support.get_platform_osx(
+                                         distutils.sysconfig.get_config_vars(),
+                                         osname, release, machine)
 +    elif osname[:9] == "dragonfly":
 +        release = str.split(release, "-")[0]
  
diff --git a/lang/python27/patches/patch-au b/lang/python27/patches/patch-au
index 486355dd7b2..6e2b62499a9 100644
--- a/lang/python27/patches/patch-au
+++ b/lang/python27/patches/patch-au
@@ -1,12 +1,12 @@
-$NetBSD: patch-au,v 1.5 2012/04/13 18:47:31 adam Exp $
+$NetBSD: patch-au,v 1.6 2013/04/12 09:03:41 adam Exp $
 
 Fix for unpriviliged build.
 
 http://hg.python.org/cpython/rev/a0f43f4481e0
 
---- Makefile.pre.in.orig	2011-06-11 16:46:26.000000000 +0100
-+++ Makefile.pre.in	2012-03-24 11:02:25.000000000 +0000
-@@ -448,7 +448,7 @@
+--- Makefile.pre.in.orig	2013-04-06 14:02:34.000000000 +0000
++++ Makefile.pre.in
+@@ -489,7 +489,7 @@ gdbhooks: $(BUILDPYTHON)-gdb.py
  
  SRC_GDB_HOOKS=$(srcdir)/Tools/gdb/libpython.py
  $(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
@@ -15,7 +15,7 @@ http://hg.python.org/cpython/rev/a0f43f4481e0
  
  # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
  # minimal framework (not including the Lib directory and such) in the current
-@@ -829,7 +830,8 @@
+@@ -879,7 +879,8 @@ altbininstall:	$(BUILDPYTHON)
  				(cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) $(LDLIBRARY)) \
  			fi \
  		fi; \
@@ -24,4 +24,4 @@ http://hg.python.org/cpython/rev/a0f43f4481e0
 +		$(INSTALL_SHARED) $(INSTSONAME) $(DESTDIR)$(LIBDIR); \
  	fi
  
- # Install the manual page
+ # Install the versioned manual page
diff --git a/lang/python27/patches/patch-ax b/lang/python27/patches/patch-ax
index a506ac51cd0..d16997b6878 100644
--- a/lang/python27/patches/patch-ax
+++ b/lang/python27/patches/patch-ax
@@ -1,13 +1,13 @@
-$NetBSD: patch-ax,v 1.3 2012/04/13 18:47:31 adam Exp $
+$NetBSD: patch-ax,v 1.4 2013/04/12 09:03:41 adam Exp $
 
 chop "-RELEASE" or "-DEVELOPMENT" from release for DragonFly.
 
---- Lib/sysconfig.py.orig	2011-06-11 15:46:25.000000000 +0000
+--- Lib/sysconfig.py.orig	2013-04-06 14:02:29.000000000 +0000
 +++ Lib/sysconfig.py
-@@ -685,6 +685,8 @@ def get_platform():
-                     machine = 'ppc64'
-                 else:
-                     machine = 'ppc'
+@@ -559,6 +559,8 @@ def get_platform():
+         osname, release, machine = _osx_support.get_platform_osx(
+                                             get_config_vars(),
+                                             osname, release, machine)
 +    elif osname[:9] == "dragonfly":
 +        release = str.split(release, '-')[0]
  
diff --git a/lang/python27/patches/patch-az b/lang/python27/patches/patch-az
index c81489b9b0d..9b4b9750525 100644
--- a/lang/python27/patches/patch-az
+++ b/lang/python27/patches/patch-az
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.2 2012/04/13 18:47:31 adam Exp $
+$NetBSD: patch-az,v 1.3 2013/04/12 09:03:41 adam Exp $
 
 --- Modules/selectmodule.c.orig	Mon Jul 25 08:09:14 2011
 +++ Modules/selectmodule.c
-@@ -1855,7 +1855,9 @@ initselect(void)
+@@ -1856,7 +1856,9 @@ initselect(void)
      PyModule_AddIntConstant(m, "KQ_FILTER_NETDEV", EVFILT_NETDEV);
  #endif
      PyModule_AddIntConstant(m, "KQ_FILTER_SIGNAL", EVFILT_SIGNAL);
diff --git a/lang/python27/patches/patch-pyconfig.h.in b/lang/python27/patches/patch-pyconfig.h.in
index ca2855eff71..5f180a3beb1 100644
--- a/lang/python27/patches/patch-pyconfig.h.in
+++ b/lang/python27/patches/patch-pyconfig.h.in
@@ -1,8 +1,8 @@
-$NetBSD: patch-pyconfig.h.in,v 1.1 2011/12/16 17:04:18 hans Exp $
+$NetBSD: patch-pyconfig.h.in,v 1.2 2013/04/12 09:03:41 adam Exp $
 
 --- pyconfig.h.in.orig	2011-06-11 17:46:28.000000000 +0200
 +++ pyconfig.h.in	2011-11-29 20:17:04.328552361 +0100
-@@ -1173,7 +1173,9 @@
+@@ -1191,7 +1191,9 @@
  #undef _UINT64_T
  
  /* Define to the level of X/Open that your system supports */