[78591] trunk/dports

jmr at macports.org jmr at macports.org
Fri May 13 09:57:50 PDT 2011


Revision: 78591
          http://trac.macports.org/changeset/78591
Author:   jmr at macports.org
Date:     2011-05-13 09:57:49 -0700 (Fri, 13 May 2011)
Log Message:
-----------
python ports:
 * update for 'port select'
 * depend on python_select for base select file (#19126)
 * add 2to3 to select files (#20271)
 * make python27 and python32 use applications_dir (#26456, #29057)
 * remove unused files and comments about them from python27

Modified Paths:
--------------
    trunk/dports/lang/python24/Portfile
    trunk/dports/lang/python24/files/python24
    trunk/dports/lang/python25/Portfile
    trunk/dports/lang/python25/files/python25
    trunk/dports/lang/python26/Portfile
    trunk/dports/lang/python26/files/python26
    trunk/dports/lang/python27/Portfile
    trunk/dports/lang/python27/files/python27
    trunk/dports/lang/python31/Portfile
    trunk/dports/lang/python31/files/python31
    trunk/dports/lang/python32/Portfile
    trunk/dports/lang/python32/files/python32
    trunk/dports/sysutils/python_select/Portfile
    trunk/dports/sysutils/python_select/files/base
    trunk/dports/sysutils/python_select/files/none
    trunk/dports/sysutils/python_select/files/python23-apple
    trunk/dports/sysutils/python_select/files/python25-apple
    trunk/dports/sysutils/python_select/files/python26-apple

Added Paths:
-----------
    trunk/dports/lang/python24/files/python24-noframework
    trunk/dports/sysutils/python_select/files/python27-apple

Removed Paths:
-------------
    trunk/dports/lang/python27/files/_localemodule.c.ed
    trunk/dports/lang/python27/files/locale.py.ed
    trunk/dports/lang/python27/files/patch-Lib-distutils-dist.py.diff
    trunk/dports/lang/python27/files/patch-Mac-IDLE-Makefile.in.diff
    trunk/dports/lang/python27/files/patch-Mac-Makefile.in.diff
    trunk/dports/lang/python27/files/patch-Mac-PythonLauncher-Makefile.in.diff
    trunk/dports/lang/python27/files/patch-Mac-Tools-Doc-setup.py.diff

Modified: trunk/dports/lang/python24/Portfile
===================================================================
--- trunk/dports/lang/python24/Portfile	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python24/Portfile	2011-05-13 16:57:49 UTC (rev 78591)
@@ -5,7 +5,7 @@
 
 name                    python24
 version                 2.4.6
-revision                8
+revision                9
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -40,6 +40,7 @@
                         patch-Mac-OSX-PythonLauncher-Makefile.in
 
 depends_lib             port:gettext port:openssl
+depends_run             port:python_select
 
 configure.args          --with-cxx=${configure.cxx} \
                         --enable-shared \
@@ -79,15 +80,20 @@
 
 destroot.target         frameworkinstall maninstall
 
+post-extract {
+    copy ${filespath}/python[string map {. {}} ${branch}]-noframework ${workpath}/python[string map {. {}} ${branch}]
+}
 select.group            python
-select.file             ${filespath}/python[string map {. {}} ${branch}]
+if {${os.subplatform} != "macosx"} {
+    select.file         ${workpath}/python[string map {. {}} ${branch}]
+}
 
 platform macosx {
     if {(![variant_isset universal] && ![string match *64* $build_arch]) || ([variant_isset universal] && ![string match *64* $universal_archs])} {
         post-destroot {
             set framewpath ${frameworks_dir}/Python.framework
             set framewdir  ${framewpath}/Versions/${branch}
-    
+
             foreach dir { lib include } {
                 file rename ${destroot}${framewdir}/${dir}/python${branch} ${destroot}${prefix}/${dir}
                 ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
@@ -97,11 +103,11 @@
             # to repoint it here
             file delete ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
             ln -s ${framewdir}/Python ${destroot}${prefix}/lib/python${branch}/config/libpython${branch}.a
-    
+
             ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
     
             file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
-    
+
             # delete symlinks without version suffix, use python_select instead to choose version
             foreach bin { python pythonw idle pydoc smtpd.py } {
                 file delete ${destroot}${prefix}/bin/${bin}
@@ -110,11 +116,13 @@
                 file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
                 ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
             }
-    
+
+            select.file     ${filespath}/python[string map {. {}} ${branch}]
+
             foreach dir { Headers Resources Python Versions/Current } {
                 file delete ${destroot}${framewpath}/${dir}
             }
-    
+
             # Without this, LINKFORSHARED is set to
             # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
             # (this becomes Python.framework/Versions/2.4/Python) which doesn't
@@ -131,22 +139,23 @@
 
         post-destroot {
             # delete symlinks without version suffix, use python_select instead to choose version
-            foreach bin { python pythonw idle pydoc smtpd.py python-config } {
-                file delete ${destroot}${prefix}/bin/${bin}
+            file delete ${destroot}${prefix}/bin/python
+            foreach bin { idle pydoc } {
+                move ${destroot}${prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${branch}
             }
+            move ${destroot}${prefix}/bin/smtpd.py ${destroot}${prefix}/bin/smtpd${branch}.py
     
             file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
-    
-            # install select file for python_select
-            xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
-            xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
         }
+
+        select.file         ${workpath}/python[string map {. {}} ${branch}]
     }
 }
 
-    notes "To fully complete your installation and make python $branch the default, please run:
-\tsudo port install python_select
-\tsudo python_select $name"
+notes \
+"To make python ${branch} the default (i.e. the version you get when you run
+'python'), please run:
+    \tsudo port select --set ${select.group} [file tail ${select.file}]"
 
 platform darwin {
     post-configure {
@@ -184,15 +193,13 @@
 
     post-destroot {
         # delete symlinks without version suffix, use python_select instead to choose version
-        foreach bin { python pythonw idle pydoc smtpd.py python-config } {
-            file delete ${destroot}${prefix}/bin/${bin}
+        file delete ${destroot}${prefix}/bin/python
+        foreach bin { idle pydoc } {
+            move ${destroot}${prefix}/bin/${bin} ${destroot}${prefix}/bin/${bin}${branch}
         }
+        move ${destroot}${prefix}/bin/smtpd.py ${destroot}${prefix}/bin/smtpd${branch}.py
 
         file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
-
-        # install select file for python_select
-        xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
-        xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
     }
 }
 

Modified: trunk/dports/lang/python24/files/python24
===================================================================
--- trunk/dports/lang/python24/files/python24	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python24/files/python24	2011-05-13 16:57:49 UTC (rev 78591)
@@ -5,6 +5,7 @@
 bin/pydoc2.4
 bin/smtpd2.4.py
 -
+-
 share/man/man1/python2.4.1.gz
 ${frameworks_dir}/Python.framework/Versions/2.4
 ${frameworks_dir}/Python.framework/Versions/2.4/Headers

Copied: trunk/dports/lang/python24/files/python24-noframework (from rev 78586, trunk/dports/lang/python24/files/python24)
===================================================================
--- trunk/dports/lang/python24/files/python24-noframework	                        (rev 0)
+++ trunk/dports/lang/python24/files/python24-noframework	2011-05-13 16:57:49 UTC (rev 78591)
@@ -0,0 +1,13 @@
+bin/python2.4
+-
+-
+bin/idle2.4
+bin/pydoc2.4
+bin/smtpd2.4.py
+-
+-
+share/man/man1/python2.4.1.gz
+-
+-
+-
+-

Modified: trunk/dports/lang/python25/Portfile
===================================================================
--- trunk/dports/lang/python25/Portfile	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python25/Portfile	2011-05-13 16:57:49 UTC (rev 78591)
@@ -5,7 +5,7 @@
 
 name                    python25
 version                 2.5.5
-revision                3
+revision                4
 
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -38,6 +38,7 @@
 depends_lib             port:gettext port:zlib port:openssl port:tk \
                         port:sqlite3 port:db46 port:bzip2 \
                         port:gdbm port:readline port:ncurses
+depends_run             port:python_select
 
 configure.args          --enable-shared \
                         --enable-framework=${frameworks_dir} \
@@ -89,6 +90,11 @@
 select.group            python
 select.file             ${filespath}/python[string map {. {}} ${branch}]
 
+notes \
+"To make python ${branch} the default (i.e. the version you get when you run
+'python'), please run:
+    \tsudo port select --set ${select.group} [file tail ${select.file}]"
+
 platform macosx {
 post-destroot {
 
@@ -134,12 +140,6 @@
 }
 }
 
-post-activate {
-    ui_msg "\nTo fully complete your installation and make python $branch the default, please run
-\n\tsudo port install python_select \
-\n\tsudo python_select $name\n"
-}
-
 platform darwin {
    post-configure {
       # See http://trac.macports.org/ticket/18376
@@ -187,10 +187,6 @@
         }
 
         file rename ${destroot}${prefix}/share/man/man1/python.1 ${destroot}${prefix}/share/man/man1/python${branch}.1
-
-        # install select file for python_select
-        xinstall -m 755 -d ${destroot}${prefix}/etc/select/python
-        xinstall -m 644 ${filespath}/python[string map {. {}} ${branch}] ${destroot}${prefix}/etc/select/python/
 }
 }
 

Modified: trunk/dports/lang/python25/files/python25
===================================================================
--- trunk/dports/lang/python25/files/python25	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python25/files/python25	2011-05-13 16:57:49 UTC (rev 78591)
@@ -5,6 +5,7 @@
 bin/pydoc2.5
 bin/smtpd2.5.py
 -
+-
 share/man/man1/python2.5.1.gz
 ${frameworks_dir}/Python.framework/Versions/2.5
 ${frameworks_dir}/Python.framework/Versions/2.5/Headers

Modified: trunk/dports/lang/python26/Portfile
===================================================================
--- trunk/dports/lang/python26/Portfile	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python26/Portfile	2011-05-13 16:57:49 UTC (rev 78591)
@@ -5,7 +5,7 @@
 
 name                    python26
 version                 2.6.6
-revision                2
+revision                3
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -16,12 +16,6 @@
 long_description        Python is an interpreted, interactive, object-oriented \
                         programming language.
 
-notes "\
-   To fully complete your installation and make python ${branch} the default, \
-   please run:\n \
-   \tsudo port install python_select\n \
-   \tsudo python_select ${name}"
-
 homepage                http://www.python.org/
 master_sites            ${homepage}/ftp/python/${version}/ \
                         ftp://ftp.python.org/pub/python/${version}/
@@ -53,6 +47,7 @@
 depends_lib             port:gettext port:zlib port:openssl \
                         port:sqlite3 port:db46 port:ncurses port:gdbm \
                         port:bzip2 port:readline
+depends_run             port:python_select
 
 configure.args          --enable-framework=${frameworks_dir} \
                         --enable-ipv6
@@ -94,6 +89,11 @@
 select.group            python
 select.file             ${filespath}/python[string map {. {}} ${branch}]
 
+notes \
+"To make python ${branch} the default (i.e. the version you get when you run
+'python'), please run:
+    \tsudo port select --set ${select.group} [file tail ${select.file}]"
+
 post-destroot {
    set framewpath ${frameworks_dir}/Python.framework
    set framewdir  ${framewpath}/Versions/${branch}

Modified: trunk/dports/lang/python26/files/python26
===================================================================
--- trunk/dports/lang/python26/files/python26	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python26/files/python26	2011-05-13 16:57:49 UTC (rev 78591)
@@ -4,6 +4,7 @@
 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

Modified: trunk/dports/lang/python27/Portfile
===================================================================
--- trunk/dports/lang/python27/Portfile	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/Portfile	2011-05-13 16:57:49 UTC (rev 78591)
@@ -7,7 +7,7 @@
 name                python27
 epoch               2
 version             2.7.1
-revision            2
+revision            3
 set major           [lindex [split $version .] 0]
 set branch          [join [lrange [split ${version} .] 0 1] .]
 categories          lang
@@ -19,12 +19,6 @@
 long_description    Python is an interpreted, interactive, object-oriented \
                     programming language.
 
-notes "\
-    To fully complete your installation and make python ${branch} the default, \
-    please run:\n \
-    \tsudo port install python_select\n \
-    \tsudo python_select ${name}"
-
 homepage            http://www.python.org/
 master_sites        ${homepage}/ftp/python/${version}/ \
                     ftp://ftp.python.org/pub/python/${version}/
@@ -36,24 +30,15 @@
                     sha1    fbe1894322ff91b80726e269c97454f4129fc2a3 \
                     rmd160  3ce59305f6cd3fb320a53771d0ea01ec0687005f
 
-# patch-Lib-distutils-dist.py.diff comes from
-# <http://bugs.python.org/issue1180>
-# Setting PYTHONHOME with patch-Mac-IDLE-Makefile.in.diff,
-# patch-Mac-Makefile.in.diff, and patch-Mac-PythonLauncher-Makefile.in.diff
-# is to work around http://bugs.python.org/issue5766
 # patch-readlinefix.diff comes from
 # <http://bugs.python.org/issue5833>
 patchfiles          patch-Makefile.pre.in.diff \
                     patch-setup.py.diff \
                     patch-setup_no_tkinter.py.diff \
                     patch-Lib-cgi.py.diff \
-                    patch-Lib-ctypes-macholib-dyld.py.diff
-#                   patch-Mac-PythonLauncher-Makefile.in.diff
-#                   patch-Mac-Makefile.in.diff
-#                   patch-Mac-IDLE-Makefile.in.diff
-#                   patch-Mac-Tools-Doc-setup.py.diff
+                    patch-Lib-ctypes-macholib-dyld.py.diff \
+                    patch-configure.diff
 #                   patch-readlinefix.diff
-#                   patch-Lib-distutils-dist.py.diff
 
 depends_lib         port:gettext \
                     port:zlib \
@@ -64,6 +49,7 @@
                     port:gdbm \
                     port:bzip2 \
                     port:readline
+depends_run         port:python_select
 
 configure.args      --enable-framework=${frameworks_dir} \
                     --enable-ipv6
@@ -74,20 +60,13 @@
     reinplace "s|@@PREFIX@@|${prefix}|g" \
         ${worksrcpath}/Lib/cgi.py \
         ${worksrcpath}/Lib/ctypes/macholib/dyld.py
-    reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|g" \
-        ${worksrcpath}/Mac/Makefile.in \
-        ${worksrcpath}/Mac/IDLE/Makefile.in \
-        ${worksrcpath}/Mac/PythonLauncher/Makefile.in
-#       ${worksrcpath}/Mac/Tools/Doc/setup.py
+    reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
+        ${worksrcpath}/configure
 
     # See http://trac.macports.org/changeset/37861
     reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
         ${worksrcpath}/Mac/PythonLauncher/Makefile.in
 
-    # http://trac.macports.org/ticket/21517
-#   system "cd ${worksrcpath} && ed - Modules/_localemodule.c < ${filespath}/_localemodule.c.ed"
-#   system "cd ${worksrcpath} && ed - Lib/locale.py < ${filespath}/locale.py.ed"
-
     if {${os.platform} == "darwin" && ${os.major} > 9} {
         # http://trac.macports.org/ticket/21559
         system "cd ${worksrcpath} && ed - Modules/posixmodule.c < ${filespath}/posixmodule.c.ed"
@@ -108,6 +87,11 @@
 select.group        python
 select.file         ${filespath}/python[string map {. {}} ${branch}]
 
+notes \
+"To make python ${branch} the default (i.e. the version you get when you run
+'python'), please run:
+    \tsudo port select --set ${select.group} [file tail ${select.file}]"
+
 post-destroot {
     set framewpath ${frameworks_dir}/Python.framework
     set framewdir  ${framewpath}/Versions/${branch}
@@ -118,18 +102,17 @@
 
     ln -s ${framewdir}/share/man/man1/python${branch}.1 ${destroot}${prefix}/share/man/man1/
     ln -s ${framewdir}/Python ${destroot}${prefix}/lib/libpython${branch}.dylib
-#   ln -s ${framewdir}/bin/2to3 ${destroot}${prefix}/bin/2to3-${branch}
 
     # Without this, LINKFORSHARED is set to
     # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
-    # (this becomes Python.framework/Versions/2.6/Python) which doesn't
+    # (this becomes Python.framework/Versions/2.7/Python) which doesn't
     # quite work (see ticket #15099); instead specifically list the
     # full path to the proper Python framework file (which becomes
-    # ${prefix}/Library/Frameworks/Python.framework/Versions/2.6/Python)
+    # ${prefix}/Library/Frameworks/Python.framework/Versions/2.7/Python)
     reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} \
         ${destroot}${framewdir}/lib/python${branch}/config/Makefile
 
-    foreach unversionedFile {idle pydoc python python-config pythonw smtpd.py} {
+    foreach unversionedFile {2to3 idle pydoc python python-config pythonw smtpd.py} {
         delete ${destroot}${prefix}/bin/${unversionedFile}
     }
 

Deleted: trunk/dports/lang/python27/files/_localemodule.c.ed
===================================================================
--- trunk/dports/lang/python27/files/_localemodule.c.ed	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/_localemodule.c.ed	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,3 +0,0 @@
-g/defined(__APPLE__)/s//0/g
-w
-

Deleted: trunk/dports/lang/python27/files/locale.py.ed
===================================================================
--- trunk/dports/lang/python27/files/locale.py.ed	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/locale.py.ed	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,3 +0,0 @@
-g/'darwin', /s///
-w
-

Deleted: trunk/dports/lang/python27/files/patch-Lib-distutils-dist.py.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Lib-distutils-dist.py.diff	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/patch-Lib-distutils-dist.py.diff	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,51 +0,0 @@
---- Lib/distutils/dist.py.orig	2008-09-03 05:13:56.000000000 -0600
-+++ Lib/distutils/dist.py	2008-10-03 18:33:47.000000000 -0600
-@@ -60,6 +60,7 @@
-                       ('quiet', 'q', "run quietly (turns verbosity off)"),
-                       ('dry-run', 'n', "don't actually do anything"),
-                       ('help', 'h', "show detailed help message"),
-+                      ('no-user-cfg', None,'ignore pydistutils.cfg in your home directory'),
-                      ]
- 
-     # 'common_usage' is a short (2-3 line) string describing the common
-@@ -267,6 +268,12 @@
-                     else:
-                         sys.stderr.write(msg + "\n")
- 
-+        # no-user-cfg is handled before other command line args
-+        # because other args override the config files, and this
-+        # one is needed before we can load the config files.
-+        # If attrs['script_args'] wasn't passed, assume false.
-+        self.want_user_cfg = '--no-user-cfg' not in (self.script_args or [])
-+
-         self.finalize_options()
- 
-     # __init__ ()
-@@ -327,6 +334,9 @@
-         Distutils __inst__.py file lives), a file in the user's home
-         directory named .pydistutils.cfg on Unix and pydistutils.cfg
-         on Windows/Mac, and setup.cfg in the current directory.
-+
-+        The file in the user's home directory can be disabled with the
-+        --no-user-cfg option.
-         """
-         files = []
-         check_environ()
-@@ -347,7 +357,7 @@
- 
-         # And look for the user config file
-         user_file = os.path.join(os.path.expanduser('~'), user_filename)
--        if os.path.isfile(user_file):
-+        if self.want_user_cfg and os.path.isfile(user_file):
-             files.append(user_file)
- 
-         # All platforms support local setup.cfg
-@@ -355,6 +365,8 @@
-         if os.path.isfile(local_file):
-             files.append(local_file)
- 
-+        if DEBUG:
-+            print "using config files: %s" % ', '.join(files)
-         return files
- 
-     # find_config_files ()

Deleted: trunk/dports/lang/python27/files/patch-Mac-IDLE-Makefile.in.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Mac-IDLE-Makefile.in.diff	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/patch-Mac-IDLE-Makefile.in.diff	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,20 +0,0 @@
---- Mac/IDLE/Makefile.in.orig	2009-01-02 04:47:17.000000000 -0700
-+++ Mac/IDLE/Makefile.in	2009-04-16 00:54:43.000000000 -0600
-@@ -22,7 +22,7 @@
- 
- BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
- 
--PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
-+PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION)
- 
- all: IDLE.app
- 
-@@ -42,7 +42,7 @@
- 		$(srcdir)/../Icons/PythonSource.icns \
- 		$(srcdir)/../Icons/PythonCompiled.icns Info.plist
- 	rm -fr IDLE.app
--	$(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(BUNDLEBULDER) \
-+	PYTHONHOME=$(DESTDIR)$(prefix) $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(BUNDLEBULDER) \
- 		--builddir=. \
- 		--name=IDLE \
- 		--link-exec \

Deleted: trunk/dports/lang/python27/files/patch-Mac-Makefile.in.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Mac-Makefile.in.diff	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/patch-Mac-Makefile.in.diff	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,20 +0,0 @@
---- Mac/Makefile.in.orig	2009-03-30 13:58:41.000000000 -0600
-+++ Mac/Makefile.in	2009-04-16 00:54:26.000000000 -0600
-@@ -19,7 +19,7 @@
- 
- # These are normally glimpsed from the previous set
- bindir=$(prefix)/bin
--PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
-+PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION)
- APPINSTALLDIR=$(prefix)/Resources/Python.app
- 
- # Variables for installing the "normal" unix binaries
-@@ -224,7 +224,7 @@
- 	cd IDLE && make install
- 
- install_BuildApplet:
--	$(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
-+	PYTHONHOME=$(DESTDIR)$(prefix) $(RUNSHARED) @ARCH_RUN_32BIT@ $(BUILDPYTHON) $(srcdir)/scripts/BuildApplet.py \
- 		--destroot "$(DESTDIR)" \
- 		--python=$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)`test -f "$(DESTDIR)$(prefix)/Resources/Python.app/Contents/MacOS/$(PYTHONFRAMEWORK)-32" && echo "-32"`  \
- 		--output "$(DESTDIR)$(PYTHONAPPSDIR)/Build Applet.app" \

Deleted: trunk/dports/lang/python27/files/patch-Mac-PythonLauncher-Makefile.in.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Mac-PythonLauncher-Makefile.in.diff	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/patch-Mac-PythonLauncher-Makefile.in.diff	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,25 +0,0 @@
---- Mac/PythonLauncher/Makefile.in.orig	2009-01-02 04:47:17.000000000 -0700
-+++ Mac/PythonLauncher/Makefile.in	2009-04-16 00:55:11.000000000 -0600
-@@ -1,3 +1,4 @@
-+prefix=@prefix@
- CC=@CC@
- LD=@CC@
- BASECFLAGS=@BASECFLAGS@
-@@ -21,7 +22,7 @@
- 
- BUNDLEBULDER=$(srcdir)/../../Lib/plat-mac/bundlebuilder.py
- 
--PYTHONAPPSDIR=/Applications/$(PYTHONFRAMEWORK) $(VERSION)
-+PYTHONAPPSDIR=@@APPLICATIONS_DIR@@/$(PYTHONFRAMEWORK) $(VERSION)
- OBJECTS=FileSettings.o MyAppDelegate.o MyDocument.o PreferencesWindowController.o doscript.o main.o
- 
- all: Python\ Launcher.app
-@@ -42,7 +43,7 @@
- 		$(srcdir)/../Icons/PythonCompiled.icns \
- 		$(srcdir)/factorySettings.plist
- 	rm -fr "Python Launcher.app"
--	$(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \
-+	PYTHONHOME=$(DESTDIR)$(prefix) $(RUNSHARED) $(BUILDPYTHON) $(BUNDLEBULDER) \
- 		--builddir=. \
- 		--name="Python Launcher" \
- 		--executable="Python Launcher" \

Deleted: trunk/dports/lang/python27/files/patch-Mac-Tools-Doc-setup.py.diff
===================================================================
--- trunk/dports/lang/python27/files/patch-Mac-Tools-Doc-setup.py.diff	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/patch-Mac-Tools-Doc-setup.py.diff	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,11 +0,0 @@
---- Mac/Tools/Doc/setup.py.diff	2008-03-29 09:24:25.000000000 -0600
-+++ Mac/Tools/Doc/setup.py	2008-10-04 19:53:40.000000000 -0600
-@@ -30,7 +30,7 @@
- 
- MAJOR_VERSION='2.4'
- MINOR_VERSION='2.4.1'
--DESTDIR='/Applications/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION
-+DESTDIR='@@APPLICATIONS_DIR@@/MacPython-%s/PythonIDE.app/Contents/Resources/English.lproj/PythonDocumentation' % MAJOR_VERSION
- 
- class DocBuild(build):
-     def initialize_options(self):

Modified: trunk/dports/lang/python27/files/python27
===================================================================
--- trunk/dports/lang/python27/files/python27	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python27/files/python27	2011-05-13 16:57:49 UTC (rev 78591)
@@ -4,6 +4,7 @@
 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

Modified: trunk/dports/lang/python31/Portfile
===================================================================
--- trunk/dports/lang/python31/Portfile	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python31/Portfile	2011-05-13 16:57:49 UTC (rev 78591)
@@ -6,7 +6,7 @@
 name                    python31
 epoch                   1
 version                 3.1.3
-revision                1
+revision                2
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -41,6 +41,7 @@
 depends_lib             port:zlib port:openssl port:tk \
                         port:sqlite3 port:ncurses port:gdbm \
                         port:bzip2 port:readline port:gettext
+depends_run             port:python_select
 
 configure.args          --enable-framework=${frameworks_dir} \
                         --enable-ipv6 \
@@ -86,6 +87,11 @@
 select.group            python
 select.file             ${filespath}/python[string map {. {}} ${branch}]
 
+notes \
+"To make python ${branch} the default (i.e. the version you get when you run
+'python'), please run:
+    \tsudo port select --set ${select.group} [file tail ${select.file}]"
+
 post-destroot {
    set framewpath ${frameworks_dir}/Python.framework
    set framewdir  ${framewpath}/Versions/${branch}
@@ -98,10 +104,10 @@
 
    # Without this, LINKFORSHARED is set to
    # ... $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)
-   # (this becomes Python.framework/Versions/3.0/Python) which doesn't
+   # (this becomes Python.framework/Versions/3.1/Python) which doesn't
    # quite work (see ticket #15099); instead specifically list the
    # full path to the proper Python framework file (which becomes
-   # ${prefix}/Library/Frameworks/Python.framework/Versions/3.0/Python)
+   # ${prefix}/Library/Frameworks/Python.framework/Versions/3.1/Python)
    reinplace {s|^\(LINKFORSHARED=.*\)$(PYTHONFRAMEWORKDIR).*$|\1 $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)|} ${destroot}${framewdir}/lib/python${branch}/config/Makefile
 
    # The framework version.plist isn't currently being installed so
@@ -115,12 +121,6 @@
       ${destroot}${framewdir}/lib/python${branch}/config/Makefile
 }
 
-post-activate {
-   ui_msg "\nTo fully complete your installation and make python $branch the default, please run
-\n\tsudo port install python_select \
-\n\tsudo python_select $name\n"
-}
-
 platform darwin {
    post-configure {
       # See http://trac.macports.org/ticket/18376

Modified: trunk/dports/lang/python31/files/python31
===================================================================
--- trunk/dports/lang/python31/files/python31	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python31/files/python31	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,11 +1,12 @@
 bin/python3.1
 bin/pythonw3.1
-bin/python-config3.1
+bin/python3.1-config
 bin/idle3.1
 bin/pydoc3.1
-bin/smtpd3.1.py
 -
-share/man/man1/python3.1a1.gz
+bin/2to3-3.1
+share/man/man1/python3.1.1
+-
 ${frameworks_dir}/Python.framework/Versions/3.1
 ${frameworks_dir}/Python.framework/Versions/3.1/Headers
 ${frameworks_dir}/Python.framework/Versions/3.1/Resources

Modified: trunk/dports/lang/python32/Portfile
===================================================================
--- trunk/dports/lang/python32/Portfile	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python32/Portfile	2011-05-13 16:57:49 UTC (rev 78591)
@@ -6,7 +6,7 @@
 name                    python32
 epoch                   20110220
 version                 3.2
-revision                1
+revision                2
 
 set major               [lindex [split $version .] 0]
 #set branch              [join [lrange [split ${version} .] 0 1] .]
@@ -33,7 +33,8 @@
 patchfiles              patch-Makefile.pre.in.diff \
                         patch-setup.py.diff \
                         patch-Lib-cgi.py.diff \
-                        patch-Lib-distutils-dist.py.diff
+                        patch-Lib-distutils-dist.py.diff \
+                        patch-configure.diff
 
 if {![variant_isset universal]} {
     patchfiles-append   patch-configure-arch_only.diff
@@ -45,14 +46,13 @@
 depends_lib             port:zlib port:openssl port:tk \
                         port:sqlite3 port:ncurses port:gdbm \
                         port:bzip2 port:readline port:gettext
+depends_run             port:python_select
 
 configure.args          --enable-framework=${frameworks_dir} \
                         --enable-ipv6 \
                         --with-computed-gotos
 configure.ccache        no
 
-configure.cppflags-append -I${prefix}/include/ncurses
-
 use_parallel_build      yes
 
 post-patch {
@@ -60,16 +60,10 @@
 
    reinplace "s|/setup.py|/setup.py --no-user-cfg|" ${worksrcpath}/Makefile.pre.in
 
-   # replace /Applications/ with ${applications_dir}/
-   reinplace "s|\\(\[^a-zA-Z0-9\]\\)/Applications/|\\1${applications_dir}/|" \
-      ${worksrcpath}/Mac/Makefile.in \
-      ${worksrcpath}/Mac/Tools/Doc/setup.py \
-      ${worksrcpath}/Mac/PythonLauncher/Makefile.in \
-      ${worksrcpath}/Mac/BuildScript/build-installer.py
+   # replace /Applications with ${applications_dir}
+   reinplace "s|@@APPLICATIONS_DIR@@|${applications_dir}|" \
+      ${worksrcpath}/configure
 
-   reinplace "s|#!/Library/Frameworks|#!${frameworks_dir}|" \
-      ${worksrcpath}/Mac/IDLE/IDLE.app/Contents/MacOS/IDLE
-
    # See http://trac.macports.org/changeset/37861
    reinplace "s|xargs -0 rm -r|/usr/bin/xargs -0 /bin/rm -r|g" \
       ${worksrcpath}/Mac/PythonLauncher/Makefile.in
@@ -92,6 +86,11 @@
 select.group            python
 select.file             ${filespath}/python[string map {. {}} ${branch}]
 
+notes \
+"To make python ${branch} the default (i.e. the version you get when you run
+'python'), please run:
+    \tsudo port select --set ${select.group} [file tail ${select.file}]"
+
 post-destroot {
    set framewpath ${frameworks_dir}/Python.framework
    set framewdir  ${framewpath}/Versions/${branch}
@@ -121,12 +120,6 @@
       ${destroot}${framewdir}/lib/python${branch}/config-${branch}m/Makefile
 }
 
-post-activate {
-   ui_msg "\nTo fully complete your installation and make python $branch the default, please run
-\n\tsudo port install python_select \
-\n\tsudo python_select $name\n"
-}
-
 platform darwin {
    post-configure {
       # See http://trac.macports.org/ticket/18376

Modified: trunk/dports/lang/python32/files/python32
===================================================================
--- trunk/dports/lang/python32/files/python32	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/lang/python32/files/python32	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,11 +1,12 @@
 bin/python3.2
 bin/pythonw3.2
-bin/python-config3.2
+bin/python3.2-config
 bin/idle3.2
 bin/pydoc3.2
-bin/smtpd3.2.py
 -
-share/man/man1/python3.2a1.gz
+bin/2to3-3.2
+share/man/man1/python3.2.1
+-
 ${frameworks_dir}/Python.framework/Versions/3.2
 ${frameworks_dir}/Python.framework/Versions/3.2/Headers
 ${frameworks_dir}/Python.framework/Versions/3.2/Resources

Modified: trunk/dports/sysutils/python_select/Portfile
===================================================================
--- trunk/dports/sysutils/python_select/Portfile	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/sysutils/python_select/Portfile	2011-05-13 16:57:49 UTC (rev 78591)
@@ -5,27 +5,25 @@
 
 name                    python_select
 version                 0.3
+revision                1
 categories              sysutils
 platforms               darwin
 license                 BSD
 maintainers             raimue
 supported_archs         noarch
-description             Switch the default python interpreter
-long_description        python_select lets you switch the default python interpreter. \
-                        python_select symlinks the standard python executables \
-                        in the MacPorts prefix to the selected version.
+description             common files for selecting default python version
+long_description        This port installs files that allow 'port select' to \
+                        be used to create links to the preferred default \
+                        version of python.
 
-homepage                http://svn.macports.org/repository/macports/contrib/select/
-master_sites            ${homepage}
-distname                select-${version}
-checksums               md5     b24cecd12fc5567e544b25c5df34a255 \
-                        sha1    4aa312d7e0b9ede1ef015fcd941ff53a0329127a \
-                        rmd160  f121d366cdecc7d5331040abfd153334399d80d5
+homepage                http://www.macports.org/
 
-configure.args          --mandir=${prefix}/share/man --name=python
+distfiles
 
+use_configure           no
+build                   {}
 # install all files
-post-destroot {
+destroot {
     select::install python ${filespath}/base
     select::install python ${filespath}/none
 }
@@ -34,35 +32,26 @@
     post-destroot {
         select::install python ${filespath}/python23-apple
     }
-
-    post-activate {
-        if {[exec ${prefix}/bin/${name} -s] == "none"} {
-            system "${destroot}${prefix}/bin/${name} python23-apple"
-        }
-    }
 }
 
 platform darwin 9 {
     post-destroot {
         select::install python ${filespath}/python25-apple
     }
-
-    post-activate {
-        if {[exec ${prefix}/bin/${name} -s] == "none"} {
-            system "${prefix}/bin/${name} python25-apple"
-        }
-    }
 }
 
 platform darwin 10 {
     post-destroot {
+        select::install python ${filespath}/python25-apple
         select::install python ${filespath}/python26-apple
     }
+}
 
-    post-activate {
-        if {[exec ${prefix}/bin/${name} -s] == "none"} {
-            system "${prefix}/bin/${name} python26-apple"
-        }
+platform darwin 11 {
+    post-destroot {
+        select::install python ${filespath}/python25-apple
+        select::install python ${filespath}/python26-apple
+        select::install python ${filespath}/python27-apple
     }
 }
 

Modified: trunk/dports/sysutils/python_select/files/base
===================================================================
--- trunk/dports/sysutils/python_select/files/base	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/sysutils/python_select/files/base	2011-05-13 16:57:49 UTC (rev 78591)
@@ -4,6 +4,7 @@
 bin/idle
 bin/pydoc
 bin/smtpd.py
+bin/2to3
 share/man/man1/python.1
 share/man/man1/python.1.gz
 ${frameworks_dir}/Python.framework/Versions/Current

Modified: trunk/dports/sysutils/python_select/files/none
===================================================================
--- trunk/dports/sysutils/python_select/files/none	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/sysutils/python_select/files/none	2011-05-13 16:57:49 UTC (rev 78591)
@@ -10,3 +10,4 @@
 -
 -
 -
+-

Modified: trunk/dports/sysutils/python_select/files/python23-apple
===================================================================
--- trunk/dports/sysutils/python_select/files/python23-apple	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/sysutils/python_select/files/python23-apple	2011-05-13 16:57:49 UTC (rev 78591)
@@ -4,6 +4,7 @@
 -
 /usr/bin/pydoc
 -
+-
 /usr/share/man/man1/python2.3.1
 -
 -

Modified: trunk/dports/sysutils/python_select/files/python25-apple
===================================================================
--- trunk/dports/sysutils/python_select/files/python25-apple	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/sysutils/python_select/files/python25-apple	2011-05-13 16:57:49 UTC (rev 78591)
@@ -5,6 +5,7 @@
 /usr/bin/pydoc2.5
 /usr/bin/smtpd2.5.py
 -
+-
 /usr/share/man/man1/python2.5.1.gz
 -
 -

Modified: trunk/dports/sysutils/python_select/files/python26-apple
===================================================================
--- trunk/dports/sysutils/python_select/files/python26-apple	2011-05-13 13:33:16 UTC (rev 78590)
+++ trunk/dports/sysutils/python_select/files/python26-apple	2011-05-13 16:57:49 UTC (rev 78591)
@@ -1,9 +1,10 @@
 /usr/bin/python2.6
 /usr/bin/pythonw2.6
 /usr/bin/python2.6-config
--
+/usr/bin/idle2.6
 /usr/bin/pydoc2.6
 /usr/bin/smtpd2.6.py
+/usr/bin/2to32.6
 -
 /usr/share/man/man1/python2.6.1.gz
 -

Copied: trunk/dports/sysutils/python_select/files/python27-apple (from rev 78586, trunk/dports/sysutils/python_select/files/python26-apple)
===================================================================
--- trunk/dports/sysutils/python_select/files/python27-apple	                        (rev 0)
+++ trunk/dports/sysutils/python_select/files/python27-apple	2011-05-13 16:57:49 UTC (rev 78591)
@@ -0,0 +1,13 @@
+/usr/bin/python2.7
+/usr/bin/pythonw2.7
+/usr/bin/python2.7-config
+/usr/bin/idle2.7
+/usr/bin/pydoc2.7
+/usr/bin/smtpd2.7.py
+/usr/bin/2to3-2.7
+-
+/usr/share/man/man1/python2.7.1.gz
+-
+-
+-
+-
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110513/d1fa60e4/attachment-0001.html>


More information about the macports-changes mailing list