[136749] trunk/dports/lang

larryv at macports.org larryv at macports.org
Mon May 25 14:13:25 PDT 2015


Revision: 136749
          https://trac.macports.org/changeset/136749
Author:   larryv at macports.org
Date:     2015-05-25 14:13:25 -0700 (Mon, 25 May 2015)
Log Message:
-----------
python{33,34,35}: Add to `python3` select group (#34326)

Modified Paths:
--------------
    trunk/dports/lang/python33/Portfile
    trunk/dports/lang/python34/Portfile
    trunk/dports/lang/python35/Portfile

Added Paths:
-----------
    trunk/dports/lang/python33/files/python-python33
    trunk/dports/lang/python33/files/python3-python33
    trunk/dports/lang/python34/files/python-python34
    trunk/dports/lang/python34/files/python3-python34
    trunk/dports/lang/python35/files/python-python35
    trunk/dports/lang/python35/files/python3-python35

Removed Paths:
-------------
    trunk/dports/lang/python33/files/python33
    trunk/dports/lang/python34/files/python34
    trunk/dports/lang/python35/files/python35

Modified: trunk/dports/lang/python33/Portfile
===================================================================
--- trunk/dports/lang/python33/Portfile	2015-05-25 21:04:41 UTC (rev 136748)
+++ trunk/dports/lang/python33/Portfile	2015-05-25 21:13:25 UTC (rev 136749)
@@ -8,7 +8,7 @@
 
 # Remember to keep py33-tkinter and py33-gdbm's versions sync'd with this
 version                 3.3.6
-revision                2
+revision                3
 
 epoch                   20141012
 
@@ -50,7 +50,8 @@
                         port:sqlite3 port:ncurses \
                         port:bzip2 port:libedit port:gettext \
                         port:xz
-depends_run             port:python_select
+depends_run             port:python_select \
+                        port:python3_select
 
 # blacklist llvm-gcc-4.2 compiler known to produce bad code
 compiler.blacklist      *llvm-gcc-4.2
@@ -90,15 +91,18 @@
 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 python3 python3-$pythonNoDot $pythonNoDot]
+
 set confdir config-${branch}m
 
 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 3 (i.e., the version run by\
+the 'python' or 'python3' 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 python3 $pythonNoDot
 "
 
 post-destroot {

Copied: trunk/dports/lang/python33/files/python-python33 (from rev 136740, trunk/dports/lang/python33/files/python33)
===================================================================
--- trunk/dports/lang/python33/files/python-python33	                        (rev 0)
+++ trunk/dports/lang/python33/files/python-python33	2015-05-25 21:13:25 UTC (rev 136749)
@@ -0,0 +1,13 @@
+bin/python3.3
+bin/pythonw3.3
+bin/python3.3-config
+bin/idle3.3
+bin/pydoc3.3
+-
+bin/2to3-3.3
+share/man/man1/python3.3.1
+-
+${frameworks_dir}/Python.framework/Versions/3.3
+${frameworks_dir}/Python.framework/Versions/3.3/Headers
+${frameworks_dir}/Python.framework/Versions/3.3/Resources
+${frameworks_dir}/Python.framework/Versions/3.3/Python

Copied: trunk/dports/lang/python33/files/python3-python33 (from rev 136740, trunk/dports/lang/python33/files/python33)
===================================================================
--- trunk/dports/lang/python33/files/python3-python33	                        (rev 0)
+++ trunk/dports/lang/python33/files/python3-python33	2015-05-25 21:13:25 UTC (rev 136749)
@@ -0,0 +1,12 @@
+bin/python3.3
+-
+bin/python3.3-32
+bin/pythonw3.3
+bin/pythonw3.3-32
+bin/python3.3-config
+-
+bin/idle3.3
+bin/pydoc3.3
+bin/2to3-3.3
+bin/pyvenv-3.3
+share/man/man1/python3.3.1

Deleted: trunk/dports/lang/python33/files/python33
===================================================================
--- trunk/dports/lang/python33/files/python33	2015-05-25 21:04:41 UTC (rev 136748)
+++ trunk/dports/lang/python33/files/python33	2015-05-25 21:13:25 UTC (rev 136749)
@@ -1,13 +0,0 @@
-bin/python3.3
-bin/pythonw3.3
-bin/python3.3-config
-bin/idle3.3
-bin/pydoc3.3
--
-bin/2to3-3.3
-share/man/man1/python3.3.1
--
-${frameworks_dir}/Python.framework/Versions/3.3
-${frameworks_dir}/Python.framework/Versions/3.3/Headers
-${frameworks_dir}/Python.framework/Versions/3.3/Resources
-${frameworks_dir}/Python.framework/Versions/3.3/Python

Modified: trunk/dports/lang/python34/Portfile
===================================================================
--- trunk/dports/lang/python34/Portfile	2015-05-25 21:04:41 UTC (rev 136748)
+++ trunk/dports/lang/python34/Portfile	2015-05-25 21:13:25 UTC (rev 136749)
@@ -8,7 +8,7 @@
 
 # Remember to keep py34-tkinter and py34-gdbm's versions sync'd with this
 version                 3.4.3
-revision                2
+revision                3
 
 epoch                   20150225
 
@@ -45,7 +45,8 @@
                         port:sqlite3 port:ncurses \
                         port:bzip2 port:libedit port:gettext \
                         port:xz
-depends_run             port:python_select
+depends_run             port:python_select \
+                        port:python3_select
 
 # blacklist llvm-gcc-4.2 compiler known to produce bad code
 compiler.blacklist      *llvm-gcc-4.2
@@ -91,15 +92,18 @@
 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 python3 python3-$pythonNoDot $pythonNoDot]
+
 set confdir config-${branch}m
 
 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 3 (i.e., the version run by\
+the 'python' or 'python3' 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 python3 $pythonNoDot
 "
 
 post-destroot {

Copied: trunk/dports/lang/python34/files/python-python34 (from rev 136740, trunk/dports/lang/python34/files/python34)
===================================================================
--- trunk/dports/lang/python34/files/python-python34	                        (rev 0)
+++ trunk/dports/lang/python34/files/python-python34	2015-05-25 21:13:25 UTC (rev 136749)
@@ -0,0 +1,13 @@
+bin/python3.4
+-
+bin/python3.4-config
+bin/idle3.4
+bin/pydoc3.4
+-
+bin/2to3-3.4
+share/man/man1/python3.4.1
+-
+${frameworks_dir}/Python.framework/Versions/3.4
+${frameworks_dir}/Python.framework/Versions/3.4/Headers
+${frameworks_dir}/Python.framework/Versions/3.4/Resources
+${frameworks_dir}/Python.framework/Versions/3.4/Python

Copied: trunk/dports/lang/python34/files/python3-python34 (from rev 136740, trunk/dports/lang/python34/files/python34)
===================================================================
--- trunk/dports/lang/python34/files/python3-python34	                        (rev 0)
+++ trunk/dports/lang/python34/files/python3-python34	2015-05-25 21:13:25 UTC (rev 136749)
@@ -0,0 +1,12 @@
+bin/python3.4
+bin/python3.4m
+bin/python3.4-32
+-
+-
+bin/python3.4-config
+bin/python3.4m-config
+bin/idle3.4
+bin/pydoc3.4
+bin/2to3-3.4
+bin/pyvenv-3.4
+share/man/man1/python3.4.1

Deleted: trunk/dports/lang/python34/files/python34
===================================================================
--- trunk/dports/lang/python34/files/python34	2015-05-25 21:04:41 UTC (rev 136748)
+++ trunk/dports/lang/python34/files/python34	2015-05-25 21:13:25 UTC (rev 136749)
@@ -1,13 +0,0 @@
-bin/python3.4
--
-bin/python3.4-config
-bin/idle3.4
-bin/pydoc3.4
--
-bin/2to3-3.4
-share/man/man1/python3.4.1
--
-${frameworks_dir}/Python.framework/Versions/3.4
-${frameworks_dir}/Python.framework/Versions/3.4/Headers
-${frameworks_dir}/Python.framework/Versions/3.4/Resources
-${frameworks_dir}/Python.framework/Versions/3.4/Python

Modified: trunk/dports/lang/python35/Portfile
===================================================================
--- trunk/dports/lang/python35/Portfile	2015-05-25 21:04:41 UTC (rev 136748)
+++ trunk/dports/lang/python35/Portfile	2015-05-25 21:13:25 UTC (rev 136749)
@@ -8,6 +8,7 @@
 
 # Remember to keep py35-tkinter and py35-gdbm's versions sync'd with this
 version                 3.5.0b1
+revision                1
 
 epoch                   20150524
 
@@ -45,7 +46,8 @@
                         port:sqlite3 port:ncurses \
                         port:bzip2 port:libedit port:gettext \
                         port:xz
-depends_run             port:python_select
+depends_run             port:python_select \
+                        port:python3_select
 
 # blacklist llvm-gcc-4.2 compiler known to produce bad code
 compiler.blacklist      *llvm-gcc-4.2
@@ -91,15 +93,18 @@
 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 python3 python3-$pythonNoDot $pythonNoDot]
+
 set confdir config-${branch}m
 
 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 3 (i.e., the version run by\
+the 'python' or 'python3' 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 python3 $pythonNoDot
 "
 
 post-destroot {

Copied: trunk/dports/lang/python35/files/python-python35 (from rev 136740, trunk/dports/lang/python35/files/python35)
===================================================================
--- trunk/dports/lang/python35/files/python-python35	                        (rev 0)
+++ trunk/dports/lang/python35/files/python-python35	2015-05-25 21:13:25 UTC (rev 136749)
@@ -0,0 +1,13 @@
+bin/python3.5
+-
+bin/python3.5-config
+bin/idle3.5
+bin/pydoc3.5
+-
+bin/2to3-3.5
+share/man/man1/python3.5.1
+-
+${frameworks_dir}/Python.framework/Versions/3.5
+${frameworks_dir}/Python.framework/Versions/3.5/Headers
+${frameworks_dir}/Python.framework/Versions/3.5/Resources
+${frameworks_dir}/Python.framework/Versions/3.5/Python

Copied: trunk/dports/lang/python35/files/python3-python35 (from rev 136740, trunk/dports/lang/python35/files/python35)
===================================================================
--- trunk/dports/lang/python35/files/python3-python35	                        (rev 0)
+++ trunk/dports/lang/python35/files/python3-python35	2015-05-25 21:13:25 UTC (rev 136749)
@@ -0,0 +1,12 @@
+bin/python3.5
+bin/python3.5m
+bin/python3.5-32
+-
+-
+bin/python3.5-config
+bin/python3.5m-config
+bin/idle3.5
+bin/pydoc3.5
+bin/2to3-3.5
+bin/pyvenv-3.5
+share/man/man1/python3.5.1

Deleted: trunk/dports/lang/python35/files/python35
===================================================================
--- trunk/dports/lang/python35/files/python35	2015-05-25 21:04:41 UTC (rev 136748)
+++ trunk/dports/lang/python35/files/python35	2015-05-25 21:13:25 UTC (rev 136749)
@@ -1,13 +0,0 @@
-bin/python3.5
--
-bin/python3.5-config
-bin/idle3.5
-bin/pydoc3.5
--
-bin/2to3-3.5
-share/man/man1/python3.5.1
--
-${frameworks_dir}/Python.framework/Versions/3.5
-${frameworks_dir}/Python.framework/Versions/3.5/Headers
-${frameworks_dir}/Python.framework/Versions/3.5/Resources
-${frameworks_dir}/Python.framework/Versions/3.5/Python
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150525/fdcf4a17/attachment.html>


More information about the macports-changes mailing list