<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/37518f6f42064101fa41c0d7ca6cacbcb6a65a05">https://github.com/macports/macports-ports/commit/37518f6f42064101fa41c0d7ca6cacbcb6a65a05</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 37518f6f42064101fa41c0d7ca6cacbcb6a65a05
</span>Author: reneeotten <reneeotten@users.noreply.github.com>
AuthorDate: Tue Jul 24 15:24:33 2018 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pysvn: update to 1.9.6
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - patches from josephsacco
</span><span style='display:block; white-space:pre;color:#404040;'> - remove obsolete py26 subport, add py36 (py37 doesn't compile)
</span><span style='display:block; white-space:pre;color:#404040;'> - remove "backport" call, only needed for Python 2.6 and earlier
</span><span style='display:block; white-space:pre;color:#404040;'> - modernize checksums
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56750
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/56751
</span>---
python/py-graveyard/Portfile | 1 +
python/py-pysvn/Portfile | 16 +++++++++-------
.../files/patch-Source_setup_configure.py.diff | 19 +++++++++----------
3 files changed, 19 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-graveyard/Portfile b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ebd834c..d942a6e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-graveyard/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -222,6 +222,7 @@ py-pyopencl 2013.2_1 26 33
</span> py-pyqtgraph 0.9.10_1 34
py-pyrfc3339 1.1 34
py-pyshp 1.2.1_1 26 32 33
<span style='display:block; white-space:pre;background:#e0ffe0;'>+py-pysvn 1.8.0_1 26
</span> py-python-jenkins 0.3.4_1 26
py-pytidylib 0.2.1_1 26
py-pytools 2013.5.6_1 26 33
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pysvn/Portfile b/python/py-pysvn/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ea76834..d090ef0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pysvn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pysvn/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pysvn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.8.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.9.6
</span> categories-append devel
maintainers {blair @blair} openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,11 +18,11 @@ homepage http://pysvn.tigris.org/
</span>
master_sites http://pysvn.barrys-emacs.org/source_kits/
distname pysvn-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 3999a7680f4d3c4d3bddfc45edf65788 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f1d584bc3b0d15eb27606ca1a6c364dc44fee345 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 39596f4884ed689cdb5a4e210e421724302a566c7ba756cc4d46bbfeb0c8326b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b4bf58b682408c79e01b50d3f6902dba17814117 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 1508f63e66fc9d1303f8fd0f49547b59492f6977be4434914c38bc29dc82b2d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 515394
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 26 27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 36
</span>
set cxx_stdlibflags {}
if {[string match *clang* ${configure.cxx}]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +41,6 @@ if {${name} ne ${subport}} {
</span> configure.universal_args-delete --disable-dependency-tracking
pre-configure {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && ${python.bin} setup.py backport"
</span> reinplace "s|'gcc|'${configure.cc}|g" \
${worksrcpath}/setup_configure.py
reinplace "s|'g\+\+|'${configure.cxx} ${cxx_stdlibflags}|g" \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,7 +52,10 @@ if {${name} ne ${subport}} {
</span> configure.args --apr-inc-dir=${prefix}/include/apr-1 \
--apu-inc-dir=${prefix}/include/apr-1 \
--apr-lib-dir=${prefix}/lib \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --svn-root-dir=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --svn-bin-dir=${prefix}/bin \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --svn-inc-dir=${prefix}/include/subversion-1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --svn-lib-dir=${prefix}/lib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pycxx-dir=${worksrcpath}/../Import/pycxx-7.0.3
</span> configure.universal_args-delete --disable-dependency-tracking
post-configure {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pysvn/files/patch-Source_setup_configure.py.diff b/python/py-pysvn/files/patch-Source_setup_configure.py.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2b20c38..bca8ac4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pysvn/files/patch-Source_setup_configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pysvn/files/patch-Source_setup_configure.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,9 +1,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -ru ../../pysvn-1.8.0.FCS/Source/setup_configure.py ./setup_configure.py
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ../../pysvn-1.8.0.FCS/Source/setup_configure.py 2015-08-18 10:28:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ./setup_configure.py 2015-11-22 17:09:15.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -527,8 +527,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self._find_paths_svn_lib,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- self.get_lib_name_for_platform( 'libsvn_client-1' ) )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup_configure.py.orig 2018-06-29 11:47:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup_configure.py 2018-06-29 11:48:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -568,8 +568,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ raise last_exception
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # if we are using the Fink SVN then remember this
- self.is_mac_os_x_fink = folder.startswith( '/sw/' )
- self.is_mac_os_x_darwin_ports = folder.startswith( '/opt/local/' )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +11,7 @@ diff -ru ../../pysvn-1.8.0.FCS/Source/setup_configure.py ./setup_configure.py
</span> return folder
def find_apr_inc( self ):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1032,7 +1032,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1103,7 +1103,7 @@
</span>
def setupUtilities( self ):
self._addVar( 'CCCFLAGS',
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,12 +20,12 @@ diff -ru ../../pysvn-1.8.0.FCS/Source/setup_configure.py ./setup_configure.py
</span> '-Wall -fPIC -fexceptions -frtti '
'-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s '
'-D%(DEBUG)s' )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1048,7 +1048,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1131,7 +1131,7 @@
</span> self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() )
py_cflags_list = [
- '-g',
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ '-g -O2',
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- '-Wall -fPIC -fexceptions -frtti',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '-g -O2 ',
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ '-Wall -fPIC',
</span> '-I. -I%(APR_INC)s -I%(APU_INC)s -I%(SVN_INC)s',
'-DPYCXX_PYTHON_2TO3 -I%(PYCXX)s -I%(PYCXX_SRC)s -I%(PYTHON_INC)s',
</pre><pre style='margin:0'>
</pre>