[136517] trunk/dports/graphics/asymptote/Portfile

[mojca at macports.org]

Revision: 136517
          https://trac.macports.org/changeset/136517
Author:   mojca at macports.org
Date:     2015-05-20 01:26:47 -0700 (Wed, 20 May 2015)
Log Message:
-----------
asymptote: remove the python26 variant

Modified Paths:
--------------
    trunk/dports/graphics/asymptote/Portfile

Modified: trunk/dports/graphics/asymptote/Portfile
===================================================================
--- trunk/dports/graphics/asymptote/Portfile	2015-05-20 07:22:33 UTC (rev 136516)
+++ trunk/dports/graphics/asymptote/Portfile	2015-05-20 08:26:47 UTC (rev 136517)
@@ -69,46 +69,33 @@
                     port:texlive-latex-recommended
 
 post-destroot {
-    set python.bin ""
-    if {[variant_isset python27]} {
-        set python.bin ${prefix}/bin/python2.7
-    } elseif {[variant_isset python26]} {
-        set python.bin ${prefix}/bin/python2.6
-    }
-    if {${python.bin} != ""} {
-        eval reinplace {"s|#!/usr/bin/env python|#!${python.bin}|"} \
-            [glob -directory ${destroot}${prefix}/share/${name}/GUI *.py]
-    } else {
+    if {![variant_isset python27]} {
         delete ${destroot}${prefix}/bin/xasy
     }
 }
 
 post-activate {
-  # run `mktexlsr` to make sure the asymptote files are found:
-  system "mktexlsr"
+    # run `mktexlsr` to make sure the asymptote files are found:
+    system "mktexlsr"
 }
 post-deactivate {
-  system "mktexlsr"
+    system "mktexlsr"
 }
 
 # asymptote's GUI needs either pyXY-pil or pyXY-Pillow
 # https://trac.macports.org/ticket/44284
-variant python26 conflicts python27 description {Enable xasy GUI using Python 2.6} {
-    set python.version  26
-    set python.branch   "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
-
-    depends_lib-append  port:py${python.version}-tkinter \
-                        path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
-}
-variant python27 conflicts python26 description {Enable xasy GUI using Python 2.7} {
+variant python27 description {Enable xasy GUI using Python 2.7} {
     set python.version  27
-    set python.branch   "[string range ${python.version} 0 end-1].[string index ${python.version} end]"
+    set python.branch   2.7
+    set python.bin      ${prefix}/bin/python${python.branch}
 
     depends_lib-append  port:py${python.version}-tkinter \
                         path:${frameworks_dir}/Python.framework/Versions/${python.branch}/lib/python${python.branch}/site-packages/PIL:py${python.version}-Pillow
+    post-destroot {
+        eval reinplace {"s|#!/usr/bin/env python|#!${python.bin}|"} \
+            [glob -directory ${destroot}${prefix}/share/${name}/GUI *.py]
+    }
 }
-if {![variant_isset python26]} {
-    default_variants +python27
-}
+default_variants    +python27
 
 livecheck.regex     /${name}-(\[0-9.\]+)${extract.suffix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150520/ed320d3e/attachment-0001.html>