<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[131578] trunk/dports/net/wireshark-devel/Portfile</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/131578">131578</a></dd>
<dt>Author</dt> <dd>larryv@macports.org</dd>
<dt>Date</dt> <dd>2015-01-14 16:14:59 -0800 (Wed, 14 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>wireshark-devel: Retire +python{25,26} (#46396)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetwiresharkdevelPortfile">trunk/dports/net/wireshark-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetwiresharkdevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/wireshark-devel/Portfile (131577 => 131578)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> name wireshark-devel
</span><span class="cx"> epoch 2
</span><span class="cx"> version 1.9.0
</span><del>-revision 3
</del><ins>+revision 4
</ins><span class="cx"> patchfiles patch-configure.diff
</span><span class="cx"> categories net
</span><span class="cx"> license {GPL-2 GPL-3}
</span><span class="lines">@@ -118,39 +118,25 @@
</span><span class="cx"> configure.args-append --with-libsmi
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant python25 description {use python25 for the experimental python interface} conflicts python26 python27 {
- configure.python ${prefix}/bin/python2.5
- depends_lib-append port:python25
-}
</del><ins>+# TODO: Remove after 2016-01-04.
+variant python25 requires python27 description {Legacy variant} {}
+variant python26 requires python27 description {Legacy variant} {}
</ins><span class="cx">
</span><del>-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 {
</del><ins>+variant python27 description {use python27 for the experimental python interface} {
</ins><span class="cx"> configure.python ${prefix}/bin/python2.7
</span><span class="cx"> depends_lib-append port:python27
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><del>- if {[variant_isset python25] || [variant_isset python26] || [variant_isset python27]} {
</del><ins>+ if {[variant_isset python27]} {
</ins><span class="cx"> configure.args-append --with-python
</span><span class="cx"> configure.args-delete --without-python
</span><del>- }
- 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]} {
</del><span class="cx"> reinplace "s|python-config|python2.7-config|g" ${worksrcpath}/configure
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-destroot {
</span><del>- if {[variant_isset python25] || [variant_isset python26] || [variant_isset python27]} {
</del><ins>+ if {[variant_isset python27]} {
</ins><span class="cx"> reinplace "s|libwireshark.dylib|${prefix}/lib/libwireshark.dylib|g" ${worksrcpath}/epan/wspython/wspy_libws.py
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>