<pre style='margin:0'>
Chih-Hsuan Yen (yan12125) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/160f340665b9d97c1065fcb2aecb5b504a7b3cb4">https://github.com/macports/macports-ports/commit/160f340665b9d97c1065fcb2aecb5b504a7b3cb4</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 160f340 python{25,31}: removed
</span>160f340 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 160f340665b9d97c1065fcb2aecb5b504a7b3cb4
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Sat Oct 27 11:32:55 2018 +0800
<span style='display:block; white-space:pre;color:#404040;'> python{25,31}: removed
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> As I proposed in https://lists.macports.org/pipermail/macports-dev/2018-October/039551.html
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Python 3.2 and 3.3 are kept for now until most Python libraries drop
</span><span style='display:block; white-space:pre;color:#404040;'> support for them. See https://hugovk.github.io/drop-python/ for
</span><span style='display:block; white-space:pre;color:#404040;'> statistical data.
</span>---
lang/python25/Portfile | 223 ----
lang/python25/files/_localemodule.c.ed | 2 -
lang/python25/files/locale.py.ed | 2 -
lang/python25/files/patch-64bit.diff | 1234 --------------------
lang/python25/files/patch-FSIORefNum.diff | 11 -
lang/python25/files/patch-Lib-cgi.py.diff | 18 -
.../files/patch-Lib-distutils-dist.py.diff | 51 -
lang/python25/files/patch-Makefile.pre.in.diff | 49 -
lang/python25/files/patch-Misc-setuid-prog.c.diff | 16 -
.../files/patch-Modules-posixmodule.c.diff | 21 -
lang/python25/files/patch-configure.diff | 48 -
lang/python25/files/patch-fwrapv.diff | 12 -
lang/python25/files/patch-libedit.diff | 132 ---
lang/python25/files/patch-mac_ver.diff | 114 --
lang/python25/files/patch-pyconfig.h.in.diff | 13 -
.../files/patch-setup.py-disabled_modules.diff | 11 -
lang/python25/files/patch-setup.py.diff | 80 --
lang/python25/files/pyconfig.ed | 2 -
lang/python25/files/pyconfig.h-universal.ed | 50 -
lang/python25/files/python25 | 13 -
lang/python31/Portfile | 172 ---
lang/python31/files/patch-Include-pyport.h.diff | 23 -
lang/python31/files/patch-Lib-cgi.py.diff | 18 -
.../files/patch-Lib-distutils-dist.py.diff | 51 -
...t-build-installer.py-yosemite_python_fixes.diff | 76 --
...patch-Lib-site.py-omit_local_site_packages.diff | 23 -
...gure_configure.ac-yosemite_configure_fixes.diff | 118 --
lang/python31/files/patch-libedit.diff | 167 ---
.../files/patch-setup.py-disabled_modules.diff | 11 -
lang/python31/files/patch-setup.py.diff | 53 -
lang/python31/files/pyconfig.ed | 2 -
lang/python31/files/pyconfig.h-universal.ed | 78 --
lang/python31/files/python31 | 13 -
lang/python31/files/uuid-64bit.patch | 40 -
python/py-gdbm/Portfile | 15 +-
python/py-graveyard/Portfile | 4 +-
python/py-tkinter/Portfile | 13 +-
37 files changed, 4 insertions(+), 2975 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/Portfile b/lang/python25/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ffea8d4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,223 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name python25
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.5.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license PSF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description An interpreted, object-oriented programming language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Python is an interpreted, interactive, object-oriented \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- programming language.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.python.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://ftp.python.org/ftp/python/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname Python-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 5d45979c5f30fb2dd5f067c6b06b88e4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 29f6dd41bf09c5e04311b367cbb7604fa016e699 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 92f0a955971f187a7d50c6422168202ec551bf22
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# patch-Lib-distutils-dist.py.diff comes from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# <https://bugs.python.org/issue1180>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.pre.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-cgi.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-distutils-dist.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-configure.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-64bit.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py-disabled_modules.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-mac_ver.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libedit.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-fwrapv.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext port:zlib path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3 port:db46 port:bzip2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libedit port:ncurses
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:python_select
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-shared \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-framework=${frameworks_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ipv6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-cxx=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/Applications/MacPython|${applications_dir}/MacPython|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/IDLE/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/Tools/Doc/setup.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/PythonLauncher/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/BuildScript/build-installer.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/PythonLauncher/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__BUILD_ARCH__|${build_arch}|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__UNIVERSAL_CFLAGS__|${configure.universal_cflags}|" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__UNIVERSAL_LDFLAGS__|${configure.universal_ldflags}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Makefile.pre.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://trac.macports.org/ticket/21517
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - Modules/_localemodule.c < ${filespath}/_localemodule.c.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - Lib/locale.py < ${filespath}/locale.py.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: From python24, do we still need this?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Workaround for case-sensitive file systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ![file exists ${worksrcpath}/python.exe] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s python ${worksrcpath}/python.exe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target frameworkinstall maninstall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ensure that correct compiler is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append MAKE="${build.cmd}" CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append MAKE="${destroot.cmd}" CC="${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.group python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.file ${filespath}/python[string map {. {}} ${branch}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To make python ${branch} the default (i.e. the version you get when you run\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-'python'), please run:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo port select --set ${select.group} [file tail ${select.file}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform macosx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewpath ${frameworks_dir}/Python.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewdir ${framewpath}/Versions/${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Without this, LINKFORSHARED is set to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (this becomes Python.framework/Versions/2.5/Python) which doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # quite work (see ticket #15099); instead we mirror the behavior of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # `python-config --ldflags` here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|^\(LINKFORSHARED=\).*$|\1 -L$(LIBPL) -lpython$(VERSION) $(LIBS) $(SYSLIBS)|} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/config/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { lib include } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/share ${destroot}${framewdir}/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete symlinks without version suffix, use python_select instead to choose version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin { python pythonw idle pydoc smtpd.py python-config } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/bin/${bin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py python${branch}-config] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix incorrectly-pointed libpython2.5.a symlink, see
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # http://trac.macports.org/ticket/19906
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_staticlink ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${python_staticlink}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/Python ${python_staticlink}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See http://trac.macports.org/ticket/18376
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -D_DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-pyconfig.h.in.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists /usr/lib/libSystemStubs.a]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s/-lSystemStubs//g ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove -arch flags from the config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/python${branch}/config/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-FSIORefNum.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 9 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.cppflags-append -D__DARWIN_UNIX03
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform puredarwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-Modules-posixmodule.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-framework=${frameworks_dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-toolbox-glue --disable-framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- destroot.target install maninstall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-build {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # thin dynamic library to have the same arch as static lib, even after -lSystemStubs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "lipo ${worksrcpath}/libpython${branch}.dylib -output ${worksrcpath}/libpython${branch}.dylib -thin `lipo -info ${worksrcpath}/libpython${branch}.a | tail -n 1 | sed -e 's/.*architecture: \\(.*\\)/\\1/'`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # delete symlinks without version suffix, use python_select instead to choose version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin { python pythonw idle pydoc smtpd.py python-config } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/bin/${bin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} == ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.platform} eq "darwin" && ${os.major} >= 14} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- archive_sites
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ui_error "${name} is not supported on Yosemite or later."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error {unsupported platform}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}downloads/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex Python (${branch}.\[0-9\]+)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/_localemodule.c.ed b/lang/python25/files/_localemodule.c.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d4617a9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/_localemodule.c.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,2 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-g/defined(__APPLE__)/s//0/g
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/locale.py.ed b/lang/python25/files/locale.py.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0bdbf3e..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/locale.py.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,2 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-g/'darwin', /s///
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-64bit.diff b/lang/python25/files/patch-64bit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 100617d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-64bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,1234 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/pymactoolbox.h.orig 2004-11-05 18:02:59.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pymactoolbox.h 2009-09-10 18:08:58.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +8,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QuickTime/QuickTime.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** Helper routines for error codes and such.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,8 +20,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyMac_GetOSErrException(void); /* Initialize & return it */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyErr_Mac(PyObject *, int); /* Exception with a mac error */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyMac_Error(OSErr); /* Uses PyMac_GetOSErrException */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern OSErr PyMac_GetFullPathname(FSSpec *, char *, int); /* convert
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fsspec->path */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** These conversion routines are defined in mactoolboxglue.c itself.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,9 +87,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* USE_TOOLBOX_OBJECT_GLUE */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* macfs exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int PyMac_GetFSSpec(PyObject *, FSSpec *); /* argument parser for FSSpec */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyMac_BuildFSSpec(FSSpec *); /* Convert FSSpec to PyObject */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int PyMac_GetFSRef(PyObject *, FSRef *); /* argument parser for FSRef */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *PyMac_BuildFSRef(FSRef *); /* Convert FSRef to PyObject */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,39 +106,54 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int CmpInstObj_Convert(PyObject *, ComponentInstance *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Ctl exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *CtlObj_New(ControlHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int CtlObj_Convert(PyObject *, ControlHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Dlg exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *DlgObj_New(DialogPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int DlgObj_Convert(PyObject *, DialogPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *DlgObj_WhichDialog(DialogPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Drag exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *DragObj_New(DragReference);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int DragObj_Convert(PyObject *, DragReference *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* List exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *ListObj_New(ListHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int ListObj_Convert(PyObject *, ListHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Menu exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *MenuObj_New(MenuHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int MenuObj_Convert(PyObject *, MenuHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Qd exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *GrafObj_New(GrafPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int GrafObj_Convert(PyObject *, GrafPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *BMObj_New(BitMapPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int BMObj_Convert(PyObject *, BitMapPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *QdRGB_New(RGBColor *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int QdRGB_Convert(PyObject *, RGBColor *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Qdoffs exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *GWorldObj_New(GWorldPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Qt exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *TrackObj_New(Track);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int TrackObj_Convert(PyObject *, Track *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *MovieObj_New(Movie);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,6 +166,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int UserDataObj_Convert(PyObject *, UserData *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *MediaObj_New(Media);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int MediaObj_Convert(PyObject *, Media *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Res exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *ResObj_New(Handle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -154,13 +175,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int OptResObj_Convert(PyObject *, Handle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* TE exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *TEObj_New(TEHandle);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int TEObj_Convert(PyObject *, TEHandle *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Win exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *WinObj_New(WindowPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int WinObj_Convert(PyObject *, WindowPtr *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *WinObj_WhichWindow(WindowPtr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* CF exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *CFObj_New(CFTypeRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Python/mactoolboxglue.c.orig 2006-07-12 02:44:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Python/mactoolboxglue.c 2009-09-10 19:26:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -105,7 +105,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return PyErr_Mac(PyMac_GetOSErrException(), err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -153,6 +153,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_XDECREF(fs);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Convert a 4-char string object argument to an OSType value */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -417,6 +418,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -429,6 +431,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/_ctypes/libffi/src/darwin/ffitarget.h.orig 2006-05-26 07:58:05.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/_ctypes/libffi/src/darwin/ffitarget.h 2009-09-10 20:15:39.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,7 +4,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * created by configure). This makes is possible to build a univeral binary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * of ctypes in one go.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if defined(__i386__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__i386__) || defined(__x86_64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef X86_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define X86_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -13,7 +13,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "../src/x86/ffitarget.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#elif defined(__ppc__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#elif defined(__ppc__) || defined(__ppc64__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef POWERPC_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define POWERPC_DARWIN
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/res/_Resmodule.c.orig 2005-07-04 06:59:44.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/res/_Resmodule.c 2009-09-10 20:44:43.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -414,6 +414,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *ResObj_as_Control(ResourceObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *_res = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -431,6 +432,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *ResObj_LoadResource(ResourceObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -501,10 +503,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(long newSize) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetNextFOND", (PyCFunction)ResObj_GetNextFOND, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> (Handle _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"as_Control", (PyCFunction)ResObj_as_Control, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("Return this resource/handle as a Control")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"as_Menu", (PyCFunction)ResObj_as_Menu, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("Return this resource/handle as a Menu")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"LoadResource", (PyCFunction)ResObj_LoadResource, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"AutoDispose", (PyCFunction)ResObj_AutoDispose, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1152,6 +1156,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Res_OpenRFPerm(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *_res = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1287,6 +1292,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _res = Py_None;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Res_InsertResourceFile(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1327,6 +1333,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Res_FSpResourceFileAlreadyOpen(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *_res = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1413,6 +1420,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- nextRefNum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Res_FSOpenResFile(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1438,6 +1446,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Res_FSCreateResFile(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *_res = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1534,6 +1543,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_BuildFSSpec, &newSpec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Res_FSOpenResourceFile(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1637,6 +1647,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(short refNum) -> (short _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"SetResFileAttrs", (PyCFunction)Res_SetResFileAttrs, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(short refNum, short attrs) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"OpenRFPerm", (PyCFunction)Res_OpenRFPerm, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(Str255 fileName, short vRefNum, SignedByte permission) -> (short _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"HOpenResFile", (PyCFunction)Res_HOpenResFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1647,10 +1658,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec spec, SignedByte permission) -> (short _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSpCreateResFile", (PyCFunction)Res_FSpCreateResFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec spec, OSType creator, OSType fileType, ScriptCode scriptTag) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"InsertResourceFile", (PyCFunction)Res_InsertResourceFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(SInt16 refNum, RsrcChainLocation where) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"DetachResourceFile", (PyCFunction)Res_DetachResourceFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(SInt16 refNum) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSpResourceFileAlreadyOpen", (PyCFunction)Res_FSpResourceFileAlreadyOpen, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec resourceFile) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSpOpenOrphanResFile", (PyCFunction)Res_FSpOpenOrphanResFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1659,14 +1672,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("() -> (SInt16 refNum)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetNextResourceFile", (PyCFunction)Res_GetNextResourceFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(SInt16 curRefNum) -> (SInt16 nextRefNum)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSOpenResFile", (PyCFunction)Res_FSOpenResFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef ref, SignedByte permission) -> (short _rv)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSCreateResFile", (PyCFunction)Res_FSCreateResFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef parentRef, Buffer nameLength) -> (FSRef newRef, FSSpec newSpec)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSResourceFileAlreadyOpen", (PyCFunction)Res_FSResourceFileAlreadyOpen, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef resourceFileRef) -> (Boolean _rv, Boolean inChain, SInt16 refNum)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSCreateResourceFile", (PyCFunction)Res_FSCreateResourceFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef parentRef, Buffer nameLength, Buffer forkNameLength) -> (FSRef newRef, FSSpec newSpec)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSOpenResourceFile", (PyCFunction)Res_FSOpenResourceFile, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef ref, Buffer forkNameLength, SignedByte permissions) -> (SInt16 refNum)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"Handle", (PyCFunction)Res_Handle, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/MacOS.c.orig 2006-07-26 05:20:54.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/MacOS.c 2009-09-10 21:47:34.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- do_close(rfobject *self)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (self->isclosed ) return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- (void)FSClose(self->fRefNum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (void)FSCloseFork(self->fRefNum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self->isclosed = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -68,6 +68,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- long n;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ByteCount n2;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (self->isclosed) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_SetString(PyExc_ValueError, "Operation on closed file");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -81,13 +82,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (v == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err = FSRead(self->fRefNum, &n, PyString_AsString(v));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSReadFork(self->fRefNum, fsAtMark, 0, n, PyString_AsString(v), &n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err && err != eofErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(v);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- _PyString_Resize(&v, n);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _PyString_Resize(&v, n2);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return v;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -109,7 +110,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(args, "s#", &buffer, &size))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err = FSWrite(self->fRefNum, &size, buffer);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSWriteFork(self->fRefNum, fsAtMark, 0, size, buffer, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (err) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,9 +127,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rf_seek(rfobject *self, PyObject *args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long amount, pos;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long amount;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int whence = SEEK_SET;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long eof;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (self->isclosed) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -138,35 +139,23 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(args, "l|i", &amount, &whence))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((err = GetEOF(self->fRefNum, &eof)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- goto ioerr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (whence) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case SEEK_CUR:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((err = GetFPos(self->fRefNum, &pos)))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- goto ioerr;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mode = fsFromMark;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case SEEK_END:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pos = eof;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mode = fsFromLEOF;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case SEEK_SET:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pos = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ mode = fsFromStart;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_BadArgument();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- pos += amount;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Don't bother implementing seek past EOF */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (pos > eof || pos < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PyErr_BadArgument();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((err = SetFPos(self->fRefNum, fsFromStart, pos)) ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ioerr:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSSetForkPosition(self->fRefNum, mode, amount);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (err != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,7 +171,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rf_tell(rfobject *self, PyObject *args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- long where;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long long where;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (self->isclosed) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -191,11 +180,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(args, ""))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((err = GetFPos(self->fRefNum, &where)) ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSGetForkPosition(self->fRefNum, &where);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (err != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return PyInt_FromLong(where);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return PyLong_FromLongLong(where);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char rf_close__doc__[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -292,17 +283,61 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacOS_GetCreatorAndType(PyObject *self, PyObject *args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FSSpec fss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FInfo info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *creator, *type, *res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef ref;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSCatalogInfo cataloginfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FileInfo* finfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSRef, &ref)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* This function is documented to take an FSSpec as well,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * which only works in 32-bit mode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyErr_Clear();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSSpec fss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FInfo info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((err = FSpGetFInfo(&fss, &info)) != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ creator = PyString_FromStringAndSize(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ (char *)&info.fdCreator, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ type = PyString_FromStringAndSize((char *)&info.fdType, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ res = Py_BuildValue("OO", creator, type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(creator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSGetCatalogInfo(&ref,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (err != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((err = FSpGetFInfo(&fss, &info)) != noErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- creator = PyString_FromStringAndSize((char *)&info.fdCreator, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- type = PyString_FromStringAndSize((char *)&info.fdType, 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Directory: doesn't have type/creator info.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * The specific error code is for backward compatibility with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * earlier versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyErr_Mac(MacOS_Error, fnfErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ finfo = (FileInfo*)&(cataloginfo.finderInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ creator = PyString_FromStringAndSize((char*)&(finfo->fileCreator), 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ type = PyString_FromStringAndSize((char*)&(finfo->fileType), 4);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- res = Py_BuildValue("OO", creator, type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(creator);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -314,20 +349,66 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MacOS_SetCreatorAndType(PyObject *self, PyObject *args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FSSpec fss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ResType creator, type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FInfo info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef ref;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FileInfo* finfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSCatalogInfo cataloginfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(args, "O&O&O&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyMac_GetFSRef, &ref, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Try to handle FSSpec arguments, for backward compatibility */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSSpec fss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FInfo info;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PyArg_ParseTuple(args, "O&O&O&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_GetFSSpec, &fss, PyMac_GetOSType, &creator, PyMac_GetOSType, &type))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((err = FSpGetFInfo(&fss, &info)) != noErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info.fdCreator = creator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info.fdType = type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((err = FSpSetFInfo(&fss, &info)) != noErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_INCREF(Py_None);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Py_None;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* __LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSGetCatalogInfo(&ref,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL, NULL, NULL);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (err != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((err = FSpGetFInfo(&fss, &info)) != noErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info.fdCreator = creator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- info.fdType = type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ((err = FSpSetFInfo(&fss, &info)) != noErr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return PyErr_Mac(MacOS_Error, err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Directory: doesn't have type/creator info.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * The specific error code is for backward compatibility with
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * earlier versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyErr_Mac(MacOS_Error, fnfErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ finfo = (FileInfo*)&(cataloginfo.finderInfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ finfo->fileCreator = creator;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ finfo->fileType = type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &cataloginfo);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (err != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyErr_Mac(MacOS_Error, fnfErr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(Py_None);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Py_None;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -399,6 +480,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Py_BuildValue("s", buf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char splash_doc[] = "Open a splash-screen dialog by resource-id (0=close)";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -470,6 +552,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(Py_None);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Py_None;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char WMAvailable_doc[] =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "True if this process can interact with the display."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -530,17 +613,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSErr err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *mode = "r";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FSSpec fss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SignedByte permission = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef ref;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ SInt8 permission = fsRdPerm;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rfobject *fp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ HFSUniStr255 name;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSSpec, &fss, &mode))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSRef, &ref, &mode))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- while (*mode) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- switch (*mode++) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case '*': break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case 'r': permission = 1; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- case 'w': permission = 2; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case 'r': permission = fsRdPerm; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ case 'w': permission = fsWrPerm; break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case 'b': break;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- default:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_BadArgument();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -548,33 +632,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( (fp = newrfobject()) == NULL )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSGetResourceForkName(&name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (err != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ( (fp = newrfobject()) == NULL )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( err == fnfErr ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* In stead of doing complicated things here to get creator/type
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ** correct we let the standard i/o library handle it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- FILE *tfp;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- char pathname[PATHNAMELEN];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( (err=PyMac_GetFullPathname(&fss, pathname, PATHNAMELEN)) ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Py_DECREF(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( (tfp = fopen(pathname, "w")) == NULL ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PyMac_Error(fnfErr); /* What else... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Py_DECREF(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fclose(tfp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if ( err ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ err = FSOpenFork(&ref, name.length, name.unicode, permission, &fp->fRefNum);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (err != noErr) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_DECREF(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -589,10 +658,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"SetCreatorAndType", MacOS_SetCreatorAndType, 1, setcrtp_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetErrorString", MacOS_GetErrorString, 1, geterr_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"openrf", MacOS_openrf, 1, openrf_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"splash", MacOS_splash, 1, splash_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"DebugStr", MacOS_DebugStr, 1, DebugStr_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"SysBeep", MacOS_SysBeep, 1, SysBeep_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"WMAvailable", MacOS_WMAvailable, 1, WMAvailable_doc},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {NULL, NULL} /* Sentinel */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/file/_Filemodule.c.orig 2006-05-29 07:57:35.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/file/_Filemodule.c 2009-09-10 22:48:47.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -18,9 +18,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <Carbon/Carbon.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef USE_TOOLBOX_OBJECT_GLUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int _PyMac_GetFSSpec(PyObject *v, FSSpec *spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern int _PyMac_GetFSRef(PyObject *v, FSRef *fsr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *_PyMac_BuildFSSpec(FSSpec *spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern int _PyMac_GetFSRef(PyObject *v, FSRef *fsr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *_PyMac_BuildFSRef(FSRef *spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_GetFSSpec _PyMac_GetFSSpec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,20 +30,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_BuildFSSpec _PyMac_BuildFSSpec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_BuildFSRef _PyMac_BuildFSRef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int PyMac_GetFSSpec(PyObject *v, FSSpec *spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--extern int PyMac_GetFSRef(PyObject *v, FSRef *fsr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *PyMac_BuildFSSpec(FSSpec *spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+extern int PyMac_GetFSRef(PyObject *v, FSRef *fsr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *PyMac_BuildFSRef(FSRef *spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Forward declarations */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *FInfo_New(FInfo *itself);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--static PyObject *FSRef_New(FSRef *itself);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *FSSpec_New(FSSpec *itself);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define FSSpec_Convert PyMac_GetFSSpec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+static PyObject *FSRef_New(FSRef *itself);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Alias_New(AliasHandle itself);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int FInfo_Convert(PyObject *v, FInfo *p_itself);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FSRef_Convert PyMac_GetFSRef
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define FSSpec_Convert PyMac_GetFSSpec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int Alias_Convert(PyObject *v, AliasHandle *p_itself);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -62,6 +70,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** Optional fsspec and fsref pointers. None will pass NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- myPyMac_GetOptFSSpecPtr(PyObject *v, FSSpec **spec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,6 +80,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return PyMac_GetFSSpec(v, *spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- myPyMac_GetOptFSRefPtr(PyObject *v, FSRef **ref)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -92,6 +102,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return Py_BuildValue("u#", itself->unicode, itself->length);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static OSErr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -135,6 +146,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *File_Error;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -282,12 +294,28 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *FSCatalogInfo_get_permissions(FSCatalogInfoObject *self, void *closure)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return Py_BuildValue("(llll)", self->ob_itself.permissions[0], self->ob_itself.permissions[1], self->ob_itself.permissions[2], self->ob_itself.permissions[3]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSPermissionInfo* info = (FSPermissionInfo*)&(self->ob_itself.permissions);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return Py_BuildValue("(llll)", info->userID, info->groupID, info->userAccess, info->mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static int FSCatalogInfo_set_permissions(FSCatalogInfoObject *self, PyObject *v, void *closure)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return PyArg_Parse(v, "(llll)", &self->ob_itself.permissions[0], &self->ob_itself.permissions[1], &self->ob_itself.permissions[2], &self->ob_itself.permissions[3])-1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long userID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long groupID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long userAccess;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ long mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int r;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSPermissionInfo* info = (FSPermissionInfo*)&(self->ob_itself.permissions);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ r = PyArg_Parse(v, "(llll)", &userID, &groupID, &userAccess, &mode);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!r) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return -1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info->userID = userID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info->groupID = groupID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info->userAccess = userAccess;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info->mode = mode;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -501,6 +529,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ----------------------- Object type FInfo ------------------------ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyTypeObject FInfo_Type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define FInfo_Check(x) ((x)->ob_type == &FInfo_Type || PyObject_TypeCheck((x), &FInfo_Type))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -682,6 +711,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FInfo_tp_free, /* tp_free */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* --------------------- End object type FInfo ---------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -729,6 +759,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self->ob_type->tp_free((PyObject *)self);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Alias_ResolveAlias(AliasObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *_res = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -818,6 +849,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wasChanged);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *Alias_FSResolveAliasWithMountFlags(AliasObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -891,6 +923,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef Alias_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"ResolveAlias", (PyCFunction)Alias_ResolveAlias, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec fromFile) -> (FSSpec target, Boolean wasChanged)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetAliasInfo", (PyCFunction)Alias_GetAliasInfo, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -899,6 +932,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec fromFile, unsigned long mountFlags) -> (FSSpec target, Boolean wasChanged)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FollowFinderAlias", (PyCFunction)Alias_FollowFinderAlias, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec fromFile, Boolean logon) -> (FSSpec target, Boolean wasChanged)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSResolveAliasWithMountFlags", (PyCFunction)Alias_FSResolveAliasWithMountFlags, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef fromFile, unsigned long mountFlags) -> (FSRef target, Boolean wasChanged)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSResolveAlias", (PyCFunction)Alias_FSResolveAlias, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1033,6 +1067,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* ----------------------- Object type FSSpec ----------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyTypeObject FSSpec_Type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1488,6 +1523,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec_tp_free, /* tp_free */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* --------------------- End object type FSSpec --------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1568,7 +1604,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSCatalogInfoBitmap whichInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSCatalogInfo catalogInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSRef newRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec newSpec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(_args, "u#lO&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &nameLength__in__, &nameLength__in_len__,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &whichInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1580,11 +1618,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- whichInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &catalogInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &newRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- &newSpec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ &newSpec
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ );
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_err != noErr) return PyMac_Error(_err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _res = Py_BuildValue("O&O&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSRef_New, &newRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec_New, &newSpec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res = Py_BuildValue("O&O", FSRef_New, &newRef, Py_None);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1598,7 +1645,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSCatalogInfoBitmap whichInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSCatalogInfo catalogInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSRef newRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec newSpec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UInt32 newDirID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(_args, "u#lO&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &nameLength__in__, &nameLength__in_len__,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1611,13 +1660,25 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- whichInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &catalogInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &newRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &newSpec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &newDirID);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_err != noErr) return PyMac_Error(_err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _res = Py_BuildValue("O&O&l",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSRef_New, &newRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec_New, &newSpec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- newDirID);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res = Py_BuildValue("O&Ol",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef_New, &newRef,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ newDirID);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1699,7 +1760,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSCatalogInfoBitmap whichInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSCatalogInfo catalogInfo;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- HFSUniStr255 outName;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec fsSpec;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSRef parentRef;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(_args, "l",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &whichInfo))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1708,14 +1771,26 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- whichInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &catalogInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &outName,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &fsSpec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NULL,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &parentRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (_err != noErr) return PyMac_Error(_err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _res = Py_BuildValue("O&O&O&O&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSCatalogInfo_New, &catalogInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_BuildHFSUniStr255, &outName,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec_New, &fsSpec,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSRef_New, &parentRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ _res = Py_BuildValue("O&O&OO&",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSCatalogInfo_New, &catalogInfo,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyMac_BuildHFSUniStr255, &outName,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_None,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSRef_New, &parentRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1784,7 +1859,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- UniCharCount forkNameLength__len__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int forkNameLength__in_len__;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SInt8 permissions;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- SInt16 forkRefNum;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSIORefNum forkRefNum;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (!PyArg_ParseTuple(_args, "u#b",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &forkNameLength__in__, &forkNameLength__in_len__,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- &permissions))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2034,7 +2109,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* --------------------- End object type FSRef ---------------------- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *File_UnmountVol(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *_res = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2562,6 +2637,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec_New, &spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *File_FSGetForkPosition(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2785,6 +2861,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *File_NewAlias(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *_res = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2933,6 +3010,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- wasAliased);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _res;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyObject *File_FSNewAlias(PyObject *_self, PyObject *_args)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3050,6 +3128,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef File_methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"UnmountVol", (PyCFunction)File_UnmountVol, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(Str63 volName, short vRefNum) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FlushVol", (PyCFunction)File_FlushVol, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3100,6 +3179,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(short vRefNum, long dirID, Str255 oldName, long newDirID, Str255 newName) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSMakeFSSpec", (PyCFunction)File_FSMakeFSSpec, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(short vRefNum, long dirID, Str255 fileName) -> (FSSpec spec)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSGetForkPosition", (PyCFunction)File_FSGetForkPosition, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(SInt16 forkRefNum) -> (SInt64 position)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSSetForkPosition", (PyCFunction)File_FSSetForkPosition, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3124,6 +3204,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(UInt8 * path, FNMessage message, OptionBits flags) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FNNotifyAll", (PyCFunction)File_FNNotifyAll, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FNMessage message, OptionBits flags) -> None")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"NewAlias", (PyCFunction)File_NewAlias, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec fromFile, FSSpec target) -> (AliasHandle alias)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"NewAliasMinimalFromFullPath", (PyCFunction)File_NewAliasMinimalFromFullPath, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3136,6 +3217,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec fromFile, FSSpec target, AliasHandle alias) -> (Boolean wasChanged)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"ResolveAliasFileWithMountFlagsNoUI", (PyCFunction)File_ResolveAliasFileWithMountFlagsNoUI, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSSpec theSpec, Boolean resolveAliasChains, unsigned long mountFlags) -> (FSSpec theSpec, Boolean targetIsFolder, Boolean wasAliased)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSNewAlias", (PyCFunction)File_FSNewAlias, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyDoc_STR("(FSRef fromFile, FSRef target) -> (AliasHandle inAlias)")},
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"FSResolveAliasFileWithMountFlags", (PyCFunction)File_FSResolveAliasFileWithMountFlags, 1,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3150,7 +3232,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_GetFSSpec(PyObject *v, FSSpec *spec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3188,12 +3270,15 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_GetFSRef(PyObject *v, FSRef *fsr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OSStatus err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec fss;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (FSRef_Check(v)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *fsr = ((FSRefObject *)v)->ob_itself;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3211,6 +3296,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return !err;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* XXXX Should try unicode here too */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Otherwise we try to go via an FSSpec */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (FSSpec_Check(v)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fss = ((FSSpecObject *)v)->ob_itself;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3219,15 +3305,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_Error(err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_SetString(PyExc_TypeError, "FSRef, FSSpec or pathname required");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_BuildFSSpec(FSSpec *spec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return FSSpec_New(spec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern PyObject *
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_BuildFSRef(FSRef *spec)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3242,10 +3331,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject *d;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_NEW(FSSpec *, PyMac_BuildFSSpec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PyMac_INIT_TOOLBOX_OBJECT_NEW(FSRef *, PyMac_BuildFSRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(FSSpec, PyMac_GetFSSpec);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PyMac_INIT_TOOLBOX_OBJECT_NEW(FSRef *, PyMac_BuildFSRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyMac_INIT_TOOLBOX_OBJECT_CONVERT(FSRef, PyMac_GetFSRef);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3262,6 +3352,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&FSCatalogInfo_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "FSCatalogInfoType", (PyObject *)&FSCatalogInfo_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FInfo_Type.ob_type = &PyType_Type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (PyType_Ready(&FInfo_Type) < 0) return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&FInfo_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3269,6 +3360,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&FInfo_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "FInfoType", (PyObject *)&FInfo_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Alias_Type.ob_type = &PyType_Type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (PyType_Ready(&Alias_Type) < 0) return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&Alias_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3276,6 +3368,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&Alias_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "AliasType", (PyObject *)&Alias_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSSpec_Type.ob_type = &PyType_Type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (PyType_Ready(&FSSpec_Type) < 0) return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&FSSpec_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3283,6 +3376,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Backward-compatible name */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&FSSpec_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyModule_AddObject(m, "FSSpecType", (PyObject *)&FSSpec_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif /* !__LP64__ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- FSRef_Type.ob_type = &PyType_Type;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (PyType_Ready(&FSRef_Type) < 0) return;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Py_INCREF(&FSRef_Type);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Lib/plat-mac/macresource.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/plat-mac/macresource.py (revision 74680)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/plat-mac/macresource.py (revision 74681)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -79,8 +79,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AppleSingle file"""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- refno = Res.FSpOpenResFile(pathname, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except Res.Error, arg:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if arg[0] in (-37, -39):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except (AttributeError, Res.Error), arg:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if isinstance(arg, AttributeError) or arg[0] in (-37, -39):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # No resource fork. We may be on OSX, and this may be either
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a data-fork based resource file or a AppleSingle file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from the CVS repository.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -106,8 +106,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- refno = Res.FSpOpenResFile(pathname, 1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Res.CloseResFile(refno)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- except Res.Error, arg:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if arg[0] in (-37, -39):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except (AttributeError, Res.Error), arg:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if isinstance(arg, AttributeError) or arg[0] in (-37, -39):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # No resource fork. We may be on OSX, and this may be either
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a data-fork based resource file or a AppleSingle file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # from the CVS repository.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Lib/plat-mac/applesingle.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/plat-mac/applesingle.py (revision 74680)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/plat-mac/applesingle.py (revision 74681)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,8 +119,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not hasattr(infile, 'read'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if isinstance(infile, Carbon.File.Alias):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- infile = infile.ResolveAlias()[0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- infile = infile.as_pathname()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if hasattr(Carbon.File, "FSSpec"):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if isinstance(infile, (Carbon.File.FSSpec, Carbon.File.FSRef)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ infile = infile.as_pathname()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if isinstance(infile, Carbon.File.FSRef):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ infile = infile.as_pathname()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- infile = open(infile, 'rb')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- asfile = AppleSingle(infile, verbose=verbose)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/scripts/BuildApplet.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/scripts/BuildApplet.py (revision 74680)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/scripts/BuildApplet.py (revision 74681)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12,7 +12,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import os
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import EasyDialogs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import EasyDialogs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EasyDialogs = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import buildtools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import getopt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -32,7 +35,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- buildapplet()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except buildtools.BuildError, detail:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- EasyDialogs.Message(detail)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if EasyDialogs is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print detail
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EasyDialogs.Message(detail)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def buildapplet():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -46,6 +52,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Ask for source text if not specified in sys.argv[1:]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not sys.argv[1:]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if EasyDialogs is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ usage()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.exit(1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- filename = EasyDialogs.AskFileForOpen(message='Select Python source or applet:',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typeList=('TEXT', 'APPL'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not filename:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Lib/plat-mac/buildtools.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/plat-mac/buildtools.py (revision 74680)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/plat-mac/buildtools.py (revision 74681)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import macostools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import macresource
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--import EasyDialogs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import EasyDialogs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ EasyDialogs = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import shutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -67,9 +70,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rsrcname=None, others=[], raw=0, progress="default", destroot=""):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if progress == "default":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- progress.label("Compiling...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- progress.inc(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if EasyDialogs is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print "Compiling %s"%(os.path.split(filename)[1],)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ process = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ progress = EasyDialogs.ProgressBar("Processing %s..."%os.path.split(filename)[1], 120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ progress.label("Compiling...")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ progress.inc(0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for the script name being longer than 32 chars. This may trigger a bug
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # on OSX that can destroy your sourcefile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if '#' in os.path.split(filename)[1]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,7 +126,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if MacOS.runtimemodel == 'macho':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- raise BuildError, "No updating yet for MachO applets"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if progress:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if EasyDialogs is None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print "Updating %s"%(os.path.split(filename)[1],)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ progress = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ progress = EasyDialogs.ProgressBar("Updating %s..."%os.path.split(filename)[1], 120)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- progress = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if not output:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-FSIORefNum.diff b/lang/python25/files/patch-FSIORefNum.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 6f8ac66..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-FSIORefNum.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/file/_Filemodule.c.orig 2009-09-12 15:55:59.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/file/_Filemodule.c 2009-09-12 16:12:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7,6 +7,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "pymactoolbox.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef SInt16 FSIORefNum;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Macro to test whether a weak-loaded CFM function exists */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyErr_SetString(PyExc_NotImplementedError, \
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-Lib-cgi.py.diff b/lang/python25/files/patch-Lib-cgi.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8153beb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-Lib-cgi.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,13 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#! /usr/local/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#! __PREFIX__/bin/python2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# intentionally NOT "/usr/bin/env python". On many systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# scripts, and /usr/local/bin is the default directory where Python is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# installed, so /usr/bin/env would be unable to find python. Granted,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# binary installations by Linux vendors often install Python in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# /usr/bin. So let those vendors patch cgi.py to match their choice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# of installation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# NOTE: The original #!/usr/local/bin/python patched for MacPorts installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Support module for CGI (Common Gateway Interface) scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-Lib-distutils-dist.py.diff b/lang/python25/files/patch-Lib-distutils-dist.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 961a8ad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-Lib-distutils-dist.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/dist.py.orig 2005-03-23 11:54:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/dist.py 2008-07-25 21:27:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -57,6 +57,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('quiet', 'q', "run quietly (turns verbosity off)"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('dry-run', 'n', "don't actually do anything"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('help', 'h', "show detailed help message"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 'common_usage' is a short (2-3 line) string describing the common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -264,6 +265,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.stderr.write(msg + "\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # no-user-cfg is handled before other command line args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # because other args override the config files, and this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # one is needed before we can load the config files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # If attrs['script_args'] wasn't passed, assume false.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or [])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.finalize_options()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # __init__ ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -324,6 +331,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Distutils __inst__.py file lives), a file in the user's home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- directory named .pydistutils.cfg on Unix and pydistutils.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- on Windows/Mac, and setup.cfg in the current directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ The file in the user's home directory can be disabled with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --no-user-cfg option.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_environ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -343,7 +353,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user_filename = "pydistutils.cfg"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # And look for the user config file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if os.environ.has_key('HOME'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if self.want_user_cfg and os.environ.has_key('HOME'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user_file = os.path.join(os.environ.get('HOME'), user_filename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.isfile(user_file):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files.append(user_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -353,6 +363,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.isfile(local_file):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files.append(local_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if DEBUG:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print "using config files: %s" % ', '.join(files)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # find_config_files ()
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-Makefile.pre.in.diff b/lang/python25/files/patch-Makefile.pre.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e99a247..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-Makefile.pre.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,49 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.pre.in.orig 2008-09-22 10:22:44.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.pre.in 2011-10-27 06:47:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,8 +348,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build the shared modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sharedmods: $(BUILDPYTHON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $$MAKEFLAGS in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Build static library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -387,7 +387,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(RESSRCDIR)/English.lproj/InfoPlist.strings
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${UNIVERSALSDK}"; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -o $(LDLIBRARY) -arch i386 -arch ppc -dynamiclib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -o $(LDLIBRARY) __UNIVERSAL_LDFLAGS__ -dynamiclib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -isysroot "${UNIVERSALSDK}" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -all_load $(LIBRARY) -Wl,-single_module \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/Python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -458,7 +458,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(SIGNAL_OBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MODOBJS) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(srcdir)/Modules/getbuildinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) -c $(PY_CFLAGS) -DSVNVERSION=\"`LC_ALL=C $(SVNVERSION)`\" -o $@ $(srcdir)/Modules/getbuildinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -c $(PY_CFLAGS) -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" -o $@ $(srcdir)/Modules/getbuildinfo.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -894,7 +894,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Install the dynamically loadable modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This goes into $(exec_prefix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sharedinstall:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix=$(prefix) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --install-scripts=$(BINDIR) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --install-platlib=$(DESTSHARED) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -968,7 +968,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This installs a few of the useful scripts in Tools/scripts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scriptsinstall:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SRCDIR=$(srcdir) $(RUNSHARED) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py --no-user-cfg install \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --prefix=$(prefix) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --install-scripts=$(BINDIR) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --root=/$(DESTDIR)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-Misc-setuid-prog.c.diff b/lang/python25/files/patch-Misc-setuid-prog.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0fee9e7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-Misc-setuid-prog.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Misc/setuid-prog.c.orig Sat Dec 11 14:29:22 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Misc/setuid-prog.c Sat Dec 11 14:30:13 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -70,6 +70,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define environ _environ
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <sys/time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <crt_externs.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define environ (*_NSGetEnviron())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* don't change def_IFS */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char def_IFS[] = "IFS= \t\n";
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* you may want to change def_PATH, but you should really change it in */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-Modules-posixmodule.c.diff b/lang/python25/files/patch-Modules-posixmodule.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c14913c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-Modules-posixmodule.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,21 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/posixmodule.c.orig Sat Dec 11 14:27:52 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/posixmodule.c Sat Dec 11 14:28:17 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -339,7 +339,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Return a dictionary corresponding to the POSIX environment table */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef WITH_NEXT_FRAMEWORK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* On Darwin/MacOSX a shared library or framework has no access to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ** environ directly, we must obtain it with _NSGetEnviron().
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +357,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- d = PyDict_New();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (d == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef WITH_NEXT_FRAMEWORK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (environ == NULL)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- environ = *_NSGetEnviron();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-configure.diff b/lang/python25/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a06fffb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,48 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2008-12-13 08:13:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2017-11-12 08:21:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4534,9 +4534,14 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # is there any other compiler on Darwin besides gcc?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if [[ `/usr/bin/arch` = 'ppc' ]]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BASECFLAGS="$BASECFLAGS -mno-fused-madd"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BASECFLAGS="__UNIVERSAL_CFLAGS__ -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BASECFLAGS="-arch __BUILD_ARCH__ ${BASECFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11362,7 +11367,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only __BUILD_ARCH__"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11374,7 +11379,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL_CRUFT=""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only __BUILD_ARCH__"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -11524,7 +11529,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ${MACOSX_DEPLOYMENT_TARGET-${cur_target}} '>' 10.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="-arch i386 -arch ppc -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="__UNIVERSAL_LDFLAGS__ -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="-arch __BUILD_ARCH__ ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLDSHARED="$LDSHARED"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-fwrapv.diff b/lang/python25/files/patch-fwrapv.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 130a3ad..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-fwrapv.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2011-11-22 09:08:58.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-11-22 09:10:56.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4428,9 +4428,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STRICT_PROTO="-Wstrict-prototypes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For gcc 4.x we need to use -fwrapv so lets check if its supported
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if "$CC" -v --help 2>/dev/null |grep -- -fwrapv > /dev/null; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- WRAP="-fwrapv"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $ac_cv_prog_cc_g in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$Py_DEBUG" = 'true' ; then
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-libedit.diff b/lang/python25/files/patch-libedit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 99da7a9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,132 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2011-10-31 13:23:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-10-31 13:28:19.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20985,9 +20985,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "checking how to link readline libs... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for py_libtermcap in "" ncursesw ncurses curses termcap; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$py_libtermcap"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- READLINE_LIBS="-lreadline"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ READLINE_LIBS="-ledit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- READLINE_LIBS="-lreadline -l$py_libtermcap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ READLINE_LIBS="-ledit -l$py_libtermcap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$READLINE_LIBS $LIBS_no_readline"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21060,13 +21060,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for readline 2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -ledit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo $ECHO_N "checking for rl_callback_handler_install in -ledit... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lreadline $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-ledit $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21137,7 +21137,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (ac_try="$ac_cpp conftest.$ac_ext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21172,7 +21172,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21188,13 +21188,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for readline 4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -lreadline" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo $ECHO_N "checking for rl_pre_input_hook in -lreadline... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -ledit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo $ECHO_N "checking for rl_pre_input_hook in -ledit... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lreadline $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-ledit $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21259,13 +21259,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for readline 4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ echo "$as_me:$LINENO: checking for rl_completion_matches in -ledit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+echo $ECHO_N "checking for rl_completion_matches in -ledit... $ECHO_C" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo $ECHO_N "(cached) $ECHO_C" >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lreadline $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-ledit $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21336,7 +21336,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { (ac_try="$ac_cpp conftest.$ac_ext"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case "(($ac_try" in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21371,7 +21371,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2011-10-31 13:23:35.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2011-10-31 13:32:40.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -488,7 +488,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- readline_extra_link_args = ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- readline_libs = ['readline']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ readline_libs = ['edit']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if self.compiler.find_library_file(lib_dirs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'ncursesw'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- readline_libs.append('ncursesw')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/readline.c.orig 2007-01-23 03:10:27.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/readline.c 2011-10-31 14:00:36.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,8 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* GNU readline definitions */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/history.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_RL_COMPLETION_MATCHES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define completion_matches(x, y) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -794,7 +793,6 @@ readline_until_enter_or_signal(char *pro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyEval_SaveThread();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (s < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rl_free_line_state();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rl_cleanup_after_signal();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rl_callback_handler_remove();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *signal = 1;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-mac_ver.diff b/lang/python25/files/patch-mac_ver.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5350dee..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-mac_ver.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,114 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# HG changeset patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# User Ronald Oussoren <ronaldoussoren@mac.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Date 1279889153 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Node ID e267ee9760bd14a8b4270e12af982c941fa7a67d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Parent bdc069a1a721b28ad21849232bd5426dda871506
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Merged revisions 83085 via svnmerge from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn+ssh://pythondev@svn.python.org/python/branches/release27-maint
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-................
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r83085 | ronald.oussoren | 2010-07-23 13:41:00 +0100 (Fri, 23 Jul 2010) | 12 lines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Merged revisions 83075 via svnmerge from
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- svn+ssh://pythondev@svn.python.org/python/branches/py3k
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ........
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- r83075 | ronald.oussoren | 2010-07-23 12:54:59 +0100 (Fri, 23 Jul 2010) | 5 lines
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Fix for issue 7895. Avoid crashing the interpreter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- when calling platform.mac_ver after calling os.fork by
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reading from a system configuration file instead of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- using OSX APIs.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ........
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-................
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Lib/platform.py b/Lib/platform.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/platform.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/platform.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -562,28 +562,20 @@ def _bcd2str(bcd):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return hex(bcd)[2:]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--def mac_ver(release='',versioninfo=('','',''),machine=''):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- """ Get MacOS version information and return it as tuple (release,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- versioninfo, machine) with versioninfo being a tuple (version,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- dev_stage, non_release_version).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Entries which cannot be determined are set to the paramter values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- which default to ''. All tuple entries are strings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def _mac_ver_gestalt():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Thanks to Mark R. Levinson for mailing documentation links and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- code examples for this function. Documentation for the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gestalt() API is available online at:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.rgaros.nl/gestalt/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Check whether the version info module is available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import gestalt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import MacOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return release,versioninfo,machine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Get the infos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sysv,sysu,sysa = _mac_ver_lookup(('sysv','sysu','sysa'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Decode the infos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -619,6 +611,53 @@ def mac_ver(release='',versioninfo=('','
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- machine = {0x1: '68k',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0x2: 'PowerPC',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 0xa: 'i386'}.get(sysa,'')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return release,versioninfo,machine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def _mac_ver_xml():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fn = '/System/Library/CoreServices/SystemVersion.plist'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if not os.path.exists(fn):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ import plistlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except ImportError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ pl = plistlib.readPlist(fn)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ release = pl['ProductVersion']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ versioninfo=('', '', '')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ machine = os.uname()[4]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if machine == 'ppc':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # for compatibility with the gestalt based code
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ machine = 'PowerPC'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return release,versioninfo,machine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def mac_ver(release='',versioninfo=('','',''),machine=''):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """ Get MacOS version information and return it as tuple (release,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ versioninfo, machine) with versioninfo being a tuple (version,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dev_stage, non_release_version).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Entries which cannot be determined are set to the paramter values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ which default to ''. All tuple entries are strings.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # First try reading the information from an XML file which should
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # always be present
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info = _mac_ver_xml()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if info is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # If that doesn't work for some reason fall back to reading the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # information using gestalt calls.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ info = _mac_ver_gestalt()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if info is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return info
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # If that also doesn't work return the default values
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return release,versioninfo,machine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def _java_getprop(name,default):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-pyconfig.h.in.diff b/lang/python25/files/patch-pyconfig.h.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bd0ecd8..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-pyconfig.h.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pyconfig.h.in.orig 2009-08-16 10:22:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pyconfig.h.in 2009-08-16 10:23:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4,6 +4,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifndef Py_PYCONFIG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define Py_PYCONFIG_H
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// Required on Darwin 10+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef _DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _DARWIN_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- support for AIX C++ shared extension modules. */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-setup.py-disabled_modules.diff b/lang/python25/files/patch-setup.py-disabled_modules.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 14d3bc5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-setup.py-disabled_modules.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2009-03-31 12:20:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2009-09-17 00:33:12.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils.command.install_lib import install_lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This global variable is used to hold the list of modules to be disabled.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--disabled_module_list = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+disabled_module_list = ["_tkinter", "gdbm"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def add_dir_to_list(dirlist, dir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Add the directory 'dir' to the list 'dirlist' (at the front) if
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/patch-setup.py.diff b/lang/python25/files/patch-setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2649594..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,80 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2008-10-16 12:58:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2009-06-07 20:55:17.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -609,7 +609,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # a release. Most open source OSes come with one or more
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # versions of BerkeleyDB already installed.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- max_db_ver = (4, 5)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ max_db_ver = (4, 6)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we leave that version disabled by default as it has proven to be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # quite a buggy library release on many platforms.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -636,6 +636,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db_inc_paths.append('/usr/local/include/db4%d' % x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db_inc_paths.append('/pkg/db-4.%d/include' % x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db_inc_paths.append('/opt/db-4.%d/include' % x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ db_inc_paths.append('__PREFIX__/include/db4%d' % x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 3.x minor number specific paths
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for x in (3,):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db_inc_paths.append('/usr/include/db3%d' % x)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -711,6 +712,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check lib directories parallel to the location of the header
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- db_dirs_to_check = [
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ os.path.join('__PREFIX__', 'lib', 'db46'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.join(db_incdir, '..', 'lib64'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.join(db_incdir, '..', 'lib'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- os.path.join(db_incdir, '..', '..', 'lib64'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1212,13 +1214,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def detect_tkinter(self, inc_dirs, lib_dirs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The _tkinter module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Rather than complicate the code below, detecting and building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # AquaTk is a separate method. Only one Tkinter will be built on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Darwin - either AquaTk, if it is found, or X11 based Tk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform = self.get_platform()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (platform == 'darwin' and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume we haven't found any of the libraries or include files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The versions with dots are used on Unix, and the versions without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2009-09-10 19:41:32.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2009-09-10 19:48:30.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1197,7 +1197,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For 8.4a2, the X11 headers are not included. Rather than include a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # complicated search, this is a hard-coded path. It could bail out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if X11 libs are not found...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1262,17 +1262,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if platform == 'sunos5':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_dirs.append('/usr/openwin/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- added_lib_dirs.append('/usr/openwin/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif os.path.exists('/usr/X11R6/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R6/lib64')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R6/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif os.path.exists('/usr/X11R5/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R5/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R5/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif os.path.exists('/usr/X11R6/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R6/lib64')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R6/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif os.path.exists('/usr/X11R5/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11R5/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R5/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume default location for X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If Cygwin, then verify that X is installed before proceeding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if platform == 'cygwin':
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/pyconfig.ed b/lang/python25/files/pyconfig.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 671d0d5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/pyconfig.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,2 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/pyconfig.h-universal.ed b/lang/python25/files/pyconfig.h-universal.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 67ecc11..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/pyconfig.h-universal.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/HAVE_LARGEFILE_SUPPORT/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* #undef HAVE_LARGEFILE_SUPPORT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define HAVE_LARGEFILE_SUPPORT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_LONG/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_PTHREAD_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_PTHREAD_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_PTHREAD_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_SIZE_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_TIME_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_TIME_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_TIME_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_UINTPTR_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_UINTPTR_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_UINTPTR_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_VOID_P/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python25/files/python25 b/lang/python25/files/python25
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e7ca5ae..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python25/files/python25
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/python2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/pythonw2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/python2.5-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/idle2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/pydoc2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/smtpd2.5.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/python2.5.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.5/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.5/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.5/Python
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/Portfile b/lang/python31/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 35fdd09..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,172 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup select 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name python31
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Remember to keep py31-tkinter and py31-gdbm's versions sync'd with this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set major [lindex [split $version .] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories lang
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license PSF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description An interpreted, object-oriented programming language
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description Python is an interpreted, interactive, object-oriented \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- programming language.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://www.python.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}ftp/python/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname Python-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 20dd2b7f801dc97db948dd168df4dd52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 021362658310f9ea5f6825bf0919f160304f4833 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 035c4370354d901924ce0fd8df65c5452839f590ec1b9c17fae2ada3e5f3b4d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-setup.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-cgi.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-distutils-dist.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py-disabled_modules.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-libedit.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-site.py-omit_local_site_packages.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Include-pyport.h.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.python.org/issue21811
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-configure_configure.ac-yosemite_configure_fixes.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:zlib path:lib/libssl.dylib:openssl \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:sqlite3 port:ncurses \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:bzip2 port:libedit port:gettext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_run port:python_select
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --enable-framework=${frameworks_dir} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ipv6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-computed-gotos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ccache no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Lib/cgi.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|/setup.py|/setup.py --no-user-cfg|" ${worksrcpath}/Makefile.pre.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # replace /Applications/ with ${applications_dir}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\(\[^a-zA-Z0-9\]\\)/Applications/|\\1${applications_dir}/|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/Tools/Doc/setup.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/PythonLauncher/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/BuildScript/build-installer.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#!/Library/Frameworks|#!${frameworks_dir}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/IDLE/IDLE.app/Contents/MacOS/IDLE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See http://trac.macports.org/changeset/37861
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/PythonLauncher/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# test_cmd_line fails
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# see https://bugs.python.org/issue4388 and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://bugs.python.org/issue4474
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.run yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test.target test
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.target frameworkinstall maninstall
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ensure that correct compiler is used
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append MAKE="${build.cmd} CC=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.group python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-select.file ${filespath}/python[string map {. {}} ${branch}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-notes "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-To make python ${branch} the default (i.e. the version you get when you run\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-'python'), please run:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-sudo port select --set ${select.group} [file tail ${select.file}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewpath ${frameworks_dir}/Python.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewdir ${framewpath}/Versions/${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach dir { Headers Resources Python Versions/Current } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${framewpath}/${dir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Without this, LINKFORSHARED is set to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (this becomes Python.framework/Versions/3.1/Python) which doesn't
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # quite work (see ticket #15099); instead we mirror the behavior of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # `python-config --ldflags` here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace {s|^\(LINKFORSHARED=\)$|\1 -L$(LIBPL) -lpython$(VERSION) $(LIBS) $(SYSLIBS)|} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/config/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # remove -arch flags from the config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${framewdir}/lib/python${branch}/config/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # See http://trac.macports.org/ticket/18376
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {![file exists /usr/lib/libSystemStubs.a]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace s/-lSystemStubs//g ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set universal_arch_flags {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set arch_run_32bit {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach arch ${universal_archs} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend universal_arch_flags -arch ${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${arch} eq "i386" || ${arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- lappend arch_run_32bit -${arch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|UNIVERSAL_ARCH_FLAGS=\".*\"|UNIVERSAL_ARCH_FLAGS=\"${universal_arch_flags}\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { ${arch_run_32bit} != "" } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "s|ARCH_RUN_32BIT=\".*\"|ARCH_RUN_32BIT=\"arch ${arch_run_32bit}\"|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} != ""} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=${configure.sdkroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-universalsdk=/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath} "ed - pyconfig.h < ${filespath}/pyconfig.h-universal.ed"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ucs4 description {Use 4-byte Unicode characters} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-wide-unicode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url ${homepage}downloads/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex Python (${branch}(?:\\.\\d+)*)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-Include-pyport.h.diff b/lang/python31/files/patch-Include-pyport.h.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 096140f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-Include-pyport.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/pyport.h.old 2012-04-10 01:25:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pyport.h 2016-08-01 05:50:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -619,6 +619,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef _PY_PORT_CTYPE_UTF8_ISSUE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef __cplusplus
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* The workaround below is unsafe in C++ because
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * the <locale> defines these symbols as real functions,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * with a slightly different signature.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ * See issue #10910
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <wctype.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef isalnum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -636,6 +642,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef toupper
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define toupper(c) towupper(btowc(c))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Declarations for symbol visibility.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-Lib-cgi.py.diff b/lang/python31/files/patch-Lib-cgi.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index caf2dfc..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-Lib-cgi.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,13 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#! /usr/local/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#! @@PREFIX@@/bin/python3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# intentionally NOT "/usr/bin/env python". On many systems
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# scripts, and /usr/local/bin is the default directory where Python is
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# installed, so /usr/bin/env would be unable to find python. Granted,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# binary installations by Linux vendors often install Python in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# /usr/bin. So let those vendors patch cgi.py to match their choice
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# of installation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# NOTE: The original #!/usr/local/bin/python patched for MacPorts installation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Support module for CGI (Common Gateway Interface) scripts.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-Lib-distutils-dist.py.diff b/lang/python31/files/patch-Lib-distutils-dist.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 72861b6..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-Lib-distutils-dist.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,51 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/dist.py.old 2012-04-10 01:25:34.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/dist.py 2016-08-01 05:35:16.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,6 +53,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('quiet', 'q', "run quietly (turns verbosity off)"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('dry-run', 'n', "don't actually do anything"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ('help', 'h', "show detailed help message"),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 'common_usage' is a short (2-3 line) string describing the common
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -260,6 +261,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sys.stderr.write(msg + "\n")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # no-user-cfg is handled before other command line args
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # because other args override the config files, and this
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # one is needed before we can load the config files.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # If attrs['script_args'] wasn't passed, assume false.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or [])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.finalize_options()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def get_option_dict(self, command):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -312,6 +319,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Distutils __inst__.py file lives), a file in the user's home
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- directory named .pydistutils.cfg on Unix and pydistutils.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- on Windows/Mac, and setup.cfg in the current directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ The file in the user's home directory can be disabled with the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ --no-user-cfg option.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- check_environ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -332,7 +342,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # And look for the user config file
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- user_file = os.path.join(os.path.expanduser('~'), user_filename)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if os.path.isfile(user_file):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if self.want_user_cfg and os.path.isfile(user_file):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files.append(user_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # All platforms support local setup.cfg
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -340,6 +350,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.isfile(local_file):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files.append(local_file)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if DEBUG:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ print("using config files: %s" % ', '.join(files))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def parse_config_files(self, filenames=None):
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff b/lang/python31/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 49e1f05..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-Lib-distutils-util.py_Mac-BuildScript-build-installer.py-yosemite_python_fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,76 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Lib/distutils/util.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/distutils/util.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/distutils/util.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -133,7 +133,16 @@ def get_platform ():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- release = macver
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- osname = "macosx"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (macrelease + '.') >= '10.4.' and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if macrelease:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ macrelease = tuple(int(i) for i in macrelease.split('.')[0:2])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ except ValueError:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ macrelease = (10, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # assume no universal support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ macrelease = (10, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (macrelease >= (10, 4)) and \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-arch' in get_config_vars().get('CFLAGS', '').strip():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The universal build will build fat binaries, but not on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # systems before 10.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Mac/BuildScript/build-installer.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/BuildScript/build-installer.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/BuildScript/build-installer.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -108,14 +108,19 @@ SRCDIR = os.path.dirname(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPTARGET = '10.3'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--target_cc_map = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def getDeptargetTuple():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return tuple([int(n) for n in DEPTARGET.split('.')[0:2]])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+def getTargetCompiler():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_cc_map = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '10.3': 'gcc-4.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '10.4': 'gcc-4.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '10.5': 'gcc-4.0',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '10.6': 'gcc-4.2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return target_cc_map.get(DEPTARGET, 'clang')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC = target_cc_map[DEPTARGET]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC = getTargetCompiler()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_3 = getVersionTuple() >= (3, 0)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -141,7 +146,7 @@ USAGE = textwrap.dedent("""\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def library_recipes():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if DEPTARGET < '10.5':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if getDeptargetTuple() < (10, 5):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result.extend([
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name="Bzip2 1.0.5",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -318,7 +323,7 @@ def pkg_recipes():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ),
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if DEPTARGET < '10.4':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if getDeptargetTuple() < (10, 4):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- result.append(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dict(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- name="PythonSystemFixes",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -509,7 +514,7 @@ def parseOptions(args=None):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SDKPATH=os.path.abspath(SDKPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DEPSRC=os.path.abspath(DEPSRC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CC=target_cc_map[DEPTARGET]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CC=getTargetCompiler()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print "Settings:"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- print " * Source directory:", SRCDIR
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-Lib-site.py-omit_local_site_packages.diff b/lang/python31/files/patch-Lib-site.py-omit_local_site_packages.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a3a1de1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-Lib-site.py-omit_local_site_packages.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: Lib/site.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/site.py.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/site.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -280,18 +280,6 @@ def addsitepackages(known_paths):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sitedirs.append(prefix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sitedirs.append(os.path.join(prefix, "lib", "site-packages"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # for framework builds *only* we add the standard Apple
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # locations.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if 'Python.framework' in prefix:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sitedirs.append(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.expanduser(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.join("~", "Library", "Python",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.version[:3], "site-packages")))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sitedirs.append(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- os.path.join("/Library", "Python",
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.version[:3], "site-packages"))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for sitedir in sitedirs:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.isdir(sitedir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- addsitedir(sitedir, known_paths)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-configure_configure.ac-yosemite_configure_fixes.diff b/lang/python31/files/patch-configure_configure.ac-yosemite_configure_fixes.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3c79a29..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-configure_configure.ac-yosemite_configure_fixes.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,118 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5522,8 +5522,16 @@ $as_echo "$CC" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Calculate the right deployment target for this build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cur_target=`sw_vers -productVersion | sed 's/\(10\.[0-9]*\).*/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test ${cur_target} '>' 10.2; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target_major=`sw_vers -productVersion | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target_minor=`sw_vers -productVersion | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target="${cur_target_major}.${cur_target_minor}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test ${cur_target_major} -eq 10 && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test ${cur_target_minor} -ge 3 && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test ${cur_target_minor} -le 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # OS X 10.3 through 10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cur_target=10.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ${enable_universalsdk}; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${UNIVERSAL_ARCHS}" = "all"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7585,14 +7593,14 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use -undefined dynamic_lookup whenever possible (10.3 and later).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This allows an extension to be used in any Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test ${dep_target_major} -eq 10 && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test ${dep_target_minor} -le 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BLDSHARED="$LDSHARED"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # building for OS X 10.0 through 10.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED='$(CC) $(LDFLAGS) -bundle'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$enable_framework" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Link against the framework. All externals should be defined.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -7603,6 +7611,13 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # building for OS X 10.3 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BLDSHARED="$LDSHARED"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Index: configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-===================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1010,8 +1010,16 @@ yes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Calculate the right deployment target for this build.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cur_target=`sw_vers -productVersion | sed 's/\(10\.[[0-9]]*\).*/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test ${cur_target} '>' 10.2; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target_major=`sw_vers -productVersion | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target_minor=`sw_vers -productVersion | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cur_target="${cur_target_major}.${cur_target_minor}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test ${cur_target_major} -eq 10 && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test ${cur_target_minor} -ge 3 && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test ${cur_target_minor} -le 5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # OS X 10.3 through 10.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cur_target=10.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test ${enable_universalsdk}; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "${UNIVERSAL_ARCHS}" = "all"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1792,14 +1800,14 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Use -undefined dynamic_lookup whenever possible (10.3 and later).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This allows an extension to be used in any Python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test ${MACOSX_DEPLOYMENT_TARGET} '>' 10.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dep_target_major=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ dep_target_minor=`echo ${MACOSX_DEPLOYMENT_TARGET} | \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test ${dep_target_major} -eq 10 && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ test ${dep_target_minor} -le 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BLDSHARED="$LDSHARED"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # building for OS X 10.0 through 10.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED='$(CC) $(LDFLAGS) -bundle'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$enable_framework" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Link against the framework. All externals should be defined.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1810,6 +1818,13 @@ then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BLDSHARED="$LDSHARED "'-bundle_loader $(BUILDPYTHON)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED="$LDSHARED "'-bundle_loader $(BINDIR)/python$(VERSION)$(EXE)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # building for OS X 10.3 and later
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test "${enable_universalsdk}"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDSHARED='$(CC) $(LDFLAGS) -bundle -undefined dynamic_lookup'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BLDSHARED="$LDSHARED"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Linux*|GNU*|QNX*) LDSHARED='$(CC) -shared';;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-libedit.diff b/lang/python31/files/patch-libedit.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 813eaa1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-libedit.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,167 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Modules/readline.c.old 2012-04-10 01:25:36.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Modules/readline.c 2016-08-01 05:36:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -28,8 +28,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* GNU readline definitions */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/history.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_RL_COMPLETION_MATCHES
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define completion_matches(x, y) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -919,7 +918,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyEval_SaveThread();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (s < 0) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- rl_free_line_state();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rl_cleanup_after_signal();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rl_callback_handler_remove();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *signal = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.old 2012-04-10 01:25:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2016-08-01 05:36:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12493,9 +12493,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking how to link readline libs... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for py_libtermcap in "" ncursesw ncurses curses termcap; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$py_libtermcap"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- READLINE_LIBS="-lreadline"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ READLINE_LIBS="-ledit"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- READLINE_LIBS="-lreadline -l$py_libtermcap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ READLINE_LIBS="-ledit -l$py_libtermcap"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBS="$READLINE_LIBS $LIBS_no_readline"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12539,13 +12539,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for readline 2.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -lreadline" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for rl_callback_handler_install in -lreadline... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_callback_handler_install in -ledit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking for rl_callback_handler_install in -ledit... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${ac_cv_lib_readline_rl_callback_handler_install+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lreadline $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-ledit $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12585,7 +12585,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for readline 2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ac_fn_c_try_cpp "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_readline=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12597,7 +12597,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12610,7 +12610,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12624,13 +12624,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for readline 4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -lreadline" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for rl_pre_input_hook in -lreadline... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_pre_input_hook in -ledit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking for rl_pre_input_hook in -ledit... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${ac_cv_lib_readline_rl_pre_input_hook+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lreadline $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-ledit $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12668,13 +12668,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # also in 4.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -lreadline" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for rl_completion_display_matches_hook in -lreadline... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_display_matches_hook in -ledit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking for rl_completion_display_matches_hook in -ledit... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${ac_cv_lib_readline_rl_completion_display_matches_hook+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lreadline $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-ledit $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12712,13 +12712,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # check for readline 4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -lreadline" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking for rl_completion_matches in -lreadline... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for rl_completion_matches in -ledit" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+$as_echo_n "checking for rl_completion_matches in -ledit... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ${ac_cv_lib_readline_rl_completion_matches+:} false; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ac_check_lib_save_LIBS=$LIBS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS="-lreadline $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS="-ledit $READLINE_LIBS $LIBS"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12758,7 +12758,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # also in readline 4.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ac_fn_c_try_cpp "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- have_readline=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -12770,7 +12770,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <readline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <editline/readline.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _ACEOF
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.old 2016-08-01 05:36:10.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2016-08-01 05:36:43.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -570,7 +570,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exts.append( Extension('audioop', ['audioop.c']) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # readline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ do_readline = self.compiler.find_library_file(lib_dirs, 'edit')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- readline_termcap_library = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curses_library = ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Determine if readline is already linked against curses or tinfo.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -627,7 +627,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- readline_extra_link_args = ()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- readline_libs = ['readline']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ readline_libs = ['edit']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if readline_termcap_library:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pass # Issue 7384: Already linked against curses or tinfo.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif curses_library:
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-setup.py-disabled_modules.diff b/lang/python31/files/patch-setup.py-disabled_modules.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2d8679b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-setup.py-disabled_modules.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2011-06-12 01:48:52.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2011-07-05 20:35:54.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17,7 +17,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils.spawn import find_executable
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # This global variable is used to hold the list of modules to be disabled.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--disabled_module_list = []
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+disabled_module_list = ["_tkinter", "_gdbm"]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def add_dir_to_list(dirlist, dir):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Add the directory 'dir' to the list 'dirlist' (at the front) if
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/patch-setup.py.diff b/lang/python31/files/patch-setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4fd0746..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,53 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.old 2012-04-10 01:25:37.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2016-08-01 05:32:33.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1420,7 +1420,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # For 8.4a2, the X11 headers are not included. Rather than include a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # complicated search, this is a hard-coded path. It could bail out
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if X11 libs are not found...
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # All existing framework builds of Tcl/Tk don't support 64-bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1466,13 +1466,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def detect_tkinter(self, inc_dirs, lib_dirs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The _tkinter module.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Rather than complicate the code below, detecting and building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # AquaTk is a separate method. Only one Tkinter will be built on
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- # Darwin - either AquaTk, if it is found, or X11 based Tk.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform = self.get_platform()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (platform == 'darwin' and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume we haven't found any of the libraries or include files
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The versions with dots are used on Unix, and the versions without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1520,17 +1514,17 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if platform == 'sunos5':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- include_dirs.append('/usr/openwin/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- added_lib_dirs.append('/usr/openwin/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif os.path.exists('/usr/X11R6/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R6/lib64')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R6/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- elif os.path.exists('/usr/X11R5/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11R5/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11R5/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif os.path.exists('/usr/X11R6/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11R6/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R6/lib64')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R6/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #elif os.path.exists('/usr/X11R5/include'):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11R5/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11R5/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Assume default location for X11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- include_dirs.append('/usr/X11/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- added_lib_dirs.append('/usr/X11/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # include_dirs.append('/usr/X11/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ # added_lib_dirs.append('/usr/X11/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # If Cygwin, then verify that X is installed before proceeding
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if platform == 'cygwin':
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/pyconfig.ed b/lang/python31/files/pyconfig.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 671d0d5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/pyconfig.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,2 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/pyconfig.h-universal.ed b/lang/python31/files/pyconfig.h-universal.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f222623..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/pyconfig.h-universal.ed
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,78 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/DOUBLE_IS_BIG_ENDIAN_IEEE754/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __BIG_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define DOUBLE_IS_BIG_ENDIAN_IEEE754 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* #undef DOUBLE_IS_BIG_ENDIAN_IEEE754 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/DOUBLE_IS_LITTLE_ENDIAN_IEEE754/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LITTLE_ENDIAN__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define DOUBLE_IS_LITTLE_ENDIAN_IEEE754 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* #undef DOUBLE_IS_LITTLE_ENDIAN_IEEE754 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/HAVE_LARGEFILE_SUPPORT/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* #undef HAVE_LARGEFILE_SUPPORT */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define HAVE_LARGEFILE_SUPPORT 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_LONG/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_PTHREAD_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_PTHREAD_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_PTHREAD_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_SIZE_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_TIME_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_TIME_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_TIME_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_UINTPTR_T/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_UINTPTR_T 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_UINTPTR_T 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF_VOID_P/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/SIZEOF__BOOL/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#if defined(__LP64__) || !defined(__POWERPC__)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF__BOOL 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define SIZEOF__BOOL 4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/VA_LIST_IS_ARRAY/c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#define VA_LIST_IS_ARRAY 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-/* #undef VA_LIST_IS_ARRAY */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/python31 b/lang/python31/files/python31
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dc15132..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/python31
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/python3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/pythonw3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/python3.1-config
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/idle3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/pydoc3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/2to3-3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-share/man/man1/python3.1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.1/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.1/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/3.1/Python
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python31/files/uuid-64bit.patch b/lang/python31/files/uuid-64bit.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 141a90b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python31/files/uuid-64bit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix uuid failure on systems with 64-bit hardware addresses:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://bugs.python.org/issue32502
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Backported from:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/python/cpython/commit/d69794f4df81de731cc66dc82136e28bee691e1e#diff-9d2d23bf4362c9ec2b6dd4b64b73756c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/uuid.py.orig 2012-04-09 18:25:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/uuid.py 2018-08-26 02:33:28.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -479,6 +479,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _node = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_NODE_GETTERS_WIN32 = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+_NODE_GETTERS_UNIX = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def getnode():
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- """Get the hardware address as a 48-bit positive integer.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -494,17 +499,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform == 'win32':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- getters = [_windll_getnode, _netbios_getnode, _ipconfig_getnode]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ getters = _NODE_GETTERS_WIN32
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- getters = [_unixdll_getnode, _ifconfig_getnode]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ getters = _NODE_GETTERS_UNIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for getter in getters + [_random_getnode]:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- try:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _node = getter()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- except:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- continue
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if _node is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (_node is not None) and (0 <= _node < (1 << 48)):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return _node
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ assert False, '_random_getnode() returned invalid value: {}'.format(_node)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _last_timestamp = None
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-gdbm/Portfile b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 51430df..1472bd2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-gdbm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ long_description ${description}
</span>
homepage https://docs.python.org/2/library/gdbm.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 31 32 33 34 35 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 26 27 32 33 34 35 36 37
</span>
set setup_py "setup.py"
set extract_files "Modules/gdbmmodule.c"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,19 +40,6 @@ subport py27-gdbm {
</span> sha256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574
livecheck.regex Python (2.7.\[0-9\]+)
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport py31-gdbm {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://docs.python.org/release/${version}/library/dbm.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 20dd2b7f801dc97db948dd168df4dd52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 021362658310f9ea5f6825bf0919f160304f4833 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 035c4370354d901924ce0fd8df65c5452839f590ec1b9c17fae2ada3e5f3b4d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set setup_py "setup-py3k.py"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set extract_files "Modules/_gdbmmodule.c"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex Python (3.1.\[0-9\]+)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> subport py32-gdbm {
maintainers nomaintainer
version 3.2.6
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graveyard/Portfile b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea9aeea..14c2329 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -171,7 +171,7 @@ py-fuse 0.2.1_4 26
</span> py-gda 2.25.3_4 26
py-gdal 2.0.0_1 26
py-gdata 2.0.18_1 26
<span style='display:block; white-space:pre;background:#ffe0e0;'>-py-gdbm 2.5.6_1 25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+py-gdbm 2.5.6_1 25 31
</span> py-gdl 2.25.3_2 26
py-generator 0.1.20120721_1 \
26 33
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -444,7 +444,7 @@ py-tempita 0.5.2_1 26
</span> py-theano 1.0.2_1 33
py-thrift 0.10.0_1 26
py-threadpool 1.2.7_1 26
<span style='display:block; white-space:pre;background:#ffe0e0;'>-py-tkinter 2.5.6_1 25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+py-tkinter 2.5.6_1 25 31
</span> py-tornado 5.0.2_1 26 33
py-tre 0.8.0_2 26
py-tweepy 1.12_1 26
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-tkinter/Portfile b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index de2191b..d7ba58e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-tkinter/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,7 +16,7 @@ long_description \
</span>
homepage https://docs.python.org/library/tkinter.html
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27 31 32 33 34 35 36 37
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 26 27 32 33 34 35 36 37
</span>
set extract_files "Modules/_tkinter.c Modules/tkappinit.c"
set module_name Tkinter
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,17 +41,6 @@ subport py27-tkinter {
</span> sha256 22d9b1ac5b26135ad2b8c2901a9413537e08749a753356ee913c84dbd2df5574
append extract_files " Modules/tkinter.h"
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-subport py31-tkinter {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.1.5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- homepage https://docs.python.org/release/${version}/library/tkinter.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums md5 20dd2b7f801dc97db948dd168df4dd52 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 021362658310f9ea5f6825bf0919f160304f4833 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 035c4370354d901924ce0fd8df65c5452839f590ec1b9c17fae2ada3e5f3b4d7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xz yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- append extract_files " Modules/tkinter.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set module_name tkinter
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span> subport py32-tkinter {
maintainers nomaintainer
version 3.2.6
</pre><pre style='margin:0'>
</pre>