Revision: 108652 https://trac.macports.org/changeset/108652 Author: macsforever2000@macports.org Date: 2013-07-29 10:25:57 -0700 (Mon, 29 Jul 2013) Log Message: ----------- py-obspy: Update to version 0.8.4 (#39795) Modified Paths: -------------- trunk/dports/python/py-obspy/Portfile trunk/dports/python/py-obspy/files/patch-setup.py.diff Modified: trunk/dports/python/py-obspy/Portfile =================================================================== --- trunk/dports/python/py-obspy/Portfile 2013-07-29 17:04:14 UTC (rev 108651) +++ trunk/dports/python/py-obspy/Portfile 2013-07-29 17:25:57 UTC (rev 108652) @@ -5,8 +5,7 @@ PortGroup python 1.0 name py-obspy -version 0.8.3 -revision 1 +version 0.8.4 categories-append science platforms darwin maintainers bo.ingv.it:Peter.Danecek openmaintainer @@ -28,9 +27,9 @@ distname obspy-${version} master_sites http://pypi.python.org/packages/source/o/obspy -checksums md5 ffb704ed3a33f0299a8e0352437e6639 \ - rmd160 4c74a75a8a26073dd5f016410cece3391d7ad712 \ - sha256 b14d44b0645d7eca2f1e1d50ffc157a8df7594f407a2ca66aedc19506b3d5813 +checksums md5 9da79d3a0604d433085ad4dc0e430100 \ + rmd160 4a5b6e486304cd4e0a96d94ddc8bf88eb0a6f574 \ + sha256 6e9e0a5c0e673ae41d64ca265d4abdadf2b83a60ff27c516a8dbb0e2b38965cf python.versions 26 27 Modified: trunk/dports/python/py-obspy/files/patch-setup.py.diff =================================================================== --- trunk/dports/python/py-obspy/files/patch-setup.py.diff 2013-07-29 17:04:14 UTC (rev 108651) +++ trunk/dports/python/py-obspy/files/patch-setup.py.diff 2013-07-29 17:25:57 UTC (rev 108652) @@ -1,6 +1,14 @@ ---- setup.orig.py 2012-12-17 14:04:38.000000000 +0100 -+++ setup.py 2013-02-06 18:52:13.000000000 +0100 -@@ -362,8 +362,8 @@ +--- setup.orig.py 2013-06-28 18:07:26.000000000 +0200 ++++ setup.py 2013-07-08 11:48:13.000000000 +0200 +@@ -27,7 +27,6 @@ + from distutils.unixccompiler import UnixCCompiler + from setuptools import find_packages, setup + from setuptools.extension import Extension +-import distribute_setup + import glob + import os + import platform +@@ -370,8 +369,8 @@ # otherwise we just use the original compile method UnixCCompiler.linker_so = None return self._original_compile(obj, src, *args, **kwargs) @@ -9,13 +17,22 @@ + UnixCCompiler.linker_so = [os.environ.get("F77")] + self.compiler_so = [os.environ.get("F77")] cc_args = ['-c', '-fno-underscoring'] - if sys.platform == 'darwin': - self.compiler_so = _darwin_compiler_fixup(self.compiler_so, -@@ -607,7 +607,6 @@ - # setup Fortran extension - src = os.path.join('obspy', 'taup', 'src') + os.sep + cc_args.append('-fPIC') + try: +@@ -621,7 +620,6 @@ + taupargs = [] + lib = MyExtension(lib_name, - libraries=['gfortran'], + extra_link_args=extra_link_args, sources=[src + 'emdlv.f', src + 'libtau.f', src + 'ttimes_subrout.f']) - return lib +@@ -629,8 +627,6 @@ + + + def setupPackage(gfortran=True, ccompiler=True): +- # automatically install distribute if the user does not have it installed +- distribute_setup.use_setuptools() + # use lib2to3 for Python 3.x + if sys.version_info[0] == 3: + convert2to3()