Ignore:
Timestamp:
Mar 20, 2010, 2:28:09 PM (11 years ago)
Author:
jmr@…
Message:

install macports1.0 next to the other Tcl packages and just put a link in the Tcl package dir if possible (#12943)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/portmgr/dmg/postflight

    r64645 r65055  
    4444CONFIGPATH=${PREFIX}/etc/macports
    4545MANPAGES=${PREFIX}/share/man
    46 REG1DIR=${PREFIX}/share/macports/Tcl/registry1.0
     46MACPORTS_TCL_DIR=${PREFIX}/share/macports/Tcl
     47REG1DIR=${MACPORTS_TCL_DIR}/registry1.0
    4748TCLSH=/usr/bin/tclsh
    4849TCL_PACKAGE_DIR=/Library/Tcl
     
    7374    ${TCLSH} ${PACKAGE_PATH}/Contents/Resources/upgrade_sources_conf_default.tcl ${PREFIX}
    7475    # Remove any duplicates from the dep map (could occur with 1.6 and earlier)
    75     ${TCLSH} ${PACKAGE_PATH}/Contents/Resources/dep_map_clean.tcl ${TCL_PACKAGE_DIR}
     76    ${TCLSH} ${PACKAGE_PATH}/Contents/Resources/dep_map_clean.tcl ${MACPORTS_TCL_DIR}
    7677}
    7778
     
    115116}
    116117
     118# link macports1.0 into tcl package dir if possible
     119function link_tcl_package {
     120    if ! test -e "${TCL_PACKAGE_DIR}/macports1.0" && test -w "${TCL_PACKAGE_DIR}"; then
     121                ln -vs "${MACPORTS_TCL_DIR}/macports1.0" "${TCL_PACKAGE_DIR}/macports1.0" || true
     122        fi
     123}
     124
    117125echo "The MacPorts Project, postflight script version ${VERSION}: checking the shell environment for user \"${USER}\"."
    118126
    119127# Set up config files
    120128setup_configs
     129# link macports1.0 pkg
     130link_tcl_package
    121131
    122132# Remove old stuff
Note: See TracChangeset for help on using the changeset viewer.