--- Portfile.orig	2008-07-07 17:31:09.000000000 -0600
+++ Portfile	2008-10-05 20:53:27.000000000 -0600
@@ -4,7 +4,7 @@
 
 name                    python25
 version                 2.5.2
-revision                5
+revision                7
 set major               2
 set branch              2.5
 categories              lang
@@ -28,8 +28,7 @@
                         sha1    7a835c93a904ae4ecb2d23b5183e94d3b92f8305 \
                         rmd160  a6e2e81910639a362f265af2e3814e7b47e2110a
 
-patchfiles              patch-Makefile.pre.in.diff \
-                        patch-setup.py.diff \
+patchfiles              patch-setup.py.diff \
                         patch-Lib-cgi.py.diff
 
 depends_lib             port:gettext
@@ -54,7 +53,7 @@
                 Mac/PythonLauncher/Makefile.in
 }
 
-build.target            all libpython${branch}.dylib
+build.target            all
 
 # TODO: From python24, do we still need this?
 # Workaround for case-sensitive file systems
@@ -78,8 +77,7 @@
             ln -s ${prefix}/${dir}/python${branch} ${destroot}${framewdir}/${dir}/python${branch}
         }
 
-        file rename ${destroot}${framewdir}/lib/libpython${branch}.dylib ${destroot}${prefix}/lib
-        ln -s ${prefix}/lib/libpython${branch}.dylib ${destroot}${framewdir}/lib/libpython${branch}.dylib
+        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