<!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>[141198] trunk/dports/science/cdf/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/141198">141198</a></dd>
<dt>Author</dt> <dd>dstrubbe@macports.org</dd>
<dt>Date</dt> <dd>2015-10-12 09:30:14 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>cdf: Use compilers portgroup. Remove unnecessary explicit mention of libgcc in link line.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencecdfPortfile">trunk/dports/science/cdf/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencecdfPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/cdf/Portfile (141197 => 141198)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/cdf/Portfile 2015-10-12 16:14:25 UTC (rev 141197)
+++ trunk/dports/science/cdf/Portfile 2015-10-12 16:30:14 UTC (rev 141198)
</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 cdf
</span><span class="cx"> epoch 1
</span><span class="lines">@@ -40,25 +41,21 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> use_configure no
</span><ins>+compilers.choose cc fc
+compilers.setup
</ins><span class="cx">
</span><span class="cx"> pre-build {
</span><span class="cx"> set cdf_os macosx
</span><span class="cx"> #set cdf_env ${configure.build_arch}
</span><span class="cx"> set cdf_env gnu
</span><span class="cx">
</span><del>- if {[string match *gcc* ${configure.compiler}]} {
- set libgcc [exec ${configure.cc} -print-libgcc-file-name]
- } else {
- set libgcc ""
- }
-
</del><span class="cx"> build.args-append ENV=${cdf_env} \
</span><span class="cx"> OS=${cdf_os} \
</span><span class="cx"> COPTIONSld_${cdf_os}_${cdf_env}= \
</span><span class="cx"> CURSESLIB_${cdf_os}_${cdf_env}=${prefix}/lib/libncurses.dylib \
</span><span class="cx"> LDOPTIONS_${cdf_os}_${cdf_env}="-dynamiclib -install_name ${prefix}/lib/libcdf.dylib" \
</span><span class="cx"> MACOSxFopt= \
</span><del>- MACOSxlink="-lc -lm ${libgcc}" \
</del><ins>+ MACOSxlink="-lc -lm" \
</ins><span class="cx"> MACOSxmin=
</span><span class="cx">
</span><span class="cx"> if {${os.endian} eq "little"} {
</span><span class="lines">@@ -73,7 +70,7 @@
</span><span class="cx"> CC="${configure.cc} ${configure.cc_archflags}" \
</span><span class="cx"> LD="${configure.cc} ${configure.cc_archflags}"
</span><span class="cx">
</span><del>- if {${configure.fc} eq ""} {
</del><ins>+ if {![fortran_variant_isset]} {
</ins><span class="cx"> build.args-append \
</span><span class="cx"> FORTRAN=no
</span><span class="cx"> } else {
</span><span class="lines">@@ -97,49 +94,5 @@
</span><span class="cx"> move ${destroot}${prefix}/CDFLeapSeconds.txt ${docdir}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-set gcc_versions {4.4 4.5 4.6 4.7 4.8 4.9}
-set default_fortran_variant +gcc49
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}"}
-
- 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
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
- set default_fortran_variant ""
- }
- }
-}
-
-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}
-
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
- }
-}
-
</del><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.regex {latest released version \(V([0-9.]+)\)}
</span></span></pre>
</div>
</div>
</body>
</html>