Ignore:
Timestamp:
Oct 7, 2015, 8:25:09 PM (3 years ago)
Author:
michaelld@…
Message:

revert r141005; my bad.

Location:
trunk/dports/_resources/port1.0/group
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/_resources/port1.0/group/octave-1.0.tcl

    r141005 r141006  
    5858    worksrcdir                  ${octave.module}
    5959
    60     # depend on the Fortran compiler used to build octave
    61 
    62     if {[catch {set installed [lindex [registry_active octave] 0]}]} {
    63         ui_msg "Warning in octave 1.0 PortGroup:"
    64         ui_msg "  Cannot find port 'octave' in the registry."
    65         ui_msg "  This should never happen!"
    66         ui_msg "  Continuing, and hoping for the best!"
    67     } else {
    68         set _variants [lindex ${installed} 3]
    69         set gcc1 [string first {gcc} ${_variants}]
    70         if {${gcc1} != -1} {
    71             # using +gccXY; retrieve that string
    72             set gcc [string range ${_variants} ${gcc1} [expr ${gcc1} + 4]]
    73         } else {
    74             # must be using +g95
    75             set gcc "g95"
    76         }
    77         #depends_lib-append port:${gcc}
    78     }
    79 
    8060    # octave is not universal
    8161
     
    9777
    9878post-extract {
     79
    9980    # rename the effective worksrcdir to always be ${octave.module}
    10081
     
    151132    # is always paired with the appropriate -Lpath statement.
    152133
    153     set GFORTRAN [glob ${prefix}/lib/libgcc/libgfortran*]
    154     set QUADMATH [glob ${prefix}/lib/libgcc/libquadmath*]
    155     set FLIBS [exec ${prefix}/bin/mkoctfile -p FLIBS | sed -e "s@-L\[^ \]* @@g" -e "s@-lgfortran@${GFORTRAN}@g" -e "s@-lquadmath@${QUADMATH}@g"]
    156     set FLIBS "-L${prefix}/lib/libgcc ${FLIBS}"
    157     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"]
    158     set LAPACK_LIBS "${FLIBS} ${LAPACK_LIBS}"
    159 
    160     ui_msg "GFORTRAN is '${GFORTRAN}'"
    161     ui_msg "QUADMATH is '${QUADMATH}'"
    162     ui_msg "FLIBS is '${FLIBS}'"
    163     ui_msg "LAPACK_LIBS is '${LAPACK_LIBS}'"
    164 
    165134    configure.env-append \
    166         FLIBS='${FLIBS}' \
    167         LAPACK_LIBS='${LAPACK_LIBS}'
     135        LAPACK_LIBS='[exec ${prefix}/bin/mkoctfile -p FLIBS] \
     136                     [exec ${prefix}/bin/mkoctfile -p LAPACK_LIBS]'
    168137
    169138    # In 10.8+, set the LC_CTYPE (locale) to "C" otherwise
     
    194163}
    195164
    196 pre-deactivate {
    197     ui_debug "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall -nodeps ${octave.module}'"
    198     system "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall -nodeps ${octave.module}'"
    199     ui_debug "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
    200     system "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
    201 
    202     # remove cruft left behind; cruft sometimes happens ;)
    203     foreach global_dir {lib/octave/packages share/octave/packages} {
    204         if {![catch {set stk_dirs [glob ${prefix}/${global_dir}/${octave.module}*]}]} {
    205             foreach stk_dir ${stk_dirs} {
    206                 ui_debug "removing cruft directory ${stk_dir}"
    207                 file delete -force ${stk_dir}
    208             }
    209         }
    210     }
     165post-deactivate {
     166    system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg uninstall -nodeps ${octave.module}'"
     167    system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
    211168}
    212169
    213170post-activate {
    214 
    215     # remove cruft left behind; cruft sometimes happens ;)
    216     foreach global_dir {lib/octave/packages share/octave/packages} {
    217         if {![catch {set stk_dirs [glob ${prefix}/${global_dir}/${octave.module}*]}]} {
    218             foreach stk_dir ${stk_dirs} {
    219                 ui_debug "removing cruft directory ${stk_dir}"
    220                 file delete -force ${stk_dir}
    221             }
    222         }
    223     }
    224 
    225     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'"
    226     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'"
    227     ui_debug "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
    228     system "${prefix}/bin/octave -V -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
     171    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'"
     172    system "${prefix}/bin/octave -q -f --eval 'pkg prefix ${prefix}/share/octave/packages ${prefix}/lib/octave/packages; pkg rebuild'"
    229173}
  • trunk/dports/_resources/port1.0/group/python-1.0.tcl

    r141005 r141006  
    9797    if {[string match py-* $name]} {
    9898        foreach v [option $option] {
    99             subport py${v}[string trimleft $name py] { depends_lib-append port:python${v} }
     99            subport py${v}[string trimleft $name py] { depends_lib port:python${v} }
    100100        }
    101101        if {$subport eq $name || $subport eq ""} {
Note: See TracChangeset for help on using the changeset viewer.