--- Portfile.orig	2009-03-28 14:46:51.000000000 +0100
+++ Portfile	2009-03-28 14:44:44.000000000 +0100
@@ -4,7 +4,7 @@
 PortGroup           python25 1.0
 
 name                py25-sphinx
-version             0.5
+version             0.6.1
 categories-append   devel
 maintainers         gmail.com:michel.sylvan
 description         Python documentation generator
@@ -21,11 +21,18 @@
 master_sites        http://pypi.python.org/packages/source/S/Sphinx/
 distname            Sphinx-${version}
 
-checksums           md5 55a33cc13b5096c8763cd4a933b30ddc \
-                    sha1 504b36a4429e2fe701cd449cad51d65d0c179225 \
-                    rmd160 b477ac3c3a439b8058a05365364fd88783f12671
+checksums           md5 fa1a32c406232a96a776de7dfae15032 \
+                    sha1 08d465a42523624e22d59f51f862ba1d497b2850 \
+                    rmd160 b385f4772548d241fcfae281d7a3a020d32c2579
 
 depends_lib         port:py25-docutils
 depends_run         port:py25-pygments \
-                    port:py25-jinja \
+                    port:py25-jinja2 \
                     port:py25-setuptools
+
+post-destroot {
+    # To avoid conflict between py*-sphinx
+    move ${destroot}${prefix}/bin/sphinx-autogen ${destroot}${prefix}/bin/sphinx-autogen-2.5
+    move ${destroot}${prefix}/bin/sphinx-build  ${destroot}${prefix}/bin/sphinx-build-2.5
+    move ${destroot}${prefix}/bin/sphinx-quickstart ${destroot}${prefix}/bin/sphinx-quickstart-2.5
+}