[131578] trunk/dports/net/wireshark-devel/Portfile

larryv at macports.org larryv at macports.org
Wed Jan 14 16:14:59 PST 2015


Revision: 131578
          https://trac.macports.org/changeset/131578
Author:   larryv at macports.org
Date:     2015-01-14 16:14:59 -0800 (Wed, 14 Jan 2015)
Log Message:
-----------
wireshark-devel: Retire +python{25,26} (#46396)

Modified Paths:
--------------
    trunk/dports/net/wireshark-devel/Portfile

Modified: trunk/dports/net/wireshark-devel/Portfile
===================================================================
--- trunk/dports/net/wireshark-devel/Portfile	2015-01-15 00:10:12 UTC (rev 131577)
+++ trunk/dports/net/wireshark-devel/Portfile	2015-01-15 00:14:59 UTC (rev 131578)
@@ -6,7 +6,7 @@
 name            wireshark-devel
 epoch           2
 version         1.9.0
-revision        3
+revision        4
 patchfiles      patch-configure.diff
 categories      net
 license         {GPL-2 GPL-3}
@@ -118,39 +118,25 @@
         configure.args-append --with-libsmi
 }
 
-variant python25 description {use python25 for the experimental python interface} conflicts python26 python27 {
-        configure.python        ${prefix}/bin/python2.5
-        depends_lib-append      port:python25
-}
+# TODO: Remove after 2016-01-04.
+variant python25 requires python27 description {Legacy variant} {}
+variant python26 requires python27 description {Legacy variant} {}
 
-variant python26 description {use python26 for the experimental python interface} conflicts python25 python27 {
-        configure.python        ${prefix}/bin/python2.6
-        depends_lib-append      port:python26
-}
-
-variant python27 description {use python27 for the experimental python interface} conflicts python25 python26 {
+variant python27 description {use python27 for the experimental python interface} {
         configure.python        ${prefix}/bin/python2.7
         depends_lib-append      port:python27
 }
 
 pre-configure {
-        if {[variant_isset python25] || [variant_isset python26] || [variant_isset python27]} {
+        if {[variant_isset python27]} {
                 configure.args-append   --with-python
                 configure.args-delete   --without-python
-        }
-        if {[variant_isset python25]} {
-                reinplace "s|python-config|python2.5-config|g" ${worksrcpath}/configure
-        }
-        if {[variant_isset python26]} {
-                reinplace "s|python-config|python2.6-config|g" ${worksrcpath}/configure
-        }
-        if {[variant_isset python27]} {
                 reinplace "s|python-config|python2.7-config|g" ${worksrcpath}/configure
         }
 }
 
 pre-destroot {
-        if {[variant_isset python25] || [variant_isset python26] || [variant_isset python27]} {
+        if {[variant_isset python27]} {
                  reinplace "s|libwireshark.dylib|${prefix}/lib/libwireshark.dylib|g" ${worksrcpath}/epan/wspython/wspy_libws.py
         }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150114/ce99e702/attachment-0001.html>


More information about the macports-changes mailing list