<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bb89b1af0ed176fc894707af0bd93fe572661275">https://github.com/macports/macports-ports/commit/bb89b1af0ed176fc894707af0bd93fe572661275</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 bb89b1a python24{,-doc}: removed
</span>bb89b1a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bb89b1af0ed176fc894707af0bd93fe572661275
</span>Author: Chih-Hsuan Yen <yan12125@macports.org>
AuthorDate: Sat Oct 20 13:13:36 2018 +0800
<span style='display:block; white-space:pre;color:#404040;'> python24{,-doc}: removed
</span>---
lang/python24-doc/Portfile | 93 -----
lang/python24-doc/files/patch-Include-pyport.h | 34 --
lang/python24-doc/files/patch-Lib-cgi.py | 18 -
lang/python24-doc/files/patch-Lib-site.py | 10 -
.../files/patch-Mac-OSX-IDLE-Makefile.in | 11 -
lang/python24-doc/files/patch-Mac-OSX-Makefile.in | 20 -
.../files/patch-Mac-OSX-PythonLauncher-Makefile.in | 20 -
lang/python24-doc/files/patch-Makefile.pre.in | 37 --
lang/python24-doc/files/patch-configure | 36 --
lang/python24-doc/files/patch-setup.py | 37 --
lang/python24/Portfile | 221 -----------
lang/python24/files/patch-Include-pyport.h | 34 --
lang/python24/files/patch-Lib-cgi.py | 18 -
lang/python24/files/patch-Lib-site.py | 10 -
lang/python24/files/patch-Mac-OSX-IDLE-Makefile.in | 11 -
lang/python24/files/patch-Mac-OSX-Makefile.in | 20 -
.../files/patch-Mac-OSX-PythonLauncher-Makefile.in | 20 -
lang/python24/files/patch-Makefile.pre.in | 11 -
lang/python24/files/patch-configure | 50 ---
lang/python24/files/patch-fwrapv.diff | 19 -
lang/python24/files/patch-macosmodule.diff | 427 ---------------------
lang/python24/files/patch-mactoolboxglue.diff | 20 -
lang/python24/files/patch-pymactoolbox.diff | 18 -
lang/python24/files/patch-setup.py | 46 ---
lang/python24/files/pyconfig.ed | 2 -
lang/python24/files/pyconfig.h-universal.ed | 43 ---
lang/python24/files/python24 | 13 -
lang/python24/files/python24-noframework | 13 -
28 files changed, 1312 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/Portfile b/lang/python24-doc/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e3d9aed..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,93 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name python24-doc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.4
</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 freebsd linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description HTML documentation for Python 2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description HTML documentation for Python 2.4. Use by running \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'pydoc2.4 TOPIC', e.g. 'pydoc2.4 NUMBERS'.
</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;'>- ftp://ftp.python.org/pub/python/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir [lindex [split $name -] 0]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname Python-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 0ba90c79175c017101100ebf5978e906
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.pre.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-cgi.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-site.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Include-pyport.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Mac-OSX-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Mac-OSX-IDLE-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Mac-OSX-PythonLauncher-Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-depends_lib port:gettext port:python24 port:latex2html
</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;'>- --mandir=${prefix}/share/man \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --bindir=${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --libdir=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-framework=${prefix}/Library/Frameworks \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-tk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ipv6
</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;'>- reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/site.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Mac/OSX/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/setup.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;'>-build.target html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.cmd { cd Doc && make }
</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;'>-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set framewdir ${prefix}/Library/Frameworks/Python.framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file mkdir ${destroot}${framewdir}/Versions/2.4/Resources/English.ljproj/Documentation
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd $worksrcpath/Doc/html/ && \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -r * ${destroot}${framewdir}/Versions/2.4/Resources/English.ljproj/Documentation"
</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;'>-# delete symlinks without version suffix, use python_select instead to choose version
</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;'>- configure.args-delete --enable-framework=${prefix}/Library/Frameworks
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin 8 {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-cxx=/usr/bin/g++-4.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;'>-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 freebsd {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-framework=${prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target all libpython2.4.so
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform linux {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --enable-framework=${prefix}/Library/Frameworks
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --disable-framework
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build.target all libpython2.4.so
</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;'>-
</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 https://www.python.org/downloads/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex Python (2.4.\[0-9\]+)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-Include-pyport.h b/lang/python24-doc/files/patch-Include-pyport.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 943a951..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-Include-pyport.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/pyport.h.orig 2007-03-12 23:26:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pyport.h 2007-03-12 23:29:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,11 +152,23 @@ typedef PY_LONG_LONG Py_intptr_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(PYOS_OS2) && defined(PYCC_GCC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</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__) && (!defined _POSIX_C_SOURCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define TEMPORARILY_DEFINING__POSIX_C_SOURCE /* so we can #undef it later */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POSIX_C_SOURCE /* avoid deprecated struct ostat in sys/stat.h */
</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 <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_STAT_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stat.h>
</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;'>-+/* Mac OS X: undefine _POSIX_C_SOURCE if it wasn't defined before */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef TEMPORARILY_DEFINING__POSIX_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef _POSIX_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef TEMPORARILY_DEFINING__POSIX_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;'>- #if defined(PYCC_VACPP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -393,6 +405,7 @@ extern char * _getpty(int *, int, mode_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- functions, even though they are included in libutil. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <termios.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct winsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int forkpty(int *, char *, struct termios *, struct winsize *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-Lib-cgi.py b/lang/python24-doc/files/patch-Lib-cgi.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 8fbbda7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-Lib-cgi.py
</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-11 09:14:38.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.4
</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: /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/python24-doc/files/patch-Lib-site.py b/lang/python24-doc/files/patch-Lib-site.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37a5d20..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-Lib-site.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/site.py Tue Jul 20 04:28:28 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/site.py.new Mon Apr 4 10:47:12 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,6 +186,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sitedirs.append( os.path.join('__PREFIX__', 'lib', 'python2.4', 'site-packages') )
</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. Currently only per-user, but /Library and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /Network/Library could be added too
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-Mac-OSX-IDLE-Makefile.in b/lang/python24-doc/files/patch-Mac-OSX-IDLE-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3f53c68..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-Mac-OSX-IDLE-Makefile.in
</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/OSX/IDLE/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/OSX/IDLE/Makefile.in 2007-04-27 13:27:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHONAPPSDIR=/Applications/MacPorts/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: IDLE.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-Mac-OSX-Makefile.in b/lang/python24-doc/files/patch-Mac-OSX-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d7629c4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-Mac-OSX-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/OSX/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/OSX/Makefile.in 2007-04-27 11:07:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VERSION=@VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builddir = ../..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srcdir = @srcdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix=__PREFIX__/Library/Frameworks/Python.framework/Versions/$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBDEST=$(prefix)/lib/python$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILDPYTHON=$(builddir)/python.exe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNSHARED= @RUNSHARED@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # These are normally glimpsed from the previous set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindir=@exec_prefix@/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHONAPPSPATH=/Applications/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHONAPPSPATH=/Applications/MacPorts/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONAPPSDIR=$(PYTHONAPPSPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- APPINSTALLDIR=$(prefix)/Resources/Python.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-Mac-OSX-PythonLauncher-Makefile.in b/lang/python24-doc/files/patch-Mac-OSX-PythonLauncher-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f47f04f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-Mac-OSX-PythonLauncher-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/OSX/PythonLauncher/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/OSX/PythonLauncher/Makefile.in 2007-04-27 13:33:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHONAPPSDIR=/Applications/MacPorts/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: PythonLauncher.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --resource=$(srcdir)/factorySettings.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --plist=$(srcdir)/Info.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find "PythonLauncher.app" -name '.svn' -print0 | xargs -0 rm -r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find "PythonLauncher.app" -name '.svn' -print0 | xargs -0 rm -r || :
</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;'>- FileSettings.o: $(srcdir)/FileSettings.m
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-Makefile.pre.in b/lang/python24-doc/files/patch-Makefile.pre.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index d3ec1ab..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-Makefile.pre.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.pre.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.pre.in 2007-04-20 18:06:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT= @OPT@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BASECFLAGS= @BASECFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS= $(BASECFLAGS) $(OPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPPFLAGS= -I. -I$(srcdir)/Include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir)/Include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS= @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLAST= @LDLAST@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SGI_ABI= @SGI_ABI@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -364,6 +364,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libpython$(VERSION).sl: $(LIBRARY_OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(LDSHARED) -o $@ $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+libpython$(VERSION).dylib: $(LIBRARY_OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LINKCC) -dynamiclib -install_name $(LIBDIR)/$@ -current_version $(VERSION) -compatibility_version $(VERSION) -o $@ -flat_namespace -undefined suppress $(LIBRARY_OBJS) $(SHLIBS) $(LIBC) $(LIBM)
</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;'>- # This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # minimal framework (not including the Lib directory and such) in the current
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -655,7 +659,12 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (cd $(DESTDIR)$(LIBDIR); $(LN) -sf $(INSTSONAME) libpython$(VERSION)$(SO)); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else true; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if test -f libpython$(VERSION).dylib; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_SHARED) libpython$(VERSION).dylib $(DESTDIR)$(LIBDIR)/libpython$(VERSION).dylib; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ true; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fi \
</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;'>- # Install the manual page
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-configure b/lang/python24-doc/files/patch-configure
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index fc8568b..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-configure
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,36 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2007-04-05 21:32:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2007-04-05 21:32:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3907,7 +3907,12 @@
</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 -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
</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;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10328,7 +10333,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 ppc'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only '`/usr/bin/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;'>-@@ -10472,8 +10477,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDSHARED="$LDSHARED "'$(PYTHONFRAMEWORKPREFIX)/$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # No framework, use the Python app as bundle-loader
</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;'>-+ BLDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -bundle_loader $(BUILDPYTHON)'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDSHARED="$LDSHARED "'-flat_namespace -undefined suppress -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;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24-doc/files/patch-setup.py b/lang/python24-doc/files/patch-setup.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2a1ae5a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24-doc/files/patch-setup.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- /Users/roederja/Desktop/setup.py.orig 2007-05-20 13:02:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2007-05-20 14:49:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -246,11 +246,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add paths to popular package managers on OS X/darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fink installs into /sw by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_dir_to_list(self.compiler.include_dirs, '/sw/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #add_dir_to_list(self.compiler.include_dirs, '/sw/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # DarwinPorts installs into /opt/local by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_dir_to_list(self.compiler.library_dirs, '__PREFIX__/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_dir_to_list(self.compiler.include_dirs, '__PREFIX__/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.normpath(sys.prefix) != '/usr':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_dir_to_list(self.compiler.library_dirs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +357,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exts.append( Extension('unicodedata', ['unicodedata.c']) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # access to ISO C locale support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data = open('pyconfig.h').read()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r"#\s*define\s+(HAVE_LIBINTL_H|WITH_LIBINTL)\s+1\s*", data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- locale_libs = ['intl']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -954,7 +954,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.extensions.extend(exts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Call the method for detecting whether _tkinter can be compiled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.detect_tkinter(inc_dirs, lib_dirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ("--disable-tk" not in sysconfig.get_config_var("CONFIG_ARGS")):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.detect_tkinter(inc_dirs, lib_dirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The _tkinter module, using frameworks. Since frameworks are quite
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/Portfile b/lang/python24/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 58bd884..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,221 +0,0 @@
</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 python24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.4.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 12
</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 fourdigits.nl:roel openmaintainer
</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;'>- ftp://ftp.python.org/pub/python/${version}/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ftp://ftp.python.jp/pub/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 76083277f6c7e4d78992f36d7ad9018d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 cb1972a554a458f6a26d3e047b359251865d7c96 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 0687989193dec2ac108142759281be7ddcf7f31e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile.pre.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-cgi.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Lib-site.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-setup.py \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Include-pyport.h \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Mac-OSX-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Mac-OSX-IDLE-Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Mac-OSX-PythonLauncher-Makefile.in \
</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 path:lib/libssl.dylib:openssl
</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 --with-cxx=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --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;'>- --without-readline \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-tk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-ipv6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_parallel_build no
</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}/Lib/site.py ${worksrcpath}/setup.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/OSX/Makefile.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/OSX/IDLE/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/OSX/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/Mac/OSX/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}|" ${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;'>-build.target all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-post-extract {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${filespath}/python[string map {. {}} ${branch}]-noframework ${workpath}/python[string map {. {}} ${branch}]
</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;'>-if {${os.subplatform} ne "macosx"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- select.file ${workpath}/python[string map {. {}} ${branch}]
</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;'>- if {(![variant_isset universal] && ![string match *64* $build_arch]) || ([variant_isset universal] && ![string match *64* $universal_archs])} {
</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;'>- 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 { 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;'>- # Since the lib/python${branch} dir was just moved above and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # libpython2.4.a in lib/python${branch}/config is relative, we need
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # to repoint it here
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- file delete ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${framewdir}/Python ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
</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 } {
</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] {
</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;'>- # 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.4/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}${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;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 64-bit, can't build mac-specific stuff
</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
</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-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;'>- file delete ${destroot}${prefix}/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin { idle pydoc } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/smtpd.py ${destroot}${prefix}/bin/smtpd${branch}.py
</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;'>- select.file ${workpath}/python[string map {. {}} ${branch}]
</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;'>-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 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} >= 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;'>- if {${os.major} >= 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#define _POSIX_C_SOURCE 200112L|#undef _POSIX_C_SOURCE|g" ${worksrcpath}/pyconfig.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#define _XOPEN_SOURCE 600|#undef _XOPEN_SOURCE|g" ${worksrcpath}/pyconfig.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-macosmodule.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-mactoolboxglue.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-pymactoolbox.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 puredarwin {
</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-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;'>- file delete ${destroot}${prefix}/bin/python
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach bin { idle pydoc } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${branch}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${destroot}${prefix}/bin/smtpd.py ${destroot}${prefix}/bin/smtpd${branch}.py
</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=${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;'>-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;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-Include-pyport.h b/lang/python24/files/patch-Include-pyport.h
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 943a951..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-Include-pyport.h
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,34 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Include/pyport.h.orig 2007-03-12 23:26:06.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pyport.h 2007-03-12 23:29:35.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -152,11 +152,23 @@ typedef PY_LONG_LONG Py_intptr_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if defined(PYOS_OS2) && defined(PYCC_GCC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <sys/types.h>
</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__) && (!defined _POSIX_C_SOURCE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define TEMPORARILY_DEFINING__POSIX_C_SOURCE /* so we can #undef it later */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define _POSIX_C_SOURCE /* avoid deprecated struct ostat in sys/stat.h */
</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 <sys/stat.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(HAVE_STAT_H)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <stat.h>
</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;'>-+/* Mac OS X: undefine _POSIX_C_SOURCE if it wasn't defined before */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifdef TEMPORARILY_DEFINING__POSIX_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef _POSIX_C_SOURCE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#undef TEMPORARILY_DEFINING__POSIX_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;'>- #if defined(PYCC_VACPP)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -393,6 +405,7 @@ extern char * _getpty(int *, int, mode_t
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- functions, even though they are included in libutil. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <termios.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+struct winsize;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extern int forkpty(int *, char *, struct termios *, struct winsize *);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-Lib-cgi.py b/lang/python24/files/patch-Lib-cgi.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 93a4386..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-Lib-cgi.py
</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-11 09:14:38.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.4
</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/python24/files/patch-Lib-site.py b/lang/python24/files/patch-Lib-site.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37a5d20..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-Lib-site.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Lib/site.py Tue Jul 20 04:28:28 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Lib/site.py.new Mon Apr 4 10:47:12 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -186,6 +186,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform == 'darwin':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sitedirs.append( os.path.join('__PREFIX__', 'lib', 'python2.4', 'site-packages') )
</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. Currently only per-user, but /Library and
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # /Network/Library could be added too
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-Mac-OSX-IDLE-Makefile.in b/lang/python24/files/patch-Mac-OSX-IDLE-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a912f5f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-Mac-OSX-IDLE-Makefile.in
</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/OSX/IDLE/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/OSX/IDLE/Makefile.in 2007-04-27 13:27:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHONAPPSDIR=__APPLICATIONS_DIR__/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: IDLE.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-Mac-OSX-Makefile.in b/lang/python24/files/patch-Mac-OSX-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9143e77..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-Mac-OSX-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/OSX/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/OSX/Makefile.in 2007-04-27 11:07:02.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- VERSION=@VERSION@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- builddir = ../..
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- srcdir = @srcdir@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+prefix=__FRAMEWORKS_DIR__/Python.framework/Versions/$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBDEST=$(prefix)/lib/python$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUILDPYTHON=$(builddir)/python.exe
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RUNSHARED= @RUNSHARED@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -16,7 +16,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # These are normally glimpsed from the previous set
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bindir=@exec_prefix@/bin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHONAPPSPATH=/Applications/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHONAPPSPATH=__APPLICATIONS_DIR__/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONAPPSDIR=$(PYTHONAPPSPATH)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- APPINSTALLDIR=$(prefix)/Resources/Python.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-Mac-OSX-PythonLauncher-Makefile.in b/lang/python24/files/patch-Mac-OSX-PythonLauncher-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c280ecb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-Mac-OSX-PythonLauncher-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/OSX/PythonLauncher/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/OSX/PythonLauncher/Makefile.in 2007-04-27 13:33:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PYTHONAPPSDIR=__APPLICATIONS_DIR__/MacPython $(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- all: PythonLauncher.app
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --resource=$(srcdir)/factorySettings.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --plist=$(srcdir)/Info.plist \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- build
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- find "PythonLauncher.app" -name '.svn' -print0 | xargs -0 rm -r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ find "PythonLauncher.app" -name '.svn' -print0 | xargs -0 rm -r || :
</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;'>- FileSettings.o: $(srcdir)/FileSettings.m
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-Makefile.pre.in b/lang/python24/files/patch-Makefile.pre.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7e82c4d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-Makefile.pre.in
</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;'>---- Makefile.pre.in.orig 2006-10-08 10:41:25.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.pre.in 2007-04-20 18:06:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT= @OPT@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BASECFLAGS= @BASECFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS= $(BASECFLAGS) $(OPT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CPPFLAGS= -I. -I$(srcdir)/Include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir)/Include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS= @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLAST= @LDLAST@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SGI_ABI= @SGI_ABI@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-configure b/lang/python24/files/patch-configure
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 62fc07f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-configure
</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;'>---- configure.orig 2006-10-18 02:03:36.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-05-10 15:15:25.000000000 +1000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3907,9 +3907,16 @@
</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 -fno-common"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BASECFLAGS="$BASECFLAGS -fno-common"
</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;'>-@@ -10316,7 +10323,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Darwin/[01234567].*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOL_CRUFT="-framework System -lcc_dynamic"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "${enable_universalsdk}"; then
</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;'>-@@ -10328,7 +10335,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 ppc'
</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;'>-@@ -10460,7 +10467,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/python24/files/patch-fwrapv.diff b/lang/python24/files/patch-fwrapv.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 407bdf1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/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,19 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2011-11-22 09:17:41.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-11-22 09:28:46.000000000 +1100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3820,13 +3820,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$Py_DEBUG" = 'true' ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Optimization messes up debuggers, so turn it off for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # debug builds.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPT="-g -Wall -Wstrict-prototypes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPT="-g -fwrapv -Wall -Wstrict-prototypes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OPT="-g -O3 -Wall -Wstrict-prototypes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPT="-g -fwrapv -O3 -Wall -Wstrict-prototypes"
</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;'>-- OPT="-O3 -Wall -Wstrict-prototypes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OPT="-O3 -fwrapv -Wall -Wstrict-prototypes"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- case $ac_sys_system in
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-macosmodule.diff b/lang/python24/files/patch-macosmodule.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5be74fb..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-macosmodule.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,427 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Mac/Modules/macosmodule.c 2004-11-05 08:02:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Mac/Modules/macosmodule.c 2009-09-05 02:07:14.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -40,7 +40,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- typedef struct {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PyObject_HEAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- short fRefNum;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ FSIORefNum fRefNum;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int isclosed;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } rfobject;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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,47 +127,36 @@
</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;'>- PyErr_SetString(PyExc_ValueError, "Operation on closed file");
</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 (!PyArg_ParseTuple(args, "l|i", &amount, &whence))
</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;'>-
</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;'>-+
</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 +172,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 +181,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;'>-@@ -281,6 +273,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Rftype__doc__ /* Documentation string */
</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;'>- /* End of code for Resource fork objects */
</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;'>-@@ -292,17 +285,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 +351,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;'>-- 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;'>-+#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;'>-+ }
</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;'>-@@ -375,6 +458,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* And try again... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- h = GetResource('Estr', err);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Py_DECREF(m);
</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;'>-@@ -398,6 +482,9 @@
</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;'>-+
</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 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;'>-@@ -416,7 +503,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- olddialog = curdialog;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curdialog = 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 ( resid != -1 ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- curdialog = GetNewDialog(resid, NULL, (WindowPtr)-1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ( curdialog ) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -451,11 +538,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, "O&|O", PyMac_GetStr255, message, &object))
</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;'>- DebugStr(message);
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static char SysBeep_doc[] = "BEEEEEP!!!";
</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 +559,8 @@
</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;'>-
</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;'>- "Will foreground the application on the first call as a side-effect."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -529,51 +620,37 @@
</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;'>- 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;'>-+
</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;'>- 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;'>-- 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;'>-
</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;'>-@@ -583,15 +660,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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- static PyMethodDef MacOS_Methods[] = {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {"GetCreatorAndType", MacOS_GetCreatorAndType, 1, getcrtp_doc},
</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;color:#808080;'>diff --git a/lang/python24/files/patch-mactoolboxglue.diff b/lang/python24/files/patch-mactoolboxglue.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b80f9c9..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-mactoolboxglue.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Python/mactoolboxglue.c 2006-10-08 19:41:25.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Python/mactoolboxglue.c 2009-09-05 01:25:57.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -414,7 +414,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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;'>-+/*
</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;'>-@@ -427,7 +427,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;'>--
</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;'>- GLUE_NEW(Handle, OptResObj_New, "Carbon.Res")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/patch-pymactoolbox.diff b/lang/python24/files/patch-pymactoolbox.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 179e108..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-pymactoolbox.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;'>---- Include/pymactoolbox.h 2004-11-05 08:02:59.000000000 +0100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Include/pymactoolbox.h 2009-09-05 01:26:30.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -134,6 +134,7 @@
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Qt exports */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/*
</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 +147,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;'>-+*/
</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;color:#808080;'>diff --git a/lang/python24/files/patch-setup.py b/lang/python24/files/patch-setup.py
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index c0ebb55..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/patch-setup.py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,46 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2006-10-08 11:41:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2008-11-19 22:13:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -15,7 +15,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 = ["readline"]
</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;background:#ffe0e0;'>-@@ -246,11 +246,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Add paths to popular package managers on OS X/darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.platform == "darwin":
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fink installs into /sw by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- add_dir_to_list(self.compiler.include_dirs, '/sw/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #add_dir_to_list(self.compiler.include_dirs, '/sw/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # DarwinPorts installs into /opt/local by default
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_dir_to_list(self.compiler.library_dirs, '__PREFIX__/lib')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ add_dir_to_list(self.compiler.include_dirs, '__PREFIX__/include')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if os.path.normpath(sys.prefix) != '/usr':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_dir_to_list(self.compiler.library_dirs,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +357,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exts.append( Extension('unicodedata', ['unicodedata.c']) )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # access to ISO C locale support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- data = open('pyconfig.h').read()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ m = re.search(r"#\s*define\s+(HAVE_LIBINTL_H|WITH_LIBINTL)\s+1\s*", data)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if m is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- locale_libs = ['intl']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -954,7 +954,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.extensions.extend(exts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Call the method for detecting whether _tkinter can be compiled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- self.detect_tkinter(inc_dirs, lib_dirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if ("--disable-tk" not in sysconfig.get_config_var("CONFIG_ARGS")):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ self.detect_tkinter(inc_dirs, lib_dirs)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The _tkinter module, using frameworks. Since frameworks are quite
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/pyconfig.ed b/lang/python24/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/python24/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/python24/files/pyconfig.h-universal.ed b/lang/python24/files/pyconfig.h-universal.ed
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 061fe25..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/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,43 +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_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/python24/files/python24 b/lang/python24/files/python24
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bb9451c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/python24
</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.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/pythonw2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/idle2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/pydoc2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/smtpd2.4.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.4.1.gz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.4/Headers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.4/Resources
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${frameworks_dir}/Python.framework/Versions/2.4/Python
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/python24/files/python24-noframework b/lang/python24/files/python24-noframework
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 977de6f..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/python24/files/python24-noframework
</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.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;'>-bin/idle2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/pydoc2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-bin/smtpd2.4.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.4.1.gz
</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></pre><pre style='margin:0'>
</pre>