<!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>[141005] trunk/dports/_resources/port1.0/group</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/141005">141005</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-10-07 13:18:42 -0700 (Wed, 07 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>python 1.0 PortGroup: when creating the requested subports, append Python to each; do not overwrite what was there before.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupoctave10tcl">trunk/dports/_resources/port1.0/group/octave-1.0.tcl</a></li>
<li><a href="#trunkdports_resourcesport10grouppython10tcl">trunk/dports/_resources/port1.0/group/python-1.0.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupoctave10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/octave-1.0.tcl (141004 => 141005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/octave-1.0.tcl 2015-10-07 19:48:25 UTC (rev 141004)
+++ trunk/dports/_resources/port1.0/group/octave-1.0.tcl 2015-10-07 20:18:42 UTC (rev 141005)
</span><span class="lines">@@ -57,6 +57,26 @@
</span><span class="cx">
</span><span class="cx"> worksrcdir ${octave.module}
</span><span class="cx">
</span><ins>+ # depend on the Fortran compiler used to build octave
+
+ if {[catch {set installed [lindex [registry_active octave] 0]}]} {
+ ui_msg "Warning in octave 1.0 PortGroup:"
+ ui_msg " Cannot find port 'octave' in the registry."
+ ui_msg " This should never happen!"
+ ui_msg " Continuing, and hoping for the best!"
+ } else {
+ set _variants [lindex ${installed} 3]
+ set gcc1 [string first {gcc} ${_variants}]
+ if {${gcc1} != -1} {
+ # using +gccXY; retrieve that string
+ set gcc [string range ${_variants} ${gcc1} [expr ${gcc1} + 4]]
+ } else {
+ # must be using +g95
+ set gcc "g95"
+ }
+ #depends_lib-append port:${gcc}
+ }
+
</ins><span class="cx"> # octave is not universal
</span><span class="cx">
</span><span class="cx"> universal_variant no
</span><span class="lines">@@ -76,7 +96,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>-
</del><span class="cx"> # rename the effective worksrcdir to always be ${octave.module}
</span><span class="cx">
</span><span class="cx"> set worksrcdir_name [exec /bin/ls ${workpath} | grep -v -E "^\\."]
</span><span class="lines">@@ -131,9 +150,21 @@
</span><span class="cx"> # fix usage of LAPACK_LIBS to include FLIBS, such that -lgfortran
</span><span class="cx"> # is always paired with the appropriate -Lpath statement.
</span><span class="cx">
</span><ins>+ set GFORTRAN [glob ${prefix}/lib/libgcc/libgfortran*]
+ set QUADMATH [glob ${prefix}/lib/libgcc/libquadmath*]
+ set FLIBS [exec ${prefix}/bin/mkoctfile -p FLIBS | sed -e "s@-L\[^ \]* @@g" -e "s@-lgfortran@${GFORTRAN}@g" -e "s@-lquadmath@${QUADMATH}@g"]
+ set FLIBS "-L${prefix}/lib/libgcc ${FLIBS}"
+ set LAPACK_LIBS [exec ${prefix}/bin/mkoctfile -p LAPACK_LIBS | sed -e "s@-L\[^ \]* @@g" -e "s@-lgfortran@${GFORTRAN}@g" -e "s@-lquadmath@${QUADMATH}@g"]
+ set LAPACK_LIBS "${FLIBS} ${LAPACK_LIBS}"
+
+ ui_msg "GFORTRAN is '${GFORTRAN}'"
+ ui_msg "QUADMATH is '${QUADMATH}'"
+ ui_msg "FLIBS is '${FLIBS}'"
+ ui_msg "LAPACK_LIBS is '${LAPACK_LIBS}'"
+
</ins><span class="cx"> configure.env-append \
</span><del>- LAPACK_LIBS='[exec ${prefix}/bin/mkoctfile -p FLIBS] \
- [exec ${prefix}/bin/mkoctfile -p LAPACK_LIBS]'
</del><ins>+ FLIBS='${FLIBS}' \
+ LAPACK_LIBS='${LAPACK_LIBS}'
</ins><span class="cx">
</span><span class="cx"> # In 10.8+, set the LC_CTYPE (locale) to "C" otherwise
</span><span class="cx"> # /usr/bin/sed can fail with an error when processing unicode
</span><span class="lines">@@ -162,12 +193,37 @@
</span><span class="cx"> xinstall -m 644 ${worksrcpath}/${distname}.tar.gz ${destroot}${prefix}/share/octave/${octave.module}.tar.gz
</span><span class="cx"> }
</span><span class="cx">
</span><del>-post-deactivate {
- system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall -nodeps ${octave.module}'"
- system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
</del><ins>+pre-deactivate {
+ ui_debug "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall -nodeps ${octave.module}'"
+ system "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall -nodeps ${octave.module}'"
+ ui_debug "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
+ system "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
+
+ # remove cruft left behind; cruft sometimes happens ;)
+ foreach global_dir {lib/octave/packages share/octave/packages} {
+ if {![catch {set stk_dirs [glob ${prefix}/${global_dir}/${octave.module}*]}]} {
+ foreach stk_dir ${stk_dirs} {
+ ui_debug "removing cruft directory ${stk_dir}"
+ file delete -force ${stk_dir}
+ }
+ }
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><del>- system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg install -verbose -global ${prefix}/share/octave/${octave.module}.tar.gz'"
- system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
</del><ins>+
+ # remove cruft left behind; cruft sometimes happens ;)
+ foreach global_dir {lib/octave/packages share/octave/packages} {
+ if {![catch {set stk_dirs [glob ${prefix}/${global_dir}/${octave.module}*]}]} {
+ foreach stk_dir ${stk_dirs} {
+ ui_debug "removing cruft directory ${stk_dir}"
+ file delete -force ${stk_dir}
+ }
+ }
+ }
+
+ ui_debug "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg install -verbose -global ${prefix}/share/octave/${octave.module}.tar.gz'"
+ system "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg install -verbose -global ${prefix}/share/octave/${octave.module}.tar.gz'"
+ ui_debug "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
+ system "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
</ins><span class="cx"> }
</span></span></pre></div>
<a id="trunkdports_resourcesport10grouppython10tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/python-1.0.tcl (141004 => 141005)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/python-1.0.tcl 2015-10-07 19:48:25 UTC (rev 141004)
+++ trunk/dports/_resources/port1.0/group/python-1.0.tcl 2015-10-07 20:18:42 UTC (rev 141005)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> global name subport python._addedcode
</span><span class="cx"> if {[string match py-* $name]} {
</span><span class="cx"> foreach v [option $option] {
</span><del>- subport py${v}[string trimleft $name py] { depends_lib port:python${v} }
</del><ins>+ subport py${v}[string trimleft $name py] { depends_lib-append port:python${v} }
</ins><span class="cx"> }
</span><span class="cx"> if {$subport eq $name || $subport eq ""} {
</span><span class="cx"> # set up py-foo as a stub port that depends on the default pyXY-foo
</span></span></pre>
</div>
</div>
</body>
</html>