[136743] trunk/dports/lang
larryv at macports.org
larryv at macports.org
Mon May 25 13:01:23 PDT 2015
Revision: 136743
https://trac.macports.org/changeset/136743
Author: larryv at macports.org
Date: 2015-05-25 13:01:23 -0700 (Mon, 25 May 2015)
Log Message:
-----------
python{26,27}: Add to `python2` select group (#34326)
Modified Paths:
--------------
trunk/dports/lang/python26/Portfile
trunk/dports/lang/python27/Portfile
Added Paths:
-----------
trunk/dports/lang/python26/files/python-python26
trunk/dports/lang/python26/files/python2-python26
trunk/dports/lang/python27/files/python-python27
trunk/dports/lang/python27/files/python2-python27
Removed Paths:
-------------
trunk/dports/lang/python26/files/python26
trunk/dports/lang/python27/files/python27
Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile 2015-05-25 19:39:08 UTC (rev 136742)
+++ trunk/dports/lang/python26/Portfile 2015-05-25 20:01:23 UTC (rev 136743)
@@ -7,7 +7,7 @@
name python26
# Remember to keep py26-tkinter and py26-gdbm's versions sync'd with this
version 2.6.9
-revision 1
+revision 2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
categories lang
@@ -54,7 +54,8 @@
depends_lib port:gettext port:zlib port:openssl \
port:sqlite3 port:db46 port:ncurses \
port:bzip2 port:libedit
-depends_run port:python_select
+depends_run port:python_select \
+ port:python2_select
configure.args --enable-framework=${frameworks_dir} \
--enable-ipv6
@@ -97,14 +98,16 @@
build.args-append MAKE="${build.cmd} CC=${configure.cc}"
destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
-select.group python
-select.file ${filespath}/python[string map {. {}} ${branch}]
+set pythonNoDot python[string map {. {}} $branch]
+select.entries [list python python-$pythonNoDot $pythonNoDot] \
+ [list python2 python2-$pythonNoDot $pythonNoDot]
notes "
-To make python ${branch} the default (i.e. the version you get when you run\
-'python'), please run:
+To make this the default Python or Python 2 (i.e., the version run by\
+the 'python' or 'python2' commands), run one or both of:
-sudo port select --set ${select.group} [file tail ${select.file}]
+ sudo port select --set python $pythonNoDot
+ sudo port select --set python2 $pythonNoDot
"
post-destroot {
Copied: trunk/dports/lang/python26/files/python-python26 (from rev 136740, trunk/dports/lang/python26/files/python26)
===================================================================
--- trunk/dports/lang/python26/files/python-python26 (rev 0)
+++ trunk/dports/lang/python26/files/python-python26 2015-05-25 20:01:23 UTC (rev 136743)
@@ -0,0 +1,13 @@
+bin/python2.6
+bin/pythonw2.6
+bin/python2.6-config
+bin/idle2.6
+bin/pydoc2.6
+bin/smtpd2.6.py
+bin/2to3-2.6
+share/man/man1/python2.6.1
+-
+${frameworks_dir}/Python.framework/Versions/2.6
+${frameworks_dir}/Python.framework/Versions/2.6/Headers
+${frameworks_dir}/Python.framework/Versions/2.6/Resources
+${frameworks_dir}/Python.framework/Versions/2.6/Python
Copied: trunk/dports/lang/python26/files/python2-python26 (from rev 136739, trunk/dports/lang/python26/files/python26)
===================================================================
--- trunk/dports/lang/python26/files/python2-python26 (rev 0)
+++ trunk/dports/lang/python26/files/python2-python26 2015-05-25 20:01:23 UTC (rev 136743)
@@ -0,0 +1,13 @@
+bin/python2.6
+bin/pythonw2.6
+bin/python2.6-config
+bin/idle2.6
+bin/pydoc2.6
+bin/smtpd2.6.py
+bin/2to3-2.6
+share/man/man1/python2.6.1
+-
+-
+-
+-
+-
Deleted: trunk/dports/lang/python26/files/python26
===================================================================
--- trunk/dports/lang/python26/files/python26 2015-05-25 19:39:08 UTC (rev 136742)
+++ trunk/dports/lang/python26/files/python26 2015-05-25 20:01:23 UTC (rev 136743)
@@ -1,13 +0,0 @@
-bin/python2.6
-bin/pythonw2.6
-bin/python2.6-config
-bin/idle2.6
-bin/pydoc2.6
-bin/smtpd2.6.py
-bin/2to3-2.6
-share/man/man1/python2.6.1
--
-${frameworks_dir}/Python.framework/Versions/2.6
-${frameworks_dir}/Python.framework/Versions/2.6/Headers
-${frameworks_dir}/Python.framework/Versions/2.6/Resources
-${frameworks_dir}/Python.framework/Versions/2.6/Python
Modified: trunk/dports/lang/python27/Portfile
===================================================================
--- trunk/dports/lang/python27/Portfile 2015-05-25 19:39:08 UTC (rev 136742)
+++ trunk/dports/lang/python27/Portfile 2015-05-25 20:01:23 UTC (rev 136743)
@@ -8,7 +8,7 @@
epoch 2
# Remember to keep py27-tkinter and py27-gdbm's versions sync'd with this
version 2.7.10
-revision 1
+revision 2
set major [lindex [split $version .] 0]
set branch [join [lrange [split ${version} .] 0 1] .]
@@ -49,7 +49,8 @@
port:ncurses \
port:bzip2 \
port:libedit
-depends_run port:python_select
+depends_run port:python_select \
+ port:python2_select
# disable-ipv6 for now, getaddrinfo-function missing
configure.args --enable-framework=${frameworks_dir} \
@@ -91,14 +92,16 @@
build.args-append MAKE="${build.cmd} CC=${configure.cc}"
destroot.args-append MAKE="${destroot.cmd} CC=${configure.cc}"
-select.group python
-select.file ${filespath}/python[string map {. {}} ${branch}]
+set pythonNoDot python[string map {. {}} $branch]
+select.entries [list python python-$pythonNoDot $pythonNoDot] \
+ [list python2 python2-$pythonNoDot $pythonNoDot]
notes "
-To make python ${branch} the default (i.e. the version you get when you run\
-'python'), please run:
+To make this the default Python or Python 2 (i.e., the version run by\
+the 'python' or 'python2' commands), run one or both of:
-sudo port select --set ${select.group} [file tail ${select.file}]
+ sudo port select --set python $pythonNoDot
+ sudo port select --set python2 $pythonNoDot
"
post-destroot {
Copied: trunk/dports/lang/python27/files/python-python27 (from rev 136739, trunk/dports/lang/python27/files/python27)
===================================================================
--- trunk/dports/lang/python27/files/python-python27 (rev 0)
+++ trunk/dports/lang/python27/files/python-python27 2015-05-25 20:01:23 UTC (rev 136743)
@@ -0,0 +1,13 @@
+bin/python2.7
+bin/pythonw2.7
+bin/python2.7-config
+bin/idle2.7
+bin/pydoc2.7
+bin/smtpd2.7.py
+bin/2to3-2.7
+share/man/man1/python2.7.1
+-
+${frameworks_dir}/Python.framework/Versions/2.7
+${frameworks_dir}/Python.framework/Versions/2.7/Headers
+${frameworks_dir}/Python.framework/Versions/2.7/Resources
+${frameworks_dir}/Python.framework/Versions/2.7/Python
Copied: trunk/dports/lang/python27/files/python2-python27 (from rev 136740, trunk/dports/lang/python27/files/python27)
===================================================================
--- trunk/dports/lang/python27/files/python2-python27 (rev 0)
+++ trunk/dports/lang/python27/files/python2-python27 2015-05-25 20:01:23 UTC (rev 136743)
@@ -0,0 +1,13 @@
+bin/python2.7
+bin/pythonw2.7
+bin/python2.7-config
+bin/idle2.7
+bin/pydoc2.7
+bin/smtpd2.7.py
+bin/2to3-2.7
+share/man/man1/python2.7.1
+-
+-
+-
+-
+-
Property changes on: trunk/dports/lang/python27/files/python2-python27
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/mld-qt-481/dports/lang/python27/files/python27:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
Deleted: trunk/dports/lang/python27/files/python27
===================================================================
--- trunk/dports/lang/python27/files/python27 2015-05-25 19:39:08 UTC (rev 136742)
+++ trunk/dports/lang/python27/files/python27 2015-05-25 20:01:23 UTC (rev 136743)
@@ -1,13 +0,0 @@
-bin/python2.7
-bin/pythonw2.7
-bin/python2.7-config
-bin/idle2.7
-bin/pydoc2.7
-bin/smtpd2.7.py
-bin/2to3-2.7
-share/man/man1/python2.7.1
--
-${frameworks_dir}/Python.framework/Versions/2.7
-${frameworks_dir}/Python.framework/Versions/2.7/Headers
-${frameworks_dir}/Python.framework/Versions/2.7/Resources
-${frameworks_dir}/Python.framework/Versions/2.7/Python
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150525/fac56bdb/attachment-0001.html>
More information about the macports-changes
mailing list