<!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>[130951] trunk/dports/science/giza</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/130951">130951</a></dd>
<dt>Author</dt> <dd>sean@macports.org</dd>
<dt>Date</dt> <dd>2015-01-03 22:00:55 -0800 (Sat, 03 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>giza: fix incorrect usuage with compilers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegizaPortfile">trunk/dports/science/giza/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/giza/files/</li>
<li><a href="#trunkdportssciencegizafilespatchMakefilediff">trunk/dports/science/giza/files/patch-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegizaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/giza/Portfile (130950 => 130951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/giza/Portfile 2015-01-04 06:00:51 UTC (rev 130950)
+++ trunk/dports/science/giza/Portfile 2015-01-04 06:00:55 UTC (rev 130951)
</span><span class="lines">@@ -27,8 +27,7 @@
</span><span class="cx"> conflicts pgplot
</span><span class="cx"> use_configure no
</span><span class="cx">
</span><del>-compilers.choose fc f90
-compilers.setup require_fortran -dragonegg
</del><ins>+compilers.setup require_fortran -dragonegg -g95
</ins><span class="cx">
</span><span class="cx"> build.cmd make
</span><span class="cx"> build.args CC=${configure.cc} FC=${configure.fc}
</span><span class="lines">@@ -41,32 +40,12 @@
</span><span class="cx"> destroot.args PREFIX=${prefix}
</span><span class="cx"> use_parallel_build no
</span><span class="cx">
</span><del>-set gcc_versions {4.4 4.5 4.6 4.7 4.8 4.9}
</del><ins>+patchfiles-append patch-Makefile.diff
</ins><span class="cx">
</span><del>-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- if {[variant_isset gcc${ver_no_dot}]} {
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.cc ${prefix}/bin/gcc-mp-${ver}
- build.args-append CC=${configure.cc} FC=${configure.fc} FLIBS="-L${prefix}/lib/gcc${ver_no_dot} -lgfortran"
- }
</del><ins>+pre-build {
+ build.args-append CC=${configure.cc} FC=${configure.fc}
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset g95]} {
- configure.fc ${prefix}/bin/g95
- build.args-append FC=${configure.fc} FLIBS="-L${prefix}/lib/ -lf95"
-}
-
-if {![fortran_variant_isset]} {
- default_variants-append +gcc48
- set ver 4.8
- set ver_no_dot [join [split ${ver} "."] ""]
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.cc ${prefix}/bin/gcc-mp-${ver}
- build.args-append CC=${configure.cc} FC=${configure.fc} FLIBS="-L${prefix}/lib/gcc${ver_no_dot} -lgfortran"
-}
-
</del><span class="cx"> post-destroot {
</span><span class="cx"> system "install_name_tool -id ${prefix}/lib/libcpgplot.dylib ${destroot}${prefix}/lib/libcpgplot.dylib"
</span><span class="cx"> system "install_name_tool -id ${prefix}/lib/libpgplot.dylib ${destroot}${prefix}/lib/libpgplot.dylib"
</span></span></pre></div>
<a id="trunkdportssciencegizafilespatchMakefilediff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/giza/files/patch-Makefile.diff (0 => 130951)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/giza/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/science/giza/files/patch-Makefile.diff 2015-01-04 06:00:55 UTC (rev 130951)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- build/Makefile.orig 2014-12-30 21:28:11.000000000 -0600
++++ build/Makefile 2014-12-30 21:28:35.000000000 -0600
+@@ -230,7 +230,7 @@
+ ln -sf $(SHARED_LIB_GIZA_VERSION) $(SHARED_LIB_GIZA)
+
+ $(SHARED_LIB_PGPLOT): $(INCDIR)/giza-version.h $(OBJECTS) giza-fortran.o giza-pgplot.o
+- $(LIBTOOL) $(SHAREDLIBFLAGS) -o $(SHARED_LIB_PGPLOT) $(OBJECTS) giza-fortran.o giza-pgplot.o $(LDFLAGS) $(FLIBS)
++ $(FC) $(SHAREDLIBFLAGS) -o $(SHARED_LIB_PGPLOT) $(OBJECTS) giza-fortran.o giza-pgplot.o $(LDFLAGS)
+
+ $(SHARED_LIB_CPGPLOT): $(INCDIR)/giza-version.h $(OBJECTS) giza-cpgplot.o
+ $(LIBTOOL) $(SHAREDLIBFLAGS) -o $@ $(OBJECTS) giza-cpgplot.o $(LDFLAGS)
</ins></span></pre>
</div>
</div>
</body>
</html>