<pre style='margin:0'>
Andrew Stromnov (stromnov) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0bfb47f00a8732f9c89744c818a1fef894215b8d">https://github.com/macports/macports-ports/commit/0bfb47f00a8732f9c89744c818a1fef894215b8d</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0bfb47f00a8732f9c89744c818a1fef894215b8d
</span>Author: Andrew Stromnov <stromnov@macports.org>
AuthorDate: Mon Jan 14 16:27:48 2019 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-pyproj: update to 1.9.6
</span>---
python/py-pyproj/Portfile | 12 +++++-----
python/py-pyproj/files/patch-setup.py.diff | 37 ------------------------------
2 files changed, 6 insertions(+), 43 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyproj/Portfile b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 92fcfcf..c3bd62d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/python/py-pyproj/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,8 +4,8 @@ PortSystem 1.0
</span> PortGroup python 1.0
name py-pyproj
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.9.5.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.9.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories-append devel
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,8 +24,9 @@ master_sites pypi:[string index ${python.rootname} 0]/${python.rootname}
</span>
distname ${python.rootname}-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 f1f3008fb452ac106310f8d4c73d7143f25690a3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 53fa54c8fa8a1dfcd6af4bf09ce1aae5d4d949da63b90570ac5ec849efaf3ea8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 925a0ca512c85ec215696e0e3c89d92dfc38cf51 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 e0c02b1554b20c710d16d673817b2a89ff94738b0b537aead8ecb2edc4c4487b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 2797999
</span>
if {${name} ne ${subport}} {
variant proj4 description {Uses proj4 4.9} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,12 +42,11 @@ if {${name} ne ${subport}} {
</span> destroot.env-append PROJ_DIR=${prefix}/lib/proj5
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_build-append \
port:py${python.version}-setuptools \
port:py${python.version}-cython
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # force cython usage
</span> post-patch {
file delete ${worksrcpath}/_proj.c
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/python/py-pyproj/files/patch-setup.py.diff b/python/py-pyproj/files/patch-setup.py.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 93b130a..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/python/py-pyproj/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2016-01-07 01:27:34.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2018-08-17 11:23:38.000000000 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- import sys, os, glob, subprocess, shutil
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from distutils import ccompiler, sysconfig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- from setuptools import setup, Extension
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+from Cython.Build import cythonize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proj_dir = os.environ.get('PROJ_DIR')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -8,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # existing proj.4 installation.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if proj_dir is not None:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- sys.stdout.write('PROJ_DIR is set, using existing proj4 installation..\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sys.stdout.write('PROJ_DIR is set, using existing proj installation..\n')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proj_libdir = os.environ.get('PROJ_LIBDIR')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- proj_incdir = os.environ.get('PROJ_INCDIR')
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libdirs=[]; incdirs = []; libraries = ['proj']
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- incdirs.append(os.path.join(proj_dir,'include'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pyprojext =\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- Extension("pyproj._proj",["_proj.c"],include_dirs=incdirs,library_dirs=libdirs,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ Extension("pyproj._proj",["_proj.pyx"],include_dirs=incdirs,library_dirs=libdirs,\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- runtime_library_dirs=libdirs,libraries=libraries)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # over-write default data directory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -33,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.write('pyproj_datadir="%s"\n' % pyproj_datadir)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- f.close()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- extensions = [pyprojext]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ extensions = cythonize([pyprojext])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- package_data = {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else:
</span></pre><pre style='margin:0'>
</pre>