Changeset 136743


Ignore:
Timestamp:
May 25, 2015, 8:01:23 PM (4 years ago)
Author:
larryv@…
Message:

python{26,27}: Add to python2 select group (#34326)

Location:
trunk/dports/lang
Files:
2 edited
2 copied
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/dports/lang/python26/Portfile

    r127635 r136743  
    88# Remember to keep py26-tkinter and py26-gdbm's versions sync'd with this
    99version                 2.6.9
    10 revision                1
     10revision                2
    1111set major               [lindex [split $version .] 0]
    1212set branch              [join [lrange [split ${version} .] 0 1] .]
     
    5555                        port:sqlite3 port:db46 port:ncurses \
    5656                        port:bzip2 port:libedit
    57 depends_run             port:python_select
     57depends_run             port:python_select \
     58                        port:python2_select
    5859
    5960configure.args          --enable-framework=${frameworks_dir} \
     
    9899destroot.args-append    MAKE="${destroot.cmd} CC=${configure.cc}"
    99100
    100 select.group            python
    101 select.file             ${filespath}/python[string map {. {}} ${branch}]
     101set pythonNoDot python[string map {. {}} $branch]
     102select.entries          [list python python-$pythonNoDot $pythonNoDot] \
     103                        [list python2 python2-$pythonNoDot $pythonNoDot]
    102104
    103105notes "
    104 To make python ${branch} the default (i.e. the version you get when you run\
    105 'python'), please run:
     106To make this the default Python or Python 2 (i.e., the version run by\
     107the 'python' or 'python2' commands), run one or both of:
    106108
    107 sudo port select --set ${select.group} [file tail ${select.file}]
     109    sudo port select --set python $pythonNoDot
     110    sudo port select --set python2 $pythonNoDot
    108111"
    109112
  • trunk/dports/lang/python26/files/python2-python26

    r136739 r136743  
    88share/man/man1/python2.6.1
    99-
    10 ${frameworks_dir}/Python.framework/Versions/2.6
    11 ${frameworks_dir}/Python.framework/Versions/2.6/Headers
    12 ${frameworks_dir}/Python.framework/Versions/2.6/Resources
    13 ${frameworks_dir}/Python.framework/Versions/2.6/Python
     10-
     11-
     12-
     13-
  • trunk/dports/lang/python27/Portfile

    r136730 r136743  
    99# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
    1010version             2.7.10
    11 revision            1
     11revision            2
    1212
    1313set major           [lindex [split $version .] 0]
     
    5050                    port:bzip2 \
    5151                    port:libedit
    52 depends_run         port:python_select
     52depends_run         port:python_select \
     53                    port:python2_select
    5354
    5455# disable-ipv6 for now, getaddrinfo-function missing
     
    9293destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
    9394
    94 select.group        python
    95 select.file         ${filespath}/python[string map {. {}} ${branch}]
     95set pythonNoDot python[string map {. {}} $branch]
     96select.entries      [list python python-$pythonNoDot $pythonNoDot] \
     97                    [list python2 python2-$pythonNoDot $pythonNoDot]
    9698
    9799notes "
    98 To make python ${branch} the default (i.e. the version you get when you run\
    99 'python'), please run:
     100To make this the default Python or Python 2 (i.e., the version run by\
     101the 'python' or 'python2' commands), run one or both of:
    100102
    101 sudo port select --set ${select.group} [file tail ${select.file}]
     103    sudo port select --set python $pythonNoDot
     104    sudo port select --set python2 $pythonNoDot
    102105"
    103106
  • trunk/dports/lang/python27/files/python2-python27

    r136740 r136743  
    88share/man/man1/python2.7.1
    99-
    10 ${frameworks_dir}/Python.framework/Versions/2.7
    11 ${frameworks_dir}/Python.framework/Versions/2.7/Headers
    12 ${frameworks_dir}/Python.framework/Versions/2.7/Resources
    13 ${frameworks_dir}/Python.framework/Versions/2.7/Python
     10-
     11-
     12-
     13-
Note: See TracChangeset for help on using the changeset viewer.