mirror of
https://github.com/kennethreitz-archive/python-build.git
synced 2026-06-05 15:20:16 +00:00
, added patch-gestaltmodule.c.diff
This commit is contained in:
utahta
@@ -11,6 +11,7 @@ class InstalledCommand(Command):
|
||||
|
||||
def run_command(self, options, args):
|
||||
cur = ""
|
||||
|
||||
if not os.path.islink("%s/current" % PATH_PYTHONS):
|
||||
logger.info("%s (*)" % sys.executable)
|
||||
elif os.path.islink("%s/current" % PATH_PYTHONS):
|
||||
|
||||
@@ -187,21 +187,22 @@ class PythonInstaller(object):
|
||||
patches = []
|
||||
if is_macosx_snowleopard():
|
||||
if is_python24(version):
|
||||
patch_dir = os.path.join(PATH_PATCHES_MACOSX_PYTHON24,'files')
|
||||
patch_dir = PATH_PATCHES_MACOSX_PYTHON24
|
||||
patches = ['patch-configure', 'patch-Makefile.pre.in',
|
||||
'patch-Lib-cgi.py', 'patch-Lib-site.py',
|
||||
'patch-setup.py', 'patch-Include-pyport.h',
|
||||
'patch-Lib-cgi.py.diff', 'patch-Lib-site.py.diff',
|
||||
'patch-setup.py.diff', 'patch-Include-pyport.h',
|
||||
'patch-Mac-OSX-Makefile.in', 'patch-Mac-OSX-IDLE-Makefile.in',
|
||||
'patch-Mac-OSX-PythonLauncher-Makefile.in', 'patch-configure-badcflags.diff',
|
||||
'patch-configure-arch_only.diff', 'patch-macosmodule.diff',
|
||||
'patch-mactoolboxglue.diff', 'patch-pymactoolbox.diff']
|
||||
'patch-mactoolboxglue.diff', 'patch-pymactoolbox.diff',
|
||||
'patch-gestaltmodule.c.diff']
|
||||
elif is_python25(version):
|
||||
patch_dir = os.path.join(PATH_PATCHES_MACOSX_PYTHON25,'files')
|
||||
patch_dir = PATH_PATCHES_MACOSX_PYTHON25
|
||||
patches = ['patch-Makefile.pre.in.diff', 'patch-Lib-cgi.py.diff',
|
||||
'patch-Lib-distutils-dist.py.diff', 'patch-setup.py.diff',
|
||||
'patch-configure-badcflags.diff', 'patch-configure-arch_only.diff',
|
||||
'patch-64bit.diff', 'patch-pyconfig.h.in.diff',
|
||||
'patch-Modules-posixmodule.c.diff']
|
||||
'patch-Modules-posixmodule.c.diff', 'patch-gestaltmodule.c.diff']
|
||||
if patches:
|
||||
logger.info("Patching %s" % self.pkg.name)
|
||||
for patch in patches:
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 62
|
||||
/repository/macports/!svn/ver/70279/trunk/dports/lang/python24
|
||||
END
|
||||
Portfile
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 71
|
||||
/repository/macports/!svn/ver/70279/trunk/dports/lang/python24/Portfile
|
||||
END
|
||||
@@ -1,65 +0,0 @@
|
||||
10
|
||||
|
||||
dir
|
||||
73430
|
||||
http://svn.macports.org/repository/macports/trunk/dports/lang/python24
|
||||
http://svn.macports.org/repository/macports
|
||||
|
||||
|
||||
|
||||
2010-08-04T15:01:11.022285Z
|
||||
70279
|
||||
macsforever2000@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
d073be05-634f-4543-b044-5fe20cf6d1d6
|
||||
|
||||
files
|
||||
dir
|
||||
|
||||
Portfile
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
780457d62169f841a63f0da05f70d918
|
||||
2010-08-04T15:01:11.022285Z
|
||||
70279
|
||||
macsforever2000@macports.org
|
||||
has-props
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
8580
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
K 13
|
||||
svn:eol-style
|
||||
V 6
|
||||
native
|
||||
K 12
|
||||
svn:keywords
|
||||
V 2
|
||||
Id
|
||||
END
|
||||
@@ -1,203 +0,0 @@
|
||||
# $Id$
|
||||
|
||||
PortSystem 1.0
|
||||
PortGroup select 1.0
|
||||
|
||||
name python24
|
||||
version 2.4.6
|
||||
revision 7
|
||||
set major [lindex [split $version .] 0]
|
||||
set branch [join [lrange [split ${version} .] 0 1] .]
|
||||
categories lang
|
||||
platforms darwin
|
||||
maintainers fourdigits.nl:roel openmaintainer
|
||||
|
||||
description An interpreted, object-oriented programming language
|
||||
long_description Python is an interpreted, interactive, object-oriented \
|
||||
programming language.
|
||||
|
||||
homepage http://www.python.org/
|
||||
master_sites ${homepage}/ftp/python/${version}/ \
|
||||
ftp://ftp.python.org/pub/python/${version}/ \
|
||||
ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
|
||||
ftp://ftp.python.jp/pub/python/${version}/
|
||||
|
||||
distname Python-${version}
|
||||
use_bzip2 yes
|
||||
|
||||
checksums md5 76083277f6c7e4d78992f36d7ad9018d \
|
||||
sha1 cb1972a554a458f6a26d3e047b359251865d7c96 \
|
||||
rmd160 0687989193dec2ac108142759281be7ddcf7f31e
|
||||
|
||||
patchfiles patch-configure \
|
||||
patch-Makefile.pre.in \
|
||||
patch-Lib-cgi.py \
|
||||
patch-Lib-site.py \
|
||||
patch-setup.py \
|
||||
patch-Include-pyport.h \
|
||||
patch-Mac-OSX-Makefile.in \
|
||||
patch-Mac-OSX-IDLE-Makefile.in \
|
||||
patch-Mac-OSX-PythonLauncher-Makefile.in \
|
||||
patch-configure-badcflags.diff \
|
||||
patch-configure-arch_only.diff
|
||||
|
||||
depends_lib port:gettext port:openssl
|
||||
|
||||
configure.args --with-cxx=${configure.cxx} \
|
||||
--enable-shared \
|
||||
--enable-framework=${frameworks_dir} \
|
||||
--mandir=${prefix}/share/man \
|
||||
--without-readline \
|
||||
--disable-tk \
|
||||
--enable-ipv6
|
||||
|
||||
use_parallel_build no
|
||||
|
||||
post-patch {
|
||||
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \
|
||||
${worksrcpath}/Lib/site.py ${worksrcpath}/setup.py
|
||||
reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" \
|
||||
${worksrcpath}/Mac/OSX/Makefile.in
|
||||
reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|g" \
|
||||
${worksrcpath}/Mac/OSX/IDLE/Makefile.in \
|
||||
${worksrcpath}/Mac/OSX/Makefile.in \
|
||||
${worksrcpath}/Mac/OSX/PythonLauncher/Makefile.in
|
||||
}
|
||||
|
||||
build.target all
|
||||
|
||||
# Workaround for case-sensitive file systems
|
||||
post-build {
|
||||
if { ![file exists ${worksrcpath}/python.exe] } {
|
||||
ln -s python ${worksrcpath}/python.exe
|
||||
}
|
||||
}
|
||||
|
||||
test.run yes
|
||||
test.target test
|
||||
|
||||
destroot.target frameworkinstall maninstall
|
||||
|
||||
select.group python
|
||||
select.file ${filespath}/python[string map {. {}} ${branch}]
|
||||
|
||||
platform macosx {
|
||||
if {(![variant_isset universal] && ![string match *64* $build_arch]) || ([variant_isset universal] && ![string match *64* $universal_archs])} {
|
||||
post-destroot {
|
||||
set framewpath ${frameworks_dir}/Python.framework
|
||||
set framewdir ${framewpath}/Versions/${branch}
|
||||
|
||||
foreach dir { lib include } {
|
||||
file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir}
|
||||
ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
|
||||
}
|
||||
# Since the lib/python${branch} dir was just moved above and
|
||||
# libpython2.4.a in lib/python${branch}/config is relative, we need
|
||||
# to repoint it here
|
||||
file delete ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
|
||||
ln -s ${framewdir}/Python ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
|
||||
|
||||
ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py] {
|
||||
file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
|
||||
ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
|
||||
}
|
||||
|
||||
foreach dir { Headers Resources Python Versions/Current } {
|
||||
file delete ${destroot}${framewpath}/${dir}
|
||||
}
|
||||
|
||||
# Without this, LINKFORSHARED is set to
|
||||
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
|
||||
# (this becomes Python.framework/Versions/2.4/Python) which doesn't
|
||||
# quite work (see ticket #15099); instead specifically list the
|
||||
# full path to the proper Python framework file (which becomes
|
||||
# ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/Python)
|
||||
reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${prefix}/lib/python${branch}/config/Makefile
|
||||
}
|
||||
} else {
|
||||
# 64-bit, can't build mac-specific stuff
|
||||
configure.args-delete --enable-framework=${frameworks_dir}
|
||||
configure.args-append --disable-toolbox-glue
|
||||
destroot.target install maninstall
|
||||
|
||||
post-destroot {
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# install select file for python_select
|
||||
xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
|
||||
xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
notes "To fully complete your installation and make python $branch the default, please run:
|
||||
\tsudo port install python_select
|
||||
\tsudo python_select $name"
|
||||
|
||||
platform darwin {
|
||||
post-configure {
|
||||
# See http://trac.macports.org/ticket/18376
|
||||
system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed"
|
||||
}
|
||||
}
|
||||
|
||||
platform darwin 9 {
|
||||
configure.cppflags-append -D__DARWIN_UNIX03
|
||||
}
|
||||
|
||||
platform darwin 10 {
|
||||
configure.cppflags-append -D__DARWIN_UNIX03
|
||||
post-configure {
|
||||
reinplace "s|#define _POSIX_C_SOURCE 200112L|#undef _POSIX_C_SOURCE|g" ${worksrcpath}/pyconfig.h
|
||||
reinplace "s|#define _XOPEN_SOURCE 600|#undef _XOPEN_SOURCE|g" ${worksrcpath}/pyconfig.h
|
||||
|
||||
patchfiles-append patch-macosmodule.diff \
|
||||
patch-mactoolboxglue.diff \
|
||||
patch-pymactoolbox.diff
|
||||
}
|
||||
}
|
||||
|
||||
platform puredarwin {
|
||||
configure.args-delete --enable-framework=${frameworks_dir}
|
||||
configure.args-append --disable-toolbox-glue --disable-framework
|
||||
destroot.target install maninstall
|
||||
|
||||
post-destroot {
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# install select file for python_select
|
||||
xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
|
||||
xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
|
||||
}
|
||||
}
|
||||
|
||||
variant universal {
|
||||
if {${configure.sdkroot} != ""} {
|
||||
configure.args-append --enable-universalsdk=${configure.sdkroot}
|
||||
} else {
|
||||
configure.args-append --enable-universalsdk=/
|
||||
}
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
livecheck.url ${homepage}download/releases/
|
||||
livecheck.regex Python (${branch}.\[0-9\]+)
|
||||
|
||||
@@ -1,203 +0,0 @@
|
||||
# $Id: Portfile 70279 2010-08-04 15:01:11Z macsforever2000@macports.org $
|
||||
|
||||
PortSystem 1.0
|
||||
PortGroup select 1.0
|
||||
|
||||
name python24
|
||||
version 2.4.6
|
||||
revision 7
|
||||
set major [lindex [split $version .] 0]
|
||||
set branch [join [lrange [split ${version} .] 0 1] .]
|
||||
categories lang
|
||||
platforms darwin
|
||||
maintainers fourdigits.nl:roel openmaintainer
|
||||
|
||||
description An interpreted, object-oriented programming language
|
||||
long_description Python is an interpreted, interactive, object-oriented \
|
||||
programming language.
|
||||
|
||||
homepage http://www.python.org/
|
||||
master_sites ${homepage}/ftp/python/${version}/ \
|
||||
ftp://ftp.python.org/pub/python/${version}/ \
|
||||
ftp://ftp.fastorama.com/mirrors/ftp.python.org/pub/python/${version}/ \
|
||||
ftp://ftp.python.jp/pub/python/${version}/
|
||||
|
||||
distname Python-${version}
|
||||
use_bzip2 yes
|
||||
|
||||
checksums md5 76083277f6c7e4d78992f36d7ad9018d \
|
||||
sha1 cb1972a554a458f6a26d3e047b359251865d7c96 \
|
||||
rmd160 0687989193dec2ac108142759281be7ddcf7f31e
|
||||
|
||||
patchfiles patch-configure \
|
||||
patch-Makefile.pre.in \
|
||||
patch-Lib-cgi.py \
|
||||
patch-Lib-site.py \
|
||||
patch-setup.py \
|
||||
patch-Include-pyport.h \
|
||||
patch-Mac-OSX-Makefile.in \
|
||||
patch-Mac-OSX-IDLE-Makefile.in \
|
||||
patch-Mac-OSX-PythonLauncher-Makefile.in \
|
||||
patch-configure-badcflags.diff \
|
||||
patch-configure-arch_only.diff
|
||||
|
||||
depends_lib port:gettext port:openssl
|
||||
|
||||
configure.args --with-cxx=${configure.cxx} \
|
||||
--enable-shared \
|
||||
--enable-framework=${frameworks_dir} \
|
||||
--mandir=${prefix}/share/man \
|
||||
--without-readline \
|
||||
--disable-tk \
|
||||
--enable-ipv6
|
||||
|
||||
use_parallel_build no
|
||||
|
||||
post-patch {
|
||||
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \
|
||||
${worksrcpath}/Lib/site.py ${worksrcpath}/setup.py
|
||||
reinplace "s|__FRAMEWORKS_DIR__|${frameworks_dir}|g" \
|
||||
${worksrcpath}/Mac/OSX/Makefile.in
|
||||
reinplace "s|__APPLICATIONS_DIR__|${applications_dir}|g" \
|
||||
${worksrcpath}/Mac/OSX/IDLE/Makefile.in \
|
||||
${worksrcpath}/Mac/OSX/Makefile.in \
|
||||
${worksrcpath}/Mac/OSX/PythonLauncher/Makefile.in
|
||||
}
|
||||
|
||||
build.target all
|
||||
|
||||
# Workaround for case-sensitive file systems
|
||||
post-build {
|
||||
if { ![file exists ${worksrcpath}/python.exe] } {
|
||||
ln -s python ${worksrcpath}/python.exe
|
||||
}
|
||||
}
|
||||
|
||||
test.run yes
|
||||
test.target test
|
||||
|
||||
destroot.target frameworkinstall maninstall
|
||||
|
||||
select.group python
|
||||
select.file ${filespath}/python[string map {. {}} ${branch}]
|
||||
|
||||
platform macosx {
|
||||
if {(![variant_isset universal] && ![string match *64* $build_arch]) || ([variant_isset universal] && ![string match *64* $universal_archs])} {
|
||||
post-destroot {
|
||||
set framewpath ${frameworks_dir}/Python.framework
|
||||
set framewdir ${framewpath}/Versions/${branch}
|
||||
|
||||
foreach dir { lib include } {
|
||||
file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir}
|
||||
ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
|
||||
}
|
||||
# Since the lib/python${branch} dir was just moved above and
|
||||
# libpython2.4.a in lib/python${branch}/config is relative, we need
|
||||
# to repoint it here
|
||||
file delete ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
|
||||
ln -s ${framewdir}/Python ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
|
||||
|
||||
ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py] {
|
||||
file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
|
||||
ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
|
||||
}
|
||||
|
||||
foreach dir { Headers Resources Python Versions/Current } {
|
||||
file delete ${destroot}${framewpath}/${dir}
|
||||
}
|
||||
|
||||
# Without this, LINKFORSHARED is set to
|
||||
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
|
||||
# (this becomes Python.framework/Versions/2.4/Python) which doesn't
|
||||
# quite work (see ticket #15099); instead specifically list the
|
||||
# full path to the proper Python framework file (which becomes
|
||||
# ${prefix}/Library/Frameworks/Python.framework/Versions/2.4/Python)
|
||||
reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${prefix}/lib/python${branch}/config/Makefile
|
||||
}
|
||||
} else {
|
||||
# 64-bit, can't build mac-specific stuff
|
||||
configure.args-delete --enable-framework=${frameworks_dir}
|
||||
configure.args-append --disable-toolbox-glue
|
||||
destroot.target install maninstall
|
||||
|
||||
post-destroot {
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# install select file for python_select
|
||||
xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
|
||||
xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
notes "To fully complete your installation and make python $branch the default, please run:
|
||||
\tsudo port install python_select
|
||||
\tsudo python_select $name"
|
||||
|
||||
platform darwin {
|
||||
post-configure {
|
||||
# See http://trac.macports.org/ticket/18376
|
||||
system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed"
|
||||
}
|
||||
}
|
||||
|
||||
platform darwin 9 {
|
||||
configure.cppflags-append -D__DARWIN_UNIX03
|
||||
}
|
||||
|
||||
platform darwin 10 {
|
||||
configure.cppflags-append -D__DARWIN_UNIX03
|
||||
post-configure {
|
||||
reinplace "s|#define _POSIX_C_SOURCE 200112L|#undef _POSIX_C_SOURCE|g" ${worksrcpath}/pyconfig.h
|
||||
reinplace "s|#define _XOPEN_SOURCE 600|#undef _XOPEN_SOURCE|g" ${worksrcpath}/pyconfig.h
|
||||
|
||||
patchfiles-append patch-macosmodule.diff \
|
||||
patch-mactoolboxglue.diff \
|
||||
patch-pymactoolbox.diff
|
||||
}
|
||||
}
|
||||
|
||||
platform puredarwin {
|
||||
configure.args-delete --enable-framework=${frameworks_dir}
|
||||
configure.args-append --disable-toolbox-glue --disable-framework
|
||||
destroot.target install maninstall
|
||||
|
||||
post-destroot {
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# install select file for python_select
|
||||
xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
|
||||
xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
|
||||
}
|
||||
}
|
||||
|
||||
variant universal {
|
||||
if {${configure.sdkroot} != ""} {
|
||||
configure.args-append --enable-universalsdk=${configure.sdkroot}
|
||||
} else {
|
||||
configure.args-append --enable-universalsdk=/
|
||||
}
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
livecheck.url ${homepage}download/releases/
|
||||
livecheck.regex Python (${branch}.\[0-9\]+)
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 68
|
||||
/repository/macports/!svn/ver/70266/trunk/dports/lang/python24/files
|
||||
END
|
||||
patch-setup.py
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 83
|
||||
/repository/macports/!svn/ver/42379/trunk/dports/lang/python24/files/patch-setup.py
|
||||
END
|
||||
patch-pymactoolbox.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 92
|
||||
/repository/macports/!svn/ver/70266/trunk/dports/lang/python24/files/patch-pymactoolbox.diff
|
||||
END
|
||||
patch-Mac-OSX-Makefile.in
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 94
|
||||
/repository/macports/!svn/ver/41218/trunk/dports/lang/python24/files/patch-Mac-OSX-Makefile.in
|
||||
END
|
||||
patch-Mac-OSX-PythonLauncher-Makefile.in
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 109
|
||||
/repository/macports/!svn/ver/41218/trunk/dports/lang/python24/files/patch-Mac-OSX-PythonLauncher-Makefile.in
|
||||
END
|
||||
python24
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 77
|
||||
/repository/macports/!svn/ver/50424/trunk/dports/lang/python24/files/python24
|
||||
END
|
||||
patch-mactoolboxglue.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 94
|
||||
/repository/macports/!svn/ver/70266/trunk/dports/lang/python24/files/patch-mactoolboxglue.diff
|
||||
END
|
||||
patch-configure-badcflags.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 99
|
||||
/repository/macports/!svn/ver/56585/trunk/dports/lang/python24/files/patch-configure-badcflags.diff
|
||||
END
|
||||
patch-Lib-cgi.py
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 85
|
||||
/repository/macports/!svn/ver/28753/trunk/dports/lang/python24/files/patch-Lib-cgi.py
|
||||
END
|
||||
patch-Lib-site.py
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 86
|
||||
/repository/macports/!svn/ver/21487/trunk/dports/lang/python24/files/patch-Lib-site.py
|
||||
END
|
||||
patch-Mac-OSX-IDLE-Makefile.in
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 99
|
||||
/repository/macports/!svn/ver/41218/trunk/dports/lang/python24/files/patch-Mac-OSX-IDLE-Makefile.in
|
||||
END
|
||||
patch-configure-arch_only.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 99
|
||||
/repository/macports/!svn/ver/56585/trunk/dports/lang/python24/files/patch-configure-arch_only.diff
|
||||
END
|
||||
patch-Include-pyport.h
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 91
|
||||
/repository/macports/!svn/ver/23777/trunk/dports/lang/python24/files/patch-Include-pyport.h
|
||||
END
|
||||
patch-Makefile.pre.in
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 90
|
||||
/repository/macports/!svn/ver/44176/trunk/dports/lang/python24/files/patch-Makefile.pre.in
|
||||
END
|
||||
pyconfig.ed
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 80
|
||||
/repository/macports/!svn/ver/48185/trunk/dports/lang/python24/files/pyconfig.ed
|
||||
END
|
||||
patch-macosmodule.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 91
|
||||
/repository/macports/!svn/ver/70266/trunk/dports/lang/python24/files/patch-macosmodule.diff
|
||||
END
|
||||
patch-configure
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 84
|
||||
/repository/macports/!svn/ver/44176/trunk/dports/lang/python24/files/patch-configure
|
||||
END
|
||||
@@ -1,572 +0,0 @@
|
||||
10
|
||||
|
||||
dir
|
||||
73430
|
||||
http://svn.macports.org/repository/macports/trunk/dports/lang/python24/files
|
||||
http://svn.macports.org/repository/macports
|
||||
|
||||
|
||||
|
||||
2010-08-04T04:14:16.151846Z
|
||||
70266
|
||||
macsforever2000@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
d073be05-634f-4543-b044-5fe20cf6d1d6
|
||||
|
||||
patch-setup.py
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
5f490b115ab19796bd3af9de6901dd49
|
||||
2008-11-20T06:13:14.102247Z
|
||||
42379
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
2219
|
||||
|
||||
patch-pymactoolbox.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
789b1776bda064daf576ee30ae56c0d0
|
||||
2010-08-04T04:14:16.151846Z
|
||||
70266
|
||||
macsforever2000@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
585
|
||||
|
||||
patch-Mac-OSX-Makefile.in
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
62e937496bf0fba58b1413b3b7080950
|
||||
2008-10-28T06:31:42.726319Z
|
||||
41218
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
721
|
||||
|
||||
patch-Mac-OSX-PythonLauncher-Makefile.in
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
d21904e251b9114c93eaaa23608102e6
|
||||
2008-10-28T06:31:42.726319Z
|
||||
41218
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
769
|
||||
|
||||
python24
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
aa43cb032d8199431e9f3371fb0d3754
|
||||
2009-04-30T21:04:30.747761Z
|
||||
50424
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
321
|
||||
|
||||
patch-mactoolboxglue.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
9101df4cf01c5c8b9eb0192757a01d64
|
||||
2010-08-04T04:14:16.151846Z
|
||||
70266
|
||||
macsforever2000@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
733
|
||||
|
||||
patch-configure-badcflags.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
0edd3830be4a95c9ef6ace14cac35a36
|
||||
2009-08-30T16:27:48.203663Z
|
||||
56585
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
629
|
||||
|
||||
patch-Lib-cgi.py
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
16a1503a53b90c650e5a18ddd3c099ba
|
||||
2007-09-08T10:37:52.838883Z
|
||||
28753
|
||||
afb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
808
|
||||
|
||||
patch-Lib-site.py
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
b3e92b93bc323584d2d50876c9d7d228
|
||||
2007-01-26T02:45:46.302708Z
|
||||
21487
|
||||
eridius@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
550
|
||||
|
||||
patch-Mac-OSX-IDLE-Makefile.in
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
75cb1fde28f15bf2219160562fc62592
|
||||
2008-10-28T06:31:42.726319Z
|
||||
41218
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
346
|
||||
|
||||
patch-configure-arch_only.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
9dbe4e25743af454086d069ca875738b
|
||||
2009-08-30T16:27:48.203663Z
|
||||
56585
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1019
|
||||
|
||||
patch-Include-pyport.h
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
e69c63be534f546dcd3f7d50f6c52bce
|
||||
2007-04-09T19:13:26.590067Z
|
||||
23777
|
||||
mgrimes@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1331
|
||||
|
||||
patch-Makefile.pre.in
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
30784b41f25f887041698ccffa050643
|
||||
2008-12-23T04:46:09.409745Z
|
||||
44176
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
345
|
||||
|
||||
pyconfig.ed
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
674a4842ff1491cf7669c37d9b0b95bc
|
||||
2009-03-16T07:42:14.908329Z
|
||||
48185
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
49
|
||||
|
||||
patch-macosmodule.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
8df02cb3c18543f8637eae8cacd51c4a
|
||||
2010-08-04T04:14:16.151846Z
|
||||
70266
|
||||
macsforever2000@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
10267
|
||||
|
||||
patch-configure
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T14:51:11.000000Z
|
||||
44225e6715e9b9e0ed742c56ecba7d86
|
||||
2008-12-23T04:46:09.409745Z
|
||||
44176
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1131
|
||||
|
||||
-34
@@ -1,34 +0,0 @@
|
||||
--- Include/pyport.h.orig 2007-03-12 23:26:06.000000000 -0700
|
||||
+++ Include/pyport.h 2007-03-12 23:29:35.000000000 -0700
|
||||
@@ -152,11 +152,23 @@ typedef PY_LONG_LONG Py_intptr_t;
|
||||
#if defined(PYOS_OS2) && defined(PYCC_GCC)
|
||||
#include <sys/types.h>
|
||||
#endif
|
||||
+
|
||||
+#if (defined __APPLE__) && (!defined _POSIX_C_SOURCE)
|
||||
+#define TEMPORARILY_DEFINING__POSIX_C_SOURCE /* so we can #undef it later */
|
||||
+#define _POSIX_C_SOURCE /* avoid deprecated struct ostat in sys/stat.h */
|
||||
+#endif
|
||||
+
|
||||
#include <sys/stat.h>
|
||||
#elif defined(HAVE_STAT_H)
|
||||
#include <stat.h>
|
||||
#endif
|
||||
|
||||
+/* Mac OS X: undefine _POSIX_C_SOURCE if it wasn't defined before */
|
||||
+#ifdef TEMPORARILY_DEFINING__POSIX_C_SOURCE
|
||||
+#undef _POSIX_C_SOURCE
|
||||
+#undef TEMPORARILY_DEFINING__POSIX_C_SOURCE
|
||||
+#endif
|
||||
+
|
||||
#if defined(PYCC_VACPP)
|
||||
/* VisualAge C/C++ Failed to Define MountType Field in sys/stat.h */
|
||||
#define S_IFMT (S_IFDIR|S_IFCHR|S_IFREG)
|
||||
@@ -393,6 +405,7 @@ extern char * _getpty(int *, int, mode_t
|
||||
/* BSDI does not supply a prototype for the 'openpty' and 'forkpty'
|
||||
functions, even though they are included in libutil. */
|
||||
#include <termios.h>
|
||||
+struct winsize;
|
||||
extern int openpty(int *, int *, char *, struct termios *, struct winsize *);
|
||||
extern int forkpty(int *, char *, struct termios *, struct winsize *);
|
||||
#endif /* !defined(HAVE_PTY_H) && !defined(HAVE_LIBUTIL_H) */
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
--- Mac/OSX/IDLE/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
|
||||
+++ Mac/OSX/IDLE/Makefile.in 2007-04-27 13:27:07.000000000 -0700
|
||||
@@ -21,7 +21,7 @@
|
||||
|
||||
BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
|
||||
|
||||
-PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
|
||||
+PYTHONAPPSDIR=__APPLICATIONS_DIR__/MacPython $(VERSION)
|
||||
|
||||
all: IDLE.app
|
||||
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
--- Mac/OSX/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
|
||||
+++ Mac/OSX/Makefile.in 2007-04-27 11:07:02.000000000 -0700
|
||||
@@ -5,7 +5,7 @@
|
||||
VERSION=@VERSION@
|
||||
builddir = ../..
|
||||
srcdir = @srcdir@
|
||||
-prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
|
||||
+prefix=__FRAMEWORKS_DIR__/Python.framework/Versions/$(VERSION)
|
||||
LIBDEST=$(prefix)/lib/python$(VERSION)
|
||||
BUILDPYTHON=$(builddir)/python.exe
|
||||
RUNSHARED= @RUNSHARED@
|
||||
@@ -16,7 +16,7 @@
|
||||
|
||||
# These are normally glimpsed from the previous set
|
||||
bindir=@exec_prefix@/bin
|
||||
-PYTHONAPPSPATH=/Applications/MacPython $(VERSION)
|
||||
+PYTHONAPPSPATH=__APPLICATIONS_DIR__/MacPython $(VERSION)
|
||||
PYTHONAPPSDIR=$(PYTHONAPPSPATH)
|
||||
APPINSTALLDIR=$(prefix)/Resources/Python.app
|
||||
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
--- Mac/OSX/PythonLauncher/Makefile.in.orig 2006-10-08 10:41:25.000000000 -0700
|
||||
+++ Mac/OSX/PythonLauncher/Makefile.in 2007-04-27 13:33:26.000000000 -0700
|
||||
@@ -20,7 +20,7 @@
|
||||
|
||||
BUNDLEBULDER=$(srcdir)/../../../Lib/plat-mac/bundlebuilder.py
|
||||
|
||||
-PYTHONAPPSDIR=/Applications/MacPython $(VERSION)
|
||||
+PYTHONAPPSDIR=__APPLICATIONS_DIR__/MacPython $(VERSION)
|
||||
OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
|
||||
|
||||
all: PythonLauncher.app
|
||||
@@ -56,7 +56,7 @@
|
||||
--resource=$(srcdir)/factorySettings.plist \
|
||||
--plist=$(srcdir)/Info.plist \
|
||||
build
|
||||
- find "PythonLauncher.app" -name '.svn' -print0 | xargs -0 rm -r
|
||||
+ find "PythonLauncher.app" -name '.svn' -print0 | xargs -0 rm -r || :
|
||||
|
||||
|
||||
FileSettings.o: $(srcdir)/FileSettings.m
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
--- Makefile.pre.in.orig 2006-10-08 10:41:25.000000000 -0700
|
||||
+++ Makefile.pre.in 2007-04-20 18:06:11.000000000 -0700
|
||||
@@ -56,7 +56,7 @@
|
||||
OPT= @OPT@
|
||||
BASECFLAGS= @BASECFLAGS@
|
||||
CFLAGS= $(BASECFLAGS) $(OPT)
|
||||
-CPPFLAGS= -I. -I$(srcdir)/Include
|
||||
+CPPFLAGS= @CPPFLAGS@ -I. -I$(srcdir)/Include
|
||||
LDFLAGS= @LDFLAGS@
|
||||
LDLAST= @LDLAST@
|
||||
SGI_ABI= @SGI_ABI@
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
--- configure.orig 2009-08-31 01:54:27.000000000 +1000
|
||||
+++ configure 2009-08-31 01:55:24.000000000 +1000
|
||||
@@ -10321,7 +10321,7 @@
|
||||
Darwin/[01234567].*)
|
||||
LIBTOOL_CRUFT="-framework System -lcc_dynamic"
|
||||
if test -z "${enable_universalsdk}"; then
|
||||
- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
|
||||
+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
|
||||
fi
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||
@@ -10333,7 +10333,7 @@
|
||||
else
|
||||
LIBTOOL_CRUFT=""
|
||||
fi
|
||||
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only '`/usr/bin/arch`
|
||||
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs'
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||
esac
|
||||
-14
@@ -1,14 +0,0 @@
|
||||
--- configure.orig 2009-08-31 01:29:04.000000000 +1000
|
||||
+++ configure 2009-08-31 01:30:05.000000000 +1000
|
||||
@@ -3909,9 +3909,9 @@
|
||||
Darwin*)
|
||||
if [[ `/usr/bin/arch` = 'ppc' ]]
|
||||
then
|
||||
- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
|
||||
+ BASECFLAGS="$BASECFLAGS -mno-fused-madd -fno-common"
|
||||
else
|
||||
- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
|
||||
+ BASECFLAGS="$BASECFLAGS -fno-common"
|
||||
fi
|
||||
if test "${enable_universalsdk}"; then
|
||||
BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
|
||||
@@ -1,25 +0,0 @@
|
||||
--- configure.orig 2007-04-05 21:32:57.000000000 -0700
|
||||
+++ configure 2007-04-05 21:32:59.000000000 -0700
|
||||
@@ -3907,7 +3907,12 @@
|
||||
;;
|
||||
# is there any other compiler on Darwin besides gcc?
|
||||
Darwin*)
|
||||
- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
|
||||
+ if [[ `/usr/bin/arch` = 'ppc' ]]
|
||||
+ then
|
||||
+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd -fno-common"
|
||||
+ else
|
||||
+ BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -fno-common"
|
||||
+ fi
|
||||
if test "${enable_universalsdk}"; then
|
||||
BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
|
||||
fi
|
||||
@@ -10328,7 +10333,7 @@
|
||||
else
|
||||
LIBTOOL_CRUFT=""
|
||||
fi
|
||||
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only ppc'
|
||||
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -lSystem -lSystemStubs -arch_only '`/usr/bin/arch`
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||
esac
|
||||
-427
@@ -1,427 +0,0 @@
|
||||
--- Mac/Modules/macosmodule.c 2004-11-05 08:02:59.000000000 +0100
|
||||
+++ Mac/Modules/macosmodule.c 2009-09-05 02:07:14.000000000 +0200
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
typedef struct {
|
||||
PyObject_HEAD
|
||||
- short fRefNum;
|
||||
+ FSIORefNum fRefNum;
|
||||
int isclosed;
|
||||
} rfobject;
|
||||
|
||||
@@ -54,7 +54,7 @@
|
||||
do_close(rfobject *self)
|
||||
{
|
||||
if (self->isclosed ) return;
|
||||
- (void)FSClose(self->fRefNum);
|
||||
+ (void)FSCloseFork(self->fRefNum);
|
||||
self->isclosed = 1;
|
||||
}
|
||||
|
||||
@@ -68,6 +68,7 @@
|
||||
long n;
|
||||
PyObject *v;
|
||||
OSErr err;
|
||||
+ ByteCount n2;
|
||||
|
||||
if (self->isclosed) {
|
||||
PyErr_SetString(PyExc_ValueError, "Operation on closed file");
|
||||
@@ -81,13 +82,13 @@
|
||||
if (v == NULL)
|
||||
return NULL;
|
||||
|
||||
- err = FSRead(self->fRefNum, &n, PyString_AsString(v));
|
||||
+ err = FSReadFork(self->fRefNum, fsAtMark, 0, n, PyString_AsString(v), &n2);
|
||||
if (err && err != eofErr) {
|
||||
PyMac_Error(err);
|
||||
Py_DECREF(v);
|
||||
return NULL;
|
||||
}
|
||||
- _PyString_Resize(&v, n);
|
||||
+ _PyString_Resize(&v, n2);
|
||||
return v;
|
||||
}
|
||||
|
||||
@@ -109,7 +110,7 @@
|
||||
}
|
||||
if (!PyArg_ParseTuple(args, "s#", &buffer, &size))
|
||||
return NULL;
|
||||
- err = FSWrite(self->fRefNum, &size, buffer);
|
||||
+ err = FSWriteFork(self->fRefNum, fsAtMark, 0, size, buffer, NULL);
|
||||
if (err) {
|
||||
PyMac_Error(err);
|
||||
return NULL;
|
||||
@@ -126,47 +127,36 @@
|
||||
static PyObject *
|
||||
rf_seek(rfobject *self, PyObject *args)
|
||||
{
|
||||
- long amount, pos;
|
||||
+ long amount;
|
||||
int whence = SEEK_SET;
|
||||
- long eof;
|
||||
+ int mode;
|
||||
OSErr err;
|
||||
|
||||
if (self->isclosed) {
|
||||
PyErr_SetString(PyExc_ValueError, "Operation on closed file");
|
||||
return NULL;
|
||||
}
|
||||
- if (!PyArg_ParseTuple(args, "l|i", &amount, &whence))
|
||||
+ if (!PyArg_ParseTuple(args, "l|i", &amount, &whence)) {
|
||||
return NULL;
|
||||
-
|
||||
- if ((err = GetEOF(self->fRefNum, &eof)))
|
||||
- goto ioerr;
|
||||
+ }
|
||||
|
||||
switch (whence) {
|
||||
case SEEK_CUR:
|
||||
- if ((err = GetFPos(self->fRefNum, &pos)))
|
||||
- goto ioerr;
|
||||
+ mode = fsFromMark;
|
||||
break;
|
||||
case SEEK_END:
|
||||
- pos = eof;
|
||||
+ mode = fsFromLEOF;
|
||||
break;
|
||||
case SEEK_SET:
|
||||
- pos = 0;
|
||||
+ mode = fsFromStart;
|
||||
break;
|
||||
default:
|
||||
PyErr_BadArgument();
|
||||
return NULL;
|
||||
}
|
||||
-
|
||||
- pos += amount;
|
||||
-
|
||||
- /* Don't bother implementing seek past EOF */
|
||||
- if (pos > eof || pos < 0) {
|
||||
- PyErr_BadArgument();
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- if ((err = SetFPos(self->fRefNum, fsFromStart, pos)) ) {
|
||||
-ioerr:
|
||||
+
|
||||
+ err = FSSetForkPosition(self->fRefNum, mode, amount);
|
||||
+ if (err != noErr) {
|
||||
PyMac_Error(err);
|
||||
return NULL;
|
||||
}
|
||||
@@ -182,7 +172,7 @@
|
||||
static PyObject *
|
||||
rf_tell(rfobject *self, PyObject *args)
|
||||
{
|
||||
- long where;
|
||||
+ long long where;
|
||||
OSErr err;
|
||||
|
||||
if (self->isclosed) {
|
||||
@@ -191,11 +181,13 @@
|
||||
}
|
||||
if (!PyArg_ParseTuple(args, ""))
|
||||
return NULL;
|
||||
- if ((err = GetFPos(self->fRefNum, &where)) ) {
|
||||
+
|
||||
+ err = FSGetForkPosition(self->fRefNum, &where);
|
||||
+ if (err != noErr) {
|
||||
PyMac_Error(err);
|
||||
return NULL;
|
||||
}
|
||||
- return PyInt_FromLong(where);
|
||||
+ return PyLong_FromLongLong(where);
|
||||
}
|
||||
|
||||
static char rf_close__doc__[] =
|
||||
@@ -281,6 +273,7 @@
|
||||
Rftype__doc__ /* Documentation string */
|
||||
};
|
||||
|
||||
+
|
||||
/* End of code for Resource fork objects */
|
||||
/* -------------------------------------------------------- */
|
||||
|
||||
@@ -292,17 +285,61 @@
|
||||
static PyObject *
|
||||
MacOS_GetCreatorAndType(PyObject *self, PyObject *args)
|
||||
{
|
||||
- FSSpec fss;
|
||||
- FInfo info;
|
||||
PyObject *creator, *type, *res;
|
||||
OSErr err;
|
||||
-
|
||||
- if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss))
|
||||
+ FSRef ref;
|
||||
+ FSCatalogInfo cataloginfo;
|
||||
+ FileInfo* finfo;
|
||||
+
|
||||
+ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSRef, &ref)) {
|
||||
+#ifndef __LP64__
|
||||
+ /* This function is documented to take an FSSpec as well,
|
||||
+ * which only works in 32-bit mode.
|
||||
+ */
|
||||
+ PyErr_Clear();
|
||||
+ FSSpec fss;
|
||||
+ FInfo info;
|
||||
+
|
||||
+ if (!PyArg_ParseTuple(args, "O&", PyMac_GetFSSpec, &fss))
|
||||
+ return NULL;
|
||||
+
|
||||
+ if ((err = FSpGetFInfo(&fss, &info)) != noErr) {
|
||||
+ return PyErr_Mac(MacOS_Error, err);
|
||||
+ }
|
||||
+ creator = PyString_FromStringAndSize(
|
||||
+ (char *)&info.fdCreator, 4);
|
||||
+ type = PyString_FromStringAndSize((char *)&info.fdType, 4);
|
||||
+ res = Py_BuildValue("OO", creator, type);
|
||||
+ Py_DECREF(creator);
|
||||
+ Py_DECREF(type);
|
||||
+ return res;
|
||||
+#else /* __LP64__ */
|
||||
+ return NULL;
|
||||
+#endif /* __LP64__ */
|
||||
+ }
|
||||
+
|
||||
+ err = FSGetCatalogInfo(&ref,
|
||||
+ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo,
|
||||
+ NULL, NULL, NULL);
|
||||
+ if (err != noErr) {
|
||||
+ PyErr_Mac(MacOS_Error, err);
|
||||
return NULL;
|
||||
- if ((err = FSpGetFInfo(&fss, &info)) != noErr)
|
||||
- return PyErr_Mac(MacOS_Error, err);
|
||||
- creator = PyString_FromStringAndSize((char *)&info.fdCreator, 4);
|
||||
- type = PyString_FromStringAndSize((char *)&info.fdType, 4);
|
||||
+ }
|
||||
+
|
||||
+ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) {
|
||||
+ /* Directory: doesn't have type/creator info.
|
||||
+ *
|
||||
+ * The specific error code is for backward compatibility with
|
||||
+ * earlier versions.
|
||||
+ */
|
||||
+ PyErr_Mac(MacOS_Error, fnfErr);
|
||||
+ return NULL;
|
||||
+
|
||||
+ }
|
||||
+ finfo = (FileInfo*)&(cataloginfo.finderInfo);
|
||||
+ creator = PyString_FromStringAndSize((char*)&(finfo->fileCreator), 4);
|
||||
+ type = PyString_FromStringAndSize((char*)&(finfo->fileType), 4);
|
||||
+
|
||||
res = Py_BuildValue("OO", creator, type);
|
||||
Py_DECREF(creator);
|
||||
Py_DECREF(type);
|
||||
@@ -314,20 +351,66 @@
|
||||
static PyObject *
|
||||
MacOS_SetCreatorAndType(PyObject *self, PyObject *args)
|
||||
{
|
||||
- FSSpec fss;
|
||||
ResType creator, type;
|
||||
- FInfo info;
|
||||
+ FSRef ref;
|
||||
+ FileInfo* finfo;
|
||||
OSErr err;
|
||||
-
|
||||
+ FSCatalogInfo cataloginfo;
|
||||
+
|
||||
if (!PyArg_ParseTuple(args, "O&O&O&",
|
||||
+ PyMac_GetFSRef, &ref, PyMac_GetOSType, &creator, PyMac_GetOSType, &type)) {
|
||||
+#ifndef __LP64__
|
||||
+ /* Try to handle FSSpec arguments, for backward compatibility */
|
||||
+ FSSpec fss;
|
||||
+ FInfo info;
|
||||
+
|
||||
+ if (!PyArg_ParseTuple(args, "O&O&O&",
|
||||
PyMac_GetFSSpec, &fss, PyMac_GetOSType, &creator, PyMac_GetOSType, &type))
|
||||
+ return NULL;
|
||||
+
|
||||
+ if ((err = FSpGetFInfo(&fss, &info)) != noErr)
|
||||
+ return PyErr_Mac(MacOS_Error, err);
|
||||
+
|
||||
+ info.fdCreator = creator;
|
||||
+ info.fdType = type;
|
||||
+
|
||||
+ if ((err = FSpSetFInfo(&fss, &info)) != noErr)
|
||||
+ return PyErr_Mac(MacOS_Error, err);
|
||||
+ Py_INCREF(Py_None);
|
||||
+ return Py_None;
|
||||
+#else /* __LP64__ */
|
||||
return NULL;
|
||||
- if ((err = FSpGetFInfo(&fss, &info)) != noErr)
|
||||
- return PyErr_Mac(MacOS_Error, err);
|
||||
- info.fdCreator = creator;
|
||||
- info.fdType = type;
|
||||
- if ((err = FSpSetFInfo(&fss, &info)) != noErr)
|
||||
- return PyErr_Mac(MacOS_Error, err);
|
||||
+#endif /* __LP64__ */
|
||||
+ }
|
||||
+
|
||||
+ err = FSGetCatalogInfo(&ref,
|
||||
+ kFSCatInfoFinderInfo|kFSCatInfoNodeFlags, &cataloginfo,
|
||||
+ NULL, NULL, NULL);
|
||||
+ if (err != noErr) {
|
||||
+ PyErr_Mac(MacOS_Error, err);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
+ if ((cataloginfo.nodeFlags & kFSNodeIsDirectoryMask) != 0) {
|
||||
+ /* Directory: doesn't have type/creator info.
|
||||
+ *
|
||||
+ * The specific error code is for backward compatibility with
|
||||
+ * earlier versions.
|
||||
+ */
|
||||
+ PyErr_Mac(MacOS_Error, fnfErr);
|
||||
+ return NULL;
|
||||
+
|
||||
+ }
|
||||
+ finfo = (FileInfo*)&(cataloginfo.finderInfo);
|
||||
+ finfo->fileCreator = creator;
|
||||
+ finfo->fileType = type;
|
||||
+
|
||||
+ err = FSSetCatalogInfo(&ref, kFSCatInfoFinderInfo, &cataloginfo);
|
||||
+ if (err != noErr) {
|
||||
+ PyErr_Mac(MacOS_Error, fnfErr);
|
||||
+ return NULL;
|
||||
+ }
|
||||
+
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
@@ -375,6 +458,7 @@
|
||||
/* And try again... */
|
||||
h = GetResource('Estr', err);
|
||||
}
|
||||
+ Py_DECREF(m);
|
||||
}
|
||||
}
|
||||
/*
|
||||
@@ -398,6 +482,9 @@
|
||||
return Py_BuildValue("s", buf);
|
||||
}
|
||||
|
||||
+
|
||||
+#ifndef __LP64__
|
||||
+
|
||||
static char splash_doc[] = "Open a splash-screen dialog by resource-id (0=close)";
|
||||
|
||||
static PyObject *
|
||||
@@ -416,7 +503,7 @@
|
||||
return NULL;
|
||||
olddialog = curdialog;
|
||||
curdialog = NULL;
|
||||
-
|
||||
+
|
||||
if ( resid != -1 ) {
|
||||
curdialog = GetNewDialog(resid, NULL, (WindowPtr)-1);
|
||||
if ( curdialog ) {
|
||||
@@ -451,11 +538,13 @@
|
||||
|
||||
if (!PyArg_ParseTuple(args, "O&|O", PyMac_GetStr255, message, &object))
|
||||
return NULL;
|
||||
+
|
||||
DebugStr(message);
|
||||
Py_INCREF(Py_None);
|
||||
return Py_None;
|
||||
}
|
||||
|
||||
+
|
||||
static char SysBeep_doc[] = "BEEEEEP!!!";
|
||||
|
||||
static PyObject *
|
||||
@@ -470,6 +559,8 @@
|
||||
return Py_None;
|
||||
}
|
||||
|
||||
+#endif /* __LP64__ */
|
||||
+
|
||||
static char WMAvailable_doc[] =
|
||||
"True if this process can interact with the display."
|
||||
"Will foreground the application on the first call as a side-effect."
|
||||
@@ -529,51 +620,37 @@
|
||||
{
|
||||
OSErr err;
|
||||
char *mode = "r";
|
||||
- FSSpec fss;
|
||||
- SignedByte permission = 1;
|
||||
+ FSRef ref;
|
||||
+ SInt8 permission = fsRdPerm;
|
||||
rfobject *fp;
|
||||
+ HFSUniStr255 name;
|
||||
|
||||
- if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSSpec, &fss, &mode))
|
||||
+ if (!PyArg_ParseTuple(args, "O&|s", PyMac_GetFSRef, &ref, &mode))
|
||||
return NULL;
|
||||
while (*mode) {
|
||||
switch (*mode++) {
|
||||
case '*': break;
|
||||
- case 'r': permission = 1; break;
|
||||
- case 'w': permission = 2; break;
|
||||
+ case 'r': permission = fsRdPerm; break;
|
||||
+ case 'w': permission = fsWrPerm; break;
|
||||
case 'b': break;
|
||||
default:
|
||||
PyErr_BadArgument();
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
+
|
||||
+ err = FSGetResourceForkName(&name);
|
||||
+ if (err != noErr) {
|
||||
+ PyMac_Error(err);
|
||||
+ return NULL;
|
||||
+ }
|
||||
|
||||
if ( (fp = newrfobject()) == NULL )
|
||||
return NULL;
|
||||
-
|
||||
- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum);
|
||||
+
|
||||
|
||||
- if ( err == fnfErr ) {
|
||||
- /* In stead of doing complicated things here to get creator/type
|
||||
- ** correct we let the standard i/o library handle it
|
||||
- */
|
||||
- FILE *tfp;
|
||||
- char pathname[PATHNAMELEN];
|
||||
-
|
||||
- if ( (err=PyMac_GetFullPathname(&fss, pathname, PATHNAMELEN)) ) {
|
||||
- PyMac_Error(err);
|
||||
- Py_DECREF(fp);
|
||||
- return NULL;
|
||||
- }
|
||||
-
|
||||
- if ( (tfp = fopen(pathname, "w")) == NULL ) {
|
||||
- PyMac_Error(fnfErr); /* What else... */
|
||||
- Py_DECREF(fp);
|
||||
- return NULL;
|
||||
- }
|
||||
- fclose(tfp);
|
||||
- err = HOpenRF(fss.vRefNum, fss.parID, fss.name, permission, &fp->fRefNum);
|
||||
- }
|
||||
- if ( err ) {
|
||||
+ err = FSOpenFork(&ref, name.length, name.unicode, permission, &fp->fRefNum);
|
||||
+ if (err != noErr) {
|
||||
Py_DECREF(fp);
|
||||
PyMac_Error(err);
|
||||
return NULL;
|
||||
@@ -583,15 +660,18 @@
|
||||
}
|
||||
|
||||
|
||||
+
|
||||
static PyMethodDef MacOS_Methods[] = {
|
||||
{"GetCreatorAndType", MacOS_GetCreatorAndType, 1, getcrtp_doc},
|
||||
{"SetCreatorAndType", MacOS_SetCreatorAndType, 1, setcrtp_doc},
|
||||
{"GetErrorString", MacOS_GetErrorString, 1, geterr_doc},
|
||||
{"openrf", MacOS_openrf, 1, openrf_doc},
|
||||
+#ifndef __LP64__
|
||||
{"splash", MacOS_splash, 1, splash_doc},
|
||||
{"DebugStr", MacOS_DebugStr, 1, DebugStr_doc},
|
||||
- {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc},
|
||||
{"SysBeep", MacOS_SysBeep, 1, SysBeep_doc},
|
||||
+#endif /* __LP64__ */
|
||||
+ {"GetTicks", MacOS_GetTicks, 1, GetTicks_doc},
|
||||
{"WMAvailable", MacOS_WMAvailable, 1, WMAvailable_doc},
|
||||
{NULL, NULL} /* Sentinel */
|
||||
};
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
--- Python/mactoolboxglue.c 2006-10-08 19:41:25.000000000 +0200
|
||||
+++ Python/mactoolboxglue.c 2009-09-05 01:25:57.000000000 +0200
|
||||
@@ -414,7 +414,7 @@
|
||||
|
||||
GLUE_NEW(GWorldPtr, GWorldObj_New, "Carbon.Qdoffs")
|
||||
GLUE_CONVERT(GWorldPtr, GWorldObj_Convert, "Carbon.Qdoffs")
|
||||
-
|
||||
+/*
|
||||
GLUE_NEW(Track, TrackObj_New, "Carbon.Qt")
|
||||
GLUE_CONVERT(Track, TrackObj_Convert, "Carbon.Qt")
|
||||
GLUE_NEW(Movie, MovieObj_New, "Carbon.Qt")
|
||||
@@ -427,7 +427,7 @@
|
||||
GLUE_CONVERT(UserData, UserDataObj_Convert, "Carbon.Qt")
|
||||
GLUE_NEW(Media, MediaObj_New, "Carbon.Qt")
|
||||
GLUE_CONVERT(Media, MediaObj_Convert, "Carbon.Qt")
|
||||
-
|
||||
+*/
|
||||
GLUE_NEW(Handle, ResObj_New, "Carbon.Res")
|
||||
GLUE_CONVERT(Handle, ResObj_Convert, "Carbon.Res")
|
||||
GLUE_NEW(Handle, OptResObj_New, "Carbon.Res")
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
--- Include/pymactoolbox.h 2004-11-05 08:02:59.000000000 +0100
|
||||
+++ Include/pymactoolbox.h 2009-09-05 01:26:30.000000000 +0200
|
||||
@@ -134,6 +134,7 @@
|
||||
extern int GWorldObj_Convert(PyObject *, GWorldPtr *);
|
||||
|
||||
/* Qt exports */
|
||||
+/*
|
||||
extern PyObject *TrackObj_New(Track);
|
||||
extern int TrackObj_Convert(PyObject *, Track *);
|
||||
extern PyObject *MovieObj_New(Movie);
|
||||
@@ -146,6 +147,7 @@
|
||||
extern int UserDataObj_Convert(PyObject *, UserData *);
|
||||
extern PyObject *MediaObj_New(Media);
|
||||
extern int MediaObj_Convert(PyObject *, Media *);
|
||||
+*/
|
||||
|
||||
/* Res exports */
|
||||
extern PyObject *ResObj_New(Handle);
|
||||
@@ -1,2 +0,0 @@
|
||||
g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
|
||||
w
|
||||
@@ -1,12 +0,0 @@
|
||||
bin/python2.4
|
||||
bin/pythonw2.4
|
||||
-
|
||||
bin/idle2.4
|
||||
bin/pydoc2.4
|
||||
bin/smtpd2.4.py
|
||||
-
|
||||
share/man/man1/python2.4.1.gz
|
||||
${frameworks_dir}/Python.framework/Versions/2.4
|
||||
${frameworks_dir}/Python.framework/Versions/2.4/Headers
|
||||
${frameworks_dir}/Python.framework/Versions/2.4/Resources
|
||||
${frameworks_dir}/Python.framework/Versions/2.4/Python
|
||||
@@ -1,18 +0,0 @@
|
||||
--- Lib/cgi.py.orig 2006-08-11 09:14:38.000000000 +0200
|
||||
+++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200
|
||||
@@ -1,13 +1,6 @@
|
||||
-#! /usr/local/bin/python
|
||||
+#! __PREFIX__/bin/python2.4
|
||||
|
||||
-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
|
||||
-# intentionally NOT "/usr/bin/env python". On many systems
|
||||
-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
|
||||
-# scripts, and /usr/local/bin is the default directory where Python is
|
||||
-# installed, so /usr/bin/env would be unable to find python. Granted,
|
||||
-# binary installations by Linux vendors often install Python in
|
||||
-# /usr/bin. So let those vendors patch cgi.py to match their choice
|
||||
-# of installation.
|
||||
+# NOTE: /usr/local/bin/python patched for MacPorts installation
|
||||
|
||||
"""Support module for CGI (Common Gateway Interface) scripts.
|
||||
|
||||
@@ -1,10 +0,0 @@
|
||||
--- Lib/site.py Tue Jul 20 04:28:28 2004
|
||||
+++ Lib/site.py.new Mon Apr 4 10:47:12 2005
|
||||
@@ -186,6 +186,7 @@
|
||||
else:
|
||||
sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
|
||||
if sys.platform == 'darwin':
|
||||
+ sitedirs.append( os.path.join('__PREFIX__', 'lib', 'python2.4', 'site-packages') )
|
||||
# for framework builds *only* we add the standard Apple
|
||||
# locations. Currently only per-user, but /Library and
|
||||
# /Network/Library could be added too
|
||||
@@ -1,46 +0,0 @@
|
||||
--- setup.py.orig 2006-10-08 11:41:25.000000000 -0600
|
||||
+++ setup.py 2008-11-19 22:13:50.000000000 -0700
|
||||
@@ -15,7 +15,7 @@
|
||||
from distutils.command.install_lib import install_lib
|
||||
|
||||
# This global variable is used to hold the list of modules to be disabled.
|
||||
-disabled_module_list = []
|
||||
+disabled_module_list = ["readline"]
|
||||
|
||||
def add_dir_to_list(dirlist, dir):
|
||||
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
||||
@@ -246,11 +246,11 @@
|
||||
# Add paths to popular package managers on OS X/darwin
|
||||
if sys.platform == "darwin":
|
||||
# Fink installs into /sw by default
|
||||
- add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
|
||||
- add_dir_to_list(self.compiler.include_dirs, '/sw/include')
|
||||
+ #add_dir_to_list(self.compiler.library_dirs, '/sw/lib')
|
||||
+ #add_dir_to_list(self.compiler.include_dirs, '/sw/include')
|
||||
# DarwinPorts installs into /opt/local by default
|
||||
- #add_dir_to_list(self.compiler.library_dirs, '/opt/local/lib')
|
||||
- #add_dir_to_list(self.compiler.include_dirs, '/opt/local/include')
|
||||
+ add_dir_to_list(self.compiler.library_dirs, '__PREFIX__/lib')
|
||||
+ add_dir_to_list(self.compiler.include_dirs, '__PREFIX__/include')
|
||||
|
||||
if os.path.normpath(sys.prefix) != '/usr':
|
||||
add_dir_to_list(self.compiler.library_dirs,
|
||||
@@ -357,7 +357,7 @@
|
||||
exts.append( Extension('unicodedata', ['unicodedata.c']) )
|
||||
# access to ISO C locale support
|
||||
data = open('pyconfig.h').read()
|
||||
- m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
|
||||
+ m = re.search(r"#\s*define\s+(HAVE_LIBINTL_H|WITH_LIBINTL)\s+1\s*", data)
|
||||
if m is not None:
|
||||
locale_libs = ['intl']
|
||||
else:
|
||||
@@ -954,7 +954,8 @@
|
||||
self.extensions.extend(exts)
|
||||
|
||||
# Call the method for detecting whether _tkinter can be compiled
|
||||
- self.detect_tkinter(inc_dirs, lib_dirs)
|
||||
+ if ("--disable-tk" not in sysconfig.get_config_var("CONFIG_ARGS")):
|
||||
+ self.detect_tkinter(inc_dirs, lib_dirs)
|
||||
|
||||
def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
|
||||
# The _tkinter module, using frameworks. Since frameworks are quite
|
||||
@@ -1,2 +0,0 @@
|
||||
g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
|
||||
w
|
||||
@@ -1,12 +0,0 @@
|
||||
bin/python2.4
|
||||
bin/pythonw2.4
|
||||
-
|
||||
bin/idle2.4
|
||||
bin/pydoc2.4
|
||||
bin/smtpd2.4.py
|
||||
-
|
||||
share/man/man1/python2.4.1.gz
|
||||
${frameworks_dir}/Python.framework/Versions/2.4
|
||||
${frameworks_dir}/Python.framework/Versions/2.4/Headers
|
||||
${frameworks_dir}/Python.framework/Versions/2.4/Resources
|
||||
${frameworks_dir}/Python.framework/Versions/2.4/Python
|
||||
@@ -0,0 +1,19 @@
|
||||
*** Mac/Modules/gestaltmodule.c 2010-11-21 15:35:00.000000000 +0900
|
||||
--- Mac/Modules/gestaltmodule.c.new 2010-11-21 15:48:27.000000000 +0900
|
||||
***************
|
||||
*** 34,40 ****
|
||||
{
|
||||
OSErr iErr;
|
||||
OSType selector;
|
||||
! long response;
|
||||
if (!PyArg_Parse(args, "O&", PyMac_GetOSType, &selector))
|
||||
return NULL;
|
||||
iErr = Gestalt ( selector, &response );
|
||||
--- 34,40 ----
|
||||
{
|
||||
OSErr iErr;
|
||||
OSType selector;
|
||||
! SInt32 response;
|
||||
if (!PyArg_Parse(args, "O&", PyMac_GetOSType, &selector))
|
||||
return NULL;
|
||||
iErr = Gestalt ( selector, &response );
|
||||
@@ -1,11 +0,0 @@
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 62
|
||||
/repository/macports/!svn/ver/69520/trunk/dports/lang/python25
|
||||
END
|
||||
Portfile
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 71
|
||||
/repository/macports/!svn/ver/69520/trunk/dports/lang/python25/Portfile
|
||||
END
|
||||
@@ -1,65 +0,0 @@
|
||||
10
|
||||
|
||||
dir
|
||||
73426
|
||||
http://svn.macports.org/repository/macports/trunk/dports/lang/python25
|
||||
http://svn.macports.org/repository/macports
|
||||
|
||||
|
||||
|
||||
2010-07-08T20:19:52.476265Z
|
||||
69520
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
d073be05-634f-4543-b044-5fe20cf6d1d6
|
||||
|
||||
files
|
||||
dir
|
||||
|
||||
Portfile
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
ca4390c343e6a0ff2dff18fd4e3cc961
|
||||
2010-07-08T20:19:52.476265Z
|
||||
69520
|
||||
jmr@macports.org
|
||||
has-props
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
7650
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
K 13
|
||||
svn:eol-style
|
||||
V 6
|
||||
native
|
||||
K 12
|
||||
svn:keywords
|
||||
V 2
|
||||
Id
|
||||
END
|
||||
@@ -1,194 +0,0 @@
|
||||
# $Id$
|
||||
|
||||
PortSystem 1.0
|
||||
PortGroup select 1.0
|
||||
|
||||
name python25
|
||||
version 2.5.5
|
||||
revision 1
|
||||
|
||||
set branch [join [lrange [split ${version} .] 0 1] .]
|
||||
categories lang
|
||||
platforms darwin
|
||||
maintainers jwa openmaintainer
|
||||
|
||||
description An interpreted, object-oriented programming language
|
||||
long_description Python is an interpreted, interactive, object-oriented \
|
||||
programming language.
|
||||
|
||||
homepage http://www.python.org/
|
||||
master_sites http://ftp.python.org/ftp/python/${version}/
|
||||
|
||||
distname Python-${version}
|
||||
use_bzip2 yes
|
||||
|
||||
checksums md5 1d00e2fb19418e486c30b850df625aa3 \
|
||||
sha1 dcf1abd94a1ab4155dcd3668cca42c5bfc81159f \
|
||||
rmd160 4754238d415142466778560d989582464385654c
|
||||
|
||||
# patch-Lib-distutils-dist.py.diff comes from
|
||||
# <http://bugs.python.org/issue1180>
|
||||
patchfiles patch-Makefile.pre.in.diff \
|
||||
patch-Lib-cgi.py.diff \
|
||||
patch-Lib-distutils-dist.py.diff \
|
||||
patch-setup.py.diff \
|
||||
patch-configure-badcflags.diff \
|
||||
patch-configure-arch_only.diff \
|
||||
patch-64bit.diff
|
||||
|
||||
depends_lib port:gettext port:zlib port:openssl port:tk \
|
||||
port:sqlite3 port:db46 port:bzip2 \
|
||||
port:gdbm port:readline port:ncurses
|
||||
|
||||
configure.args --enable-shared \
|
||||
--enable-framework=${frameworks_dir} \
|
||||
--mandir=${prefix}/share/man \
|
||||
--enable-ipv6 \
|
||||
--with-cxx=${configure.cxx}
|
||||
|
||||
configure.cppflags-append -I${prefix}/include/ncurses
|
||||
|
||||
post-patch {
|
||||
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \
|
||||
${worksrcpath}/setup.py
|
||||
reinplace "s|/Applications/MacPython|${applications_dir}/MacPython|g" \
|
||||
${worksrcpath}/Mac/Makefile.in \
|
||||
${worksrcpath}/Mac/IDLE/Makefile.in \
|
||||
${worksrcpath}/Mac/Tools/Doc/setup.py \
|
||||
${worksrcpath}/Mac/PythonLauncher/Makefile.in \
|
||||
${worksrcpath}/Mac/BuildScript/build-installer.py
|
||||
reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
|
||||
${worksrcpath}/Mac/PythonLauncher/Makefile.in
|
||||
}
|
||||
|
||||
build.target all
|
||||
|
||||
# TODO: From python24, do we still need this?
|
||||
# Workaround for case-sensitive file systems
|
||||
post-build {
|
||||
if { ![file exists ${worksrcpath}/python.exe] } {
|
||||
ln -s python ${worksrcpath}/python.exe
|
||||
}
|
||||
}
|
||||
|
||||
test.run yes
|
||||
test.target test
|
||||
|
||||
destroot.target frameworkinstall maninstall
|
||||
|
||||
# ensure that correct compiler is used
|
||||
build.args-append MAKE="${build.cmd}" CC="${configure.cc}"
|
||||
destroot.args-append MAKE="${destroot.cmd}" CC="${configure.cc}"
|
||||
|
||||
select.group python
|
||||
select.file ${filespath}/python[string map {. {}} ${branch}]
|
||||
|
||||
platform macosx {
|
||||
post-destroot {
|
||||
|
||||
set framewpath ${frameworks_dir}/Python.framework
|
||||
set framewdir ${framewpath}/Versions/${branch}
|
||||
|
||||
# Without this, LINKFORSHARED is set to
|
||||
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
|
||||
# (this becomes Python.framework/Versions/2.5/Python) which doesn't
|
||||
# quite work (see ticket #15099); instead specifically list the
|
||||
# full path to the proper Python framework file (which becomes
|
||||
# ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/Python)
|
||||
reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile
|
||||
|
||||
foreach dir { lib include } {
|
||||
file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir}
|
||||
ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
|
||||
}
|
||||
ln -s ${prefix}/share ${destroot}${framewdir}/share
|
||||
|
||||
ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py python${branch}-config] {
|
||||
file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
|
||||
ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
|
||||
}
|
||||
|
||||
foreach dir { Headers Resources Python Versions/Current } {
|
||||
file delete ${destroot}${framewpath}/${dir}
|
||||
}
|
||||
|
||||
# Fix incorrectly-pointed libpython2.5.a symlink, see
|
||||
# http://trac.macports.org/ticket/19906
|
||||
set python_staticlink ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
|
||||
file delete ${python_staticlink}
|
||||
ln -s ${framewdir}/Python ${python_staticlink}
|
||||
}
|
||||
}
|
||||
|
||||
post-activate {
|
||||
ui_msg "\nTo fully complete your installation and make python $branch the default, please run
|
||||
\n\tsudo port install python_select \
|
||||
\n\tsudo python_select $name\n"
|
||||
}
|
||||
|
||||
platform darwin {
|
||||
post-configure {
|
||||
# See http://trac.macports.org/ticket/18376
|
||||
system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed"
|
||||
}
|
||||
}
|
||||
|
||||
platform darwin 8 {
|
||||
patchfiles-append patch-FSIORefNum.diff
|
||||
}
|
||||
|
||||
platform darwin 9 {
|
||||
configure.cppflags-append -D__DARWIN_UNIX03
|
||||
}
|
||||
|
||||
platform darwin 10 {
|
||||
configure.cppflags-append -D_DARWIN_C_SOURCE
|
||||
patchfiles-append patch-pyconfig.h.in.diff
|
||||
}
|
||||
|
||||
platform puredarwin {
|
||||
patchfiles-append patch-Modules-posixmodule.c.diff
|
||||
configure.args-delete --enable-framework=${frameworks_dir}
|
||||
configure.args-append --disable-toolbox-glue --disable-framework
|
||||
destroot.target install maninstall
|
||||
|
||||
post-build {
|
||||
# thin dynamic library to have the same arch as static lib, even after -lSystemStubs
|
||||
system "lipo ${worksrcpath}/libpython${branch}.dylib -output ${worksrcpath}/libpython${branch}.dylib -thin `lipo -info ${worksrcpath}/libpython${branch}.a | tail -n 1 | sed -e 's/.*architecture: \\(.*\\)/\\1/'`"
|
||||
}
|
||||
|
||||
post-destroot {
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# install select file for python_select
|
||||
xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
|
||||
xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
|
||||
}
|
||||
}
|
||||
|
||||
configure.universal_archs i386 ppc
|
||||
|
||||
variant universal {
|
||||
if {${configure.sdkroot} == ""} {
|
||||
configure.args-append --enable-universalsdk=/
|
||||
} else {
|
||||
configure.args-append --enable-universalsdk=${configure.sdkroot}
|
||||
}
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
livecheck.url ${homepage}download/releases/
|
||||
livecheck.regex Python (${branch}.\[0-9\]+)
|
||||
@@ -1,194 +0,0 @@
|
||||
# $Id: Portfile 69520 2010-07-08 20:19:52Z jmr@macports.org $
|
||||
|
||||
PortSystem 1.0
|
||||
PortGroup select 1.0
|
||||
|
||||
name python25
|
||||
version 2.5.5
|
||||
revision 1
|
||||
|
||||
set branch [join [lrange [split ${version} .] 0 1] .]
|
||||
categories lang
|
||||
platforms darwin
|
||||
maintainers jwa openmaintainer
|
||||
|
||||
description An interpreted, object-oriented programming language
|
||||
long_description Python is an interpreted, interactive, object-oriented \
|
||||
programming language.
|
||||
|
||||
homepage http://www.python.org/
|
||||
master_sites http://ftp.python.org/ftp/python/${version}/
|
||||
|
||||
distname Python-${version}
|
||||
use_bzip2 yes
|
||||
|
||||
checksums md5 1d00e2fb19418e486c30b850df625aa3 \
|
||||
sha1 dcf1abd94a1ab4155dcd3668cca42c5bfc81159f \
|
||||
rmd160 4754238d415142466778560d989582464385654c
|
||||
|
||||
# patch-Lib-distutils-dist.py.diff comes from
|
||||
# <http://bugs.python.org/issue1180>
|
||||
patchfiles patch-Makefile.pre.in.diff \
|
||||
patch-Lib-cgi.py.diff \
|
||||
patch-Lib-distutils-dist.py.diff \
|
||||
patch-setup.py.diff \
|
||||
patch-configure-badcflags.diff \
|
||||
patch-configure-arch_only.diff \
|
||||
patch-64bit.diff
|
||||
|
||||
depends_lib port:gettext port:zlib port:openssl port:tk \
|
||||
port:sqlite3 port:db46 port:bzip2 \
|
||||
port:gdbm port:readline port:ncurses
|
||||
|
||||
configure.args --enable-shared \
|
||||
--enable-framework=${frameworks_dir} \
|
||||
--mandir=${prefix}/share/man \
|
||||
--enable-ipv6 \
|
||||
--with-cxx=${configure.cxx}
|
||||
|
||||
configure.cppflags-append -I${prefix}/include/ncurses
|
||||
|
||||
post-patch {
|
||||
reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/Lib/cgi.py \
|
||||
${worksrcpath}/setup.py
|
||||
reinplace "s|/Applications/MacPython|${applications_dir}/MacPython|g" \
|
||||
${worksrcpath}/Mac/Makefile.in \
|
||||
${worksrcpath}/Mac/IDLE/Makefile.in \
|
||||
${worksrcpath}/Mac/Tools/Doc/setup.py \
|
||||
${worksrcpath}/Mac/PythonLauncher/Makefile.in \
|
||||
${worksrcpath}/Mac/BuildScript/build-installer.py
|
||||
reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
|
||||
${worksrcpath}/Mac/PythonLauncher/Makefile.in
|
||||
}
|
||||
|
||||
build.target all
|
||||
|
||||
# TODO: From python24, do we still need this?
|
||||
# Workaround for case-sensitive file systems
|
||||
post-build {
|
||||
if { ![file exists ${worksrcpath}/python.exe] } {
|
||||
ln -s python ${worksrcpath}/python.exe
|
||||
}
|
||||
}
|
||||
|
||||
test.run yes
|
||||
test.target test
|
||||
|
||||
destroot.target frameworkinstall maninstall
|
||||
|
||||
# ensure that correct compiler is used
|
||||
build.args-append MAKE="${build.cmd}" CC="${configure.cc}"
|
||||
destroot.args-append MAKE="${destroot.cmd}" CC="${configure.cc}"
|
||||
|
||||
select.group python
|
||||
select.file ${filespath}/python[string map {. {}} ${branch}]
|
||||
|
||||
platform macosx {
|
||||
post-destroot {
|
||||
|
||||
set framewpath ${frameworks_dir}/Python.framework
|
||||
set framewdir ${framewpath}/Versions/${branch}
|
||||
|
||||
# Without this, LINKFORSHARED is set to
|
||||
# ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
|
||||
# (this becomes Python.framework/Versions/2.5/Python) which doesn't
|
||||
# quite work (see ticket #15099); instead specifically list the
|
||||
# full path to the proper Python framework file (which becomes
|
||||
# ${prefix}/Library/Frameworks/Python.framework/Versions/2.5/Python)
|
||||
reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile
|
||||
|
||||
foreach dir { lib include } {
|
||||
file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir}
|
||||
ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
|
||||
}
|
||||
ln -s ${prefix}/share ${destroot}${framewdir}/share
|
||||
|
||||
ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py python${branch}-config] {
|
||||
file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
|
||||
ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
|
||||
}
|
||||
|
||||
foreach dir { Headers Resources Python Versions/Current } {
|
||||
file delete ${destroot}${framewpath}/${dir}
|
||||
}
|
||||
|
||||
# Fix incorrectly-pointed libpython2.5.a symlink, see
|
||||
# http://trac.macports.org/ticket/19906
|
||||
set python_staticlink ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
|
||||
file delete ${python_staticlink}
|
||||
ln -s ${framewdir}/Python ${python_staticlink}
|
||||
}
|
||||
}
|
||||
|
||||
post-activate {
|
||||
ui_msg "\nTo fully complete your installation and make python $branch the default, please run
|
||||
\n\tsudo port install python_select \
|
||||
\n\tsudo python_select $name\n"
|
||||
}
|
||||
|
||||
platform darwin {
|
||||
post-configure {
|
||||
# See http://trac.macports.org/ticket/18376
|
||||
system "cd ${worksrcpath} && ed - pyconfig.h < ${filespath}/pyconfig.ed"
|
||||
}
|
||||
}
|
||||
|
||||
platform darwin 8 {
|
||||
patchfiles-append patch-FSIORefNum.diff
|
||||
}
|
||||
|
||||
platform darwin 9 {
|
||||
configure.cppflags-append -D__DARWIN_UNIX03
|
||||
}
|
||||
|
||||
platform darwin 10 {
|
||||
configure.cppflags-append -D_DARWIN_C_SOURCE
|
||||
patchfiles-append patch-pyconfig.h.in.diff
|
||||
}
|
||||
|
||||
platform puredarwin {
|
||||
patchfiles-append patch-Modules-posixmodule.c.diff
|
||||
configure.args-delete --enable-framework=${frameworks_dir}
|
||||
configure.args-append --disable-toolbox-glue --disable-framework
|
||||
destroot.target install maninstall
|
||||
|
||||
post-build {
|
||||
# thin dynamic library to have the same arch as static lib, even after -lSystemStubs
|
||||
system "lipo ${worksrcpath}/libpython${branch}.dylib -output ${worksrcpath}/libpython${branch}.dylib -thin `lipo -info ${worksrcpath}/libpython${branch}.a | tail -n 1 | sed -e 's/.*architecture: \\(.*\\)/\\1/'`"
|
||||
}
|
||||
|
||||
post-destroot {
|
||||
# delete symlinks without version suffix, use python_select instead to choose version
|
||||
foreach bin { python pythonw idle pydoc smtpd.py python-config } {
|
||||
file delete ${destroot}${prefix}/bin/${bin}
|
||||
}
|
||||
|
||||
file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
|
||||
|
||||
# install select file for python_select
|
||||
xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
|
||||
xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
|
||||
}
|
||||
}
|
||||
|
||||
configure.universal_archs i386 ppc
|
||||
|
||||
variant universal {
|
||||
if {${configure.sdkroot} == ""} {
|
||||
configure.args-append --enable-universalsdk=/
|
||||
} else {
|
||||
configure.args-append --enable-universalsdk=${configure.sdkroot}
|
||||
}
|
||||
}
|
||||
|
||||
livecheck.type regex
|
||||
livecheck.url ${homepage}download/releases/
|
||||
livecheck.regex Python (${branch}.\[0-9\]+)
|
||||
@@ -1,89 +0,0 @@
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 68
|
||||
/repository/macports/!svn/ver/60380/trunk/dports/lang/python25/files
|
||||
END
|
||||
patch-Misc-setuid-prog.c.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 98
|
||||
/repository/macports/!svn/ver/34379/trunk/dports/lang/python25/files/patch-Misc-setuid-prog.c.diff
|
||||
END
|
||||
patch-FSIORefNum.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 90
|
||||
/repository/macports/!svn/ver/57516/trunk/dports/lang/python25/files/patch-FSIORefNum.diff
|
||||
END
|
||||
patch-Lib-cgi.py.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 90
|
||||
/repository/macports/!svn/ver/34379/trunk/dports/lang/python25/files/patch-Lib-cgi.py.diff
|
||||
END
|
||||
patch-configure-arch_only.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 99
|
||||
/repository/macports/!svn/ver/52864/trunk/dports/lang/python25/files/patch-configure-arch_only.diff
|
||||
END
|
||||
patch-Modules-posixmodule.c.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 101
|
||||
/repository/macports/!svn/ver/34379/trunk/dports/lang/python25/files/patch-Modules-posixmodule.c.diff
|
||||
END
|
||||
patch-Lib-distutils-dist.py.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 101
|
||||
/repository/macports/!svn/ver/42997/trunk/dports/lang/python25/files/patch-Lib-distutils-dist.py.diff
|
||||
END
|
||||
patch-configure.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 89
|
||||
/repository/macports/!svn/ver/34379/trunk/dports/lang/python25/files/patch-configure.diff
|
||||
END
|
||||
pyconfig.ed
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 80
|
||||
/repository/macports/!svn/ver/60380/trunk/dports/lang/python25/files/pyconfig.ed
|
||||
END
|
||||
python25
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 77
|
||||
/repository/macports/!svn/ver/50424/trunk/dports/lang/python25/files/python25
|
||||
END
|
||||
patch-configure-badcflags.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 99
|
||||
/repository/macports/!svn/ver/40837/trunk/dports/lang/python25/files/patch-configure-badcflags.diff
|
||||
END
|
||||
patch-Makefile.pre.in.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 95
|
||||
/repository/macports/!svn/ver/43000/trunk/dports/lang/python25/files/patch-Makefile.pre.in.diff
|
||||
END
|
||||
patch-setup.py.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 88
|
||||
/repository/macports/!svn/ver/57388/trunk/dports/lang/python25/files/patch-setup.py.diff
|
||||
END
|
||||
patch-64bit.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 85
|
||||
/repository/macports/!svn/ver/57388/trunk/dports/lang/python25/files/patch-64bit.diff
|
||||
END
|
||||
patch-pyconfig.h.in.diff
|
||||
K 25
|
||||
svn:wc:ra_dav:version-url
|
||||
V 93
|
||||
/repository/macports/!svn/ver/55669/trunk/dports/lang/python25/files/patch-pyconfig.h.in.diff
|
||||
END
|
||||
@@ -1,504 +0,0 @@
|
||||
10
|
||||
|
||||
dir
|
||||
73426
|
||||
http://svn.macports.org/repository/macports/trunk/dports/lang/python25/files
|
||||
http://svn.macports.org/repository/macports
|
||||
|
||||
|
||||
|
||||
2009-11-10T14:40:06.347802Z
|
||||
60380
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
d073be05-634f-4543-b044-5fe20cf6d1d6
|
||||
|
||||
patch-Misc-setuid-prog.c.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
2bc1e6606dde7390fd8240b131bdf4ec
|
||||
2008-02-22T23:26:05.539782Z
|
||||
34379
|
||||
mww@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
410
|
||||
|
||||
patch-FSIORefNum.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
8084ec041a99e7cb661772f009df15a7
|
||||
2009-09-12T06:14:57.000179Z
|
||||
57516
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
399
|
||||
|
||||
patch-Lib-cgi.py.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
82a8c9d18f4280a8bbb8a6cbf5868a8a
|
||||
2008-02-22T23:26:05.539782Z
|
||||
34379
|
||||
mww@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
808
|
||||
|
||||
patch-configure-arch_only.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
14c3bb850c180ab737a46d59bc82d6a0
|
||||
2009-06-24T22:01:14.810769Z
|
||||
52864
|
||||
landonf@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
941
|
||||
|
||||
patch-Modules-posixmodule.c.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
10bf449d661c9721211c94b5c3acd7fb
|
||||
2008-02-22T23:26:05.539782Z
|
||||
34379
|
||||
mww@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
571
|
||||
|
||||
patch-Lib-distutils-dist.py.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
92eea653ba7debcbfd848b3e95fa664e
|
||||
2008-12-03T05:16:31.085444Z
|
||||
42997
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
2050
|
||||
|
||||
patch-configure.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
758a0b524c7089e1367b9304628b7f33
|
||||
2008-02-22T23:26:05.539782Z
|
||||
34379
|
||||
mww@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
956
|
||||
|
||||
pyconfig.ed
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
674a4842ff1491cf7669c37d9b0b95bc
|
||||
2009-11-10T14:40:06.347802Z
|
||||
60380
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
49
|
||||
|
||||
python25
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
00706fcdb40c3ab1242bd33ffcaecf00
|
||||
2009-04-30T21:04:30.747761Z
|
||||
50424
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
340
|
||||
|
||||
patch-configure-badcflags.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
0270e74fe78847844dbd13831777d22c
|
||||
2008-10-16T01:47:43.712585Z
|
||||
40837
|
||||
toby@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
460
|
||||
|
||||
patch-Makefile.pre.in.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
715099f836a2265992b3b1842f05d2a2
|
||||
2008-12-03T06:04:11.934031Z
|
||||
43000
|
||||
blb@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1449
|
||||
|
||||
patch-setup.py.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
36831c5d2729aee54fe424ba32776ace
|
||||
2009-09-10T13:23:37.201201Z
|
||||
57388
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
3814
|
||||
|
||||
patch-64bit.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
5f7cfee7ab539a15e7997224f51e8b97
|
||||
2009-09-10T13:23:37.201201Z
|
||||
57388
|
||||
jmr@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
37004
|
||||
|
||||
patch-pyconfig.h.in.diff
|
||||
file
|
||||
|
||||
|
||||
|
||||
|
||||
2010-11-13T11:26:29.000000Z
|
||||
df5999ec974fbe1a2716a63c882b4639
|
||||
2009-08-16T18:17:13.357907Z
|
||||
55669
|
||||
landonf@macports.org
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
396
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
-11
@@ -1,11 +0,0 @@
|
||||
--- Mac/Modules/file/_Filemodule.c.orig 2009-09-12 15:55:59.000000000 +1000
|
||||
+++ Mac/Modules/file/_Filemodule.c 2009-09-12 16:12:07.000000000 +1000
|
||||
@@ -7,6 +7,8 @@
|
||||
|
||||
#include "pymactoolbox.h"
|
||||
|
||||
+typedef SInt16 FSIORefNum;
|
||||
+
|
||||
/* Macro to test whether a weak-loaded CFM function exists */
|
||||
#define PyMac_PRECHECK(rtn) do { if ( &rtn == NULL ) {\
|
||||
PyErr_SetString(PyExc_NotImplementedError, \
|
||||
-18
@@ -1,18 +0,0 @@
|
||||
--- Lib/cgi.py.orig 2006-08-10 19:41:07.000000000 +0200
|
||||
+++ Lib/cgi.py 2007-08-21 15:36:54.000000000 +0200
|
||||
@@ -1,13 +1,6 @@
|
||||
-#! /usr/local/bin/python
|
||||
+#! __PREFIX__/bin/python2.5
|
||||
|
||||
-# NOTE: the above "/usr/local/bin/python" is NOT a mistake. It is
|
||||
-# intentionally NOT "/usr/bin/env python". On many systems
|
||||
-# (e.g. Solaris), /usr/local/bin is not in $PATH as passed to CGI
|
||||
-# scripts, and /usr/local/bin is the default directory where Python is
|
||||
-# installed, so /usr/bin/env would be unable to find python. Granted,
|
||||
-# binary installations by Linux vendors often install Python in
|
||||
-# /usr/bin. So let those vendors patch cgi.py to match their choice
|
||||
-# of installation.
|
||||
+# NOTE: /usr/local/bin/python patched for MacPorts installation
|
||||
|
||||
"""Support module for CGI (Common Gateway Interface) scripts.
|
||||
|
||||
-51
@@ -1,51 +0,0 @@
|
||||
--- Lib/distutils/dist.py.orig 2005-03-23 11:54:36.000000000 -0700
|
||||
+++ Lib/distutils/dist.py 2008-07-25 21:27:15.000000000 -0600
|
||||
@@ -57,6 +57,7 @@
|
||||
('quiet', 'q', "run quietly (turns verbosity off)"),
|
||||
('dry-run', 'n', "don't actually do anything"),
|
||||
('help', 'h', "show detailed help message"),
|
||||
+ ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'),
|
||||
]
|
||||
|
||||
# 'common_usage' is a short (2-3 line) string describing the common
|
||||
@@ -264,6 +265,12 @@
|
||||
else:
|
||||
sys.stderr.write(msg + "\n")
|
||||
|
||||
+ # no-user-cfg is handled before other command line args
|
||||
+ # because other args override the config files, and this
|
||||
+ # one is needed before we can load the config files.
|
||||
+ # If attrs['script_args'] wasn't passed, assume false.
|
||||
+ self.want_user_cfg = '--no-user-cfg' not in (self.script_args or [])
|
||||
+
|
||||
self.finalize_options()
|
||||
|
||||
# __init__ ()
|
||||
@@ -324,6 +331,9 @@
|
||||
Distutils __inst__.py file lives), a file in the user's home
|
||||
directory named .pydistutils.cfg on Unix and pydistutils.cfg
|
||||
on Windows/Mac, and setup.cfg in the current directory.
|
||||
+
|
||||
+ The file in the user's home directory can be disabled with the
|
||||
+ --no-user-cfg option.
|
||||
"""
|
||||
files = []
|
||||
check_environ()
|
||||
@@ -343,7 +353,7 @@
|
||||
user_filename = "pydistutils.cfg"
|
||||
|
||||
# And look for the user config file
|
||||
- if os.environ.has_key('HOME'):
|
||||
+ if self.want_user_cfg and os.environ.has_key('HOME'):
|
||||
user_file = os.path.join(os.environ.get('HOME'), user_filename)
|
||||
if os.path.isfile(user_file):
|
||||
files.append(user_file)
|
||||
@@ -353,6 +363,8 @@
|
||||
if os.path.isfile(local_file):
|
||||
files.append(local_file)
|
||||
|
||||
+ if DEBUG:
|
||||
+ print "using config files: %s" % ', '.join(files)
|
||||
return files
|
||||
|
||||
# find_config_files ()
|
||||
-31
@@ -1,31 +0,0 @@
|
||||
--- Makefile.pre.in.orig 2007-12-05 13:43:57.000000000 -0700
|
||||
+++ Makefile.pre.in 2008-07-25 21:41:02.000000000 -0600
|
||||
@@ -348,8 +348,8 @@
|
||||
# Build the shared modules
|
||||
sharedmods: $(BUILDPYTHON)
|
||||
case $$MAKEFLAGS in \
|
||||
- *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
|
||||
- *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
|
||||
+ *-s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q --no-user-cfg build;; \
|
||||
+ *) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg build;; \
|
||||
esac
|
||||
|
||||
# Build static library
|
||||
@@ -894,7 +904,7 @@
|
||||
# Install the dynamically loadable modules
|
||||
# This goes into $(exec_prefix)
|
||||
sharedinstall:
|
||||
- $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \
|
||||
+ $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py --no-user-cfg install \
|
||||
--prefix=$(prefix) \
|
||||
--install-scripts=$(BINDIR) \
|
||||
--install-platlib=$(DESTSHARED) \
|
||||
@@ -968,7 +978,7 @@
|
||||
# This installs a few of the useful scripts in Tools/scripts
|
||||
scriptsinstall:
|
||||
SRCDIR=$(srcdir) $(RUNSHARED) \
|
||||
- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \
|
||||
+ ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py --no-user-cfg install \
|
||||
--prefix=$(prefix) \
|
||||
--install-scripts=$(BINDIR) \
|
||||
--root=/$(DESTDIR)
|
||||
-16
@@ -1,16 +0,0 @@
|
||||
--- Misc/setuid-prog.c.orig Sat Dec 11 14:29:22 2004
|
||||
+++ Misc/setuid-prog.c Sat Dec 11 14:30:13 2004
|
||||
@@ -70,6 +70,12 @@
|
||||
#define environ _environ
|
||||
#endif
|
||||
|
||||
+#if defined(__APPLE__)
|
||||
+#include <sys/time.h>
|
||||
+#include <crt_externs.h>
|
||||
+#define environ (*_NSGetEnviron())
|
||||
+#endif
|
||||
+
|
||||
/* don't change def_IFS */
|
||||
char def_IFS[] = "IFS= \t\n";
|
||||
/* you may want to change def_PATH, but you should really change it in */
|
||||
|
||||
-21
@@ -1,21 +0,0 @@
|
||||
--- Modules/posixmodule.c.orig Sat Dec 11 14:27:52 2004
|
||||
+++ Modules/posixmodule.c Sat Dec 11 14:28:17 2004
|
||||
@@ -339,7 +339,7 @@
|
||||
#endif
|
||||
|
||||
/* Return a dictionary corresponding to the POSIX environment table */
|
||||
-#ifdef WITH_NEXT_FRAMEWORK
|
||||
+#ifdef __APPLE__
|
||||
/* On Darwin/MacOSX a shared library or framework has no access to
|
||||
** environ directly, we must obtain it with _NSGetEnviron().
|
||||
*/
|
||||
@@ -357,7 +357,7 @@
|
||||
d = PyDict_New();
|
||||
if (d == NULL)
|
||||
return NULL;
|
||||
-#ifdef WITH_NEXT_FRAMEWORK
|
||||
+#ifdef __APPLE__
|
||||
if (environ == NULL)
|
||||
environ = *_NSGetEnviron();
|
||||
#endif
|
||||
|
||||
-20
@@ -1,20 +0,0 @@
|
||||
--- configure.orig 2009-06-24 13:57:38.000000000 -0700
|
||||
+++ configure 2009-06-24 13:58:38.000000000 -0700
|
||||
@@ -11362,7 +11362,7 @@
|
||||
if test "${enable_universalsdk}"; then
|
||||
:
|
||||
else
|
||||
- LIBTOOL_CRUFT="${LIBTOOL_CRUFT} -arch_only `arch`"
|
||||
+ LIBTOOL_CRUFT="${LIBTOOL_CRUFT}"
|
||||
fi
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||
@@ -11374,7 +11374,7 @@
|
||||
else
|
||||
LIBTOOL_CRUFT=""
|
||||
fi
|
||||
- LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only `arch`"
|
||||
+ LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs"
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
|
||||
LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
|
||||
esac
|
||||
-11
@@ -1,11 +0,0 @@
|
||||
--- configure.orig 2008-10-15 18:00:59.000000000 -0700
|
||||
+++ configure 2008-10-15 18:02:47.000000000 -0700
|
||||
@@ -4538,7 +4538,7 @@
|
||||
;;
|
||||
# is there any other compiler on Darwin besides gcc?
|
||||
Darwin*)
|
||||
- BASECFLAGS="$BASECFLAGS -Wno-long-double -no-cpp-precomp -mno-fused-madd"
|
||||
+ BASECFLAGS="$BASECFLAGS -mno-fused-madd"
|
||||
if test "${enable_universalsdk}"; then
|
||||
BASECFLAGS="-arch ppc -arch i386 -isysroot ${UNIVERSALSDK} ${BASECFLAGS}"
|
||||
fi
|
||||
@@ -1,28 +0,0 @@
|
||||
--- configure.in.orig 2007-09-28 21:07:32.000000000 +0200
|
||||
+++ configure.in 2007-09-28 21:08:12.000000000 +0200
|
||||
@@ -669,6 +669,11 @@
|
||||
BLDLIBRARY='-L. -lpython$(VERSION)'
|
||||
RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
|
||||
;;
|
||||
+ Darwin*)
|
||||
+ LDLIBRARY='libpython$(VERSION).dylib'
|
||||
+ BLDLIBRARY='-L. -lpython$(VERSION)'
|
||||
+ RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
|
||||
+ ;;
|
||||
esac
|
||||
else # shared is disabled
|
||||
case $ac_sys_system in
|
||||
--- configure.orig 2007-09-28 21:07:26.000000000 +0200
|
||||
+++ configure 2007-09-28 21:07:33.000000000 +0200
|
||||
@@ -3445,6 +3445,11 @@
|
||||
BLDLIBRARY='-L. -lpython$(VERSION)'
|
||||
RUNSHARED=DLL_PATH=`pwd`:${DLL_PATH:-/atheos/sys/libs:/atheos/autolnk/lib}
|
||||
;;
|
||||
+ Darwin*)
|
||||
+ LDLIBRARY='libpython$(VERSION).dylib'
|
||||
+ BLDLIBRARY='-L. -lpython$(VERSION)'
|
||||
+ RUNSHARED=DYLD_LIBRARY_PATH="`pwd`:${DYLD_LIBRARY_PATH}"
|
||||
+ ;;
|
||||
esac
|
||||
else # shared is disabled
|
||||
case $ac_sys_system in
|
||||
-13
@@ -1,13 +0,0 @@
|
||||
--- pyconfig.h.in.orig 2009-08-16 10:22:50.000000000 -0700
|
||||
+++ pyconfig.h.in 2009-08-16 10:23:24.000000000 -0700
|
||||
@@ -4,6 +4,10 @@
|
||||
#ifndef Py_PYCONFIG_H
|
||||
#define Py_PYCONFIG_H
|
||||
|
||||
+// Required on Darwin 10+
|
||||
+#ifndef _DARWIN_C_SOURCE
|
||||
+#define _DARWIN_C_SOURCE
|
||||
+#endif
|
||||
|
||||
/* Define for AIX if your compiler is a genuine IBM xlC/xlC_r and you want
|
||||
support for AIX C++ shared extension modules. */
|
||||
@@ -1,80 +0,0 @@
|
||||
--- setup.py.orig 2008-10-16 12:58:19.000000000 -0600
|
||||
+++ setup.py 2009-06-07 20:55:17.000000000 -0600
|
||||
@@ -609,7 +609,7 @@
|
||||
# a release. Most open source OSes come with one or more
|
||||
# versions of BerkeleyDB already installed.
|
||||
|
||||
- max_db_ver = (4, 5)
|
||||
+ max_db_ver = (4, 6)
|
||||
# NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
|
||||
# we leave that version disabled by default as it has proven to be
|
||||
# quite a buggy library release on many platforms.
|
||||
@@ -636,6 +636,7 @@
|
||||
db_inc_paths.append('/usr/local/include/db4%d' % x)
|
||||
db_inc_paths.append('/pkg/db-4.%d/include' % x)
|
||||
db_inc_paths.append('/opt/db-4.%d/include' % x)
|
||||
+ db_inc_paths.append('__PREFIX__/include/db4%d' % x)
|
||||
# 3.x minor number specific paths
|
||||
for x in (3,):
|
||||
db_inc_paths.append('/usr/include/db3%d' % x)
|
||||
@@ -711,6 +712,7 @@
|
||||
|
||||
# check lib directories parallel to the location of the header
|
||||
db_dirs_to_check = [
|
||||
+ os.path.join('__PREFIX__', 'lib', 'db46'),
|
||||
os.path.join(db_incdir, '..', 'lib64'),
|
||||
os.path.join(db_incdir, '..', 'lib'),
|
||||
os.path.join(db_incdir, '..', '..', 'lib64'),
|
||||
@@ -1212,13 +1214,7 @@
|
||||
def detect_tkinter(self, inc_dirs, lib_dirs):
|
||||
# The _tkinter module.
|
||||
|
||||
- # Rather than complicate the code below, detecting and building
|
||||
- # AquaTk is a separate method. Only one Tkinter will be built on
|
||||
- # Darwin - either AquaTk, if it is found, or X11 based Tk.
|
||||
platform = self.get_platform()
|
||||
- if (platform == 'darwin' and
|
||||
- self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
|
||||
- return
|
||||
|
||||
# Assume we haven't found any of the libraries or include files
|
||||
# The versions with dots are used on Unix, and the versions without
|
||||
--- setup.py.orig 2009-09-10 19:41:32.000000000 +1000
|
||||
+++ setup.py 2009-09-10 19:48:30.000000000 +1000
|
||||
@@ -1197,7 +1197,7 @@
|
||||
# For 8.4a2, the X11 headers are not included. Rather than include a
|
||||
# complicated search, this is a hard-coded path. It could bail out
|
||||
# if X11 libs are not found...
|
||||
- include_dirs.append('/usr/X11R6/include')
|
||||
+ #include_dirs.append('/usr/X11R6/include')
|
||||
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
|
||||
|
||||
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
|
||||
@@ -1262,17 +1262,17 @@
|
||||
if platform == 'sunos5':
|
||||
include_dirs.append('/usr/openwin/include')
|
||||
added_lib_dirs.append('/usr/openwin/lib')
|
||||
- elif os.path.exists('/usr/X11R6/include'):
|
||||
- include_dirs.append('/usr/X11R6/include')
|
||||
- added_lib_dirs.append('/usr/X11R6/lib64')
|
||||
- added_lib_dirs.append('/usr/X11R6/lib')
|
||||
- elif os.path.exists('/usr/X11R5/include'):
|
||||
- include_dirs.append('/usr/X11R5/include')
|
||||
- added_lib_dirs.append('/usr/X11R5/lib')
|
||||
- else:
|
||||
+ #elif os.path.exists('/usr/X11R6/include'):
|
||||
+ # include_dirs.append('/usr/X11R6/include')
|
||||
+ # added_lib_dirs.append('/usr/X11R6/lib64')
|
||||
+ # added_lib_dirs.append('/usr/X11R6/lib')
|
||||
+ #elif os.path.exists('/usr/X11R5/include'):
|
||||
+ # include_dirs.append('/usr/X11R5/include')
|
||||
+ # added_lib_dirs.append('/usr/X11R5/lib')
|
||||
+ #else:
|
||||
# Assume default location for X11
|
||||
- include_dirs.append('/usr/X11/include')
|
||||
- added_lib_dirs.append('/usr/X11/lib')
|
||||
+ # include_dirs.append('/usr/X11/include')
|
||||
+ # added_lib_dirs.append('/usr/X11/lib')
|
||||
|
||||
# If Cygwin, then verify that X is installed before proceeding
|
||||
if platform == 'cygwin':
|
||||
@@ -1,2 +0,0 @@
|
||||
g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
|
||||
w
|
||||
@@ -1,12 +0,0 @@
|
||||
bin/python2.5
|
||||
bin/pythonw2.5
|
||||
bin/python2.5-config
|
||||
bin/idle2.5
|
||||
bin/pydoc2.5
|
||||
bin/smtpd2.5.py
|
||||
-
|
||||
share/man/man1/python2.5.1.gz
|
||||
${frameworks_dir}/Python.framework/Versions/2.5
|
||||
${frameworks_dir}/Python.framework/Versions/2.5/Headers
|
||||
${frameworks_dir}/Python.framework/Versions/2.5/Resources
|
||||
${frameworks_dir}/Python.framework/Versions/2.5/Python
|
||||
@@ -1,2 +0,0 @@
|
||||
g,.*\(HAVE_POLL[_A-Z]*\).*,s,,/* #undef \1 */,
|
||||
w
|
||||
@@ -1,12 +0,0 @@
|
||||
bin/python2.5
|
||||
bin/pythonw2.5
|
||||
bin/python2.5-config
|
||||
bin/idle2.5
|
||||
bin/pydoc2.5
|
||||
bin/smtpd2.5.py
|
||||
-
|
||||
share/man/man1/python2.5.1.gz
|
||||
${frameworks_dir}/Python.framework/Versions/2.5
|
||||
${frameworks_dir}/Python.framework/Versions/2.5/Headers
|
||||
${frameworks_dir}/Python.framework/Versions/2.5/Resources
|
||||
${frameworks_dir}/Python.framework/Versions/2.5/Python
|
||||
@@ -0,0 +1,19 @@
|
||||
*** Mac/Modules/gestaltmodule.c 2010-11-21 14:34:58.000000000 +0900
|
||||
--- Mac/Modules/gestaltmodule.c.new 2010-11-21 14:38:30.000000000 +0900
|
||||
***************
|
||||
*** 34,40 ****
|
||||
{
|
||||
OSErr iErr;
|
||||
OSType selector;
|
||||
! long response;
|
||||
if (!PyArg_ParseTuple(args, "O&", PyMac_GetOSType, &selector))
|
||||
return NULL;
|
||||
iErr = Gestalt ( selector, &response );
|
||||
--- 34,40 ----
|
||||
{
|
||||
OSErr iErr;
|
||||
OSType selector;
|
||||
! SInt32 response;
|
||||
if (!PyArg_ParseTuple(args, "O&", PyMac_GetOSType, &selector))
|
||||
return NULL;
|
||||
iErr = Gestalt ( selector, &response );
|
||||
Reference in New Issue
Block a user