<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/06158ece68b6ea0fc2bc42dae74c521c897be062">https://github.com/macports/macports-ports/commit/06158ece68b6ea0fc2bc42dae74c521c897be062</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 06158ece68b6ea0fc2bc42dae74c521c897be062
</span>Author: Andrew Stromnov <stromnov@macports.org>
AuthorDate: Fri Aug 17 11:31:52 2018 +0300
<span style='display:block; white-space:pre;color:#404040;'> py-pyproj: update build process, add py37 subport
</span>---
python/py-pyproj/Portfile | 13 ++++++--
python/py-pyproj/files/patch-setup.py.diff | 49 ++++++++++++++++++++++--------
2 files changed, 47 insertions(+), 15 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 e4595cc..92fcfcf 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;'>@@ -5,12 +5,12 @@ PortGroup python 1.0
</span>
name py-pyproj
version 1.9.5.1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 5
</span> categories-append devel
platforms darwin
license MIT
<span style='display:block; white-space:pre;background:#ffe0e0;'>-python.versions 27 34 35 36
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+python.versions 27 34 35 36 37
</span>
maintainers {stromnov @stromnov} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,8 +41,15 @@ if {${name} ne ${subport}} {
</span> destroot.env-append PROJ_DIR=${prefix}/lib/proj5
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:py${python.version}-setuptools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-setuptools \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:py${python.version}-cython
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ file delete ${worksrcpath}/_proj.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span>
post-destroot {
xinstall -m 644 -W ${worksrcpath} \
<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><span style='display:block; white-space:pre;color:#808080;'>index ee601ed..93b130a 100644
</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;'>+++ b/python/py-pyproj/files/patch-setup.py.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +1,37 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- setup.py.orig 2013-01-22 15:26:50.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ setup.py 2013-01-22 15:27:58.000000000 +0400
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -9,7 +9,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pathout = os.path.join('lib',os.path.join('pyproj','data'))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if sys.argv[1] != 'sdist':
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc = ccompiler.new_compiler()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- #sysconfig.customize_compiler(cc) # doesn't work in python 3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysconfig.get_config_vars()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ sysconfig.customize_compiler(cc) # doesn't work in python 3.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cc.set_include_dirs(['src'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- objects = cc.compile(['nad2bin.c', 'src/pj_malloc.c'])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- execname = 'nad2bin'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- setup.py.orig 2016-01-07 01:27:34.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ setup.py 2018-08-17 11:23:38.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ import sys, os, glob, subprocess, shutil
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from distutils import ccompiler, sysconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ from setuptools import setup, Extension
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++from Cython.Build import cythonize
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proj_dir = os.environ.get('PROJ_DIR')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,7 +9,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # existing proj.4 installation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if proj_dir is not None:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- sys.stdout.write('PROJ_DIR is set, using existing proj4 installation..\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sys.stdout.write('PROJ_DIR is set, using existing proj installation..\n')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proj_libdir = os.environ.get('PROJ_LIBDIR')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ proj_incdir = os.environ.get('PROJ_INCDIR')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libdirs=[]; incdirs = []; libraries = ['proj']
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -20,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ incdirs.append(os.path.join(proj_dir,'include'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pyprojext =\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- Extension("pyproj._proj",["_proj.c"],include_dirs=incdirs,library_dirs=libdirs,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Extension("pyproj._proj",["_proj.pyx"],include_dirs=incdirs,library_dirs=libdirs,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ runtime_library_dirs=libdirs,libraries=libraries)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # over-write default data directory.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -33,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f.write('pyproj_datadir="%s"\n' % pyproj_datadir)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ f.close()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- extensions = [pyprojext]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extensions = cythonize([pyprojext])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ package_data = {}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else:
</span></pre><pre style='margin:0'>
</pre>