[131004] trunk/dports/textproc/asciidoc/Portfile

[larryv at macports.org]

Revision: 131004
          https://trac.macports.org/changeset/131004
Author:   larryv at macports.org
Date:     2015-01-04 16:49:05 -0800 (Sun, 04 Jan 2015)
Log Message:
-----------
asciidoc: Use Python 2.7 always (#46398)

Modified Paths:
--------------
    trunk/dports/textproc/asciidoc/Portfile

Modified: trunk/dports/textproc/asciidoc/Portfile
===================================================================
--- trunk/dports/textproc/asciidoc/Portfile	2015-01-05 00:38:19 UTC (rev 131003)
+++ trunk/dports/textproc/asciidoc/Portfile	2015-01-05 00:49:05 UTC (rev 131004)
@@ -5,7 +5,7 @@
 
 name                asciidoc
 version             8.6.9
-revision            1
+revision            2
 checksums           sha256  78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 \
                     rmd160  f19936593e3bed2755d77d38dd78a4769f77c7fa
 
@@ -28,53 +28,25 @@
 homepage            http://www.methods.co.nz/asciidoc/
 master_sites        sourceforge
 
+depends_lib         port:python27
 depends_run         port:docbook-xml-4.5 \
                     port:fop \
                     port:libxml2
 
-variant python25 conflicts python26 python27 description {Use python 2.5} {
-    depends_lib-append        port:python25
-    configure.python          ${prefix}/bin/python2.5
+configure.python    ${prefix}/bin/python2.7
 
-    post-destroot {
-    reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python2.5:" \
-        ${destroot}${prefix}/bin/asciidoc \
-        ${destroot}${prefix}/bin/a2x
-    }
-}
+destroot.target install docs vimdir=${prefix}/share/vim/vimfiles/
 
-variant python26 conflicts python25 python27 description {Use python 2.6} {
-    depends_lib-append        port:python26
-    configure.python          ${prefix}/bin/python2.6
-
-    post-destroot {
-    reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python2.6:" \
-        ${destroot}${prefix}/bin/asciidoc \
-        ${destroot}${prefix}/bin/a2x
-    }
+pre-destroot {
+    xinstall -d ${destroot}${prefix}/share/vim/vimfiles
 }
 
-variant python27 conflicts python25 python26 description {Use python 2.7} {
-    depends_lib-append        port:python27
-    configure.python          ${prefix}/bin/python2.7
-
-    post-destroot {
+post-destroot {
     reinplace "s:#!/usr/bin/env python:#!${prefix}/bin/python2.7:" \
         ${destroot}${prefix}/bin/asciidoc \
         ${destroot}${prefix}/bin/a2x
-    }
 }
 
-if {![variant_isset python25] && ![variant_isset python26]} {
-    default_variants +python27
-}
-
-destroot.target install docs vimdir=${prefix}/share/vim/vimfiles/
-
-pre-destroot {
-    xinstall -d ${destroot}${prefix}/share/vim/vimfiles
-}
-
 platform darwin {
     # Avoid hidden dependency on gsed
     configure.env-append SED=/usr/bin/sed
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150104/211f8165/attachment.html>