Ignore:
Timestamp:
Dec 23, 2002, 6:44:41 PM (16 years ago)
Author:
landonf
Message:

Merge in landonf-1_0

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/src/port1.0/portutil.tcl

    r1452 r1500  
    10731073}
    10741074
     1075# build the specified portfile with default workpath
     1076proc portfile_run {this} {
     1077    set portname [$this get name]
     1078        if {[portexec_int $portname install] == 0} {
     1079                portexec_int $portname clean
     1080    }
     1081}
     1082
    10751083# builds the specified port (looked up in the index) to the specified target
    10761084# doesn't yet support options or variants...
     
    10851093        set options(workpath) ${newworkpath}
    10861094    }
    1087 
    10881095        # Escape regex special characters
    1089         regsub -all "(\\(){1}|(\\)){1}|(\\{1}){1}|(\\+){1}|(\\{1}){1}|(\\{){1}|(\\}){1}|(\\^){1}|(\\$){1}|(\\.){1}|(\\\\){1}" $portname "\\\\&" search_string
     1096        regsub -all "(\\(){1}|(\\)){1}|(\\{1}){1}|(\\+){1}|(\\{1}){1}|(\\{){1}|(\\}){1}|(\\^){1}|(\\$){1}|(\\.){1}|(\\\\){1}" $portname "\\\\&" search_string 
    10901097
    10911098    set res [dportsearch ^$search_string\$]
    10921099    if {[llength $res] < 2} {
    1093         ui_error "Portfile $portname not found"
     1100        ui_error "Dependency $portname not found"
    10941101        return -1
    10951102    }
     1103
    10961104    array set portinfo [lindex $res 1]
    10971105    set porturl $portinfo(porturl)
     
    11071115}
    11081116
    1109 # build the specified portfile
    1110 proc portfile_run {this} {
    1111     set portname [$this get name]
    1112         if {[portexec_int $portname install] == 0} {
    1113                 portexec_int $portname clean
    1114     }
    1115 }
    1116 
    11171117proc portfile_test {this} {
    11181118    set receipt [registry_exists [$this get name]]
     
    11891189            lappend search_path $env(DYLD_LIBRARY_PATH)
    11901190        } else {
    1191             lappend search_path /lib /usr/local/lib /lib /usr/lib /opt/local/lib /usr/X11R6/lib ${prefix}/lib
     1191            lappend search_path /lib /usr/local/lib /lib /usr/lib /op/local/lib /usr/X11R6/lib ${prefix}/lib
    11921192        }
    11931193        if {[info exists env(DYLD_FALLBACK_LIBRARY_PATH)]} {
     
    13061306    } else {
    13071307        # XXX adduser is only available for darwin, add more support here
    1308         ui_warning "WARNING: adduser is not implemented on ${os.platform}."
    1309         ui_warning "The requested user was not created."
     1308        ui_warn "WARNING: adduser is not implemented on ${os.platform}."
     1309        ui_warn "The requested user was not created."
    13101310    }
    13111311}
     
    13361336    } else {
    13371337        # XXX addgroup is only available for darwin, add more support here
    1338         ui_warning "WARNING: addgroup is not implemented on ${os.platform}."
    1339         ui_warning "The requested group was not created."
    1340     }
    1341 }
     1338        ui_warn "WARNING: addgroup is not implemented on ${os.platform}."
     1339        ui_warn "The requested group was not created."
     1340    }
     1341}
Note: See TracChangeset for help on using the changeset viewer.