<!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>[127714] trunk/dports/science/berkeleygw/Portfile</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/127714">127714</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2014-11-01 12:17:33 -0700 (Sat, 01 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>berkeleygw: Use compilers PortGroup. Add note about registering account. Consolidate common part of build.args between variants.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceberkeleygwPortfile">trunk/dports/science/berkeleygw/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceberkeleygwPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/berkeleygw/Portfile (127713 => 127714)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/berkeleygw/Portfile 2014-11-01 18:45:54 UTC (rev 127713)
+++ trunk/dports/science/berkeleygw/Portfile 2014-11-01 19:17:33 UTC (rev 127714)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup compilers 1.0
</ins><span class="cx">
</span><span class="cx"> name berkeleygw
</span><span class="cx"> version 1.0.6
</span><span class="lines">@@ -20,16 +21,25 @@
</span><span class="cx"> checksums rmd160 7d4861abdc7592a0768420df2fd9014918de8bd4 \
</span><span class="cx"> sha256 8912a5654d2b343689ec6c0ccd6b355ad336d04e46592684a1125573a6544ea7
</span><span class="cx">
</span><ins>+distfiles BGW-${version}.tar.gz
+
</ins><span class="cx"> depends_lib port:atlas \
</span><span class="cx"> port:fftw
</span><ins>+# do we need Fortran variant for fftw?
</ins><span class="cx">
</span><ins>+compilers.choose fc cpp
+compilers.setup require_fortran -dragonegg
+
+if {![fortran_variant_isset]} {
+ default_variants-append +gcc48
+}
+
</ins><span class="cx"> # fftw is not universal
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><del>-distfiles BGW-${version}.tar.gz
</del><ins>+patchfiles patch-testsuite-Silane-PARATEC-Silane.test.diff \
+ patch-Common-common-rules.mk.diff
</ins><span class="cx">
</span><del>-patchfiles patch-testsuite-Silane-PARATEC-Silane.test.diff
-
</del><span class="cx"> configure {
</span><span class="cx"> system -W ${worksrcpath} "sed 's|/opt/local|${prefix}|' < config/generic.serial.macos.mk > arch.mk"
</span><span class="cx"> }
</span><span class="lines">@@ -43,76 +53,30 @@
</span><span class="cx"> test.cmd make
</span><span class="cx"> test.target check
</span><span class="cx">
</span><del>-# more options that could be added: threads, openmpi, mpich
-
-# This is from the Fortran recipe, but with some customization
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc48
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description "build with gcc${ver_no_dot}" conflicts g95}
-
- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
- }
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
- }
- append variant_line { {}}
-
- eval $variant_line
-
- append g95_conflicts " conflicts gcc${ver_no_dot}"
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
</del><ins>+notes {
+ For the purposes of record-keeping and support, please register an account at www.berkeleygw.org.
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-eval [concat {variant g95 description {build with clang/g95}} $g95_conflicts {{}}]
</del><ins>+# more options that could be added: threads, openmpi, mpich
</ins><span class="cx">
</span><del>-if {[variant_isset g95]} {
- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
- }
-}
</del><ins>+pre-build {
+ build.args LINK="${configure.fc}" CC_COMP=${configure.cxx} C_COMP=${configure.cc} C_LINK=${configure.cxx} \
+ LAPACKLIB="-L${prefix}/lib/ -lsatlas"
</ins><span class="cx">
</span><del>-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
-}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- if {[variant_isset gcc${ver_no_dot}]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc${ver_no_dot}
-
- build.args VERSION=-mp-${ver}
</del><ins>+ if {[variant_isset g95]} {
+ build.args-append COMPFLAG="-DG95" FCPP="${configure.cc} -P -E -ansi" \
+ F90free="${prefix}/bin/g95 -ffree-form -ffree-line-length-huge -fno-second-underscore" \
+ MOD_OPT="-fmod="
+ # test, destroot args needed just to avoid trying to build in the test/openmp directory unnecessarily
+ test.args COMPFLAG="-DG95"
+ destroot.args COMPFLAG="-DG95"
+ } else {
+ # gcc is default in arch.mk so most things do not need to be modified
+ build.args-append FCPP="${configure.cpp} -ansi" \
+ F90free="${configure.fc} -ffree-form -ffree-line-length-none -fno-second-underscore"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {[variant_isset g95]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:g95
-
- build.args COMPFLAG="-DG95" FCPP="${configure.cc} -P -E -ansi" LINK="${prefix}/bin/g95" \
- F90free="${prefix}/bin/g95 -ffree-form -ffree-line-length-huge -fno-second-underscore" \
- MOD_OPT="-fmod=" CC_COMP=${configure.cxx} C_COMP=${configure.cc} C_LINK=${configure.cxx} \
- LAPACKLIB="-L${prefix}/lib/ -lsatlas"
- # test, destroot args needed just to avoid trying to build in the test/openmp directory unnecessarily
- test.args COMPFLAG="-DG95"
- destroot.args COMPFLAG="-DG95"
- patchfiles-append patch-Common-common-rules.mk.diff
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex BGW-(\[0-9.\]+).tar
</span></span></pre>
</div>
</div>
</body>
</html>