Ticket #22897: Portfile.diff

Portfile

@@ -4 +4 @@
 PortSystem          1.0
 
 name                gpodder
-version             2.0
+version             2.1
+revision            0
 categories          gnome audio
 license             GPLv3
 maintainers         neric27@wanadoo.fr openmaintainer
@@ -19 +20 @@
 homepage            http://gpodder.org
 master_sites        http://download.berlios.de/gpodder/
 
-checksums           md5     288641768cdef679ed2e7976562b200e \
-                    sha1    47841ff1832dd222b7c63f765660b3d9716cbe95 \
-                    rmd160  f637599125f6b2de9d803187039d920fea49876b
+checksums           md5     57ed679e3722b7c214956b8d4e13141a \
+                    sha1    3528e0925654373deef54a6c4e7929c0d31b9c3a \
+                    rmd160  62cbb236f3327e685c5d8b63da8fe4b817e71ac6
 
 depends_build       port:help2man\
                     port:intltool
@@ -37 +38 @@
     patch {
         reinplace s|python|${prefix}/bin/python2.5|g ${worksrcpath}/Makefile
     }
+
+    destroot.args PREFIX=${prefix}
 }
 
+
+set my_python "${frameworks_dir}/Python.framework/Versions/2.6"
+
 variant python26 conflicts python25 description {Use Python 2.6} {
     depends_lib-append  port:py26-feedparser\
                         port:py26-pil\
                         port:dbus-python26\
                         port:gnome-python26-extras
+    
     patch {
-        reinplace s|python|${prefix}/bin/python2.6|g ${worksrcpath}/Makefile
+        reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
+    }
+    
+    # install in python 2.6 prefix, see bug #22522
+    destroot.args PREFIX=${frameworks_dir}/Python.framework/Versions/2.6
+    
+    # Install the 2.6 apps in the standard path :
+    # the 2 variants can't be active simultaneously.
+    post-destroot {
+        foreach {app} {gpodder gpo gpodder-backup} {
+                ln -s ${my_python}/bin/${app} ${destroot}${prefix}/bin/${app}
+        }
     }
 }
 
@@ -57 +75 @@
 
 build {}
 
-destroot.args PREFIX=${prefix}
 
 livecheck.type      regex
 livecheck.url       ${master_sites}