Ticket #16933: Portfile.diff

Portfile

@@ -4 +4 @@
 
 name                    python26
 version                 2.6
-revision                2
+revision                3
 set major               [lindex [split $version .] 0]
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              lang
@@ -51 +51 @@
 
 configure.args          --enable-shared \
                         --enable-framework=${frameworks_dir} \
-                        --mandir=${prefix}/share/man \
-                        --without-readline \
-                        --disable-tk \
                         --enable-ipv6
 
 use_parallel_build      no
@@ -64 +61 @@
       ${worksrcpath}/Mac/Makefile.in ${worksrcpath}/Mac/IDLE/Makefile.in \
       ${worksrcpath}/Mac/Tools/Doc/setup.py \
       ${worksrcpath}/Mac/PythonLauncher/Makefile.in
-   reinplace "s|xargs -0 rm -r|xargs -0 rm -rf|g" \
+
+   # 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
 }
 
@@ -79 +78 @@
    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}
-   }
-
-   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 python-config } {
-      file delete ${destroot}${prefix}/bin/${bin}
-   }
-   foreach bin [list python${branch} pythonw${branch} idle${branch} pydoc${branch} smtpd${branch}.py python${branch}-config] {
-      file rename -force ${destroot}${framewdir}/bin/${bin} ${destroot}${prefix}/bin
-      ln -s ${prefix}/bin/${bin} ${destroot}${framewdir}/bin/${bin}
-   }
-
    foreach dir { Headers Resources Python Versions/Current } {
       file delete ${destroot}${framewpath}/${dir}
    }
 
+   ln -s ${framewdir}/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}/${name} ${destroot}${prefix}/etc/select/python/
@@ -110 +93 @@
    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"
+   ui_msg "The program IDLE will not run until py26-tkinter is installed.\n"
 }
 
 platform darwin 7 {