<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[114091] trunk/dports/python/py-obspy</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/114091">114091</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2013-11-28 14:43:06 -0800 (Thu, 28 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-obspy: fix a problem with gfortran (maintainer, #41122)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpyobspyPortfile">trunk/dports/python/py-obspy/Portfile</a></li>
<li><a href="#trunkdportspythonpyobspyfilespatchsetuppydiff">trunk/dports/python/py-obspy/files/patch-setup.py.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpyobspyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-obspy/Portfile (114090 => 114091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-obspy/Portfile 2013-11-28 22:32:28 UTC (rev 114090)
+++ trunk/dports/python/py-obspy/Portfile 2013-11-28 22:43:06 UTC (rev 114091)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name py-obspy
</span><span class="cx"> version 0.8.4
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories-append science
</span><span class="cx"> platforms darwin
</span><span class="cx"> maintainers bo.ingv.it:Peter.Danecek openmaintainer
</span><span class="lines">@@ -35,17 +35,17 @@
</span><span class="cx"> python.versions 26 27
</span><span class="cx">
</span><span class="cx"> if {${subport} != ${name}} {
</span><del>- depends_build port:py${python.version}-setuptools
- depends_lib-append port:py${python.version}-numpy \
- port:py${python.version}-scipy \
- port:py${python.version}-lxml \
- port:py${python.version}-suds \
- port:py${python.version}-sqlalchemy
</del><ins>+ depends_build-append port:py${python.version}-setuptools
+ depends_lib-append port:py${python.version}-numpy \
+ port:py${python.version}-scipy \
+ port:py${python.version}-lxml \
+ port:py${python.version}-suds \
+ port:py${python.version}-sqlalchemy
</ins><span class="cx">
</span><span class="cx"> # py-scipy is not universal
</span><del>- universal_variant no
</del><ins>+ universal_variant no
</ins><span class="cx">
</span><del>- patchfiles patch-setup.py.diff
</del><ins>+ patchfiles patch-setup.py.diff
</ins><span class="cx">
</span><span class="cx"> set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
</span><span class="cx"> set default_fortran_variant +gcc48
</span><span class="lines">@@ -86,8 +86,7 @@
</span><span class="cx"> depends_build-append port:gcc${ver_no_dot}
</span><span class="cx">
</span><span class="cx"> configure.fc ${prefix}/bin/gfortran-mp-${ver}
</span><del>- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
</del><ins>+ compiler.library_path ${prefix}/lib/gcc${ver_no_dot}
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkdportspythonpyobspyfilespatchsetuppydiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-obspy/files/patch-setup.py.diff (114090 => 114091)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-obspy/files/patch-setup.py.diff 2013-11-28 22:32:28 UTC (rev 114090)
+++ trunk/dports/python/py-obspy/files/patch-setup.py.diff 2013-11-28 22:43:06 UTC (rev 114091)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><del>---- setup.orig.py 2013-06-28 18:07:26.000000000 +0200
-+++ setup.py 2013-07-08 11:48:13.000000000 +0200
</del><ins>+--- setup.orig.py
++++ setup.py
</ins><span class="cx"> @@ -27,7 +27,6 @@
</span><span class="cx"> from distutils.unixccompiler import UnixCCompiler
</span><span class="cx"> from setuptools import find_packages, setup
</span><span class="lines">@@ -14,22 +14,14 @@
</span><span class="cx"> return self._original_compile(obj, src, *args, **kwargs)
</span><span class="cx"> - UnixCCompiler.linker_so = ["gfortran"]
</span><span class="cx"> - self.compiler_so = ["gfortran"]
</span><del>-+ UnixCCompiler.linker_so = [os.environ.get("F77")]
-+ self.compiler_so = [os.environ.get("F77")]
</del><ins>++ UnixCCompiler.linker_so = [os.environ.get("FC")]
++ self.compiler_so = [os.environ.get("FC")]
</ins><span class="cx"> cc_args = ['-c', '-fno-underscoring']
</span><span class="cx"> cc_args.append('-fPIC')
</span><span class="cx"> try:
</span><del>-@@ -621,7 +620,6 @@
- taupargs = []
</del><ins>+@@ -629,8 +628,6 @@
</ins><span class="cx">
</span><del>- lib = MyExtension(lib_name,
-- libraries=['gfortran'],
- extra_link_args=extra_link_args,
- sources=[src + 'emdlv.f', src + 'libtau.f',
- src + 'ttimes_subrout.f'])
-@@ -629,8 +627,6 @@
</del><span class="cx">
</span><del>-
</del><span class="cx"> def setupPackage(gfortran=True, ccompiler=True):
</span><span class="cx"> - # automatically install distribute if the user does not have it installed
</span><span class="cx"> - distribute_setup.use_setuptools()
</span></span></pre>
</div>
</div>
</body>
</html>