v0.4.0-20130726

Allow installation of python 2.4.2

CHANGELOG.md

@@ -1,5 +1,17 @@
 ## Version History
 
+#### 0.4.0-20130726
+
+* pyenv: Fix minor issue of variable scope in `pyenv versions` 
+* python-build: Update base version to ruby-build v20130628
+* python-build: Use brew managed OpenSSL and GNU Readline if they are available
+* python-build: Fix build of CPython 3.3+ on OS X (#29)
+* python-build: Fix build of native modules of CPython 2.5 on OS X (#33)
+* python-build: Fix build of CPython 2.6+ on openSUSE (#36)
+* python-build: Add ancient versions; 2.4.2 and 2.4.6. The build might be broken. (#37)
+* python-build: Update default pip version (1.3.1 -> 1.4)
+* python-build: Update default setuptools version (0.7.2 -> 0.9.7)
+
 #### 0.4.0-20130613
 
 * pyenv: Changed versioning schema. There are two parts; the former is the base rbenv version, and the latter is the date of release.

libexec/pyenv---version

@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="0.4.0-20130613"
+version="0.4.0-20130726"
 
 cd "$PYENV_ROOT"
 git_revision="$(git describe --tags HEAD 2>/dev/null || true)"

libexec/pyenv-versions

@@ -10,13 +10,13 @@ set -e
 if [ "$1" = "--bare" ]; then
   hit_prefix=""
   miss_prefix=""
-  IFS=: current_versions=()
+  current_versions=()
   version_origin=""
   include_system=""
 else
   hit_prefix="* "
   miss_prefix="  "
-  IFS=: current_versions=($(pyenv-version-name || true))
+  current_versions=($(IFS=:; for version in $(pyenv-version-name); do echo "$version"; done || true))
   version_origin=" (set by $(pyenv-version-origin))"
   include_system="1"
 fi

plugins/python-build/bin/pyenv-install

@@ -149,12 +149,10 @@ if [ -z "${PYTHON_BUILD_CACHE_PATH}" ] && [ -d "${PYENV_ROOT}/cache" ]; then
 fi
 
 # Default PYENV_VERSION to the globally-specified Python version. (The
-# Python 3.4 installer requires an existing Python installation to run. An
+# CPython installer requires an existing Python installation to run. An
 # unsatisfied local .python-version file can cause the installer to
 # fail.)
-if [ -z "${PYENV_VERSION}" ]; then
-  export PYENV_VERSION="$(pyenv global 2>/dev/null || true)"
-fi
+#export PYENV_VERSION="$(pyenv global 2>/dev/null || true)"
 
 
 # Execute `before_install` hooks.

plugins/python-build/bin/python-build

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PYTHON_BUILD_VERSION="20130518"
+PYTHON_BUILD_VERSION="20130628"
 
 set -E
 exec 3<&2 # preserve original stderr at fd 3
@@ -203,11 +203,11 @@ verify_checksum() {
   [ -e "$filename" ] || return 0
 
   # If there's no expected checksum, return success
-  local expected_checksum="$2"
+  local expected_checksum=`echo "$2" | tr [A-Z] [a-z]`
   [ -n "$expected_checksum" ] || return 0
 
   # If the computed checksum is empty, return failure
-  local computed_checksum="$(compute_md5 < "$filename")"
+  local computed_checksum=`echo "$(compute_md5 < "$filename")" | tr [A-Z] [a-z]`
   [ -n "$computed_checksum" ] || return 1
 
   if [ "$expected_checksum" != "$computed_checksum" ]; then
@@ -520,7 +520,7 @@ build_package_standard() {
     MAKE_OPTS="-j 2"
   fi
 
-  # Support PYTHON_CONFIGURE_OPTS, etc.
+  # Support YAML_CONFIGURE_OPTS, PYTHON_CONFIGURE_OPTS, etc.
   local package_var_name="$(capitalize "${package_name%%-*}")"
   local PACKAGE_CONFIGURE="${package_var_name}_CONFIGURE"
   local PACKAGE_PREFIX_PATH="${package_var_name}_PREFIX_PATH"
@@ -533,7 +533,9 @@ build_package_standard() {
   ( if [ "${CFLAGS+defined}" ] || [ "${!PACKAGE_CFLAGS+defined}" ]; then
       export CFLAGS="$CFLAGS ${!PACKAGE_CFLAGS}"
     fi
-    ${!PACKAGE_CONFIGURE:-./configure} --prefix="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}" $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}"
+    ${!PACKAGE_CONFIGURE:-./configure} --prefix="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}" \
+                                       --libdir="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}/lib" \
+                                       $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}"
   ) >&4 2>&1
 
   { "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"
@@ -622,30 +624,53 @@ fix_directory_permissions() {
 }
 
 require_gcc() {
-  local gcc="$(locate_gcc || true)"
+  require_cc "gcc"
+}
 
-  if [ -z "$gcc" ]; then
+require_cc() {
+  while [ -n "$1" ]; do
+    if [ "$1" = "--if" ]; then
+      "$2" || return 0
+      shift 2
+    else
+      break
+    fi
+  done
+
+  local cc
+  local ccname="${1:-cc}"
+  cc="$(locate_cc "$ccname" || true)"
+
+  if [ -z "$cc" ]; then
     local esc=$'\033'
     { echo
-      echo "${esc}[1mERROR${esc}[0m: This package must be compiled with GCC, but python-build couldn't"
-      echo "find a suitable \`gcc\` executable on your system. Please install GCC"
+      echo "${esc}[1mERROR${esc}[0m: This package must be compiled with $ccname, but python-build couldn't"
+      echo "find a suitable \`$ccname\` executable on your system. Please install $ccname"
       echo "and try again."
       echo
     } >&3
     return 1
   fi
-
-  export CC="$gcc"
-}
+ 
+  export CC="$cc"
+} 
 
 locate_gcc() {
-  local gcc gccs
-  IFS=: gccs=($(gccs_in_path))
+  locate_cc "gcc" "$@"
+}
 
-  verify_gcc "$CC" ||
-  verify_gcc "$(command -v gcc || true)" || {
-    for gcc in "${gccs[@]}"; do
-      verify_gcc "$gcc" && break || true
+locate_cc() {
+  local ccname="$1"; shift
+  if [ -z "$ccname" ]; then
+    return 1
+  fi
+  local cc ccs
+  IFS=: ccs=($(ccs_in_path "${ccname}"))
+
+  verify_cc "${ccname}" "$CC" ||
+  verify_cc "${ccname}" "$(command -v "${ccname}" || true)" || {
+    for cc in "${ccs[@]}"; do
+      verify_cc "${ccname}" "$cc" && break || true
     done
   }
 
@@ -653,39 +678,126 @@ locate_gcc() {
 }
 
 gccs_in_path() {
-  local gcc path paths
-  local gccs=()
+  ccs_in_path "gcc" "$@"
+}
+
+ccs_in_path() {
+  local ccname="$1"; shift
+  if [ -z "$ccname" ]; then
+    return 1
+  fi
+  local cc path paths
+  local ccs=()
   IFS=: paths=($PATH)
 
   shopt -s nullglob
   for path in "${paths[@]}"; do
-    for gcc in "$path"/gcc-*; do
-      gccs["${#gccs[@]}"]="$gcc"
+    for cc in "$path"/${ccname}-*; do
+      ccs["${#ccs[@]}"]="$cc"
     done
   done
   shopt -u nullglob
 
-  printf :%s "${gccs[@]}"
+  printf :%s "${ccs[@]}"
 }
 
 verify_gcc() {
-  local gcc="$1"
-  if [ -z "$gcc" ]; then
+  verify_cc "gcc" "$@"
+}
+
+verify_cc() {
+  local ccname="$1"; shift
+  if [ -z "$ccname" ]; then
+    return 1
+  fi
+  local cc="$1"
+  if [ -z "$cc" ]; then
     return 1
   fi
 
-  local version="$("$gcc" --version || true)"
+  local version="$("$cc" --version || true)"
   if [ -z "$version" ]; then
     return 1
   fi
 
-  echo "$gcc"
+  echo "$cc"
+}
+
+require_java() {
+  local java="$(locate_java || true)"
+
+  if [ -z "$java" ]; then
+    local esc=$'\033'
+    { echo
+      echo "${esc}[1mERROR${esc}[0m: This package must be installed with java, but python-build couldn't"
+      echo "find a suitable \`java\` executable on your system. Please install Java"
+      echo "and try again."
+      echo
+    } >&3
+    return 1
+  fi
+
+  export JAVA="$java"
+}
+
+locate_java() {
+  local java javas
+  IFS=: javas=($(javas_in_path))
+
+  verify_java "$JAVA" ||
+  verify_java "$(command -v java || true)" || {
+    for java in "${javas[@]}"; do
+      verify_java "$java" && break || true
+    done
+  }
+
+  return 1
+}
+
+javas_in_path() {
+  local java path paths
+  local javas=()
+  IFS=: paths=($PATH)
+
+  shopt -s nullglob
+  for path in "${paths[@]}"; do
+    local java="$path"/java
+    if [ -x "$java" ]; then
+      javas["${#javas[@]}"]="$java"
+    fi
+  done
+  shopt -u nullglob
+
+  printf :%s "${javas[@]}"
+}
+
+verify_java() {
+  local java="$1"
+  if [ -z "$java" ]; then
+    return 1
+  fi
+
+  if [ ! -x "$java" ]; then
+    return 1
+  fi
+
+  echo "$java"
 }
 
 has_broken_mac_openssl() {
   [ "$(uname -s)" = "Darwin" ] &&
-  [ "$(openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8r 8 Feb 2011" ] #&&
-# [[ "$PYTHON_CONFIGURE_OPTS" != *--with-openssl-dir=* ]] # The "--with-*-dir=" style arguments are only effective for mkmf.rb
+  [[ "$(openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] &&
+  ! use_homebrew_openssl
+}
+
+use_homebrew_openssl() {
+  local ssldir="$(brew --prefix openssl 2>/dev/null || true)"
+  if [ -d "$ssldir" ]; then
+    CPPFLAGS="-I$ssldir/include $CPPFLAGS"
+    LDFLAGS="-L$ssldir/lib $LDFLAGS"
+  else
+    return 1
+  fi
 }
 
 build_package_mac_openssl() {
@@ -718,26 +830,52 @@ build_package_mac_openssl() {
 }
 
 has_broken_mac_readline() {
+  [ "$(uname -s)" = "Darwin" ] &&
+  _has_broken_mac_readline &&
+  ! use_homebrew_readline
+}
+
+_has_broken_mac_readline() {
   # MacOSX 10.4 has a broken readline.
   # https://github.com/yyuu/pyenv/issues/23
   local retval=1
   local conftest="$BUILD_PATH/has_broken_mac_readline.h"
   if [ "$(uname -s)" = "Darwin" ]; then
     echo "#include <readline/rlconf.h>" > "$conftest"
-    "${CPP:-cpp}" $CFLAGS $CPPFLAGS $LDFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
+    "${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
     rm -f "$conftest"
   fi
   return "$retval"
 }
 
-# Post-install check for Python 2.5.x
-build_package_verify_py25() {
+use_homebrew_readline() {
+  local rldir="$(brew --prefix readline 2>/dev/null || true)"
+  if [ -d "$rldir" ]; then
+    CPPFLAGS="-I$rldir/include $CPPFLAGS"
+    LDFLAGS="-L$rldir/lib $LDFLAGS"
+  else
+    return 1
+  fi
+}
+
+has_broken_mac_llvm_gcc() {
+  [ "$(uname -s)" = "Darwin" ] &&
+  [[ "$(gcc --version 2>/dev/null || true)" == *"llvm-gcc-4.2"* ]]
+}
+
+# Post-install check for Python 2.4.x
+build_package_verify_py24() {
   build_package_verify_readline "$@"
-  build_package_verify_sqlite3 "$@"
   build_package_verify_zlib "$@"
   build_package_verify_bz2 "$@"
 }
 
+# Post-install check for Python 2.5.x
+build_package_verify_py25() {
+  build_package_verify_py24 "$@"
+  build_package_verify_sqlite3 "$@"
+}
+
 # Post-install check for Python 2.6.x
 build_package_verify_py26() {
   build_package_verify_py25 "$@"
@@ -823,67 +961,6 @@ except ImportError:
   ' >&4 2>&1
 }
 
-require_java() {
-  local java="$(locate_java || true)"
-
-  if [ -z "$java" ]; then
-    local esc=$'\033'
-    { echo
-      echo "${esc}[1mERROR${esc}[0m: This package must be installed with java, but python-build couldn't"
-      echo "find a suitable \`java\` executable on your system. Please install Java"
-      echo "and try again."
-      echo
-    } >&3
-    return 1
-  fi
-
-  export JAVA="$java"
-}
-
-locate_java() {
-  local java javas
-  IFS=: javas=($(javas_in_path))
-
-  verify_java "$JAVA" ||
-  verify_java "$(command -v java || true)" || {
-    for java in "${javas[@]}"; do
-      verify_java "$java" && break || true
-    done
-  }
-
-  return 1
-}
-
-javas_in_path() {
-  local java path paths
-  local javas=()
-  IFS=: paths=($PATH)
-
-  shopt -s nullglob
-  for path in "${paths[@]}"; do
-    local java="$path"/java
-    if [ -x "$java" ]; then
-      javas["${#javas[@]}"]="$java"
-    fi
-  done
-  shopt -u nullglob
-
-  printf :%s "${javas[@]}"
-}
-
-verify_java() {
-  local java="$1"
-  if [ -z "$java" ]; then
-    return 1
-  fi
-
-  if [ ! -x "$java" ]; then
-    return 1
-  fi
-
-  echo "$java"
-}
-
 version() {
   echo "python-build ${PYTHON_BUILD_VERSION}"
 }
@@ -972,6 +1049,16 @@ else
   TMP="${TMPDIR%/}"
 fi
 
+# Work around warnings building Ruby 2.0 on Clang 2.x:
+# pass -Wno-error=shorten-64-to-32 if the compiler accepts it.
+#
+# When we set CFLAGS, Ruby won't apply its default flags, though. Since clang
+# builds 1.9.x and 2.x only, where -O3 is default, we can safely set that flag.
+# Ensure it's the first flag since later flags take precedence.
+#if "${CC:-cc}" -x c /dev/null -E -Wno-error=shorten-64-to-32 &>/dev/null; then
+#  PYTHON_CFLAGS="-O3 -Wno-error=shorten-64-to-32 $PYTHON_CFLAGS"
+#fi
+
 if [ -z "$MAKE" ]; then
   export MAKE="make"
 fi

plugins/python-build/share/python-build/2.4.2

@@ -0,0 +1,5 @@
+require_gcc
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "Python-2.4.2" "http://www.python.org/ftp/python/2.4.2/Python-2.4.2.tgz#07cfc759546f6723bb367be5b1ce9875" standard verify_py24
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python

plugins/python-build/share/python-build/2.4.6

@@ -0,0 +1,5 @@
+require_gcc
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "Python-2.4.6" "http://www.python.org/ftp/python/2.4.6/Python-2.4.6.tgz#7564b2b142b1b8345cd5358b7aaaa482" standard verify_py24
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python

plugins/python-build/share/python-build/2.5

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.5" "http://www.python.org/ftp/python/2.5/Python-2.5.tgz#bc1b74f90a472a6c0a85481aaeb43f95" standard verify_py25
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/2.5.1

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.5.1" "http://www.python.org/ftp/python/2.5.1/Python-2.5.1.tgz#cca695828df8adc3e69b637af07522e1" standard verify_py25
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/2.5.2

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.5.2" "http://www.python.org/ftp/python/2.5.2/Python-2.5.2.tgz#3f7ca8aa86c6bd275426d63b46e07992" standard verify_py25
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/2.5.3

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.5.3" "http://www.python.org/ftp/python/2.5.3/Python-2.5.3.tgz#a971f8928d6beb31ae0de56f7034d6a2" standard verify_py25
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/2.5.4

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.5.4" "http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz#ad47b23778f64edadaaa8b5534986eed" standard verify_py25
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/2.5.5

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.5.5" "http://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz#abc02139ca38f4258e8e372f7da05c88" standard verify_py25
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/2.5.6

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.5.6" "http://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz#d1d9c83928561addf11d00b22a18ca50" standard verify_py25
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python

plugins/python-build/share/python-build/2.6-dev

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-2.6-dev" "https://bitbucket.org/mirror/cpython" "2.6" standard verify_py26
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.6.6

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.6.6" "http://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz#b2f209df270a33315e62c1ffac1937f0" standard verify_py26
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.6.7

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.6.7" "http://www.python.org/ftp/python/2.6.7/Python-2.6.7.tgz#af474f85a3af69ea50438a2a48039d7d" standard verify_py26
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.6.8

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.6.8" "http://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz#f6c1781f5d73ab7dfa5181f43ea065f6" standard verify_py26
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.7

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7" "http://www.python.org/ftp/python/2.7/Python-2.7.tgz#35f56b092ecf39a6bd59d64f142aae0f" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.7-dev

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-2.7-dev" "https://bitbucket.org/mirror/cpython" "2.7" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.7.1

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.1" "http://www.python.org/ftp/python/2.7.1/Python-2.7.1.tgz#15ed56733655e3fab785e49a7278d2fb" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.7.2

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.2" "http://www.python.org/ftp/python/2.7.2/Python-2.7.2.tgz#0ddfe265f1b3d0a8c2459f5bf66894c7" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.7.3

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.3" "http://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz#2cf641732ac23b18d139be077bd906cd" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.7.4

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.4" "http://www.python.org/ftp/python/2.7.4/Python-2.7.4.tgz#592603cfaf4490a980e93ecb92bde44a" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/2.7.5

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-2.7.5" "http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz#b4f01a1d0ba0b46b05c73b2ac909b1df" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.0.1

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.0.1" "http://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#220b73f0a1a20c4b1cdf9f9db4cd52fe" standard verify_py30
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.1-dev

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.1-dev" "https://bitbucket.org/mirror/cpython" "3.1" standard verify_py31
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.1.3

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.1.3" "http://www.python.org/ftp/python/3.1.3/Python-3.1.3.tgz#d797fa6abe82c21227e328f05a535424" standard verify_py31
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.1.4

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.1.4" "http://www.python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fa9f8efdc63944c8393870282e8b5c35" standard verify_py31
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.1.5

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.1.5" "http://www.python.org/ftp/python/3.1.5/Python-3.1.5.tgz#02196d3fc7bc76bdda68aa36b0dd16ab" standard verify_py31
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.2

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2" "http://www.python.org/ftp/python/3.2/Python-3.2.tgz#5efe838a7878b170f6728d7e5d7517af" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.2-dev

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.2-dev" "https://bitbucket.org/mirror/cpython" "3.2" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.2.1

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.1" "http://www.python.org/ftp/python/3.2.1/Python-3.2.1.tgz#6c2aa3481cadb7bdf74e625fffc352b2" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.2.2

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.2" "http://www.python.org/ftp/python/3.2.2/Python-3.2.2.tgz#3c63a6d97333f4da35976b6a0755eb67" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.2.3

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.3" "http://www.python.org/ftp/python/3.2.3/Python-3.2.3.tgz#dcf3a738e7028f1deb41b180bf0e2cbc" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.2.4

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.4" "http://www.python.org/ftp/python/3.2.4/Python-3.2.4.tgz#3af05758d0bc2b1a27249e8d622c3e91" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.2.5

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.2.5" "http://www.python.org/ftp/python/3.2.5/Python-3.2.5.tgz#ed8d5529d2aebc36b53f4e0a0c9e6728" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.3-dev

@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+require_cc --if has_broken_mac_llvm_gcc "clang"
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.3.0

@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+require_cc --if has_broken_mac_llvm_gcc "clang"
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#198a64f7a04d1d5e95ce2782d5fd8254" standard verify_py33
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.3.1

@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+require_cc --if has_broken_mac_llvm_gcc "clang"
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#c19bfd6ea252b61779a4f2996fb3b330" standard verify_py33
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.3.2

@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+require_cc --if has_broken_mac_llvm_gcc "clang"
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#0a2ea57f6184baf45b150aee53c0c8da" standard verify_py33
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/3.4-dev

@@ -1,12 +1,12 @@
 # Python 3.4 requires "python3.4" to be executable if it is in ${PATH}.
 if ! pyenv-which python3.4 1>/dev/null 2>&1; then
   if pyenv-whence python3.4 1>/dev/null 2>&1; then
-    export PYENV_VERSION="$(pyenv-whence python3.4 2>/dev/null | tail -1)"
+    export PYENV_VERSION="$(pyenv-version-name):$(pyenv-whence python3.4 2>/dev/null | tail -1)"
   fi
 fi
 
-require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+require_cc --if has_broken_mac_llvm_gcc "clang"
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py34
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/jython-2.5-dev

@@ -1,6 +1,6 @@
 require_java
 install_hg "jython-2.5-dev" "http://hg.python.org/jython" "2.5" jython_builder
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.5.0

@@ -3,7 +3,7 @@ install_jar "Jython-2.5.0" "https://downloads.sourceforge.net/project/jython/jyt
 # distribute (>= 0.33) does not support Jython prior to 2.5.2
 # * https://github.com/yyuu/pyenv/issues/15
 # * https://bitbucket.org/tarek/distribute/issue/367/importing-setuptoolssandbox-fails-on
-install_package "distribute-0.6.32" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#acb7a2da81e3612bfb1608abe4f0e568" python
+install_package "distribute-0.6.32" "https://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#acb7a2da81e3612bfb1608abe4f0e568" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.5.1

@@ -3,7 +3,7 @@ install_jar "Jython-2.5.1" "https://downloads.sourceforge.net/project/jython/jyt
 # distribute (>= 0.33) does not support Jython prior to 2.5.2
 # * https://github.com/yyuu/pyenv/issues/15
 # * https://bitbucket.org/tarek/distribute/issue/367/importing-setuptoolssandbox-fails-on
-install_package "distribute-0.6.32" "http://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#acb7a2da81e3612bfb1608abe4f0e568" python
+install_package "distribute-0.6.32" "https://pypi.python.org/packages/source/d/distribute/distribute-0.6.32.tar.gz#acb7a2da81e3612bfb1608abe4f0e568" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.5.2

@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.5.2" "https://downloads.sourceforge.net/project/jython/jython/2.5.2/jython_installer-2.5.2.jar#7c7d9abd8985df480edeacd27ed9dcd5" jython
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.5.3

@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.5.3" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.3/jython-installer-2.5.3.jar#41633b4557483d6d4237ee79ffcebe7b" jython
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.5.4-rc1

@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.5.4-rc1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.4-rc1/jython-installer-2.5.4-rc1.jar#1be8d75d02886ce1a8542bb794a20db2" jython
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.7-beta1

@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.7-beta1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-dev

@@ -1,6 +1,6 @@
 require_java
 install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
-install_package "pip-1.2.1" "http://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
+install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/002_darwin_c_source.patch

@@ -0,0 +1,166 @@
+diff -r -u ./configure ../Python-2.5/configure
+--- ./configure	2006-09-05 11:54:42.000000000 +0900
++++ ../Python-2.5/configure	2013-07-19 15:27:46.000000000 +0900
+@@ -1396,6 +1396,16 @@
+ _ACEOF
+ 
+ 
++# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
++# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
++# them.
++
++cat >>confdefs.h <<\_ACEOF
++#define _DARWIN_C_SOURCE 1
++_ACEOF
++
++
++
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+@@ -3885,11 +3895,110 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
++	    # used to be here, but non-Apple gcc doesn't accept them.
++            if test "${CC}" = gcc
++	    then
++		{ echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
++echo -n "checking which compiler should be used... " >&6; }
++		case "${UNIVERSALSDK}" in
++		*/MacOSX10.4u.sdk)
++			# Build using 10.4 SDK, force usage of gcc when the
++			# compiler is gcc, otherwise the user will get very
++			# confusing error messages when building on OSX 10.6
++			CC=gcc-4.0
++			CPP=cpp-4.0
++			;;
++		esac
++		{ echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++echo "$CC" >&6; }
++	    fi
++
++
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		UNIVERSAL_ARCH_FLAGS=""
++	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   ARCH_RUN_32BIT=""
++		   LIPO_32BIT_FLAGS=""
++	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS=""
++		   ARCH_RUN_32BIT="true"
++
++	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
++
++	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++		 else
++	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++
++		 fi
++
++
++		CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
++		if test "${UNIVERSALSDK}" != "/"
++		then
++			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
++			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
++		fi
+ 	    fi
+ 
++	    # Calculate the right deployment target for this build.
++	    #
++	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
++	    if test ${cur_target} '>' 10.2 && \
++	       test ${cur_target} '<' 10.6
++	    then
++		    cur_target=10.3
++		    if test ${enable_universalsdk}; then
++			    if test "${UNIVERSAL_ARCHS}" = "all"; then
++				    # Ensure that the default platform for a
++				    # 4-way universal build is OSX 10.5,
++				    # that's the first OS release where
++				    # 4-way builds make sense.
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "intel"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
++				    cur_target='10.5'
++			    fi
++		    else
++			    if test `/usr/bin/arch` = "i386"; then
++				    # On Intel macs default to a deployment
++				    # target of 10.4, that's the first OSX
++				    # release with Intel support.
++				    cur_target="10.4"
++			    fi
++		    fi
++	    fi
++	    CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
++
++	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
++	    # environment with a value that is the same as what we'll use
++	    # in the Makefile to ensure that we'll get the same compiler
++	    # environment during configure and build time.
++	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
++	    export MACOSX_DEPLOYMENT_TARGET
++	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
++
+ 	    ;;
+ 	OSF*)
+ 	    BASECFLAGS="$BASECFLAGS -mieee"
+@@ -10851,7 +10960,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10863,7 +10972,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+diff -r -u ./pyconfig.h.in ../Python-2.5/pyconfig.h.in
+--- ./pyconfig.h.in	2006-07-30 23:09:47.000000000 +0900
++++ ../Python-2.5/pyconfig.h.in	2013-07-17 23:12:31.000000000 +0900
+@@ -912,6 +912,11 @@
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
++/* Define on Darwin to activate all library features */
++#ifndef _DARWIN_C_SOURCE
++#define _DARWIN_C_SOURCE
++#endif
++
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+ 

plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/003_osx_lp64.patch

@@ -0,0 +1,271 @@
+diff -r -u ./Include/pymactoolbox.h ../Python-2.5/Include/pymactoolbox.h
+--- ./Include/pymactoolbox.h	2004-11-05 16:02:59.000000000 +0900
++++ ../Python-2.5/Include/pymactoolbox.h	2013-07-17 23:38:51.000000000 +0900
+@@ -8,7 +8,10 @@
+ #endif
+ 
+ #include <Carbon/Carbon.h>
++
++#ifndef __LP64__
+ #include <QuickTime/QuickTime.h>
++#endif /* !__LP64__ */
+ 
+ /*
+ ** Helper routines for error codes and such.
+@@ -18,8 +21,11 @@
+ PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
+ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
+ PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
++#ifndef __LP64__ 
+ extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
+ 							      fsspec->path */
++#endif /* __LP64__ */
++
+ /*
+ ** These conversion routines are defined in mactoolboxglue.c itself.
+ */
+@@ -83,8 +89,10 @@
+ #endif /* USE_TOOLBOX_OBJECT_GLUE */
+ 
+ /* macfs exports */
++#ifndef __LP64__
+ int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
+ PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
++#endif /* !__LP64__ */
+ 
+ int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
+ PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
+@@ -101,39 +109,54 @@
+ extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ /* Ctl exports */
++#ifndef __LP64__
+ extern PyObject *CtlObj_New(ControlHandle);
+ extern int CtlObj_Convert(PyObject *, ControlHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Dlg exports */
++#ifndef __LP64__
+ extern PyObject *DlgObj_New(DialogPtr);
+ extern int DlgObj_Convert(PyObject *, DialogPtr *);
+ extern PyObject *DlgObj_WhichDialog(DialogPtr);
++#endif /* !__LP64__ */
+ 
+ /* Drag exports */
++#ifndef __LP64__
+ extern PyObject *DragObj_New(DragReference);
+ extern int DragObj_Convert(PyObject *, DragReference *);
++#endif /* !__LP64__ */
+ 
+ /* List exports */
++#ifndef __LP64__
+ extern PyObject *ListObj_New(ListHandle);
+ extern int ListObj_Convert(PyObject *, ListHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Menu exports */
++#ifndef __LP64__
+ extern PyObject *MenuObj_New(MenuHandle);
+ extern int MenuObj_Convert(PyObject *, MenuHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Qd exports */
++#ifndef __LP64__
+ extern PyObject *GrafObj_New(GrafPtr);
+ extern int GrafObj_Convert(PyObject *, GrafPtr *);
+ extern PyObject *BMObj_New(BitMapPtr);
+ extern int BMObj_Convert(PyObject *, BitMapPtr *);
+ extern PyObject *QdRGB_New(RGBColor *);
+ extern int QdRGB_Convert(PyObject *, RGBColor *);
++#endif /* !__LP64__ */
+ 
+ /* Qdoffs exports */
++#ifndef __LP64__
+ extern PyObject *GWorldObj_New(GWorldPtr);
+ extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
++#endif /* !__LP64__ */
+ 
+ /* Qt exports */
++#ifndef __LP64__
+ extern PyObject *TrackObj_New(Track);
+ extern int TrackObj_Convert(PyObject *, Track *);
+ extern PyObject *MovieObj_New(Movie);
+@@ -146,6 +169,7 @@
+ extern int UserDataObj_Convert(PyObject *, UserData *);
+ extern PyObject *MediaObj_New(Media);
+ extern int MediaObj_Convert(PyObject *, Media *);
++#endif /* !__LP64__ */
+ 
+ /* Res exports */
+ extern PyObject *ResObj_New(Handle);
+@@ -154,13 +178,17 @@
+ extern int OptResObj_Convert(PyObject *, Handle *);
+ 
+ /* TE exports */
++#ifndef __LP64__
+ extern PyObject *TEObj_New(TEHandle);
+ extern int TEObj_Convert(PyObject *, TEHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Win exports */
++#ifndef __LP64__
+ extern PyObject *WinObj_New(WindowPtr);
+ extern int WinObj_Convert(PyObject *, WindowPtr *);
+ extern PyObject *WinObj_WhichWindow(WindowPtr);
++#endif /* !__LP64__ */
+ 
+ /* CF exports */
+ extern PyObject *CFObj_New(CFTypeRef);
+diff -r -u ./Mac/Modules/res/_Resmodule.c ../Python-2.5/Mac/Modules/res/_Resmodule.c
+--- ./Mac/Modules/res/_Resmodule.c	2005-07-04 05:59:44.000000000 +0900
++++ ../Python-2.5/Mac/Modules/res/_Resmodule.c	2013-07-17 23:38:51.000000000 +0900
+@@ -414,6 +414,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -431,6 +432,7 @@
+ 	return _res;
+ 
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
+ {
+@@ -1152,6 +1154,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1287,6 +1290,7 @@
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1327,6 +1331,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1413,6 +1418,7 @@
+ 	                     nextRefNum);
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1438,6 +1444,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1534,6 +1541,7 @@
+ 	                     PyMac_BuildFSSpec, &newSpec);
+ 	return _res;
+ }
++#endif /* __LP64__ */
+ 
+ static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1637,6 +1645,7 @@
+ 	 PyDoc_STR("(short refNum) -> (short _rv)")},
+ 	{"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
+ 	 PyDoc_STR("(short refNum, short attrs) -> None")},
++#ifndef __LP64__
+ 	{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
+ 	 PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
+ 	{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
+@@ -1647,10 +1656,12 @@
+ 	 PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
+ 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
+ 	 PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
++#endif /* !__LP64__ */
+ 	{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
+ 	{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum) -> None")},
++#ifndef __LP64__
+ 	{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
+@@ -1659,14 +1670,17 @@
+ 	 PyDoc_STR("() -> (SInt16 refNum)")},
+ 	{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
++#ifndef __LP64__
+ 	{"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
+ 	 PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
+ 	{"Handle", (PyCFunction)Res_Handle, 1,
+diff -r -u ./Modules/_ctypes/libffi/src/darwin/ffitarget.h ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- ./Modules/_ctypes/libffi/src/darwin/ffitarget.h	2006-05-26 06:58:05.000000000 +0900
++++ ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h	2013-07-17 23:38:51.000000000 +0900
+@@ -4,7 +4,7 @@
+  * created by configure). This makes is possible to build a univeral binary
+  * of ctypes in one go.
+  */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+diff -r -u ./Python/mactoolboxglue.c ../Python-2.5/Python/mactoolboxglue.c
+--- ./Python/mactoolboxglue.c	2006-07-12 01:44:25.000000000 +0900
++++ ../Python-2.5/Python/mactoolboxglue.c	2013-07-17 23:39:09.000000000 +0900
+@@ -106,6 +106,7 @@
+ }
+ 
+ 
++#ifndef __LP64__
+ OSErr
+ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
+ {
+@@ -153,6 +154,7 @@
+ 	Py_XDECREF(fs);
+ 	return err;
+ }
++#endif /* !__LP64__ */
+ 
+ /* Convert a 4-char string object argument to an OSType value */
+ int
+@@ -417,6 +419,7 @@
+ GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
+ GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
+ 
++#ifndef __LP64__
+ GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
+@@ -429,6 +432,7 @@
+ GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
++#endif /* !__LP64__ */
+ 
+ GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
+ GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")

plugins/python-build/share/python-build/patches/2.5.1/Python-2.5.1/005_osx_failed_modules.patch

@@ -0,0 +1,124 @@
+diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
+index 8115614..e36fce9 100755
+--- ./Mac/Modules/cg/_CGmodule.c
++++ ./Mac/Modules/cg/_CGmodule.c
+@@ -1025,6 +1025,7 @@ static PyObject *CGContextRefObj_CGContextSetShouldAntialias(CGContextRefObject
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *CGContextRefObj_SyncCGContextOriginWithPort(CGContextRefObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1055,6 +1056,7 @@ static PyObject *CGContextRefObj_ClipCGContextToRegion(CGContextRefObject *_self
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif
+ 
+ static PyMethodDef CGContextRefObj_methods[] = {
+ 	{"CGContextSaveGState", (PyCFunction)CGContextRefObj_CGContextSaveGState, 1,
+@@ -1173,10 +1175,12 @@ static PyMethodDef CGContextRefObj_methods[] = {
+ 	 PyDoc_STR("() -> None")},
+ 	{"CGContextSetShouldAntialias", (PyCFunction)CGContextRefObj_CGContextSetShouldAntialias, 1,
+ 	 PyDoc_STR("(int shouldAntialias) -> None")},
++#ifndef __LP64__
+ 	{"SyncCGContextOriginWithPort", (PyCFunction)CGContextRefObj_SyncCGContextOriginWithPort, 1,
+ 	 PyDoc_STR("(CGrafPtr port) -> None")},
+ 	{"ClipCGContextToRegion", (PyCFunction)CGContextRefObj_ClipCGContextToRegion, 1,
+ 	 PyDoc_STR("(Rect portRect, RgnHandle region) -> None")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+@@ -1254,6 +1258,7 @@ PyTypeObject CGContextRef_Type = {
+ /* ------------------ End object type CGContextRef ------------------ */
+ 
+ 
++#ifndef __LP64__
+ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1271,10 +1276,13 @@ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ 	return _res;
+ 
+ }
++#endif
+ 
+ static PyMethodDef CG_methods[] = {
++#ifndef __LP64__
+ 	{"CreateCGContextForPort", (PyCFunction)CG_CreateCGContextForPort, 1,
+ 	 PyDoc_STR("(CGrafPtr) -> CGContextRef")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
+index 0acf3fd..1728b59 100644
+--- ./Modules/_curses_panel.c
++++ ./Modules/_curses_panel.c
+@@ -56,7 +56,7 @@ typedef struct {
+ 
+ PyTypeObject PyCursesPanel_Type;
+ 
+-#define PyCursesPanel_Check(v)	 ((v)->ob_type == &PyCursesPanel_Type)
++#define PyCursesPanel_Check(v)   (Py_TYPE(v) == &PyCursesPanel_Type)
+ 
+ /* Some helper functions. The problem is that there's always a window
+    associated with a panel. To ensure that Python's GC doesn't pull
+@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
+     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
+     if (po == NULL) return NULL;
+     po->pan = pan;
+-    po->wo = wo;
+-    Py_INCREF(wo);
+     if (insert_lop(po) < 0) {
+-	PyObject_DEL(po);
+-	return NULL;
++        po->wo = NULL;
++        Py_DECREF(po);
++        return NULL;
+     }
++    po->wo = wo;
++    Py_INCREF(wo);
+     return (PyObject *)po;
+ }
+ 
+@@ -191,8 +192,10 @@ static void
+ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
+ {
+     (void)del_panel(po->pan);
+-    Py_DECREF(po->wo);
+-    remove_lop(po);
++    if (po->wo != NULL) {
++        Py_DECREF(po->wo);
++        remove_lop(po);
++    }
+     PyObject_DEL(po);
+ }
+ 
+@@ -338,11 +341,10 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
+ /* -------------------------------------------------------*/
+ 
+ PyTypeObject PyCursesPanel_Type = {
+-    PyObject_HEAD_INIT(NULL)
+-    0,			/*ob_size*/
+-    "_curses_panel.curses panel",	/*tp_name*/
+-    sizeof(PyCursesPanelObject),	/*tp_basicsize*/
+-    0,			/*tp_itemsize*/
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "_curses_panel.curses panel",       /*tp_name*/
++    sizeof(PyCursesPanelObject),        /*tp_basicsize*/
++    0,                  /*tp_itemsize*/
+     /* methods */
+     (destructor)PyCursesPanel_Dealloc, /*tp_dealloc*/
+     0,			/*tp_print*/
+@@ -458,7 +460,7 @@ init_curses_panel(void)
+     PyObject *m, *d, *v;
+ 
+     /* Initialize object type */
+-    PyCursesPanel_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyCursesPanel_Type) = &PyType_Type;
+ 
+     import_curses();
+ 

plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/002_darwin_c_source.patch

@@ -0,0 +1,166 @@
+diff -r -u ./configure ../Python-2.5/configure
+--- ./configure	2006-09-05 11:54:42.000000000 +0900
++++ ../Python-2.5/configure	2013-07-19 15:27:46.000000000 +0900
+@@ -1396,6 +1396,16 @@
+ _ACEOF
+ 
+ 
++# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
++# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
++# them.
++
++cat >>confdefs.h <<\_ACEOF
++#define _DARWIN_C_SOURCE 1
++_ACEOF
++
++
++
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+@@ -3885,11 +3895,110 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
++	    # used to be here, but non-Apple gcc doesn't accept them.
++            if test "${CC}" = gcc
++	    then
++		{ echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
++echo -n "checking which compiler should be used... " >&6; }
++		case "${UNIVERSALSDK}" in
++		*/MacOSX10.4u.sdk)
++			# Build using 10.4 SDK, force usage of gcc when the
++			# compiler is gcc, otherwise the user will get very
++			# confusing error messages when building on OSX 10.6
++			CC=gcc-4.0
++			CPP=cpp-4.0
++			;;
++		esac
++		{ echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++echo "$CC" >&6; }
++	    fi
++
++
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		UNIVERSAL_ARCH_FLAGS=""
++	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   ARCH_RUN_32BIT=""
++		   LIPO_32BIT_FLAGS=""
++	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS=""
++		   ARCH_RUN_32BIT="true"
++
++	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
++
++	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++		 else
++	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++
++		 fi
++
++
++		CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
++		if test "${UNIVERSALSDK}" != "/"
++		then
++			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
++			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
++		fi
+ 	    fi
+ 
++	    # Calculate the right deployment target for this build.
++	    #
++	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
++	    if test ${cur_target} '>' 10.2 && \
++	       test ${cur_target} '<' 10.6
++	    then
++		    cur_target=10.3
++		    if test ${enable_universalsdk}; then
++			    if test "${UNIVERSAL_ARCHS}" = "all"; then
++				    # Ensure that the default platform for a
++				    # 4-way universal build is OSX 10.5,
++				    # that's the first OS release where
++				    # 4-way builds make sense.
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "intel"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
++				    cur_target='10.5'
++			    fi
++		    else
++			    if test `/usr/bin/arch` = "i386"; then
++				    # On Intel macs default to a deployment
++				    # target of 10.4, that's the first OSX
++				    # release with Intel support.
++				    cur_target="10.4"
++			    fi
++		    fi
++	    fi
++	    CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
++
++	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
++	    # environment with a value that is the same as what we'll use
++	    # in the Makefile to ensure that we'll get the same compiler
++	    # environment during configure and build time.
++	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
++	    export MACOSX_DEPLOYMENT_TARGET
++	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
++
+ 	    ;;
+ 	OSF*)
+ 	    BASECFLAGS="$BASECFLAGS -mieee"
+@@ -10851,7 +10960,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10863,7 +10972,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+diff -r -u ./pyconfig.h.in ../Python-2.5/pyconfig.h.in
+--- ./pyconfig.h.in	2006-07-30 23:09:47.000000000 +0900
++++ ../Python-2.5/pyconfig.h.in	2013-07-17 23:12:31.000000000 +0900
+@@ -912,6 +912,11 @@
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
++/* Define on Darwin to activate all library features */
++#ifndef _DARWIN_C_SOURCE
++#define _DARWIN_C_SOURCE
++#endif
++
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+ 

plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/003_osx_lp64.patch

@@ -0,0 +1,271 @@
+diff -r -u ./Include/pymactoolbox.h ../Python-2.5/Include/pymactoolbox.h
+--- ./Include/pymactoolbox.h	2004-11-05 16:02:59.000000000 +0900
++++ ../Python-2.5/Include/pymactoolbox.h	2013-07-17 23:38:51.000000000 +0900
+@@ -8,7 +8,10 @@
+ #endif
+ 
+ #include <Carbon/Carbon.h>
++
++#ifndef __LP64__
+ #include <QuickTime/QuickTime.h>
++#endif /* !__LP64__ */
+ 
+ /*
+ ** Helper routines for error codes and such.
+@@ -18,8 +21,11 @@
+ PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
+ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
+ PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
++#ifndef __LP64__ 
+ extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
+ 							      fsspec->path */
++#endif /* __LP64__ */
++
+ /*
+ ** These conversion routines are defined in mactoolboxglue.c itself.
+ */
+@@ -83,8 +89,10 @@
+ #endif /* USE_TOOLBOX_OBJECT_GLUE */
+ 
+ /* macfs exports */
++#ifndef __LP64__
+ int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
+ PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
++#endif /* !__LP64__ */
+ 
+ int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
+ PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
+@@ -101,39 +109,54 @@
+ extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ /* Ctl exports */
++#ifndef __LP64__
+ extern PyObject *CtlObj_New(ControlHandle);
+ extern int CtlObj_Convert(PyObject *, ControlHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Dlg exports */
++#ifndef __LP64__
+ extern PyObject *DlgObj_New(DialogPtr);
+ extern int DlgObj_Convert(PyObject *, DialogPtr *);
+ extern PyObject *DlgObj_WhichDialog(DialogPtr);
++#endif /* !__LP64__ */
+ 
+ /* Drag exports */
++#ifndef __LP64__
+ extern PyObject *DragObj_New(DragReference);
+ extern int DragObj_Convert(PyObject *, DragReference *);
++#endif /* !__LP64__ */
+ 
+ /* List exports */
++#ifndef __LP64__
+ extern PyObject *ListObj_New(ListHandle);
+ extern int ListObj_Convert(PyObject *, ListHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Menu exports */
++#ifndef __LP64__
+ extern PyObject *MenuObj_New(MenuHandle);
+ extern int MenuObj_Convert(PyObject *, MenuHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Qd exports */
++#ifndef __LP64__
+ extern PyObject *GrafObj_New(GrafPtr);
+ extern int GrafObj_Convert(PyObject *, GrafPtr *);
+ extern PyObject *BMObj_New(BitMapPtr);
+ extern int BMObj_Convert(PyObject *, BitMapPtr *);
+ extern PyObject *QdRGB_New(RGBColor *);
+ extern int QdRGB_Convert(PyObject *, RGBColor *);
++#endif /* !__LP64__ */
+ 
+ /* Qdoffs exports */
++#ifndef __LP64__
+ extern PyObject *GWorldObj_New(GWorldPtr);
+ extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
++#endif /* !__LP64__ */
+ 
+ /* Qt exports */
++#ifndef __LP64__
+ extern PyObject *TrackObj_New(Track);
+ extern int TrackObj_Convert(PyObject *, Track *);
+ extern PyObject *MovieObj_New(Movie);
+@@ -146,6 +169,7 @@
+ extern int UserDataObj_Convert(PyObject *, UserData *);
+ extern PyObject *MediaObj_New(Media);
+ extern int MediaObj_Convert(PyObject *, Media *);
++#endif /* !__LP64__ */
+ 
+ /* Res exports */
+ extern PyObject *ResObj_New(Handle);
+@@ -154,13 +178,17 @@
+ extern int OptResObj_Convert(PyObject *, Handle *);
+ 
+ /* TE exports */
++#ifndef __LP64__
+ extern PyObject *TEObj_New(TEHandle);
+ extern int TEObj_Convert(PyObject *, TEHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Win exports */
++#ifndef __LP64__
+ extern PyObject *WinObj_New(WindowPtr);
+ extern int WinObj_Convert(PyObject *, WindowPtr *);
+ extern PyObject *WinObj_WhichWindow(WindowPtr);
++#endif /* !__LP64__ */
+ 
+ /* CF exports */
+ extern PyObject *CFObj_New(CFTypeRef);
+diff -r -u ./Mac/Modules/res/_Resmodule.c ../Python-2.5/Mac/Modules/res/_Resmodule.c
+--- ./Mac/Modules/res/_Resmodule.c	2005-07-04 05:59:44.000000000 +0900
++++ ../Python-2.5/Mac/Modules/res/_Resmodule.c	2013-07-17 23:38:51.000000000 +0900
+@@ -414,6 +414,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -431,6 +432,7 @@
+ 	return _res;
+ 
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
+ {
+@@ -1152,6 +1154,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1287,6 +1290,7 @@
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1327,6 +1331,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1413,6 +1418,7 @@
+ 	                     nextRefNum);
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1438,6 +1444,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1534,6 +1541,7 @@
+ 	                     PyMac_BuildFSSpec, &newSpec);
+ 	return _res;
+ }
++#endif /* __LP64__ */
+ 
+ static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1637,6 +1645,7 @@
+ 	 PyDoc_STR("(short refNum) -> (short _rv)")},
+ 	{"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
+ 	 PyDoc_STR("(short refNum, short attrs) -> None")},
++#ifndef __LP64__
+ 	{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
+ 	 PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
+ 	{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
+@@ -1647,10 +1656,12 @@
+ 	 PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
+ 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
+ 	 PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
++#endif /* !__LP64__ */
+ 	{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
+ 	{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum) -> None")},
++#ifndef __LP64__
+ 	{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
+@@ -1659,14 +1670,17 @@
+ 	 PyDoc_STR("() -> (SInt16 refNum)")},
+ 	{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
++#ifndef __LP64__
+ 	{"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
+ 	 PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
+ 	{"Handle", (PyCFunction)Res_Handle, 1,
+diff -r -u ./Modules/_ctypes/libffi/src/darwin/ffitarget.h ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- ./Modules/_ctypes/libffi/src/darwin/ffitarget.h	2006-05-26 06:58:05.000000000 +0900
++++ ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h	2013-07-17 23:38:51.000000000 +0900
+@@ -4,7 +4,7 @@
+  * created by configure). This makes is possible to build a univeral binary
+  * of ctypes in one go.
+  */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+diff -r -u ./Python/mactoolboxglue.c ../Python-2.5/Python/mactoolboxglue.c
+--- ./Python/mactoolboxglue.c	2006-07-12 01:44:25.000000000 +0900
++++ ../Python-2.5/Python/mactoolboxglue.c	2013-07-17 23:39:09.000000000 +0900
+@@ -106,6 +106,7 @@
+ }
+ 
+ 
++#ifndef __LP64__
+ OSErr
+ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
+ {
+@@ -153,6 +154,7 @@
+ 	Py_XDECREF(fs);
+ 	return err;
+ }
++#endif /* !__LP64__ */
+ 
+ /* Convert a 4-char string object argument to an OSType value */
+ int
+@@ -417,6 +419,7 @@
+ GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
+ GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
+ 
++#ifndef __LP64__
+ GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
+@@ -429,6 +432,7 @@
+ GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
++#endif /* !__LP64__ */
+ 
+ GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
+ GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")

plugins/python-build/share/python-build/patches/2.5.2/Python-2.5.2/005_osx_failed_modules.patch

@@ -0,0 +1,124 @@
+diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
+index 8115614..e36fce9 100755
+--- ./Mac/Modules/cg/_CGmodule.c
++++ ./Mac/Modules/cg/_CGmodule.c
+@@ -1025,6 +1025,7 @@ static PyObject *CGContextRefObj_CGContextSetShouldAntialias(CGContextRefObject
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *CGContextRefObj_SyncCGContextOriginWithPort(CGContextRefObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1055,6 +1056,7 @@ static PyObject *CGContextRefObj_ClipCGContextToRegion(CGContextRefObject *_self
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif
+ 
+ static PyMethodDef CGContextRefObj_methods[] = {
+ 	{"CGContextSaveGState", (PyCFunction)CGContextRefObj_CGContextSaveGState, 1,
+@@ -1173,10 +1175,12 @@ static PyMethodDef CGContextRefObj_methods[] = {
+ 	 PyDoc_STR("() -> None")},
+ 	{"CGContextSetShouldAntialias", (PyCFunction)CGContextRefObj_CGContextSetShouldAntialias, 1,
+ 	 PyDoc_STR("(int shouldAntialias) -> None")},
++#ifndef __LP64__
+ 	{"SyncCGContextOriginWithPort", (PyCFunction)CGContextRefObj_SyncCGContextOriginWithPort, 1,
+ 	 PyDoc_STR("(CGrafPtr port) -> None")},
+ 	{"ClipCGContextToRegion", (PyCFunction)CGContextRefObj_ClipCGContextToRegion, 1,
+ 	 PyDoc_STR("(Rect portRect, RgnHandle region) -> None")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+@@ -1254,6 +1258,7 @@ PyTypeObject CGContextRef_Type = {
+ /* ------------------ End object type CGContextRef ------------------ */
+ 
+ 
++#ifndef __LP64__
+ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1271,10 +1276,13 @@ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ 	return _res;
+ 
+ }
++#endif
+ 
+ static PyMethodDef CG_methods[] = {
++#ifndef __LP64__
+ 	{"CreateCGContextForPort", (PyCFunction)CG_CreateCGContextForPort, 1,
+ 	 PyDoc_STR("(CGrafPtr) -> CGContextRef")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
+index 0acf3fd..1728b59 100644
+--- ./Modules/_curses_panel.c
++++ ./Modules/_curses_panel.c
+@@ -56,7 +56,7 @@ typedef struct {
+ 
+ PyTypeObject PyCursesPanel_Type;
+ 
+-#define PyCursesPanel_Check(v)	 ((v)->ob_type == &PyCursesPanel_Type)
++#define PyCursesPanel_Check(v)   (Py_TYPE(v) == &PyCursesPanel_Type)
+ 
+ /* Some helper functions. The problem is that there's always a window
+    associated with a panel. To ensure that Python's GC doesn't pull
+@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
+     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
+     if (po == NULL) return NULL;
+     po->pan = pan;
+-    po->wo = wo;
+-    Py_INCREF(wo);
+     if (insert_lop(po) < 0) {
+-	PyObject_DEL(po);
+-	return NULL;
++        po->wo = NULL;
++        Py_DECREF(po);
++        return NULL;
+     }
++    po->wo = wo;
++    Py_INCREF(wo);
+     return (PyObject *)po;
+ }
+ 
+@@ -191,8 +192,10 @@ static void
+ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
+ {
+     (void)del_panel(po->pan);
+-    Py_DECREF(po->wo);
+-    remove_lop(po);
++    if (po->wo != NULL) {
++        Py_DECREF(po->wo);
++        remove_lop(po);
++    }
+     PyObject_DEL(po);
+ }
+ 
+@@ -338,11 +341,10 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
+ /* -------------------------------------------------------*/
+ 
+ PyTypeObject PyCursesPanel_Type = {
+-    PyObject_HEAD_INIT(NULL)
+-    0,			/*ob_size*/
+-    "_curses_panel.curses panel",	/*tp_name*/
+-    sizeof(PyCursesPanelObject),	/*tp_basicsize*/
+-    0,			/*tp_itemsize*/
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "_curses_panel.curses panel",       /*tp_name*/
++    sizeof(PyCursesPanelObject),        /*tp_basicsize*/
++    0,                  /*tp_itemsize*/
+     /* methods */
+     (destructor)PyCursesPanel_Dealloc, /*tp_dealloc*/
+     0,			/*tp_print*/
+@@ -458,7 +460,7 @@ init_curses_panel(void)
+     PyObject *m, *d, *v;
+ 
+     /* Initialize object type */
+-    PyCursesPanel_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyCursesPanel_Type) = &PyType_Type;
+ 
+     import_curses();
+ 

plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/002_darwin_c_source.patch

@@ -0,0 +1,166 @@
+diff -r -u ./configure ../Python-2.5/configure
+--- ./configure	2006-09-05 11:54:42.000000000 +0900
++++ ../Python-2.5/configure	2013-07-19 15:27:46.000000000 +0900
+@@ -1396,6 +1396,16 @@
+ _ACEOF
+ 
+ 
++# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
++# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
++# them.
++
++cat >>confdefs.h <<\_ACEOF
++#define _DARWIN_C_SOURCE 1
++_ACEOF
++
++
++
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+@@ -3885,11 +3895,110 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
++	    # used to be here, but non-Apple gcc doesn't accept them.
++            if test "${CC}" = gcc
++	    then
++		{ echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
++echo -n "checking which compiler should be used... " >&6; }
++		case "${UNIVERSALSDK}" in
++		*/MacOSX10.4u.sdk)
++			# Build using 10.4 SDK, force usage of gcc when the
++			# compiler is gcc, otherwise the user will get very
++			# confusing error messages when building on OSX 10.6
++			CC=gcc-4.0
++			CPP=cpp-4.0
++			;;
++		esac
++		{ echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++echo "$CC" >&6; }
++	    fi
++
++
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		UNIVERSAL_ARCH_FLAGS=""
++	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   ARCH_RUN_32BIT=""
++		   LIPO_32BIT_FLAGS=""
++	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS=""
++		   ARCH_RUN_32BIT="true"
++
++	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
++
++	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++		 else
++	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++
++		 fi
++
++
++		CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
++		if test "${UNIVERSALSDK}" != "/"
++		then
++			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
++			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
++		fi
+ 	    fi
+ 
++	    # Calculate the right deployment target for this build.
++	    #
++	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
++	    if test ${cur_target} '>' 10.2 && \
++	       test ${cur_target} '<' 10.6
++	    then
++		    cur_target=10.3
++		    if test ${enable_universalsdk}; then
++			    if test "${UNIVERSAL_ARCHS}" = "all"; then
++				    # Ensure that the default platform for a
++				    # 4-way universal build is OSX 10.5,
++				    # that's the first OS release where
++				    # 4-way builds make sense.
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "intel"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
++				    cur_target='10.5'
++			    fi
++		    else
++			    if test `/usr/bin/arch` = "i386"; then
++				    # On Intel macs default to a deployment
++				    # target of 10.4, that's the first OSX
++				    # release with Intel support.
++				    cur_target="10.4"
++			    fi
++		    fi
++	    fi
++	    CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
++
++	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
++	    # environment with a value that is the same as what we'll use
++	    # in the Makefile to ensure that we'll get the same compiler
++	    # environment during configure and build time.
++	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
++	    export MACOSX_DEPLOYMENT_TARGET
++	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
++
+ 	    ;;
+ 	OSF*)
+ 	    BASECFLAGS="$BASECFLAGS -mieee"
+@@ -10851,7 +10960,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10863,7 +10972,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+diff -r -u ./pyconfig.h.in ../Python-2.5/pyconfig.h.in
+--- ./pyconfig.h.in	2006-07-30 23:09:47.000000000 +0900
++++ ../Python-2.5/pyconfig.h.in	2013-07-17 23:12:31.000000000 +0900
+@@ -912,6 +912,11 @@
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
++/* Define on Darwin to activate all library features */
++#ifndef _DARWIN_C_SOURCE
++#define _DARWIN_C_SOURCE
++#endif
++
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+ 

plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/003_osx_lp64.patch

@@ -0,0 +1,271 @@
+diff -r -u ./Include/pymactoolbox.h ../Python-2.5/Include/pymactoolbox.h
+--- ./Include/pymactoolbox.h	2004-11-05 16:02:59.000000000 +0900
++++ ../Python-2.5/Include/pymactoolbox.h	2013-07-17 23:38:51.000000000 +0900
+@@ -8,7 +8,10 @@
+ #endif
+ 
+ #include <Carbon/Carbon.h>
++
++#ifndef __LP64__
+ #include <QuickTime/QuickTime.h>
++#endif /* !__LP64__ */
+ 
+ /*
+ ** Helper routines for error codes and such.
+@@ -18,8 +21,11 @@
+ PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
+ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
+ PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
++#ifndef __LP64__ 
+ extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
+ 							      fsspec->path */
++#endif /* __LP64__ */
++
+ /*
+ ** These conversion routines are defined in mactoolboxglue.c itself.
+ */
+@@ -83,8 +89,10 @@
+ #endif /* USE_TOOLBOX_OBJECT_GLUE */
+ 
+ /* macfs exports */
++#ifndef __LP64__
+ int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
+ PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
++#endif /* !__LP64__ */
+ 
+ int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
+ PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
+@@ -101,39 +109,54 @@
+ extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ /* Ctl exports */
++#ifndef __LP64__
+ extern PyObject *CtlObj_New(ControlHandle);
+ extern int CtlObj_Convert(PyObject *, ControlHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Dlg exports */
++#ifndef __LP64__
+ extern PyObject *DlgObj_New(DialogPtr);
+ extern int DlgObj_Convert(PyObject *, DialogPtr *);
+ extern PyObject *DlgObj_WhichDialog(DialogPtr);
++#endif /* !__LP64__ */
+ 
+ /* Drag exports */
++#ifndef __LP64__
+ extern PyObject *DragObj_New(DragReference);
+ extern int DragObj_Convert(PyObject *, DragReference *);
++#endif /* !__LP64__ */
+ 
+ /* List exports */
++#ifndef __LP64__
+ extern PyObject *ListObj_New(ListHandle);
+ extern int ListObj_Convert(PyObject *, ListHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Menu exports */
++#ifndef __LP64__
+ extern PyObject *MenuObj_New(MenuHandle);
+ extern int MenuObj_Convert(PyObject *, MenuHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Qd exports */
++#ifndef __LP64__
+ extern PyObject *GrafObj_New(GrafPtr);
+ extern int GrafObj_Convert(PyObject *, GrafPtr *);
+ extern PyObject *BMObj_New(BitMapPtr);
+ extern int BMObj_Convert(PyObject *, BitMapPtr *);
+ extern PyObject *QdRGB_New(RGBColor *);
+ extern int QdRGB_Convert(PyObject *, RGBColor *);
++#endif /* !__LP64__ */
+ 
+ /* Qdoffs exports */
++#ifndef __LP64__
+ extern PyObject *GWorldObj_New(GWorldPtr);
+ extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
++#endif /* !__LP64__ */
+ 
+ /* Qt exports */
++#ifndef __LP64__
+ extern PyObject *TrackObj_New(Track);
+ extern int TrackObj_Convert(PyObject *, Track *);
+ extern PyObject *MovieObj_New(Movie);
+@@ -146,6 +169,7 @@
+ extern int UserDataObj_Convert(PyObject *, UserData *);
+ extern PyObject *MediaObj_New(Media);
+ extern int MediaObj_Convert(PyObject *, Media *);
++#endif /* !__LP64__ */
+ 
+ /* Res exports */
+ extern PyObject *ResObj_New(Handle);
+@@ -154,13 +178,17 @@
+ extern int OptResObj_Convert(PyObject *, Handle *);
+ 
+ /* TE exports */
++#ifndef __LP64__
+ extern PyObject *TEObj_New(TEHandle);
+ extern int TEObj_Convert(PyObject *, TEHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Win exports */
++#ifndef __LP64__
+ extern PyObject *WinObj_New(WindowPtr);
+ extern int WinObj_Convert(PyObject *, WindowPtr *);
+ extern PyObject *WinObj_WhichWindow(WindowPtr);
++#endif /* !__LP64__ */
+ 
+ /* CF exports */
+ extern PyObject *CFObj_New(CFTypeRef);
+diff -r -u ./Mac/Modules/res/_Resmodule.c ../Python-2.5/Mac/Modules/res/_Resmodule.c
+--- ./Mac/Modules/res/_Resmodule.c	2005-07-04 05:59:44.000000000 +0900
++++ ../Python-2.5/Mac/Modules/res/_Resmodule.c	2013-07-17 23:38:51.000000000 +0900
+@@ -414,6 +414,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -431,6 +432,7 @@
+ 	return _res;
+ 
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
+ {
+@@ -1152,6 +1154,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1287,6 +1290,7 @@
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1327,6 +1331,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1413,6 +1418,7 @@
+ 	                     nextRefNum);
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1438,6 +1444,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1534,6 +1541,7 @@
+ 	                     PyMac_BuildFSSpec, &newSpec);
+ 	return _res;
+ }
++#endif /* __LP64__ */
+ 
+ static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1637,6 +1645,7 @@
+ 	 PyDoc_STR("(short refNum) -> (short _rv)")},
+ 	{"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
+ 	 PyDoc_STR("(short refNum, short attrs) -> None")},
++#ifndef __LP64__
+ 	{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
+ 	 PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
+ 	{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
+@@ -1647,10 +1656,12 @@
+ 	 PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
+ 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
+ 	 PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
++#endif /* !__LP64__ */
+ 	{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
+ 	{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum) -> None")},
++#ifndef __LP64__
+ 	{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
+@@ -1659,14 +1670,17 @@
+ 	 PyDoc_STR("() -> (SInt16 refNum)")},
+ 	{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
++#ifndef __LP64__
+ 	{"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
+ 	 PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
+ 	{"Handle", (PyCFunction)Res_Handle, 1,
+diff -r -u ./Modules/_ctypes/libffi/src/darwin/ffitarget.h ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- ./Modules/_ctypes/libffi/src/darwin/ffitarget.h	2006-05-26 06:58:05.000000000 +0900
++++ ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h	2013-07-17 23:38:51.000000000 +0900
+@@ -4,7 +4,7 @@
+  * created by configure). This makes is possible to build a univeral binary
+  * of ctypes in one go.
+  */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+diff -r -u ./Python/mactoolboxglue.c ../Python-2.5/Python/mactoolboxglue.c
+--- ./Python/mactoolboxglue.c	2006-07-12 01:44:25.000000000 +0900
++++ ../Python-2.5/Python/mactoolboxglue.c	2013-07-17 23:39:09.000000000 +0900
+@@ -106,6 +106,7 @@
+ }
+ 
+ 
++#ifndef __LP64__
+ OSErr
+ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
+ {
+@@ -153,6 +154,7 @@
+ 	Py_XDECREF(fs);
+ 	return err;
+ }
++#endif /* !__LP64__ */
+ 
+ /* Convert a 4-char string object argument to an OSType value */
+ int
+@@ -417,6 +419,7 @@
+ GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
+ GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
+ 
++#ifndef __LP64__
+ GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
+@@ -429,6 +432,7 @@
+ GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
++#endif /* !__LP64__ */
+ 
+ GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
+ GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")

plugins/python-build/share/python-build/patches/2.5.3/Python-2.5.3/005_osx_failed_modules.patch

@@ -0,0 +1,124 @@
+diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
+index 8115614..e36fce9 100755
+--- ./Mac/Modules/cg/_CGmodule.c
++++ ./Mac/Modules/cg/_CGmodule.c
+@@ -1025,6 +1025,7 @@ static PyObject *CGContextRefObj_CGContextSetShouldAntialias(CGContextRefObject
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *CGContextRefObj_SyncCGContextOriginWithPort(CGContextRefObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1055,6 +1056,7 @@ static PyObject *CGContextRefObj_ClipCGContextToRegion(CGContextRefObject *_self
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif
+ 
+ static PyMethodDef CGContextRefObj_methods[] = {
+ 	{"CGContextSaveGState", (PyCFunction)CGContextRefObj_CGContextSaveGState, 1,
+@@ -1173,10 +1175,12 @@ static PyMethodDef CGContextRefObj_methods[] = {
+ 	 PyDoc_STR("() -> None")},
+ 	{"CGContextSetShouldAntialias", (PyCFunction)CGContextRefObj_CGContextSetShouldAntialias, 1,
+ 	 PyDoc_STR("(int shouldAntialias) -> None")},
++#ifndef __LP64__
+ 	{"SyncCGContextOriginWithPort", (PyCFunction)CGContextRefObj_SyncCGContextOriginWithPort, 1,
+ 	 PyDoc_STR("(CGrafPtr port) -> None")},
+ 	{"ClipCGContextToRegion", (PyCFunction)CGContextRefObj_ClipCGContextToRegion, 1,
+ 	 PyDoc_STR("(Rect portRect, RgnHandle region) -> None")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+@@ -1254,6 +1258,7 @@ PyTypeObject CGContextRef_Type = {
+ /* ------------------ End object type CGContextRef ------------------ */
+ 
+ 
++#ifndef __LP64__
+ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1271,10 +1276,13 @@ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ 	return _res;
+ 
+ }
++#endif
+ 
+ static PyMethodDef CG_methods[] = {
++#ifndef __LP64__
+ 	{"CreateCGContextForPort", (PyCFunction)CG_CreateCGContextForPort, 1,
+ 	 PyDoc_STR("(CGrafPtr) -> CGContextRef")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
+index 0acf3fd..1728b59 100644
+--- ./Modules/_curses_panel.c
++++ ./Modules/_curses_panel.c
+@@ -56,7 +56,7 @@ typedef struct {
+ 
+ PyTypeObject PyCursesPanel_Type;
+ 
+-#define PyCursesPanel_Check(v)	 ((v)->ob_type == &PyCursesPanel_Type)
++#define PyCursesPanel_Check(v)   (Py_TYPE(v) == &PyCursesPanel_Type)
+ 
+ /* Some helper functions. The problem is that there's always a window
+    associated with a panel. To ensure that Python's GC doesn't pull
+@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
+     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
+     if (po == NULL) return NULL;
+     po->pan = pan;
+-    po->wo = wo;
+-    Py_INCREF(wo);
+     if (insert_lop(po) < 0) {
+-	PyObject_DEL(po);
+-	return NULL;
++        po->wo = NULL;
++        Py_DECREF(po);
++        return NULL;
+     }
++    po->wo = wo;
++    Py_INCREF(wo);
+     return (PyObject *)po;
+ }
+ 
+@@ -191,8 +192,10 @@ static void
+ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
+ {
+     (void)del_panel(po->pan);
+-    Py_DECREF(po->wo);
+-    remove_lop(po);
++    if (po->wo != NULL) {
++        Py_DECREF(po->wo);
++        remove_lop(po);
++    }
+     PyObject_DEL(po);
+ }
+ 
+@@ -338,11 +341,10 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
+ /* -------------------------------------------------------*/
+ 
+ PyTypeObject PyCursesPanel_Type = {
+-    PyObject_HEAD_INIT(NULL)
+-    0,			/*ob_size*/
+-    "_curses_panel.curses panel",	/*tp_name*/
+-    sizeof(PyCursesPanelObject),	/*tp_basicsize*/
+-    0,			/*tp_itemsize*/
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "_curses_panel.curses panel",       /*tp_name*/
++    sizeof(PyCursesPanelObject),        /*tp_basicsize*/
++    0,                  /*tp_itemsize*/
+     /* methods */
+     (destructor)PyCursesPanel_Dealloc, /*tp_dealloc*/
+     0,			/*tp_print*/
+@@ -458,7 +460,7 @@ init_curses_panel(void)
+     PyObject *m, *d, *v;
+ 
+     /* Initialize object type */
+-    PyCursesPanel_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyCursesPanel_Type) = &PyType_Type;
+ 
+     import_curses();
+ 

plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/002_darwin_c_source.patch

@@ -0,0 +1,166 @@
+diff -r -u ./configure ../Python-2.5/configure
+--- ./configure	2006-09-05 11:54:42.000000000 +0900
++++ ../Python-2.5/configure	2013-07-19 15:27:46.000000000 +0900
+@@ -1396,6 +1396,16 @@
+ _ACEOF
+ 
+ 
++# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
++# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
++# them.
++
++cat >>confdefs.h <<\_ACEOF
++#define _DARWIN_C_SOURCE 1
++_ACEOF
++
++
++
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+@@ -3885,11 +3895,110 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
++	    # used to be here, but non-Apple gcc doesn't accept them.
++            if test "${CC}" = gcc
++	    then
++		{ echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
++echo -n "checking which compiler should be used... " >&6; }
++		case "${UNIVERSALSDK}" in
++		*/MacOSX10.4u.sdk)
++			# Build using 10.4 SDK, force usage of gcc when the
++			# compiler is gcc, otherwise the user will get very
++			# confusing error messages when building on OSX 10.6
++			CC=gcc-4.0
++			CPP=cpp-4.0
++			;;
++		esac
++		{ echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++echo "$CC" >&6; }
++	    fi
++
++
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		UNIVERSAL_ARCH_FLAGS=""
++	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   ARCH_RUN_32BIT=""
++		   LIPO_32BIT_FLAGS=""
++	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS=""
++		   ARCH_RUN_32BIT="true"
++
++	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
++
++	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++		 else
++	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++
++		 fi
++
++
++		CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
++		if test "${UNIVERSALSDK}" != "/"
++		then
++			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
++			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
++		fi
+ 	    fi
+ 
++	    # Calculate the right deployment target for this build.
++	    #
++	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
++	    if test ${cur_target} '>' 10.2 && \
++	       test ${cur_target} '<' 10.6
++	    then
++		    cur_target=10.3
++		    if test ${enable_universalsdk}; then
++			    if test "${UNIVERSAL_ARCHS}" = "all"; then
++				    # Ensure that the default platform for a
++				    # 4-way universal build is OSX 10.5,
++				    # that's the first OS release where
++				    # 4-way builds make sense.
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "intel"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
++				    cur_target='10.5'
++			    fi
++		    else
++			    if test `/usr/bin/arch` = "i386"; then
++				    # On Intel macs default to a deployment
++				    # target of 10.4, that's the first OSX
++				    # release with Intel support.
++				    cur_target="10.4"
++			    fi
++		    fi
++	    fi
++	    CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
++
++	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
++	    # environment with a value that is the same as what we'll use
++	    # in the Makefile to ensure that we'll get the same compiler
++	    # environment during configure and build time.
++	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
++	    export MACOSX_DEPLOYMENT_TARGET
++	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
++
+ 	    ;;
+ 	OSF*)
+ 	    BASECFLAGS="$BASECFLAGS -mieee"
+@@ -10851,7 +10960,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10863,7 +10972,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+diff -r -u ./pyconfig.h.in ../Python-2.5/pyconfig.h.in
+--- ./pyconfig.h.in	2006-07-30 23:09:47.000000000 +0900
++++ ../Python-2.5/pyconfig.h.in	2013-07-17 23:12:31.000000000 +0900
+@@ -912,6 +912,11 @@
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
++/* Define on Darwin to activate all library features */
++#ifndef _DARWIN_C_SOURCE
++#define _DARWIN_C_SOURCE
++#endif
++
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+ 

plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/003_osx_lp64.patch

@@ -0,0 +1,271 @@
+diff -r -u ./Include/pymactoolbox.h ../Python-2.5/Include/pymactoolbox.h
+--- ./Include/pymactoolbox.h	2004-11-05 16:02:59.000000000 +0900
++++ ../Python-2.5/Include/pymactoolbox.h	2013-07-17 23:38:51.000000000 +0900
+@@ -8,7 +8,10 @@
+ #endif
+ 
+ #include <Carbon/Carbon.h>
++
++#ifndef __LP64__
+ #include <QuickTime/QuickTime.h>
++#endif /* !__LP64__ */
+ 
+ /*
+ ** Helper routines for error codes and such.
+@@ -18,8 +21,11 @@
+ PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
+ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
+ PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
++#ifndef __LP64__ 
+ extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
+ 							      fsspec->path */
++#endif /* __LP64__ */
++
+ /*
+ ** These conversion routines are defined in mactoolboxglue.c itself.
+ */
+@@ -83,8 +89,10 @@
+ #endif /* USE_TOOLBOX_OBJECT_GLUE */
+ 
+ /* macfs exports */
++#ifndef __LP64__
+ int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
+ PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
++#endif /* !__LP64__ */
+ 
+ int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
+ PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
+@@ -101,39 +109,54 @@
+ extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ /* Ctl exports */
++#ifndef __LP64__
+ extern PyObject *CtlObj_New(ControlHandle);
+ extern int CtlObj_Convert(PyObject *, ControlHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Dlg exports */
++#ifndef __LP64__
+ extern PyObject *DlgObj_New(DialogPtr);
+ extern int DlgObj_Convert(PyObject *, DialogPtr *);
+ extern PyObject *DlgObj_WhichDialog(DialogPtr);
++#endif /* !__LP64__ */
+ 
+ /* Drag exports */
++#ifndef __LP64__
+ extern PyObject *DragObj_New(DragReference);
+ extern int DragObj_Convert(PyObject *, DragReference *);
++#endif /* !__LP64__ */
+ 
+ /* List exports */
++#ifndef __LP64__
+ extern PyObject *ListObj_New(ListHandle);
+ extern int ListObj_Convert(PyObject *, ListHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Menu exports */
++#ifndef __LP64__
+ extern PyObject *MenuObj_New(MenuHandle);
+ extern int MenuObj_Convert(PyObject *, MenuHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Qd exports */
++#ifndef __LP64__
+ extern PyObject *GrafObj_New(GrafPtr);
+ extern int GrafObj_Convert(PyObject *, GrafPtr *);
+ extern PyObject *BMObj_New(BitMapPtr);
+ extern int BMObj_Convert(PyObject *, BitMapPtr *);
+ extern PyObject *QdRGB_New(RGBColor *);
+ extern int QdRGB_Convert(PyObject *, RGBColor *);
++#endif /* !__LP64__ */
+ 
+ /* Qdoffs exports */
++#ifndef __LP64__
+ extern PyObject *GWorldObj_New(GWorldPtr);
+ extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
++#endif /* !__LP64__ */
+ 
+ /* Qt exports */
++#ifndef __LP64__
+ extern PyObject *TrackObj_New(Track);
+ extern int TrackObj_Convert(PyObject *, Track *);
+ extern PyObject *MovieObj_New(Movie);
+@@ -146,6 +169,7 @@
+ extern int UserDataObj_Convert(PyObject *, UserData *);
+ extern PyObject *MediaObj_New(Media);
+ extern int MediaObj_Convert(PyObject *, Media *);
++#endif /* !__LP64__ */
+ 
+ /* Res exports */
+ extern PyObject *ResObj_New(Handle);
+@@ -154,13 +178,17 @@
+ extern int OptResObj_Convert(PyObject *, Handle *);
+ 
+ /* TE exports */
++#ifndef __LP64__
+ extern PyObject *TEObj_New(TEHandle);
+ extern int TEObj_Convert(PyObject *, TEHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Win exports */
++#ifndef __LP64__
+ extern PyObject *WinObj_New(WindowPtr);
+ extern int WinObj_Convert(PyObject *, WindowPtr *);
+ extern PyObject *WinObj_WhichWindow(WindowPtr);
++#endif /* !__LP64__ */
+ 
+ /* CF exports */
+ extern PyObject *CFObj_New(CFTypeRef);
+diff -r -u ./Mac/Modules/res/_Resmodule.c ../Python-2.5/Mac/Modules/res/_Resmodule.c
+--- ./Mac/Modules/res/_Resmodule.c	2005-07-04 05:59:44.000000000 +0900
++++ ../Python-2.5/Mac/Modules/res/_Resmodule.c	2013-07-17 23:38:51.000000000 +0900
+@@ -414,6 +414,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -431,6 +432,7 @@
+ 	return _res;
+ 
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
+ {
+@@ -1152,6 +1154,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1287,6 +1290,7 @@
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1327,6 +1331,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1413,6 +1418,7 @@
+ 	                     nextRefNum);
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1438,6 +1444,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1534,6 +1541,7 @@
+ 	                     PyMac_BuildFSSpec, &newSpec);
+ 	return _res;
+ }
++#endif /* __LP64__ */
+ 
+ static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1637,6 +1645,7 @@
+ 	 PyDoc_STR("(short refNum) -> (short _rv)")},
+ 	{"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
+ 	 PyDoc_STR("(short refNum, short attrs) -> None")},
++#ifndef __LP64__
+ 	{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
+ 	 PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
+ 	{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
+@@ -1647,10 +1656,12 @@
+ 	 PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
+ 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
+ 	 PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
++#endif /* !__LP64__ */
+ 	{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
+ 	{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum) -> None")},
++#ifndef __LP64__
+ 	{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
+@@ -1659,14 +1670,17 @@
+ 	 PyDoc_STR("() -> (SInt16 refNum)")},
+ 	{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
++#ifndef __LP64__
+ 	{"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
+ 	 PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
+ 	{"Handle", (PyCFunction)Res_Handle, 1,
+diff -r -u ./Modules/_ctypes/libffi/src/darwin/ffitarget.h ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- ./Modules/_ctypes/libffi/src/darwin/ffitarget.h	2006-05-26 06:58:05.000000000 +0900
++++ ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h	2013-07-17 23:38:51.000000000 +0900
+@@ -4,7 +4,7 @@
+  * created by configure). This makes is possible to build a univeral binary
+  * of ctypes in one go.
+  */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+diff -r -u ./Python/mactoolboxglue.c ../Python-2.5/Python/mactoolboxglue.c
+--- ./Python/mactoolboxglue.c	2006-07-12 01:44:25.000000000 +0900
++++ ../Python-2.5/Python/mactoolboxglue.c	2013-07-17 23:39:09.000000000 +0900
+@@ -106,6 +106,7 @@
+ }
+ 
+ 
++#ifndef __LP64__
+ OSErr
+ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
+ {
+@@ -153,6 +154,7 @@
+ 	Py_XDECREF(fs);
+ 	return err;
+ }
++#endif /* !__LP64__ */
+ 
+ /* Convert a 4-char string object argument to an OSType value */
+ int
+@@ -417,6 +419,7 @@
+ GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
+ GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
+ 
++#ifndef __LP64__
+ GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
+@@ -429,6 +432,7 @@
+ GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
++#endif /* !__LP64__ */
+ 
+ GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
+ GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")

plugins/python-build/share/python-build/patches/2.5.4/Python-2.5.4/005_osx_failed_modules.patch

@@ -0,0 +1,124 @@
+diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
+index 8115614..e36fce9 100755
+--- ./Mac/Modules/cg/_CGmodule.c
++++ ./Mac/Modules/cg/_CGmodule.c
+@@ -1025,6 +1025,7 @@ static PyObject *CGContextRefObj_CGContextSetShouldAntialias(CGContextRefObject
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *CGContextRefObj_SyncCGContextOriginWithPort(CGContextRefObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1055,6 +1056,7 @@ static PyObject *CGContextRefObj_ClipCGContextToRegion(CGContextRefObject *_self
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif
+ 
+ static PyMethodDef CGContextRefObj_methods[] = {
+ 	{"CGContextSaveGState", (PyCFunction)CGContextRefObj_CGContextSaveGState, 1,
+@@ -1173,10 +1175,12 @@ static PyMethodDef CGContextRefObj_methods[] = {
+ 	 PyDoc_STR("() -> None")},
+ 	{"CGContextSetShouldAntialias", (PyCFunction)CGContextRefObj_CGContextSetShouldAntialias, 1,
+ 	 PyDoc_STR("(int shouldAntialias) -> None")},
++#ifndef __LP64__
+ 	{"SyncCGContextOriginWithPort", (PyCFunction)CGContextRefObj_SyncCGContextOriginWithPort, 1,
+ 	 PyDoc_STR("(CGrafPtr port) -> None")},
+ 	{"ClipCGContextToRegion", (PyCFunction)CGContextRefObj_ClipCGContextToRegion, 1,
+ 	 PyDoc_STR("(Rect portRect, RgnHandle region) -> None")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+@@ -1254,6 +1258,7 @@ PyTypeObject CGContextRef_Type = {
+ /* ------------------ End object type CGContextRef ------------------ */
+ 
+ 
++#ifndef __LP64__
+ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1271,10 +1276,13 @@ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ 	return _res;
+ 
+ }
++#endif
+ 
+ static PyMethodDef CG_methods[] = {
++#ifndef __LP64__
+ 	{"CreateCGContextForPort", (PyCFunction)CG_CreateCGContextForPort, 1,
+ 	 PyDoc_STR("(CGrafPtr) -> CGContextRef")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
+index 0acf3fd..1728b59 100644
+--- ./Modules/_curses_panel.c
++++ ./Modules/_curses_panel.c
+@@ -56,7 +56,7 @@ typedef struct {
+ 
+ PyTypeObject PyCursesPanel_Type;
+ 
+-#define PyCursesPanel_Check(v)	 ((v)->ob_type == &PyCursesPanel_Type)
++#define PyCursesPanel_Check(v)   (Py_TYPE(v) == &PyCursesPanel_Type)
+ 
+ /* Some helper functions. The problem is that there's always a window
+    associated with a panel. To ensure that Python's GC doesn't pull
+@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
+     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
+     if (po == NULL) return NULL;
+     po->pan = pan;
+-    po->wo = wo;
+-    Py_INCREF(wo);
+     if (insert_lop(po) < 0) {
+-	PyObject_DEL(po);
+-	return NULL;
++        po->wo = NULL;
++        Py_DECREF(po);
++        return NULL;
+     }
++    po->wo = wo;
++    Py_INCREF(wo);
+     return (PyObject *)po;
+ }
+ 
+@@ -191,8 +192,10 @@ static void
+ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
+ {
+     (void)del_panel(po->pan);
+-    Py_DECREF(po->wo);
+-    remove_lop(po);
++    if (po->wo != NULL) {
++        Py_DECREF(po->wo);
++        remove_lop(po);
++    }
+     PyObject_DEL(po);
+ }
+ 
+@@ -338,11 +341,10 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
+ /* -------------------------------------------------------*/
+ 
+ PyTypeObject PyCursesPanel_Type = {
+-    PyObject_HEAD_INIT(NULL)
+-    0,			/*ob_size*/
+-    "_curses_panel.curses panel",	/*tp_name*/
+-    sizeof(PyCursesPanelObject),	/*tp_basicsize*/
+-    0,			/*tp_itemsize*/
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "_curses_panel.curses panel",       /*tp_name*/
++    sizeof(PyCursesPanelObject),        /*tp_basicsize*/
++    0,                  /*tp_itemsize*/
+     /* methods */
+     (destructor)PyCursesPanel_Dealloc, /*tp_dealloc*/
+     0,			/*tp_print*/
+@@ -458,7 +460,7 @@ init_curses_panel(void)
+     PyObject *m, *d, *v;
+ 
+     /* Initialize object type */
+-    PyCursesPanel_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyCursesPanel_Type) = &PyType_Type;
+ 
+     import_curses();
+ 

plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/002_darwin_c_source.patch

@@ -0,0 +1,166 @@
+diff -r -u ./configure ../Python-2.5/configure
+--- ./configure	2006-09-05 11:54:42.000000000 +0900
++++ ../Python-2.5/configure	2013-07-19 15:27:46.000000000 +0900
+@@ -1396,6 +1396,16 @@
+ _ACEOF
+ 
+ 
++# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
++# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
++# them.
++
++cat >>confdefs.h <<\_ACEOF
++#define _DARWIN_C_SOURCE 1
++_ACEOF
++
++
++
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+@@ -3885,11 +3895,110 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
++	    # used to be here, but non-Apple gcc doesn't accept them.
++            if test "${CC}" = gcc
++	    then
++		{ echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
++echo -n "checking which compiler should be used... " >&6; }
++		case "${UNIVERSALSDK}" in
++		*/MacOSX10.4u.sdk)
++			# Build using 10.4 SDK, force usage of gcc when the
++			# compiler is gcc, otherwise the user will get very
++			# confusing error messages when building on OSX 10.6
++			CC=gcc-4.0
++			CPP=cpp-4.0
++			;;
++		esac
++		{ echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++echo "$CC" >&6; }
++	    fi
++
++
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		UNIVERSAL_ARCH_FLAGS=""
++	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   ARCH_RUN_32BIT=""
++		   LIPO_32BIT_FLAGS=""
++	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS=""
++		   ARCH_RUN_32BIT="true"
++
++	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
++
++	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++		 else
++	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++
++		 fi
++
++
++		CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
++		if test "${UNIVERSALSDK}" != "/"
++		then
++			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
++			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
++		fi
+ 	    fi
+ 
++	    # Calculate the right deployment target for this build.
++	    #
++	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
++	    if test ${cur_target} '>' 10.2 && \
++	       test ${cur_target} '<' 10.6
++	    then
++		    cur_target=10.3
++		    if test ${enable_universalsdk}; then
++			    if test "${UNIVERSAL_ARCHS}" = "all"; then
++				    # Ensure that the default platform for a
++				    # 4-way universal build is OSX 10.5,
++				    # that's the first OS release where
++				    # 4-way builds make sense.
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "intel"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
++				    cur_target='10.5'
++			    fi
++		    else
++			    if test `/usr/bin/arch` = "i386"; then
++				    # On Intel macs default to a deployment
++				    # target of 10.4, that's the first OSX
++				    # release with Intel support.
++				    cur_target="10.4"
++			    fi
++		    fi
++	    fi
++	    CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
++
++	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
++	    # environment with a value that is the same as what we'll use
++	    # in the Makefile to ensure that we'll get the same compiler
++	    # environment during configure and build time.
++	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
++	    export MACOSX_DEPLOYMENT_TARGET
++	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
++
+ 	    ;;
+ 	OSF*)
+ 	    BASECFLAGS="$BASECFLAGS -mieee"
+@@ -10851,7 +10960,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10863,7 +10972,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+diff -r -u ./pyconfig.h.in ../Python-2.5/pyconfig.h.in
+--- ./pyconfig.h.in	2006-07-30 23:09:47.000000000 +0900
++++ ../Python-2.5/pyconfig.h.in	2013-07-17 23:12:31.000000000 +0900
+@@ -912,6 +912,11 @@
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
++/* Define on Darwin to activate all library features */
++#ifndef _DARWIN_C_SOURCE
++#define _DARWIN_C_SOURCE
++#endif
++
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+ 

plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/003_osx_lp64.patch

@@ -0,0 +1,271 @@
+diff -r -u ./Include/pymactoolbox.h ../Python-2.5/Include/pymactoolbox.h
+--- ./Include/pymactoolbox.h	2004-11-05 16:02:59.000000000 +0900
++++ ../Python-2.5/Include/pymactoolbox.h	2013-07-17 23:38:51.000000000 +0900
+@@ -8,7 +8,10 @@
+ #endif
+ 
+ #include <Carbon/Carbon.h>
++
++#ifndef __LP64__
+ #include <QuickTime/QuickTime.h>
++#endif /* !__LP64__ */
+ 
+ /*
+ ** Helper routines for error codes and such.
+@@ -18,8 +21,11 @@
+ PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
+ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
+ PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
++#ifndef __LP64__ 
+ extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
+ 							      fsspec->path */
++#endif /* __LP64__ */
++
+ /*
+ ** These conversion routines are defined in mactoolboxglue.c itself.
+ */
+@@ -83,8 +89,10 @@
+ #endif /* USE_TOOLBOX_OBJECT_GLUE */
+ 
+ /* macfs exports */
++#ifndef __LP64__
+ int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
+ PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
++#endif /* !__LP64__ */
+ 
+ int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
+ PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
+@@ -101,39 +109,54 @@
+ extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ /* Ctl exports */
++#ifndef __LP64__
+ extern PyObject *CtlObj_New(ControlHandle);
+ extern int CtlObj_Convert(PyObject *, ControlHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Dlg exports */
++#ifndef __LP64__
+ extern PyObject *DlgObj_New(DialogPtr);
+ extern int DlgObj_Convert(PyObject *, DialogPtr *);
+ extern PyObject *DlgObj_WhichDialog(DialogPtr);
++#endif /* !__LP64__ */
+ 
+ /* Drag exports */
++#ifndef __LP64__
+ extern PyObject *DragObj_New(DragReference);
+ extern int DragObj_Convert(PyObject *, DragReference *);
++#endif /* !__LP64__ */
+ 
+ /* List exports */
++#ifndef __LP64__
+ extern PyObject *ListObj_New(ListHandle);
+ extern int ListObj_Convert(PyObject *, ListHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Menu exports */
++#ifndef __LP64__
+ extern PyObject *MenuObj_New(MenuHandle);
+ extern int MenuObj_Convert(PyObject *, MenuHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Qd exports */
++#ifndef __LP64__
+ extern PyObject *GrafObj_New(GrafPtr);
+ extern int GrafObj_Convert(PyObject *, GrafPtr *);
+ extern PyObject *BMObj_New(BitMapPtr);
+ extern int BMObj_Convert(PyObject *, BitMapPtr *);
+ extern PyObject *QdRGB_New(RGBColor *);
+ extern int QdRGB_Convert(PyObject *, RGBColor *);
++#endif /* !__LP64__ */
+ 
+ /* Qdoffs exports */
++#ifndef __LP64__
+ extern PyObject *GWorldObj_New(GWorldPtr);
+ extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
++#endif /* !__LP64__ */
+ 
+ /* Qt exports */
++#ifndef __LP64__
+ extern PyObject *TrackObj_New(Track);
+ extern int TrackObj_Convert(PyObject *, Track *);
+ extern PyObject *MovieObj_New(Movie);
+@@ -146,6 +169,7 @@
+ extern int UserDataObj_Convert(PyObject *, UserData *);
+ extern PyObject *MediaObj_New(Media);
+ extern int MediaObj_Convert(PyObject *, Media *);
++#endif /* !__LP64__ */
+ 
+ /* Res exports */
+ extern PyObject *ResObj_New(Handle);
+@@ -154,13 +178,17 @@
+ extern int OptResObj_Convert(PyObject *, Handle *);
+ 
+ /* TE exports */
++#ifndef __LP64__
+ extern PyObject *TEObj_New(TEHandle);
+ extern int TEObj_Convert(PyObject *, TEHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Win exports */
++#ifndef __LP64__
+ extern PyObject *WinObj_New(WindowPtr);
+ extern int WinObj_Convert(PyObject *, WindowPtr *);
+ extern PyObject *WinObj_WhichWindow(WindowPtr);
++#endif /* !__LP64__ */
+ 
+ /* CF exports */
+ extern PyObject *CFObj_New(CFTypeRef);
+diff -r -u ./Mac/Modules/res/_Resmodule.c ../Python-2.5/Mac/Modules/res/_Resmodule.c
+--- ./Mac/Modules/res/_Resmodule.c	2005-07-04 05:59:44.000000000 +0900
++++ ../Python-2.5/Mac/Modules/res/_Resmodule.c	2013-07-17 23:38:51.000000000 +0900
+@@ -414,6 +414,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -431,6 +432,7 @@
+ 	return _res;
+ 
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
+ {
+@@ -1152,6 +1154,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1287,6 +1290,7 @@
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1327,6 +1331,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1413,6 +1418,7 @@
+ 	                     nextRefNum);
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1438,6 +1444,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1534,6 +1541,7 @@
+ 	                     PyMac_BuildFSSpec, &newSpec);
+ 	return _res;
+ }
++#endif /* __LP64__ */
+ 
+ static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1637,6 +1645,7 @@
+ 	 PyDoc_STR("(short refNum) -> (short _rv)")},
+ 	{"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
+ 	 PyDoc_STR("(short refNum, short attrs) -> None")},
++#ifndef __LP64__
+ 	{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
+ 	 PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
+ 	{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
+@@ -1647,10 +1656,12 @@
+ 	 PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
+ 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
+ 	 PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
++#endif /* !__LP64__ */
+ 	{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
+ 	{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum) -> None")},
++#ifndef __LP64__
+ 	{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
+@@ -1659,14 +1670,17 @@
+ 	 PyDoc_STR("() -> (SInt16 refNum)")},
+ 	{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
++#ifndef __LP64__
+ 	{"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
+ 	 PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
+ 	{"Handle", (PyCFunction)Res_Handle, 1,
+diff -r -u ./Modules/_ctypes/libffi/src/darwin/ffitarget.h ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- ./Modules/_ctypes/libffi/src/darwin/ffitarget.h	2006-05-26 06:58:05.000000000 +0900
++++ ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h	2013-07-17 23:38:51.000000000 +0900
+@@ -4,7 +4,7 @@
+  * created by configure). This makes is possible to build a univeral binary
+  * of ctypes in one go.
+  */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+diff -r -u ./Python/mactoolboxglue.c ../Python-2.5/Python/mactoolboxglue.c
+--- ./Python/mactoolboxglue.c	2006-07-12 01:44:25.000000000 +0900
++++ ../Python-2.5/Python/mactoolboxglue.c	2013-07-17 23:39:09.000000000 +0900
+@@ -106,6 +106,7 @@
+ }
+ 
+ 
++#ifndef __LP64__
+ OSErr
+ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
+ {
+@@ -153,6 +154,7 @@
+ 	Py_XDECREF(fs);
+ 	return err;
+ }
++#endif /* !__LP64__ */
+ 
+ /* Convert a 4-char string object argument to an OSType value */
+ int
+@@ -417,6 +419,7 @@
+ GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
+ GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
+ 
++#ifndef __LP64__
+ GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
+@@ -429,6 +432,7 @@
+ GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
++#endif /* !__LP64__ */
+ 
+ GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
+ GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")

plugins/python-build/share/python-build/patches/2.5.5/Python-2.5.5/005_osx_failed_modules.patch

@@ -0,0 +1,124 @@
+diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
+index 8115614..e36fce9 100755
+--- ./Mac/Modules/cg/_CGmodule.c
++++ ./Mac/Modules/cg/_CGmodule.c
+@@ -1025,6 +1025,7 @@ static PyObject *CGContextRefObj_CGContextSetShouldAntialias(CGContextRefObject
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *CGContextRefObj_SyncCGContextOriginWithPort(CGContextRefObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1055,6 +1056,7 @@ static PyObject *CGContextRefObj_ClipCGContextToRegion(CGContextRefObject *_self
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif
+ 
+ static PyMethodDef CGContextRefObj_methods[] = {
+ 	{"CGContextSaveGState", (PyCFunction)CGContextRefObj_CGContextSaveGState, 1,
+@@ -1173,10 +1175,12 @@ static PyMethodDef CGContextRefObj_methods[] = {
+ 	 PyDoc_STR("() -> None")},
+ 	{"CGContextSetShouldAntialias", (PyCFunction)CGContextRefObj_CGContextSetShouldAntialias, 1,
+ 	 PyDoc_STR("(int shouldAntialias) -> None")},
++#ifndef __LP64__
+ 	{"SyncCGContextOriginWithPort", (PyCFunction)CGContextRefObj_SyncCGContextOriginWithPort, 1,
+ 	 PyDoc_STR("(CGrafPtr port) -> None")},
+ 	{"ClipCGContextToRegion", (PyCFunction)CGContextRefObj_ClipCGContextToRegion, 1,
+ 	 PyDoc_STR("(Rect portRect, RgnHandle region) -> None")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+@@ -1254,6 +1258,7 @@ PyTypeObject CGContextRef_Type = {
+ /* ------------------ End object type CGContextRef ------------------ */
+ 
+ 
++#ifndef __LP64__
+ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1271,10 +1276,13 @@ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ 	return _res;
+ 
+ }
++#endif
+ 
+ static PyMethodDef CG_methods[] = {
++#ifndef __LP64__
+ 	{"CreateCGContextForPort", (PyCFunction)CG_CreateCGContextForPort, 1,
+ 	 PyDoc_STR("(CGrafPtr) -> CGContextRef")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
+index 0acf3fd..1728b59 100644
+--- ./Modules/_curses_panel.c
++++ ./Modules/_curses_panel.c
+@@ -56,7 +56,7 @@ typedef struct {
+ 
+ PyTypeObject PyCursesPanel_Type;
+ 
+-#define PyCursesPanel_Check(v)	 ((v)->ob_type == &PyCursesPanel_Type)
++#define PyCursesPanel_Check(v)   (Py_TYPE(v) == &PyCursesPanel_Type)
+ 
+ /* Some helper functions. The problem is that there's always a window
+    associated with a panel. To ensure that Python's GC doesn't pull
+@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
+     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
+     if (po == NULL) return NULL;
+     po->pan = pan;
+-    po->wo = wo;
+-    Py_INCREF(wo);
+     if (insert_lop(po) < 0) {
+-	PyObject_DEL(po);
+-	return NULL;
++        po->wo = NULL;
++        Py_DECREF(po);
++        return NULL;
+     }
++    po->wo = wo;
++    Py_INCREF(wo);
+     return (PyObject *)po;
+ }
+ 
+@@ -191,8 +192,10 @@ static void
+ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
+ {
+     (void)del_panel(po->pan);
+-    Py_DECREF(po->wo);
+-    remove_lop(po);
++    if (po->wo != NULL) {
++        Py_DECREF(po->wo);
++        remove_lop(po);
++    }
+     PyObject_DEL(po);
+ }
+ 
+@@ -338,11 +341,10 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
+ /* -------------------------------------------------------*/
+ 
+ PyTypeObject PyCursesPanel_Type = {
+-    PyObject_HEAD_INIT(NULL)
+-    0,			/*ob_size*/
+-    "_curses_panel.curses panel",	/*tp_name*/
+-    sizeof(PyCursesPanelObject),	/*tp_basicsize*/
+-    0,			/*tp_itemsize*/
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "_curses_panel.curses panel",       /*tp_name*/
++    sizeof(PyCursesPanelObject),        /*tp_basicsize*/
++    0,                  /*tp_itemsize*/
+     /* methods */
+     (destructor)PyCursesPanel_Dealloc, /*tp_dealloc*/
+     0,			/*tp_print*/
+@@ -458,7 +460,7 @@ init_curses_panel(void)
+     PyObject *m, *d, *v;
+ 
+     /* Initialize object type */
+-    PyCursesPanel_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyCursesPanel_Type) = &PyType_Type;
+ 
+     import_curses();
+ 

plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/002_darwin_c_source.patch

@@ -0,0 +1,166 @@
+diff -r -u ./configure ../Python-2.5/configure
+--- ./configure	2006-09-05 11:54:42.000000000 +0900
++++ ../Python-2.5/configure	2013-07-19 15:27:46.000000000 +0900
+@@ -1396,6 +1396,16 @@
+ _ACEOF
+ 
+ 
++# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
++# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
++# them.
++
++cat >>confdefs.h <<\_ACEOF
++#define _DARWIN_C_SOURCE 1
++_ACEOF
++
++
++
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+@@ -3885,11 +3895,110 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
++	    # used to be here, but non-Apple gcc doesn't accept them.
++            if test "${CC}" = gcc
++	    then
++		{ echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
++echo -n "checking which compiler should be used... " >&6; }
++		case "${UNIVERSALSDK}" in
++		*/MacOSX10.4u.sdk)
++			# Build using 10.4 SDK, force usage of gcc when the
++			# compiler is gcc, otherwise the user will get very
++			# confusing error messages when building on OSX 10.6
++			CC=gcc-4.0
++			CPP=cpp-4.0
++			;;
++		esac
++		{ echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++echo "$CC" >&6; }
++	    fi
++
++
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		UNIVERSAL_ARCH_FLAGS=""
++	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   ARCH_RUN_32BIT=""
++		   LIPO_32BIT_FLAGS=""
++	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS=""
++		   ARCH_RUN_32BIT="true"
++
++	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
++
++	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++		 else
++	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++
++		 fi
++
++
++		CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
++		if test "${UNIVERSALSDK}" != "/"
++		then
++			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
++			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
++		fi
+ 	    fi
+ 
++	    # Calculate the right deployment target for this build.
++	    #
++	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
++	    if test ${cur_target} '>' 10.2 && \
++	       test ${cur_target} '<' 10.6
++	    then
++		    cur_target=10.3
++		    if test ${enable_universalsdk}; then
++			    if test "${UNIVERSAL_ARCHS}" = "all"; then
++				    # Ensure that the default platform for a
++				    # 4-way universal build is OSX 10.5,
++				    # that's the first OS release where
++				    # 4-way builds make sense.
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "intel"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
++				    cur_target='10.5'
++			    fi
++		    else
++			    if test `/usr/bin/arch` = "i386"; then
++				    # On Intel macs default to a deployment
++				    # target of 10.4, that's the first OSX
++				    # release with Intel support.
++				    cur_target="10.4"
++			    fi
++		    fi
++	    fi
++	    CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
++
++	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
++	    # environment with a value that is the same as what we'll use
++	    # in the Makefile to ensure that we'll get the same compiler
++	    # environment during configure and build time.
++	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
++	    export MACOSX_DEPLOYMENT_TARGET
++	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
++
+ 	    ;;
+ 	OSF*)
+ 	    BASECFLAGS="$BASECFLAGS -mieee"
+@@ -10851,7 +10960,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10863,7 +10972,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+diff -r -u ./pyconfig.h.in ../Python-2.5/pyconfig.h.in
+--- ./pyconfig.h.in	2006-07-30 23:09:47.000000000 +0900
++++ ../Python-2.5/pyconfig.h.in	2013-07-17 23:12:31.000000000 +0900
+@@ -912,6 +912,11 @@
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
++/* Define on Darwin to activate all library features */
++#ifndef _DARWIN_C_SOURCE
++#define _DARWIN_C_SOURCE
++#endif
++
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+ 

plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/003_osx_lp64.patch

@@ -0,0 +1,271 @@
+diff -r -u ./Include/pymactoolbox.h ../Python-2.5/Include/pymactoolbox.h
+--- ./Include/pymactoolbox.h	2004-11-05 16:02:59.000000000 +0900
++++ ../Python-2.5/Include/pymactoolbox.h	2013-07-17 23:38:51.000000000 +0900
+@@ -8,7 +8,10 @@
+ #endif
+ 
+ #include <Carbon/Carbon.h>
++
++#ifndef __LP64__
+ #include <QuickTime/QuickTime.h>
++#endif /* !__LP64__ */
+ 
+ /*
+ ** Helper routines for error codes and such.
+@@ -18,8 +21,11 @@
+ PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
+ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
+ PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
++#ifndef __LP64__ 
+ extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
+ 							      fsspec->path */
++#endif /* __LP64__ */
++
+ /*
+ ** These conversion routines are defined in mactoolboxglue.c itself.
+ */
+@@ -83,8 +89,10 @@
+ #endif /* USE_TOOLBOX_OBJECT_GLUE */
+ 
+ /* macfs exports */
++#ifndef __LP64__
+ int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
+ PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
++#endif /* !__LP64__ */
+ 
+ int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
+ PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
+@@ -101,39 +109,54 @@
+ extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ /* Ctl exports */
++#ifndef __LP64__
+ extern PyObject *CtlObj_New(ControlHandle);
+ extern int CtlObj_Convert(PyObject *, ControlHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Dlg exports */
++#ifndef __LP64__
+ extern PyObject *DlgObj_New(DialogPtr);
+ extern int DlgObj_Convert(PyObject *, DialogPtr *);
+ extern PyObject *DlgObj_WhichDialog(DialogPtr);
++#endif /* !__LP64__ */
+ 
+ /* Drag exports */
++#ifndef __LP64__
+ extern PyObject *DragObj_New(DragReference);
+ extern int DragObj_Convert(PyObject *, DragReference *);
++#endif /* !__LP64__ */
+ 
+ /* List exports */
++#ifndef __LP64__
+ extern PyObject *ListObj_New(ListHandle);
+ extern int ListObj_Convert(PyObject *, ListHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Menu exports */
++#ifndef __LP64__
+ extern PyObject *MenuObj_New(MenuHandle);
+ extern int MenuObj_Convert(PyObject *, MenuHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Qd exports */
++#ifndef __LP64__
+ extern PyObject *GrafObj_New(GrafPtr);
+ extern int GrafObj_Convert(PyObject *, GrafPtr *);
+ extern PyObject *BMObj_New(BitMapPtr);
+ extern int BMObj_Convert(PyObject *, BitMapPtr *);
+ extern PyObject *QdRGB_New(RGBColor *);
+ extern int QdRGB_Convert(PyObject *, RGBColor *);
++#endif /* !__LP64__ */
+ 
+ /* Qdoffs exports */
++#ifndef __LP64__
+ extern PyObject *GWorldObj_New(GWorldPtr);
+ extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
++#endif /* !__LP64__ */
+ 
+ /* Qt exports */
++#ifndef __LP64__
+ extern PyObject *TrackObj_New(Track);
+ extern int TrackObj_Convert(PyObject *, Track *);
+ extern PyObject *MovieObj_New(Movie);
+@@ -146,6 +169,7 @@
+ extern int UserDataObj_Convert(PyObject *, UserData *);
+ extern PyObject *MediaObj_New(Media);
+ extern int MediaObj_Convert(PyObject *, Media *);
++#endif /* !__LP64__ */
+ 
+ /* Res exports */
+ extern PyObject *ResObj_New(Handle);
+@@ -154,13 +178,17 @@
+ extern int OptResObj_Convert(PyObject *, Handle *);
+ 
+ /* TE exports */
++#ifndef __LP64__
+ extern PyObject *TEObj_New(TEHandle);
+ extern int TEObj_Convert(PyObject *, TEHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Win exports */
++#ifndef __LP64__
+ extern PyObject *WinObj_New(WindowPtr);
+ extern int WinObj_Convert(PyObject *, WindowPtr *);
+ extern PyObject *WinObj_WhichWindow(WindowPtr);
++#endif /* !__LP64__ */
+ 
+ /* CF exports */
+ extern PyObject *CFObj_New(CFTypeRef);
+diff -r -u ./Mac/Modules/res/_Resmodule.c ../Python-2.5/Mac/Modules/res/_Resmodule.c
+--- ./Mac/Modules/res/_Resmodule.c	2005-07-04 05:59:44.000000000 +0900
++++ ../Python-2.5/Mac/Modules/res/_Resmodule.c	2013-07-17 23:38:51.000000000 +0900
+@@ -414,6 +414,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -431,6 +432,7 @@
+ 	return _res;
+ 
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
+ {
+@@ -1152,6 +1154,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1287,6 +1290,7 @@
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1327,6 +1331,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1413,6 +1418,7 @@
+ 	                     nextRefNum);
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1438,6 +1444,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1534,6 +1541,7 @@
+ 	                     PyMac_BuildFSSpec, &newSpec);
+ 	return _res;
+ }
++#endif /* __LP64__ */
+ 
+ static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1637,6 +1645,7 @@
+ 	 PyDoc_STR("(short refNum) -> (short _rv)")},
+ 	{"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
+ 	 PyDoc_STR("(short refNum, short attrs) -> None")},
++#ifndef __LP64__
+ 	{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
+ 	 PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
+ 	{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
+@@ -1647,10 +1656,12 @@
+ 	 PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
+ 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
+ 	 PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
++#endif /* !__LP64__ */
+ 	{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
+ 	{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum) -> None")},
++#ifndef __LP64__
+ 	{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
+@@ -1659,14 +1670,17 @@
+ 	 PyDoc_STR("() -> (SInt16 refNum)")},
+ 	{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
++#ifndef __LP64__
+ 	{"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
+ 	 PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
+ 	{"Handle", (PyCFunction)Res_Handle, 1,
+diff -r -u ./Modules/_ctypes/libffi/src/darwin/ffitarget.h ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- ./Modules/_ctypes/libffi/src/darwin/ffitarget.h	2006-05-26 06:58:05.000000000 +0900
++++ ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h	2013-07-17 23:38:51.000000000 +0900
+@@ -4,7 +4,7 @@
+  * created by configure). This makes is possible to build a univeral binary
+  * of ctypes in one go.
+  */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+diff -r -u ./Python/mactoolboxglue.c ../Python-2.5/Python/mactoolboxglue.c
+--- ./Python/mactoolboxglue.c	2006-07-12 01:44:25.000000000 +0900
++++ ../Python-2.5/Python/mactoolboxglue.c	2013-07-17 23:39:09.000000000 +0900
+@@ -106,6 +106,7 @@
+ }
+ 
+ 
++#ifndef __LP64__
+ OSErr
+ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
+ {
+@@ -153,6 +154,7 @@
+ 	Py_XDECREF(fs);
+ 	return err;
+ }
++#endif /* !__LP64__ */
+ 
+ /* Convert a 4-char string object argument to an OSType value */
+ int
+@@ -417,6 +419,7 @@
+ GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
+ GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
+ 
++#ifndef __LP64__
+ GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
+@@ -429,6 +432,7 @@
+ GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
++#endif /* !__LP64__ */
+ 
+ GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
+ GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")

plugins/python-build/share/python-build/patches/2.5.6/Python-2.5.6/005_osx_failed_modules.patch

@@ -0,0 +1,124 @@
+diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
+index 8115614..e36fce9 100755
+--- ./Mac/Modules/cg/_CGmodule.c
++++ ./Mac/Modules/cg/_CGmodule.c
+@@ -1025,6 +1025,7 @@ static PyObject *CGContextRefObj_CGContextSetShouldAntialias(CGContextRefObject
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *CGContextRefObj_SyncCGContextOriginWithPort(CGContextRefObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1055,6 +1056,7 @@ static PyObject *CGContextRefObj_ClipCGContextToRegion(CGContextRefObject *_self
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif
+ 
+ static PyMethodDef CGContextRefObj_methods[] = {
+ 	{"CGContextSaveGState", (PyCFunction)CGContextRefObj_CGContextSaveGState, 1,
+@@ -1173,10 +1175,12 @@ static PyMethodDef CGContextRefObj_methods[] = {
+ 	 PyDoc_STR("() -> None")},
+ 	{"CGContextSetShouldAntialias", (PyCFunction)CGContextRefObj_CGContextSetShouldAntialias, 1,
+ 	 PyDoc_STR("(int shouldAntialias) -> None")},
++#ifndef __LP64__
+ 	{"SyncCGContextOriginWithPort", (PyCFunction)CGContextRefObj_SyncCGContextOriginWithPort, 1,
+ 	 PyDoc_STR("(CGrafPtr port) -> None")},
+ 	{"ClipCGContextToRegion", (PyCFunction)CGContextRefObj_ClipCGContextToRegion, 1,
+ 	 PyDoc_STR("(Rect portRect, RgnHandle region) -> None")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+@@ -1254,6 +1258,7 @@ PyTypeObject CGContextRef_Type = {
+ /* ------------------ End object type CGContextRef ------------------ */
+ 
+ 
++#ifndef __LP64__
+ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1271,10 +1276,13 @@ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ 	return _res;
+ 
+ }
++#endif
+ 
+ static PyMethodDef CG_methods[] = {
++#ifndef __LP64__
+ 	{"CreateCGContextForPort", (PyCFunction)CG_CreateCGContextForPort, 1,
+ 	 PyDoc_STR("(CGrafPtr) -> CGContextRef")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
+index 0acf3fd..1728b59 100644
+--- ./Modules/_curses_panel.c
++++ ./Modules/_curses_panel.c
+@@ -56,7 +56,7 @@ typedef struct {
+ 
+ PyTypeObject PyCursesPanel_Type;
+ 
+-#define PyCursesPanel_Check(v)	 ((v)->ob_type == &PyCursesPanel_Type)
++#define PyCursesPanel_Check(v)   (Py_TYPE(v) == &PyCursesPanel_Type)
+ 
+ /* Some helper functions. The problem is that there's always a window
+    associated with a panel. To ensure that Python's GC doesn't pull
+@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
+     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
+     if (po == NULL) return NULL;
+     po->pan = pan;
+-    po->wo = wo;
+-    Py_INCREF(wo);
+     if (insert_lop(po) < 0) {
+-	PyObject_DEL(po);
+-	return NULL;
++        po->wo = NULL;
++        Py_DECREF(po);
++        return NULL;
+     }
++    po->wo = wo;
++    Py_INCREF(wo);
+     return (PyObject *)po;
+ }
+ 
+@@ -191,8 +192,10 @@ static void
+ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
+ {
+     (void)del_panel(po->pan);
+-    Py_DECREF(po->wo);
+-    remove_lop(po);
++    if (po->wo != NULL) {
++        Py_DECREF(po->wo);
++        remove_lop(po);
++    }
+     PyObject_DEL(po);
+ }
+ 
+@@ -338,11 +341,10 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
+ /* -------------------------------------------------------*/
+ 
+ PyTypeObject PyCursesPanel_Type = {
+-    PyObject_HEAD_INIT(NULL)
+-    0,			/*ob_size*/
+-    "_curses_panel.curses panel",	/*tp_name*/
+-    sizeof(PyCursesPanelObject),	/*tp_basicsize*/
+-    0,			/*tp_itemsize*/
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "_curses_panel.curses panel",       /*tp_name*/
++    sizeof(PyCursesPanelObject),        /*tp_basicsize*/
++    0,                  /*tp_itemsize*/
+     /* methods */
+     (destructor)PyCursesPanel_Dealloc, /*tp_dealloc*/
+     0,			/*tp_print*/
+@@ -458,7 +460,7 @@ init_curses_panel(void)
+     PyObject *m, *d, *v;
+ 
+     /* Initialize object type */
+-    PyCursesPanel_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyCursesPanel_Type) = &PyType_Type;
+ 
+     import_curses();
+ 

plugins/python-build/share/python-build/patches/2.5/Python-2.5/002_darwin_c_source.patch

@@ -0,0 +1,166 @@
+diff -r -u ./configure ../Python-2.5/configure
+--- ./configure	2006-09-05 11:54:42.000000000 +0900
++++ ../Python-2.5/configure	2013-07-19 15:27:46.000000000 +0900
+@@ -1396,6 +1396,16 @@
+ _ACEOF
+ 
+ 
++# The later defininition of _XOPEN_SOURCE and _POSIX_C_SOURCE disables
++# certain features on Mac OS X, so we need _DARWIN_C_SOURCE to re-enable
++# them.
++
++cat >>confdefs.h <<\_ACEOF
++#define _DARWIN_C_SOURCE 1
++_ACEOF
++
++
++
+ define_xopen_source=yes
+ 
+ # Arguments passed to configure.
+@@ -3885,11 +3895,110 @@
+ 	    ;;
+ 	# is there any other compiler on Darwin besides gcc?
+ 	Darwin*)
+-	    BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
++	    # -Wno-long-double, -no-cpp-precomp, and -mno-fused-madd
++	    # used to be here, but non-Apple gcc doesn't accept them.
++            if test "${CC}" = gcc
++	    then
++		{ echo "$as_me:${as_lineno-$LINENO}: checking which compiler should be used" >&5
++echo -n "checking which compiler should be used... " >&6; }
++		case "${UNIVERSALSDK}" in
++		*/MacOSX10.4u.sdk)
++			# Build using 10.4 SDK, force usage of gcc when the
++			# compiler is gcc, otherwise the user will get very
++			# confusing error messages when building on OSX 10.6
++			CC=gcc-4.0
++			CPP=cpp-4.0
++			;;
++		esac
++		{ echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
++echo "$CC" >&6; }
++	    fi
++
++
+ 	    if test "${enable_universalsdk}"; then
+-		BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
++		UNIVERSAL_ARCH_FLAGS=""
++	        if test "$UNIVERSAL_ARCHS" = "32-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc -arch i386"
++		   ARCH_RUN_32BIT=""
++		   LIPO_32BIT_FLAGS=""
++	         elif test "$UNIVERSAL_ARCHS" = "64-bit" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS=""
++		   ARCH_RUN_32BIT="true"
++
++	         elif test "$UNIVERSAL_ARCHS" = "all" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch ppc64 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++	         elif test "$UNIVERSAL_ARCHS" = "intel" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386"
++
++	         elif test "$UNIVERSAL_ARCHS" = "3-way" ; then
++		   UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
++		   LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
++		   ARCH_RUN_32BIT="/usr/bin/arch -i386 -ppc"
++
++		 else
++	           as_fn_error $? "proper usage is --with-universal-arch=32-bit|64-bit|all|intel|3-way" "$LINENO" 5
++
++		 fi
++
++
++		CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
++		if test "${UNIVERSALSDK}" != "/"
++		then
++			CFLAGS="-isysroot ${UNIVERSALSDK} ${CFLAGS}"
++			LDFLAGS="-isysroot ${UNIVERSALSDK} ${LDFLAGS}"
++			CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
++		fi
+ 	    fi
+ 
++	    # Calculate the right deployment target for this build.
++	    #
++	    cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
++	    if test ${cur_target} '>' 10.2 && \
++	       test ${cur_target} '<' 10.6
++	    then
++		    cur_target=10.3
++		    if test ${enable_universalsdk}; then
++			    if test "${UNIVERSAL_ARCHS}" = "all"; then
++				    # Ensure that the default platform for a
++				    # 4-way universal build is OSX 10.5,
++				    # that's the first OS release where
++				    # 4-way builds make sense.
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "3-way"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "intel"; then
++				    cur_target='10.5'
++
++			    elif test "${UNIVERSAL_ARCHS}" = "64-bit"; then
++				    cur_target='10.5'
++			    fi
++		    else
++			    if test `/usr/bin/arch` = "i386"; then
++				    # On Intel macs default to a deployment
++				    # target of 10.4, that's the first OSX
++				    # release with Intel support.
++				    cur_target="10.4"
++			    fi
++		    fi
++	    fi
++	    CONFIGURE_MACOSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET-${cur_target}}
++
++	    # Make sure that MACOSX_DEPLOYMENT_TARGET is set in the
++	    # environment with a value that is the same as what we'll use
++	    # in the Makefile to ensure that we'll get the same compiler
++	    # environment during configure and build time.
++	    MACOSX_DEPLOYMENT_TARGET="$CONFIGURE_MACOSX_DEPLOYMENT_TARGET"
++	    export MACOSX_DEPLOYMENT_TARGET
++	    EXPORT_MACOSX_DEPLOYMENT_TARGET=''
++
+ 	    ;;
+ 	OSF*)
+ 	    BASECFLAGS="$BASECFLAGS -mieee"
+@@ -10851,7 +10960,7 @@
+     if test "${enable_universalsdk}"; then
+ 	    :
+     else
+-	LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
++	LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
+     fi
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+@@ -10863,7 +10972,7 @@
+         else
+             LIBTOOL_CRUFT=""
+     fi
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
++    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
+diff -r -u ./pyconfig.h.in ../Python-2.5/pyconfig.h.in
+--- ./pyconfig.h.in	2006-07-30 23:09:47.000000000 +0900
++++ ../Python-2.5/pyconfig.h.in	2013-07-17 23:12:31.000000000 +0900
+@@ -912,6 +912,11 @@
+ /* Define on Irix to enable u_int */
+ #undef _BSD_TYPES
+ 
++/* Define on Darwin to activate all library features */
++#ifndef _DARWIN_C_SOURCE
++#define _DARWIN_C_SOURCE
++#endif
++
+ /* This must be set to 64 on some systems to enable large file support. */
+ #undef _FILE_OFFSET_BITS
+ 

plugins/python-build/share/python-build/patches/2.5/Python-2.5/003_osx_lp64.patch

@@ -0,0 +1,271 @@
+diff -r -u ./Include/pymactoolbox.h ../Python-2.5/Include/pymactoolbox.h
+--- ./Include/pymactoolbox.h	2004-11-05 16:02:59.000000000 +0900
++++ ../Python-2.5/Include/pymactoolbox.h	2013-07-17 23:38:51.000000000 +0900
+@@ -8,7 +8,10 @@
+ #endif
+ 
+ #include <Carbon/Carbon.h>
++
++#ifndef __LP64__
+ #include <QuickTime/QuickTime.h>
++#endif /* !__LP64__ */
+ 
+ /*
+ ** Helper routines for error codes and such.
+@@ -18,8 +21,11 @@
+ PyObject *PyMac_GetOSErrException(void);	/* Initialize & return it */
+ PyObject *PyErr_Mac(PyObject *, int);		/* Exception with a mac error */
+ PyObject *PyMac_Error(OSErr);			/* Uses PyMac_GetOSErrException */
++#ifndef __LP64__ 
+ extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
+ 							      fsspec->path */
++#endif /* __LP64__ */
++
+ /*
+ ** These conversion routines are defined in mactoolboxglue.c itself.
+ */
+@@ -83,8 +89,10 @@
+ #endif /* USE_TOOLBOX_OBJECT_GLUE */
+ 
+ /* macfs exports */
++#ifndef __LP64__
+ int PyMac_GetFSSpec(PyObject *, FSSpec *);	/* argument parser for FSSpec */
+ PyObject *PyMac_BuildFSSpec(FSSpec *);		/* Convert FSSpec to PyObject */
++#endif /* !__LP64__ */
+ 
+ int PyMac_GetFSRef(PyObject *, FSRef *);	/* argument parser for FSRef */
+ PyObject *PyMac_BuildFSRef(FSRef *);		/* Convert FSRef to PyObject */
+@@ -101,39 +109,54 @@
+ extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
+ 
+ /* Ctl exports */
++#ifndef __LP64__
+ extern PyObject *CtlObj_New(ControlHandle);
+ extern int CtlObj_Convert(PyObject *, ControlHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Dlg exports */
++#ifndef __LP64__
+ extern PyObject *DlgObj_New(DialogPtr);
+ extern int DlgObj_Convert(PyObject *, DialogPtr *);
+ extern PyObject *DlgObj_WhichDialog(DialogPtr);
++#endif /* !__LP64__ */
+ 
+ /* Drag exports */
++#ifndef __LP64__
+ extern PyObject *DragObj_New(DragReference);
+ extern int DragObj_Convert(PyObject *, DragReference *);
++#endif /* !__LP64__ */
+ 
+ /* List exports */
++#ifndef __LP64__
+ extern PyObject *ListObj_New(ListHandle);
+ extern int ListObj_Convert(PyObject *, ListHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Menu exports */
++#ifndef __LP64__
+ extern PyObject *MenuObj_New(MenuHandle);
+ extern int MenuObj_Convert(PyObject *, MenuHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Qd exports */
++#ifndef __LP64__
+ extern PyObject *GrafObj_New(GrafPtr);
+ extern int GrafObj_Convert(PyObject *, GrafPtr *);
+ extern PyObject *BMObj_New(BitMapPtr);
+ extern int BMObj_Convert(PyObject *, BitMapPtr *);
+ extern PyObject *QdRGB_New(RGBColor *);
+ extern int QdRGB_Convert(PyObject *, RGBColor *);
++#endif /* !__LP64__ */
+ 
+ /* Qdoffs exports */
++#ifndef __LP64__
+ extern PyObject *GWorldObj_New(GWorldPtr);
+ extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
++#endif /* !__LP64__ */
+ 
+ /* Qt exports */
++#ifndef __LP64__
+ extern PyObject *TrackObj_New(Track);
+ extern int TrackObj_Convert(PyObject *, Track *);
+ extern PyObject *MovieObj_New(Movie);
+@@ -146,6 +169,7 @@
+ extern int UserDataObj_Convert(PyObject *, UserData *);
+ extern PyObject *MediaObj_New(Media);
+ extern int MediaObj_Convert(PyObject *, Media *);
++#endif /* !__LP64__ */
+ 
+ /* Res exports */
+ extern PyObject *ResObj_New(Handle);
+@@ -154,13 +178,17 @@
+ extern int OptResObj_Convert(PyObject *, Handle *);
+ 
+ /* TE exports */
++#ifndef __LP64__
+ extern PyObject *TEObj_New(TEHandle);
+ extern int TEObj_Convert(PyObject *, TEHandle *);
++#endif /* !__LP64__ */
+ 
+ /* Win exports */
++#ifndef __LP64__
+ extern PyObject *WinObj_New(WindowPtr);
+ extern int WinObj_Convert(PyObject *, WindowPtr *);
+ extern PyObject *WinObj_WhichWindow(WindowPtr);
++#endif /* !__LP64__ */
+ 
+ /* CF exports */
+ extern PyObject *CFObj_New(CFTypeRef);
+diff -r -u ./Mac/Modules/res/_Resmodule.c ../Python-2.5/Mac/Modules/res/_Resmodule.c
+--- ./Mac/Modules/res/_Resmodule.c	2005-07-04 05:59:44.000000000 +0900
++++ ../Python-2.5/Mac/Modules/res/_Resmodule.c	2013-07-17 23:38:51.000000000 +0900
+@@ -414,6 +414,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -431,6 +432,7 @@
+ 	return _res;
+ 
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
+ {
+@@ -1152,6 +1154,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1287,6 +1290,7 @@
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1327,6 +1331,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1413,6 +1418,7 @@
+ 	                     nextRefNum);
+ 	return _res;
+ }
++#endif /* !__LP64__ */
+ 
+ static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1438,6 +1444,7 @@
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1534,6 +1541,7 @@
+ 	                     PyMac_BuildFSSpec, &newSpec);
+ 	return _res;
+ }
++#endif /* __LP64__ */
+ 
+ static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
+ {
+@@ -1637,6 +1645,7 @@
+ 	 PyDoc_STR("(short refNum) -> (short _rv)")},
+ 	{"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
+ 	 PyDoc_STR("(short refNum, short attrs) -> None")},
++#ifndef __LP64__
+ 	{"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
+ 	 PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
+ 	{"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
+@@ -1647,10 +1656,12 @@
+ 	 PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
+ 	{"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
+ 	 PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
++#endif /* !__LP64__ */
+ 	{"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
+ 	{"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 refNum) -> None")},
++#ifndef __LP64__
+ 	{"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
+@@ -1659,14 +1670,17 @@
+ 	 PyDoc_STR("() -> (SInt16 refNum)")},
+ 	{"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
+ 	 PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
+ 	 PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
++#ifndef __LP64__
+ 	{"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
+ 	{"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
+ 	 PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
+ 	{"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
+ 	 PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
++#endif /* __LP64__ */
+ 	{"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
+ 	 PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
+ 	{"Handle", (PyCFunction)Res_Handle, 1,
+diff -r -u ./Modules/_ctypes/libffi/src/darwin/ffitarget.h ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h
+--- ./Modules/_ctypes/libffi/src/darwin/ffitarget.h	2006-05-26 06:58:05.000000000 +0900
++++ ../Python-2.5/Modules/_ctypes/libffi/src/darwin/ffitarget.h	2013-07-17 23:38:51.000000000 +0900
+@@ -4,7 +4,7 @@
+  * created by configure). This makes is possible to build a univeral binary
+  * of ctypes in one go.
+  */
+-#if defined(__i386__)
++#if defined(__i386__) || defined(__x86_64__)
+ 
+ #ifndef X86_DARWIN
+ #define X86_DARWIN
+diff -r -u ./Python/mactoolboxglue.c ../Python-2.5/Python/mactoolboxglue.c
+--- ./Python/mactoolboxglue.c	2006-07-12 01:44:25.000000000 +0900
++++ ../Python-2.5/Python/mactoolboxglue.c	2013-07-17 23:39:09.000000000 +0900
+@@ -106,6 +106,7 @@
+ }
+ 
+ 
++#ifndef __LP64__
+ OSErr
+ PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
+ {
+@@ -153,6 +154,7 @@
+ 	Py_XDECREF(fs);
+ 	return err;
+ }
++#endif /* !__LP64__ */
+ 
+ /* Convert a 4-char string object argument to an OSType value */
+ int
+@@ -417,6 +419,7 @@
+ GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
+ GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
+ 
++#ifndef __LP64__
+ GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
+@@ -429,6 +432,7 @@
+ GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
+ GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
+ GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
++#endif /* !__LP64__ */
+ 
+ GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
+ GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")

plugins/python-build/share/python-build/patches/2.5/Python-2.5/005_osx_failed_modules.patch

@@ -0,0 +1,124 @@
+diff --git ./Mac/Modules/cg/_CGmodule.c ./Mac/Modules/cg/_CGmodule.c
+index 8115614..e36fce9 100755
+--- ./Mac/Modules/cg/_CGmodule.c
++++ ./Mac/Modules/cg/_CGmodule.c
+@@ -1025,6 +1025,7 @@ static PyObject *CGContextRefObj_CGContextSetShouldAntialias(CGContextRefObject
+ 	return _res;
+ }
+ 
++#ifndef __LP64__
+ static PyObject *CGContextRefObj_SyncCGContextOriginWithPort(CGContextRefObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1055,6 +1056,7 @@ static PyObject *CGContextRefObj_ClipCGContextToRegion(CGContextRefObject *_self
+ 	_res = Py_None;
+ 	return _res;
+ }
++#endif
+ 
+ static PyMethodDef CGContextRefObj_methods[] = {
+ 	{"CGContextSaveGState", (PyCFunction)CGContextRefObj_CGContextSaveGState, 1,
+@@ -1173,10 +1175,12 @@ static PyMethodDef CGContextRefObj_methods[] = {
+ 	 PyDoc_STR("() -> None")},
+ 	{"CGContextSetShouldAntialias", (PyCFunction)CGContextRefObj_CGContextSetShouldAntialias, 1,
+ 	 PyDoc_STR("(int shouldAntialias) -> None")},
++#ifndef __LP64__
+ 	{"SyncCGContextOriginWithPort", (PyCFunction)CGContextRefObj_SyncCGContextOriginWithPort, 1,
+ 	 PyDoc_STR("(CGrafPtr port) -> None")},
+ 	{"ClipCGContextToRegion", (PyCFunction)CGContextRefObj_ClipCGContextToRegion, 1,
+ 	 PyDoc_STR("(Rect portRect, RgnHandle region) -> None")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+@@ -1254,6 +1258,7 @@ PyTypeObject CGContextRef_Type = {
+ /* ------------------ End object type CGContextRef ------------------ */
+ 
+ 
++#ifndef __LP64__
+ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ {
+ 	PyObject *_res = NULL;
+@@ -1271,10 +1276,13 @@ static PyObject *CG_CreateCGContextForPort(PyObject *_self, PyObject *_args)
+ 	return _res;
+ 
+ }
++#endif
+ 
+ static PyMethodDef CG_methods[] = {
++#ifndef __LP64__
+ 	{"CreateCGContextForPort", (PyCFunction)CG_CreateCGContextForPort, 1,
+ 	 PyDoc_STR("(CGrafPtr) -> CGContextRef")},
++#endif
+ 	{NULL, NULL, 0}
+ };
+ 
+diff --git ./Modules/_curses_panel.c ./Modules/_curses_panel.c
+index 0acf3fd..1728b59 100644
+--- ./Modules/_curses_panel.c
++++ ./Modules/_curses_panel.c
+@@ -56,7 +56,7 @@ typedef struct {
+ 
+ PyTypeObject PyCursesPanel_Type;
+ 
+-#define PyCursesPanel_Check(v)	 ((v)->ob_type == &PyCursesPanel_Type)
++#define PyCursesPanel_Check(v)   (Py_TYPE(v) == &PyCursesPanel_Type)
+ 
+ /* Some helper functions. The problem is that there's always a window
+    associated with a panel. To ensure that Python's GC doesn't pull
+@@ -178,12 +178,13 @@ PyCursesPanel_New(PANEL *pan, PyCursesWindowObject *wo)
+     po = PyObject_NEW(PyCursesPanelObject, &PyCursesPanel_Type);
+     if (po == NULL) return NULL;
+     po->pan = pan;
+-    po->wo = wo;
+-    Py_INCREF(wo);
+     if (insert_lop(po) < 0) {
+-	PyObject_DEL(po);
+-	return NULL;
++        po->wo = NULL;
++        Py_DECREF(po);
++        return NULL;
+     }
++    po->wo = wo;
++    Py_INCREF(wo);
+     return (PyObject *)po;
+ }
+ 
+@@ -191,8 +192,10 @@ static void
+ PyCursesPanel_Dealloc(PyCursesPanelObject *po)
+ {
+     (void)del_panel(po->pan);
+-    Py_DECREF(po->wo);
+-    remove_lop(po);
++    if (po->wo != NULL) {
++        Py_DECREF(po->wo);
++        remove_lop(po);
++    }
+     PyObject_DEL(po);
+ }
+ 
+@@ -338,11 +341,10 @@ PyCursesPanel_GetAttr(PyCursesPanelObject *self, char *name)
+ /* -------------------------------------------------------*/
+ 
+ PyTypeObject PyCursesPanel_Type = {
+-    PyObject_HEAD_INIT(NULL)
+-    0,			/*ob_size*/
+-    "_curses_panel.curses panel",	/*tp_name*/
+-    sizeof(PyCursesPanelObject),	/*tp_basicsize*/
+-    0,			/*tp_itemsize*/
++    PyVarObject_HEAD_INIT(NULL, 0)
++    "_curses_panel.curses panel",       /*tp_name*/
++    sizeof(PyCursesPanelObject),        /*tp_basicsize*/
++    0,                  /*tp_itemsize*/
+     /* methods */
+     (destructor)PyCursesPanel_Dealloc, /*tp_dealloc*/
+     0,			/*tp_print*/
+@@ -458,7 +460,7 @@ init_curses_panel(void)
+     PyObject *m, *d, *v;
+ 
+     /* Initialize object type */
+-    PyCursesPanel_Type.ob_type = &PyType_Type;
++    Py_TYPE(&PyCursesPanel_Type) = &PyType_Type;
+ 
+     import_curses();
+ 

plugins/python-build/share/python-build/pypy-1.5

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.5-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.6

@@ -23,5 +23,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.7

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.7-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.7-dev" "https://bitbucket.org/pypy/pypy" "release-1.7.x" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.8

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.8-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.8-dev" "https://bitbucket.org/pypy/pypy" "release-1.8.x" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.9

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-1.9-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.9-dev" "https://bitbucket.org/pypy/pypy" "release-1.9.x" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-2.0

@@ -29,5 +29,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-2.0-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-2.0-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#4dc82e2240dd2b5be313119672988538" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-2.0.1

@@ -23,5 +23,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-2.0.1-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#34072be1eeb63f9d37cf387e58aae81d" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-2.0.2

@@ -23,5 +23,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-2.0.2-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#c26662e348159b460057548ddaf35333" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder" verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/pypy-py3k-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-py3k-dev" "https://bitbucket.org/pypy/pypy" "py3k" "pypy_builder" verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/stackless-2.7-dev

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "stackless-2.7-dev" "http://hg.python.org/stackless" "2.7-slp" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/stackless-2.7.2

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "stackless-272-export" "http://www.stackless.com/binaries/stackless-272-export.tar.bz2#79a718db998f2cdd95478d2cb54d56f2" standard verify_py27
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/stackless-3.2-dev

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "stackless-3.2-dev" "http://hg.python.org/stackless" "3.2-slp" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python

plugins/python-build/share/python-build/stackless-3.2.2

@@ -1,5 +1,5 @@
 require_gcc
-install_package "readline-6.2" "ftp://ftp.cwru.edu/pub/bash/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "stackless-322-export" "http://www.stackless.com/binaries/stackless-322-export.tar.bz2#3a3edcfb4240bdcc580cec2baea60af4" standard verify_py32
-install_package "setuptools-0.7.2" "https://bitbucket.org/pypa/setuptools/downloads/setuptools-0.7.2.tar.gz#20003718b266929c4a49e5d7ba3f792c" python
-install_package "pip-1.3.1" "http://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
+install_package "setuptools-0.9.7" "https://pypi.python.org/packages/source/s/setuptools/setuptools-0.9.7.tar.gz#ce3bb480e4f6d71fc2fb3388f6fe8123" python
+install_package "pip-1.4" "https://pypi.python.org/packages/source/p/pip/pip-1.4.tar.gz#ca790be30004937987767eac42cfa44a" python