<pre style='margin:0'>
Mark Evenson (easye) pushed a commit to branch larryv-subversion-subports
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/1a35a52d86172cf99a722adc1ceb71c6c552b053">https://github.com/macports/macports-ports/commit/1a35a52d86172cf99a722adc1ceb71c6c552b053</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 1a35a52d86172cf99a722adc1ceb71c6c552b053
</span>Merge: bf4b246 b1e2d6b f972c8c
Author: Lawrence Velázquez <larryv@macports.org>
AuthorDate: Wed Aug 21 21:27:46 2013 +0000
<span style='display:block; white-space:pre;color:#404040;'> Add subports for Python 2.5, 2.6, and 2.7 bindings.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Obsolete the 2.4 bindings, which upstream no longer supports.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> git-svn-id: https://svn.macports.org/repository/macports/branches/larryv-subversion-subports/dports@109907 d073be05-634f-4543-b044-5fe20cf6d1d6
</span>
devel/subversion-python24bindings/Portfile | 10 +
devel/subversion/Portfile | 60 ++-
devel/subversion/files/add-python-version.patch | 98 ++++
devel/subversion/files/patch-swig-python-core.diff | 493 +++++++++++++++++++++
devel/subversion/files/use-python-config.patch | 146 ++++++
5 files changed, 805 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --cc devel/subversion-python24bindings/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 0000000,b78fcc6,b78fcc6..f7bf265
</span>mode 000000,100644,100644..100644
<span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion-python24bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion-python24bindings/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@@@ -1,0 -1,110 -1,110 +1,10 @@@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # $Id$
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ name subversion-python24bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.8.1
</span> --revision 1
--categories devel python
--platforms darwin
--maintainers openmaintainer blair
--description Python bindings for the subversion version control system (svn)
--license Apache-2
<span style='display:block; white-space:pre;background:#e0ffe0;'>+++revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --long_description Subversion (svn) is a version control system designed to be \
-- as similar to cvs(1) as possible, while fixing many \
-- outstanding problems with cvs(1). The python bindings \
-- provide access to subversion API from python.
--
--homepage http://subversion.apache.org/
--master_sites apache:subversion
--use_bzip2 yes
--checksums md5 f2ee0471b8a560f5efa0f2349d9c9ab9 \
-- sha1 7705819a0037c14fb32eef36f2e57a803217c689 \
-- rmd160 aaff1efd8e1b8112603eb7855cb546316fe88707
--
--distname subversion-${version}
--dist_subdir subversion
--
--depends_lib port:expat \
-- port:apr port:apr-util \
-- port:db46 port:subversion \
-- port:python24 \
-- port:py24-bsddb port:sqlite3 \
-- port:gettext port:libiconv \
-- port:serf1 port:cyrus-sasl2 \
-- port:file port:libcomerr \
-- port:zlib
--
--patchfiles patch-swig-python-core.diff
--
--post-patch {
-- system "cd ${worksrcpath}; find build* Makefile.in subversion/bindings/swig/python -type f -print0 | xargs -0 perl -w -p -i -e 's/libsvn_swig_py/libsvn_swig_py24/g'"
-- file rename \
-- ${worksrcpath}/subversion/bindings/swig/python/libsvn_swig_py \
-- ${worksrcpath}/subversion/bindings/swig/python/libsvn_swig_py24
--}
--
--configure.args --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
-- --with-apr=${prefix}/bin/apr-1-config \
-- --with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
-- --mandir=\\\${prefix}/share/man \
-- --with-serf=${prefix} \
-- --with-sasl=${prefix} \
-- --with-libmagic=${prefix} \
-- --without-gnome-keyring
--
--configure.env ac_cv_path_PYTHON=${prefix}/bin/python2.4 \
-- ac_cv_python_includes=-I${prefix}/include/python2.4 \
-- ac_cv_python_link="${configure.cc} -L${prefix}/lib -bundle -undefined dynamic_lookup" \
-- ac_cv_python_libs="-L${prefix}/lib -bundle -undefined dynamic_lookup" \
-- ac_cv_python_compile=${configure.cc}
--
--use_parallel_build yes
--build.target swig-py
--destroot.target install-swig-py DESTDIR=${destroot}
--
--test.run yes
--test.target check-swig-py
--
--pre-test {
-- set x {}
-- fs-traverse dir ${worksrcpath}/subversion {
-- if {[file tail ${dir}] == ".libs" && [file isdirectory ${dir}]} {
-- lappend x ${dir}
-- continue
-- }
-- }
-- test.env-append DYLD_LIBRARY_PATH=[join ${x} ":"]
-- }
--
--pre-configure { reinplace "s|hardcode_direct=yes|hardcode_direct=no|g" \
-- ${worksrcpath}/configure
-- }
--
--post-configure { reinplace "s|need_relink=yes|need_relink=no|g" \
-- ${worksrcpath}/libtool
-- }
--
--variant no_bdb description {Build without support for BerkeleyDB repositories} {
-- depends_lib-delete port:db46 port:py-bsddb
-- configure.args-delete --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6
-- configure.args-append --without-berkeley-db
-- }
--
--post-destroot {
-- set PYTHON_PATH ${prefix}/lib/python2.4
--
-- xinstall -m 755 -d ${destroot}${PYTHON_PATH}/site-packages
-- xinstall -m 755 ${portpath}/${filesdir}/svn-python.pth \
-- ${destroot}${PYTHON_PATH}/site-packages
-- reinplace "s|@PREFIX@|${prefix}|g" \
-- ${destroot}${PYTHON_PATH}/site-packages/svn-python.pth
--
-- file rename "${destroot}${prefix}/lib/svn-python" \
-- "${destroot}${prefix}/lib/svn-python2.4"
-- }
--
--livecheck.type regex
--livecheck.url http://svn.apache.org/repos/asf/subversion/tags/
--livecheck.regex "(\\d+\\.\\d+\\.\\d+)/"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+++replaced_by subversion-python27bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++PortGroup obsolete 1.0
</span><span style='display:block; white-space:pre;color:#808080;'>diff --cc devel/subversion/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 438105c,e842fc3,e842fc3..193f906
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@@@ -1,250 -1,152 -1,152 +1,306 @@@@
</span> ++# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
# $Id$
--PortSystem 1.0
--
--name subversion
--version 1.8.1
--revision 3
--categories devel
--platforms darwin
--maintainers geeklair.net:dluke blair
--description subversion (svn) -- a version control system designed to be a better cvs
--license Apache-2
--
--long_description Subversion (svn) is a version control system designed to be \
-- as similar to cvs(1) as possible, while fixing many \
-- outstanding problems with cvs(1).
--
--homepage http://subversion.apache.org/
--master_sites apache:subversion
--use_bzip2 yes
--checksums md5 f2ee0471b8a560f5efa0f2349d9c9ab9 \
-- sha1 7705819a0037c14fb32eef36f2e57a803217c689 \
-- rmd160 aaff1efd8e1b8112603eb7855cb546316fe88707
--
--depends_lib port:expat \
-- port:apr port:apr-util \
-- port:db46 port:sqlite3 \
-- port:gettext port:libiconv \
-- port:serf1 port:cyrus-sasl2 \
-- port:file port:libcomerr \
-- port:zlib
--
--depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle
--
--test.run yes
--test.target check
--test.env CLEANUP=true
--
--patchfiles config_impl.h.patch
--
--post-patch { reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/subversion/libsvn_subr/config_impl.h
-- }
--
--configure.args --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
-- --with-apr=${prefix}/bin/apr-1-config \
-- --with-apr-util=${prefix}/bin/apu-1-config --without-apxs \
-- --mandir=\\\${prefix}/share/man \
-- --with-serf=${prefix} \
-- --with-sasl=${prefix} \
-- --with-libmagic=${prefix} \
-- --without-gnome-keyring
--
--use_parallel_build yes
--build.target all tools
--destroot.target-append install-tools
--
--pre-test { set x {}
-- fs-traverse dir ${worksrcpath}/subversion {
-- if {[file tail ${dir}] == ".libs" && [file isdirectory ${dir}]} {
-- lappend x ${dir}
-- continue
-- }
-- }
--
-- test.env-append DYLD_LIBRARY_PATH=[join ${x} ":"]
-- }
--
--pre-configure { reinplace "s|hardcode_direct=yes|hardcode_direct=no|g" \
-- ${worksrcpath}/configure
-- }
--
--post-configure { reinplace "s|need_relink=yes|need_relink=no|g" \
-- ${worksrcpath}/libtool
-- }
--
--post-destroot { # install global config file so curl-ca-bundle certs are used
-- xinstall -d ${destroot}${prefix}/etc/subversion
-- xinstall -m 644 ${filespath}/servers.default ${destroot}${prefix}/etc/subversion
-- # install bash completion file
-- set completions_path ${destroot}${prefix}/share/bash-completion/completions
-- xinstall -d ${completions_path}
-- xinstall -m 644 ${worksrcpath}/tools/client-side/bash_completion ${completions_path}/subversion
-- }
--
--post-activate { if {![file exists ${prefix}/etc/subversion/servers]} {
-- copy ${prefix}/etc/subversion/servers.default ${prefix}/etc/subversion/servers
-- }
-- }
--
--variant mod_dav_svn description {Install the subversion apache module (mod_dav_svn)} {
-- depends_build path:apache2/bin/apxs:apache2
-- configure.args-append \
-- --with-apxs=${prefix}/apache2/bin/apxs \
-- --disable-mod-activation
-- configure.args-delete --without-apxs
--
-- destroot.violate_mtree yes
-- }
--
--variant no_bdb description {Build without support for BerkeleyDB repositories} {
-- depends_lib-delete port:db46
-- configure.args-delete --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6
-- configure.args-append --without-berkeley-db
-- }
--
--variant mac_os_x_server_mod_dav_svn description {Unsupported - attempt to build the subversion apache module with apple supplied apache2} {
-- configure.args-append \
-- --with-apxs=/opt/apache2/bin/apxs \
-- --disable-mod-activation
-- configure.args-delete --without-apxs
--
-- destroot.violate_mtree yes
--
-- post-install {
-- ui_warn "This variant (+mac_os_x_server_mod_dav_svn) builds against the Apple-supplied apache2 in /opt/apache2 and thus may have problems that the normal variant (+mod_dav_svn) which builds against the macports supplied apache2 will not have."
-- }
-- }
--
--variant tools description {Install some optional extra subversion tools} {
-- post-destroot {
-- xinstall -d -m 755 ${destroot}${prefix}/share/${name}
-- delete ${worksrcpath}/tools/diff/
-- delete ${worksrcpath}/tools/server-side/mod_dontdothat
-- eval delete [glob ${worksrcpath}/tools/server-side/*{.o,.lo,.c}]
-- delete ${worksrcpath}/tools/server-side/fsfs-stats
-- delete ${worksrcpath}/tools/server-side/svn-populate-node-origins-index
-- delete ${worksrcpath}/tools/server-side/svn-rep-sharing-stats
-- delete ${worksrcpath}/tools/server-side/svnauthz-validate
-- copy ${worksrcpath}/tools ${destroot}${prefix}/share/${name}/tools
-- }
-- }
--
--# see http://subversion.tigris.org/issues/show_bug.cgi?id=2464
--variant unicode_path description {Installs a hack to workaround Mac OS X unicode path issues} {
-- patchfiles-append patch-osx_unicode_precomp.diff
-- post-install {
-- ui_warn "This variant (+unicode_path) implements a hack to deal with composed/decomposed unicode handling on Mac OS X which is different from linux and windows. It is an implementation of solution 1 from http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-filenames which _WILL_ break some setups. Please be sure you understand what you are asking for when you install this variant."
-- }
-- }
--
--variant disable_keychain description {Disables support for the Mac OS X Keychain} {
-- configure.args-append --disable-keychain
-- }
--
--# CarbonCore/MacTypes.h: No such file or directory
--platform puredarwin { configure.args-append \
-- --disable-keychain
-- }
--
--livecheck.type regex
--livecheck.url http://svn.apache.org/repos/asf/subversion/tags/
--livecheck.regex "(\\d+\\.\\d+\\.\\d+)/"
++PortSystem 1.0
++
++name subversion
++
++
++# Subports
++set perl5.branches {5.8 5.10 5.12 5.14 5.16}
++foreach branch ${perl5.branches} {
++ set p_idx [lsearch ${perl5.branches} ${branch}]
++ set other_perls [lreplace ${perl5.branches} $p_idx $p_idx]
++ subport subversion-perlbindings-${branch} {
++ set perl5.major ${branch}
++ set perl5.bin ${prefix}/bin/perl${perl5.major}
++ foreach c_perl ${other_perls} {
++ conflicts-append subversion-perlbindings-${c_perl}
++ }
++ }
++}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+++foreach {ver branch} {25 2.5 26 2.6 27 2.7} {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ subport subversion-python${ver}bindings {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set python.version ${ver}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set python.branch ${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ if {${python.version} eq {25}} {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set python.prefix ${prefix}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ } else {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set python.prefix ${frameworks_dir}/Python.framework/Versions/${python.branch}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set python.bin ${python.prefix}/bin/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set python.libdir ${python.prefix}/lib/python${python.branch}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++}
</span> ++
++
++# General
++version 1.8.1
++revision 1
++categories devel
++platforms darwin
++license Apache-2
++maintainers geeklair.net:dluke blair
++long_description Subversion (svn) is a version control system \
++ designed to be as similar to CVS as possible, \
++ while fixing many outstanding problems with CVS.
++homepage http://subversion.apache.org/
++
++switch -regexp -- ${subport} {
++ perl {
++ categories-append perl
++ description Perl ${perl5.major} bindings for the \
++ Subversion version control system
++ long_description-append These bindings provide access to the \
++ Subversion API from Perl ${perl5.major}.
++ }
<span style='display:block; white-space:pre;background:#e0e0ff;'>+++ python {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ categories-append python
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description Python ${python.branch} bindings for \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ the Subversion version control system
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ long_description-append These bindings provide access to the \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ Subversion API from Python \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ ${python.branch}.
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span> ++ default {
++ description A version control system designed to \
++ be a better CVS
++ }
++}
++
++
++# Dependencies
++depends_lib port:apr \
++ port:apr-util \
++ port:cyrus-sasl2 \
++ port:db46 \
++ port:expat \
++ port:gettext \
++ port:libcomerr \
++ port:libiconv \
++ port:libmagic \
++ port:serf1 \
++ port:sqlite3 \
++ port:zlib
++switch -regexp -- ${subport} {
++ perl {depends_lib-append port:${name} port:perl${perl5.major}}
<span style='display:block; white-space:pre;background:#e0e0ff;'>+++ python {depends_lib-append port:${name} port:python${python.version}}
</span> ++ default {depends_run path:share/curl/curl-ca-bundle.crt:curl-ca-bundle}
++}
++
++
++# Fetch and checksum
++master_sites apache:subversion
++use_bzip2 yes
++checksums sha1 7705819a0037c14fb32eef36f2e57a803217c689 \
++ rmd160 aaff1efd8e1b8112603eb7855cb546316fe88707 \
++ sha256 faaaaedba25777331e761884598af1dd9fe33631d6415b2e0ba5348867c4edb4
++
++
++# Patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles config_impl.h.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-swig-perl-native-core.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++patchfiles add-python-version.patch \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ config_impl.h.patch \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ patch-swig-perl-native-core.c.diff \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ patch-swig-python-core.diff \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ use-python-config.patch
</span> ++post-patch {
++ reinplace "s|__PREFIX__|${prefix}|" \
++ ${worksrcpath}/subversion/libsvn_subr/config_impl.h
++}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+++switch -regexp -- ${subport} {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ python {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ post-patch {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ reinplace "s/__PYTHON_VERSION__/${python.version}/" \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ ${worksrcpath}/build.conf
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ reinplace "s/__PYTHON_BRANCH__/${python.branch}/" \
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ ${worksrcpath}/Makefile.in
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++}
</span> ++
++
++# Configure
++configure.args --disable-keychain \
++ --with-apr=${prefix}/bin/apr-1-config \
++ --with-apr-util=${prefix}/bin/apu-1-config \
++ --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
++ --with-libmagic=${prefix} \
++ --with-sasl=${prefix} \
++ --with-serf=${prefix} \
++ --with-zlib=${prefix} \
++ --without-apxs \
++ --without-gnome-keyring
++switch -regexp -- ${subport} {
++ perl {configure.args-append PERL=${perl5.bin}}
<span style='display:block; white-space:pre;background:#e0e0ff;'>+++ python {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ configure.args-append PYTHON=${python.bin}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ pre-configure {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ # Regenerate build-outputs.mk from patched build.conf.
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ system -W ${worksrcpath} {python gen-make.py --release}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span> ++}
++
++
++# Build
++switch -regexp -- ${subport} {
++ perl {
++ use_parallel_build no
++ build.target swig-pl
++ }
<span style='display:block; white-space:pre;background:#e0e0ff;'>+++ python {build.target swig-py}
</span> ++ default {build.target-append tools}
++}
++
++
++# Destroot
++switch -regexp -- ${subport} {
++ perl {
++ destroot {
++ system -W ${worksrcpath} \
++ "${build.cmd} install-swig-pl-lib ${destroot.post_args}"
++ system -W ${worksrcpath}/subversion/bindings/swig/perl/native \
++ "${build.cmd} pure_install INSTALLDIRS=vendor ${destroot.post_args}"
++ fs-traverse pl ${destroot} {
++ if {[file tail ${pl}] eq {.packlist}} {
++ reinplace "s|${destroot}||" ${pl}
++ ui_info "Fixed packlist '${pl}'"
++ }
++ }
++ }
++ }
<span style='display:block; white-space:pre;background:#e0e0ff;'>+++ python {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ destroot.target install-swig-py
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set pth ${destroot}${python.libdir}/site-packages/svn-python.pth
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ xinstall -d -m 755 [file dirname ${pth}]
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ set pth_ch [open ${pth} {WRONLY CREAT TRUNC} 0644]
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ puts ${pth_ch} "${prefix}/lib/svn-python${python.branch}"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ close ${pth_ch}
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ }
</span> ++ default {
++ destroot.target-append install-tools
++ post-destroot {
++ # install global config file so curl-ca-bundle certs are used
++ xinstall -d ${destroot}${prefix}/etc/subversion
++ xinstall -m 644 ${filespath}/servers.default \
++ ${destroot}${prefix}/etc/subversion
++ # install bash completion file
++ set completions_path \
++ ${destroot}${prefix}/share/bash-completion/completions
++ xinstall -d ${completions_path}
++ xinstall -m 644 ${worksrcpath}/tools/client-side/bash_completion \
++ ${completions_path}/subversion
++ }
++ }
++}
++
++
++# Activate
++subport ${name} {
++ post-activate {
++ if {![file exists ${prefix}/etc/subversion/servers]} {
++ copy ${prefix}/etc/subversion/servers.default \
++ ${prefix}/etc/subversion/servers
++ }
++ }
++}
++
++
++# Test
++test.run yes
++switch -regexp -- ${subport} {
++ perl {test.target check-swig-pl}
<span style='display:block; white-space:pre;background:#e0e0ff;'>+++ python {test.target check-swig-py}
</span> ++ default {
++ test.target check
++ test.env CLEANUP=true
++ pre-test {
++ set libs {}
++ fs-traverse dir ${worksrcpath}/subversion {
++ if {[llength [glob -nocomplain ${dir}/*.dylib]] > 0} {
++ lappend libs ${dir}
++ continue
++ }
++ }
++ test.env-append DYLD_LIBRARY_PATH=[join ${libs} :]
++ }
++ }
++}
++
++
++# Variants
++
++variant no_bdb description {Build without support for BerkeleyDB repositories} {
++ depends_lib-delete port:db46
++ configure.args-replace --with-berkeley-db=:${prefix}/include/db46:${prefix}/lib/db46:db-4.6 \
++ --without-berkeley-db
++}
++
++subport ${name} {
++ variant mod_dav_svn description {Install the subversion apache module (mod_dav_svn)} {
++ depends_build path:apache2/bin/apxs:apache2
++ configure.args-replace --without-apxs \
++ --with-apxs=${prefix}/apache2/bin/apxs
++ configure.args-append --disable-mod-activation
++ destroot.violate_mtree yes
++ }
++
++ variant mac_os_x_server_mod_dav_svn description {Unsupported - attempt to build the subversion apache module with apple supplied apache2} {
++ configure.args-replace --without-apxs \
++ --with-apxs=/opt/apache2/bin/apxs
++ configure.args-append --disable-mod-activation
++ destroot.violate_mtree yes
++ post-install {
++ ui_warn "This variant (+mac_os_x_server_mod_dav_svn) builds against the Apple-supplied apache2 in /opt/apache2 and thus may have problems that the normal variant (+mod_dav_svn) which builds against the macports supplied apache2 will not have."
++ }
++ }
++
++ variant tools description {Install some optional extra subversion tools} {
++ post-destroot {
++ xinstall -d -m 755 ${destroot}${prefix}/share/${name}
++ eval delete ${worksrcpath}/tools/diff/ \
++ ${worksrcpath}/tools/server-side/mod_dontdothat \
++ [glob ${worksrcpath}/tools/server-side/*{.o,.lo,.c}] \
++ ${worksrcpath}/tools/server-side/fsfs-stats \
++ ${worksrcpath}/tools/server-side/svn-populate-node-origins-index \
++ ${worksrcpath}/tools/server-side/svn-rep-sharing-stats \
++ ${worksrcpath}/tools/server-side/svnauthz-validate
++ copy ${worksrcpath}/tools ${destroot}${prefix}/share/${name}/tools
++ }
++ }
++
++ # see http://subversion.tigris.org/issues/show_bug.cgi?id=2464
++ variant unicode_path description {Installs a hack to workaround Mac OS X unicode path issues} {
++ patchfiles-append patch-osx_unicode_precomp.diff
++ post-install {
++ ui_warn "This variant (+unicode_path) implements a hack to deal with composed/decomposed unicode handling on Mac OS X which is different from linux and windows. It is an implementation of solution 1 from http://svn.collab.net/repos/svn/trunk/notes/unicode-composition-for-filenames which _WILL_ break some setups. Please be sure you understand what you are asking for when you install this variant."
++ }
++ }
++
++ platform macosx {
++ # Legacy negative variant to be removed after August 2014.
++ variant disable_keychain conflicts osxkeychain description {Legacy compatibility variant} {}
++ variant osxkeychain conflicts disable_keychain description {Enable OS X Keychain support} {
++ configure.args-delete --disable-keychain
++ }
++ if {[variant_isset disable_keychain]} {
++ default_variants -osxkeychain
++ } else {
++ default_variants +osxkeychain
++ }
++ }
++}
++
++
++# Livecheck
++if {${subport} eq ${name}} {
++ livecheck.type regex
++ livecheck.url http://svn.apache.org/repos/asf/subversion/tags/
++ livecheck.regex {(\d+\.\d+\.\d+)/}
++} else {
++ livecheck.type none
++}
<span style='display:block; white-space:pre;color:#808080;'>diff --cc devel/subversion/files/add-python-version.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0000000,0000000,0000000..2c62453
</span>new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/files/add-python-version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@@@ -1,0 -1,0 -1,0 +1,98 @@@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++Index: Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++--- Makefile.in (revision 1510369)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++++ Makefile.in (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -81,8 +81,8 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ swig_rb_libdir = @libdir@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ ### these possibly need further discussion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-swig_pydir = @libdir@/svn-python/libsvn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-swig_pydir_extra = @libdir@/svn-python/svn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++swig_pydir = @libdir@/svn-python__PYTHON_BRANCH__/libsvn
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++swig_pydir_extra = @libdir@/svn-python__PYTHON_BRANCH__/svn
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ swig_pldir = @libdir@/svn-perl
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ swig_rbdir = $(SWIG_RB_SITE_ARCH_DIR)/svn/ext
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ toolsdir = @bindir@/svn-tools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++Index: build.conf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++===================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++--- build.conf (revision 1510369)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++++ build.conf (working copy)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -427,7 +427,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = core.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_diff libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion core library bindings
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ include-runtime = yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -436,7 +436,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = svn_client.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_client libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ nonlibs = swig_core
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion client library bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -445,7 +445,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = svn_delta.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_delta libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ nonlibs = swig_core
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion delta library bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -454,7 +454,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = svn_diff.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_diff libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ nonlibs = swig_core
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion diff library bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -463,7 +463,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = svn_fs.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_fs libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ nonlibs = swig_core
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion FS library bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -472,7 +472,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = svn_ra.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_ra libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ nonlibs = swig_core
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion RA library bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -481,7 +481,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = svn_repos.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_repos libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ nonlibs = swig_core
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion repository library bindings
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -490,13 +490,13 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ sources = svn_wc.i
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-libs = libsvn_swig_py libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++libs = libsvn_swig_py__PYTHON_VERSION__ libsvn_swig_perl libsvn_swig_ruby
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ libsvn_wc libsvn_subr apr
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ nonlibs = swig_core
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ description = Subversion WC library bindings
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ # SWIG utility library for Python modules
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++-[libsvn_swig_py]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++[libsvn_swig_py__PYTHON_VERSION__]
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ type = swig_lib
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ lang = python
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ path = subversion/bindings/swig/python/libsvn_swig_py
</span><span style='display:block; white-space:pre;color:#808080;'>diff --cc devel/subversion/files/patch-swig-python-core.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 0000000,da290c6,da290c6..da290c6
</span>mode 000000,100644,100644..100644
<span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/subversion/files/patch-swig-python-core.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/files/patch-swig-python-core.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --cc devel/subversion/files/use-python-config.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 0000000,0000000,0000000..10b3667
</span>new file mode 100644
<span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/subversion/files/use-python-config.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@@@ -1,0 -1,0 -1,0 +1,146 @@@@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++--- configure.orig 2013-07-16 17:46:43.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++++ configure 2013-08-20 23:15:58.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -22861,7 +22861,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_includes="`$PYTHON-config --includes`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_includes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -22879,7 +22879,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_compile="$CC"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -22892,7 +22892,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_link="$CC `$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -22905,7 +22905,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_libs="`$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23344,7 +23344,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_includes="`$PYTHON-config --includes`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_includes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23362,7 +23362,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_compile="$CC"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23375,7 +23375,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_link="$CC `$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23388,7 +23388,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_libs="`$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23827,7 +23827,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_includes="`$PYTHON-config --includes`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_includes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23845,7 +23845,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_compile="$CC"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23858,7 +23858,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_link="$CC `$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -23871,7 +23871,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_libs="`$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -24313,7 +24313,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_includes="`$PYTHON ${abs_srcdir}/build/get-py-info.py --includes`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_includes="`$PYTHON-config --includes`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_includes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -24331,7 +24331,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_compile="`$PYTHON ${abs_srcdir}/build/get-py-info.py --compile`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_compile="$CC"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_compile" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -24344,7 +24344,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_link="`$PYTHON ${abs_srcdir}/build/get-py-info.py --link`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_link="$CC `$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_link" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++@@ -24357,7 +24357,7 @@
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ $as_echo_n "(cached) " >&6
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ else
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+++- ac_cv_python_libs="`$PYTHON ${abs_srcdir}/build/get-py-info.py --libs`"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ac_cv_python_libs="`$PYTHON-config --ldflags`"
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ fi
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_python_libs" >&5
</span></pre><pre style='margin:0'>
</pre>