[122173] trunk/dports/gnome/gpodder/Portfile

[elelay at macports.org]

Revision: 122173
          https://trac.macports.org/changeset/122173
Author:   elelay at macports.org
Date:     2014-07-16 10:57:05 -0700 (Wed, 16 Jul 2014)
Log Message:
-----------
gpodder: apply improvements suggested by ionic (#44306)

Modified Paths:
--------------
    trunk/dports/gnome/gpodder/Portfile

Modified: trunk/dports/gnome/gpodder/Portfile
===================================================================
--- trunk/dports/gnome/gpodder/Portfile	2014-07-16 17:14:41 UTC (rev 122172)
+++ trunk/dports/gnome/gpodder/Portfile	2014-07-16 17:57:05 UTC (rev 122173)
@@ -6,6 +6,7 @@
 
 name                gpodder
 version             3.7.0
+# TODO: remember to remove the revision
 revision            1
 categories          gnome audio
 license             GPL-3
@@ -32,22 +33,27 @@
 depends_lib         port:vorbis-tools\
                     port:lame
 
-set my_python "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
+set my_python       "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
+set python.version  "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
+set python.branch   "DUMMY_VALUE_WILL_BE_OVERWRITTEN"
 
-variant python26 conflicts description {Use Python 2.6} {
-    depends_lib-append  port:py26-feedparser\
-                        port:dbus-python26\
-                        port:py26-mygpoclient \
-                        port:py26-pygtk
-    
-    set my_python "${frameworks_dir}/Python.framework/Versions/2.6"
+variant python26 conflicts python27 description {Use Python 2.6} {
+    set python.version  26
+    set python.branch "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
 
+    set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
+
+    depends_lib-append  port:py${python.version}-feedparser \
+                        port:dbus-python${python.version} \
+                        port:py${python.version}-mygpoclient \
+                        port:py${python.version}-pygtk
+
     post-patch {
         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
+    destroot.args PREFIX=${my_python}
     
     # Install the 2.6 apps in the standard path :
     # the 2 variants can't be active simultaneously.
@@ -58,20 +64,23 @@
     }
 }
 
-variant python27 conflicts python26 conflicts description {Use Python 2.7} {
-    depends_lib-append  port:py27-feedparser\
-                        port:dbus-python27\
-                        port:py27-mygpoclient \
-                        port:py27-pygtk
+variant python27 conflicts python26 description {Use Python 2.7} {
+    set python.version  27
+    set python.branch   "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
 
-    set my_python "${frameworks_dir}/Python.framework/Versions/2.7"
-    
+    set my_python "${frameworks_dir}/Python.framework/Versions/${python.branch}"
+
+    depends_lib-append  port:py${python.version}-feedparser \
+                        port:dbus-python${python.version} \
+                        port:py${python.version}-mygpoclient \
+                        port:py${python.version}-pygtk
+
     post-patch {
         reinplace s|python|${my_python}/bin/python|g ${worksrcpath}/Makefile
     }
 
     # install in python 2.7 prefix, see bug #22522
-    destroot.args PREFIX=${frameworks_dir}/Python.framework/Versions/2.7
+    destroot.args PREFIX=${my_python}
 
     # Install the 2.7 apps in the standard path :
     # the 2 variants can't be active simultaneously.
@@ -100,10 +109,8 @@
 }
 
 variant html_notes description {Use WebkitGtk+ to show episode notes in HTML format} {
-	if {[variant_isset python26]} {
-		depends_lib-append  port:py26-webkitgtk
-	} else {
-		depends_lib-append  port:py27-webkitgtk
+	if {[variant_isset python26] || [variant_isset python27]} {
+		depends_lib-append  port:py${python.version}-webkitgtk
 	}
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140716/76817c89/attachment.html>