<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bd98730535089e333d7f905fff29e4830cf94551">https://github.com/macports/macports-ports/commit/bd98730535089e333d7f905fff29e4830cf94551</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit bd98730535089e333d7f905fff29e4830cf94551
</span>Author: Renee Otten <reneeotten@macports.org>
AuthorDate: Sun May 24 14:58:55 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> py-pysvn: update to 1.9.11, fix livecheck
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add explicit dependency on apr
</span>---
python/py-pysvn/Portfile | 30 ++++++++++------------
.../files/patch-IndirectPythonInterface.cxx.diff | 11 --------
.../files/patch-Source_setup_configure.py.diff | 16 ++++++------
3 files changed, 22 insertions(+), 35 deletions(-)
<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 747f43c..4f058fc 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,24 +4,26 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pysvn
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.9.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.9.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories-append devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span> platforms darwin
license Apache-1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description Python Subversion Extension (pysvn)
long_description The pysvn module is a python interface to the Subversion version \
control system. This API exposes client interfaces for managing a \
working copy, querying a repository, and synchronizing the two.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://pysvn.tigris.org/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://pysvn.sourceforge.io/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:pysvn
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://pysvn.barrys-emacs.org/source_kits/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname pysvn-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 b4bf58b682408c79e01b50d3f6902dba17814117 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 1508f63e66fc9d1303f8fd0f49547b59492f6977be4434914c38bc29dc82b2d6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 515394
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 24182a8381831473ef02e6b85728a28924892c6d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 4a3ebe03973ccf17b59d97b8666b528e90a5b0228f5e34370c7cff3221cc4f1b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 624408
</span>
python.versions 27 36 37 38
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -32,11 +34,11 @@ if {[string match *clang* ${configure.cxx}]} {
</span>
if {${name} ne ${subport}} {
depends_lib-append \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:apr \
</span> port:subversion
patch.dir ${worksrcpath}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-Source_setup_configure.py.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-IndirectPythonInterface.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-Source_setup_configure.py.diff
</span>
worksrcdir ${worksrcdir}/Source
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -59,7 +61,7 @@ if {${name} ne ${subport}} {
</span> --svn-inc-dir=${prefix}/include/subversion-1 \
--svn-lib-dir=${prefix}/lib \
--link-python-framework-via-dynamic-lookup \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --pycxx-dir=${worksrcpath}/../Import/pycxx-7.0.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --pycxx-dir=${worksrcpath}/../Import/pycxx-7.1.3
</span> configure.universal_args-delete --disable-dependency-tracking
post-configure {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,8 +87,4 @@ if {${name} ne ${subport}} {
</span> test.target
livecheck.type none
<span style='display:block; white-space:pre;background:#ffe0e0;'>-} else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.url http://pysvn.tigris.org/project_downloads.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- livecheck.regex >pysvn-(.*?)${extract.suffix}<
</span> }
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pysvn/files/patch-IndirectPythonInterface.cxx.diff b/python/py-pysvn/files/patch-IndirectPythonInterface.cxx.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index f4d22d1..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pysvn/files/patch-IndirectPythonInterface.cxx.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Import/pycxx-7.0.3/Src/IndirectPythonInterface.cxx.orig 2018-07-24 16:44:03.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Import/pycxx-7.0.3/Src/IndirectPythonInterface.cxx 2018-07-24 16:44:28.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -468,7 +468,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int &_Py_OptimizeFlag() { return Py_OptimizeFlag; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int &_Py_NoSiteFlag() { return Py_NoSiteFlag; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int &_Py_VerboseFlag() { return Py_VerboseFlag; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--char *__Py_PackageContext() { return _Py_PackageContext; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+char *__Py_PackageContext() { return (char *)(_Py_PackageContext); }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // Needed to keep the abstactions for delayload interface
</span><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 b3fb501..c630c27 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,18 +1,18 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- Source/setup_configure.py.orig 2018-06-29 11:47:16.000000000 -0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Source/setup_configure.py 2018-06-29 11:48:44.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/setup_configure.py.orig 2019-07-28 13:43:17.000000000 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/setup_configure.py 2020-05-24 14:58:13.000000000 -0400
</span> @@ -568,8 +568,8 @@
raise last_exception
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</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/' )
+ self.is_mac_os_x_fink = False
+ self.is_mac_os_x_darwin_ports = False
return folder
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> def find_apr_inc( self ):
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1103,7 +1103,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1104,7 +1104,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> def setupUtilities( self ):
self._addVar( 'CCCFLAGS',
- '-g '
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,9 +20,9 @@
</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;'>-@@ -1131,7 +1131,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1132,7 +1132,7 @@
</span> self._addVar( 'PYTHON_INC', distutils.sysconfig.get_python_inc() )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> py_cflags_list = [
- '-g',
+ '-g -O2 ',
</pre><pre style='margin:0'>
</pre>