Index: Portfile
===================================================================
--- Portfile	(revision 43192)
+++ Portfile	(working copy)
@@ -39,6 +39,11 @@
 distname            ${name}[strsed ${vim_version} {g/\.//}]
 dist_subdir         ${distname}
 
+# Can be removed once MacPorts 1.7.0 is released
+if {![info exists frameworks_dir]} {
+   set frameworks_dir ${prefix}/Library/Frameworks
+}
+
 depends_build       bin:gnutar:gnutar \
                     bin:grep:grep
 depends_lib         port:ncurses \
@@ -117,8 +122,18 @@
     depends_lib-append      port:perl5.8
 }
 variant python description {Enable Python scripting} {
-    configure.args-append   --enable-pythoninterp
-    depends_lib-append      port:python25
+    configure.args-append   --enable-pythoninterp \
+                            --with-python=${prefix}/bin/python2.6 \
+                            --with-python-config-dir=${frameworks_dir}/Python.framework/Versions/2.6/lib/python2.6/config/
+    depends_lib-append      port:python26
+    depends_build-append    port:autoconf
+    configure.env-append    PYTHON=python2.6
+
+    patchfiles-append       patch-vim-python.diff
+
+    pre-configure {
+        system "autoconf ${worksrcpath}/src/configure.in > ${worksrcpath}/src/auto/configure"
+    }
 }
 variant ruby description {Enable Ruby scripting} {
     configure.args-append   --enable-rubyinterp