Changeset 46958


Ignore:
Timestamp:
Feb 18, 2009, 10:32:59 AM (11 years ago)
Author:
ryandesign@…
Message:

packageall.tcl, rpmall.tcl: The default prefix is /opt/local, not /opt. Also, we're called MacPorts now.

Location:
trunk/base/portmgr/packaging
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/portmgr/packaging/packageall.tcl

    r26177 r46958  
    228228
    229229        # Start with verbose output off;
    230         # this will prevent the repopulation of /opt from getting logged.
     230        # this will prevent the repopulation of /opt/local from getting logged.
    231231        set ui_options(ports_verbose) no
    232232
     
    258258               
    259259        # Building the port:
    260         # - remove /opt so it won't pollute the port.
    261         # - re-install DarwinPorts.
    262         # - keep distfiles outside /opt so we don't have to keep fetching them.
     260        # - remove /opt/local so it won't pollute the port.
     261        # - re-install MacPorts.
     262        # - keep distfiles outside /opt/local so we don't have to keep fetching them.
    263263        # - send out an email to the maintainer if any errors occurred.
    264264
    265         ui_msg "removing /opt"
     265        ui_msg "removing /optlocal"
    266266        #unset ui_options(ports_verbose)
    267         if {[catch {system "rm -Rf /opt"} error]} {
     267        if {[catch {system "rm -Rf /opt/local"} error]} {
    268268                puts stderr "Internal error: $error"
    269269        }
     
    350350        pkg_ui_log "To: [join $maintainers {, }]"
    351351        pkg_ui_log "From: donotreply@opendarwin.org"
    352         pkg_ui_log "Subject: DarwinPorts $portinfo(name)-$portinfo(version) build failure"
     352        pkg_ui_log "Subject: MacPorts $portinfo(name)-$portinfo(version) build failure"
    353353        pkg_ui_log ""
    354         pkg_ui_log "The following is a transcript produced by the DarwinPorts automated build       "
     354        pkg_ui_log "The following is a transcript produced by the MacPorts automated build       "
    355355        pkg_ui_log "system.  You are receiving this email because you are listed as a maintainer    "
    356356        pkg_ui_log "of this port, which has failed the automated packaging process.  Please update  "
     
    359359        pkg_ui_log ""
    360360        pkg_ui_log "Thank you,"
    361         pkg_ui_log "The DarwinPorts Team"
     361        pkg_ui_log "The MacPorts Team"
    362362        pkg_ui_log ""
    363363        pkg_ui_log "================================================================================"
  • trunk/base/portmgr/packaging/rpmall.tcl

    r26177 r46958  
    239239
    240240        # Start with verbose output off;
    241         # this will prevent the repopulation of /opt from getting logged.
     241        # this will prevent the repopulation of /opt/local from getting logged.
    242242        set ui_options(ports_verbose) no
    243243
     
    311311       
    312312        # Building the port:
    313         # - remove /opt so it won't pollute the port.
    314         # - re-install DarwinPorts.
    315         # - keep distfiles outside /opt so we don't have to keep fetching them.
     313        # - remove /opt/local so it won't pollute the port.
     314        # - re-install MacPorts.
     315        # - keep distfiles outside /opt/local so we don't have to keep fetching them.
    316316        # - send out an email to the maintainer if any errors occurred.
    317317
     
    324324        system "rpm -q --queryformat='%{name} ' -p ${remove_files} | xargs rpm -e || true"
    325325
    326         ui_msg "->    Removing /opt"
     326        ui_msg "->    Removing /opt/local"
    327327        #unset ui_options(ports_verbose)
    328         if {[catch {system "rm -Rf /opt"} error]} {
     328        if {[catch {system "rm -Rf /opt/local"} error]} {
    329329                puts stderr "Internal error: $error"
    330330        }
     
    339339        #       puts stderr "Internal error: $error"
    340340        #}
    341         ui_msg "->    Installing darwinports"
     341        ui_msg "->    Installing MacPorts"
    342342        if {[catch {system "cd $env(HOME)/darwinports && make && make install"} error]} {
    343343                puts stderr "Internal error: $error"
     
    413413        pkg_ui_log "To: [join $maintainers {, }]"
    414414        pkg_ui_log "From: donotreply@opendarwin.org"
    415         pkg_ui_log "Subject: DarwinPorts $portinfo(name)-$portinfo(version) build failure"
     415        pkg_ui_log "Subject: MacPorts $portinfo(name)-$portinfo(version) build failure"
    416416        pkg_ui_log ""
    417         pkg_ui_log "The following is a transcript produced by the DarwinPorts automated build       "
     417        pkg_ui_log "The following is a transcript produced by the MacPorts automated build       "
    418418        pkg_ui_log "system.  You are receiving this email because you are listed as a maintainer    "
    419419        pkg_ui_log "of this port, which has failed the automated packaging process.  Please update  "
     
    422422        pkg_ui_log ""
    423423        pkg_ui_log "Thank you,"
    424         pkg_ui_log "The DarwinPorts Team"
     424        pkg_ui_log "The MacPorts Team"
    425425        pkg_ui_log ""
    426426        pkg_ui_log "================================================================================"
Note: See TracChangeset for help on using the changeset viewer.