--- Portfile.orig	2009-02-01 11:05:37.000000000 -0500
+++ Portfile	2009-02-08 18:31:58.000000000 -0500
@@ -34,7 +34,6 @@
 
 configure.args          --enable-shared \
                         --enable-framework=${frameworks_dir} \
-                        --mandir=${prefix}/share/man \
                         --without-readline \
                         --disable-tk \
                         --enable-ipv6
@@ -76,22 +75,17 @@
         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}/${dir}/python${branch} ${destroot}${prefix}/${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
+        ln -s ${framewdir}/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}