<!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>[124152] trunk/dports/python</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/124152">124152</a></dd>
<dt>Author</dt> <dd>petr@macports.org</dd>
<dt>Date</dt> <dd>2014-08-19 16:53:55 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>py{26}-ngl: unified portgroup, rename, format, fix livecheck</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpynglPortfile">trunk/dports/python/py-ngl/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/python/py-ngl/</li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/dports/python/py26-ngl/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpynglPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-ngl/Portfile (123646 => 124152)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py26-ngl/Portfile 2014-08-11 21:34:49 UTC (rev 123646)
+++ trunk/dports/python/py-ngl/Portfile 2014-08-19 23:53:55 UTC (rev 124152)
</span><span class="lines">@@ -2,27 +2,29 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><del>-PortGroup python26 1.0
</del><ins>+PortGroup python 1.0
</ins><span class="cx">
</span><del>-name py26-ngl
</del><ins>+name py-ngl
</ins><span class="cx"> version 1.3.0b1
</span><span class="cx"> revision 1
</span><ins>+categories-append science
</ins><span class="cx"> platforms darwin
</span><ins>+license PyNGL
</ins><span class="cx"> maintainers nomaintainer
</span><del>-license PyNGL
-categories-append science
</del><ins>+
</ins><span class="cx"> description module to visualize scientific data
</span><ins>+long_description \
+ PyNGL is a Python language module used to visualize scientific data, \
+ with an emphasis on high quality 2D visualizations.
+
</ins><span class="cx"> homepage http://www.pyngl.ucar.edu/
</span><span class="cx"> master_sites http://www.pyngl.ucar.edu/Download/
</span><span class="cx"> distname PyNGL-${version}
</span><ins>+
</ins><span class="cx"> checksums md5 231e0ad8ab7f295483f131367ab856cc \
</span><span class="cx"> sha1 76bbb03c05f0acb1591172543d3decc7c4397422 \
</span><span class="cx"> rmd160 bd4357d46af0a723cd81c16bdb0ecc3df03fa6a2
</span><span class="cx">
</span><del>-long_description \
- PyNGL is a Python language module used to visualize scientific data, \
- with an emphasis on high quality 2D visualizations.
-
</del><span class="cx"> fetch {
</span><span class="cx"> if {![file exists ${distpath}/${distfiles}]} {
</span><span class="cx"> xinstall -d ${distpath}
</span><span class="lines">@@ -31,96 +33,103 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-patch {
- reinplace "s|/usr/X11R6/lib|${prefix}/lib|" ${worksrcpath}/setup.py
- reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|" ${worksrcpath}/examples/pynglex
- reinplace "s|py_cmd = 'python'|py_cmd = '${prefix}/bin/python2.6'|" ${worksrcpath}/examples/pynglex
-}
</del><ins>+python.versions 26
</ins><span class="cx">
</span><del>-# ncarg is not universal (and thus py26-nio is not universal)
-universal_variant no
</del><ins>+if {${name} ne ${subport}} {
+ depends_lib-append port:py26-nio
</ins><span class="cx">
</span><del>-depends_lib-append port:py26-nio
</del><ins>+ # ncarg is not universal (and thus py26-nio is not universal)
+ universal_variant no
</ins><span class="cx">
</span><del>-build.env PNG_PREFIX=${prefix} \
- ZLIB_PREFIX=${prefix} \
- NCARG_ROOT=${prefix}
-destroot.env NCARG_ROOT=${prefix}
</del><ins>+ patch {
+ reinplace "s|/usr/X11R6/lib|${prefix}/lib|" ${worksrcpath}/setup.py
+ reinplace "s|/usr/bin/env python|${prefix}/bin/python2.6|" ${worksrcpath}/examples/pynglex
+ reinplace "s|py_cmd = 'python'|py_cmd = '${prefix}/bin/python2.6'|" ${worksrcpath}/examples/pynglex
+ }
</ins><span class="cx">
</span><del>-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 {}
</del><ins>+ build.env PNG_PREFIX=${prefix} \
+ ZLIB_PREFIX=${prefix} \
+ NCARG_ROOT=${prefix}
</ins><span class="cx">
</span><del>-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
</del><ins>+ destroot.env NCARG_ROOT=${prefix}
</ins><span class="cx">
</span><del>- set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
</del><ins>+ 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 {}
</ins><span class="cx">
</span><del>- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
</del><ins>+ 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}" 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}"
</ins><span class="cx"> }
</span><ins>+ append variant_line { {}}
</ins><span class="cx">
</span><del>- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
</del><ins>+ 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 ""
+ }
+ }
</ins><span class="cx"> }
</span><del>- append variant_line { {}}
</del><span class="cx">
</span><del>- eval $variant_line
</del><ins>+ eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
</ins><span class="cx">
</span><del>- append g95_conflicts " conflicts gcc${ver_no_dot}"
-
- if {[variant_isset gcc${ver_no_dot}]} {
- if {${default_fortran_variant} != "+gcc${ver_no_dot}"} {
</del><ins>+ if {[variant_isset g95]} {
+ if {${default_fortran_variant} != "+g95"} {
</ins><span class="cx"> set default_fortran_variant ""
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-if {[variant_isset g95]} {
- if {${default_fortran_variant} != "+g95"} {
- set default_fortran_variant ""
</del><ins>+ if {${default_fortran_variant} != ""} {
+ default_variants-append "${default_fortran_variant}"
</ins><span class="cx"> }
</span><del>-}
</del><span class="cx">
</span><del>-if {${default_fortran_variant} != ""} {
- default_variants-append "${default_fortran_variant}"
-}
</del><ins>+ foreach ver ${gcc_versions} {
+ set ver_no_dot [join [split ${ver} "."] ""]
</ins><span class="cx">
</span><del>-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
</del><ins>+ 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}
</ins><span class="cx">
</span><del>- if {[variant_isset gcc${ver_no_dot}]} {
</del><ins>+ configure.fc ${prefix}/bin/gfortran-mp-${ver}
+ configure.f77 ${prefix}/bin/gfortran-mp-${ver}
+ configure.f90 ${prefix}/bin/gfortran-mp-${ver}
+
+ build.env-append F2CLIBS=gfortran \
+ F2CLIBS_PREFIX=${prefix}/lib/gcc${ver_no_dot} \
+ CC=${configure.cc}
+ }
+ }
+
+ if {[variant_isset g95]} {
</ins><span class="cx"> depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
</span><del>- depends_build-append port:gcc${ver_no_dot}
</del><ins>+ depends_build-append port:g95
</ins><span class="cx">
</span><del>- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
</del><ins>+ configure.fc ${prefix}/bin/g95
+ configure.f77 ${prefix}/bin/g95
+ configure.f90 ${prefix}/bin/g95
</ins><span class="cx">
</span><del>- build.env-append F2CLIBS=gfortran \
- F2CLIBS_PREFIX=${prefix}/lib/gcc${ver_no_dot} \
</del><ins>+ configure.fflags-append -fno-second-underscore
+
+ build.env-append F2CLIBS=f95 \
+ F2CLIBS_PREFIX=${prefix}/lib/ \
</ins><span class="cx"> CC=${configure.cc}
</span><span class="cx"> }
</span><del>-}
</del><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
-
- configure.fc ${prefix}/bin/g95
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
-
- configure.fflags-append -fno-second-underscore
-
- build.env-append F2CLIBS=f95 \
- F2CLIBS_PREFIX=${prefix}/lib/ \
- CC=${configure.cc}
</del><ins>+ livecheck.type none
+} else {
+ livecheck.type regex
+ livecheck.url ${master_sites}
+ livecheck.regex {of PyNGL is ([0-9]\.[0-9]\.[0-9]+)}
</ins><span class="cx"> }
</span><del>-
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex {The current version of PyNGL and PyNIO is ([0-9]\.[0-9]\.[0-9][a-z]+[0-9]+)}
</del></span></pre>
</div>
</div>
</body>
</html>