<!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>[119784] trunk/dports/net/wireshark/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/119784">119784</a></dd>
<dt>Author</dt> <dd>ricci@macports.org</dd>
<dt>Date</dt> <dd>2014-05-06 13:17:22 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>net/wireshark:
invert the no_ variants to comply with new standards
resolves a tiny part of #39383</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetwiresharkPortfile">trunk/dports/net/wireshark/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetwiresharkPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/wireshark/Portfile (119783 => 119784)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/wireshark/Portfile 2014-05-06 20:11:06 UTC (rev 119783)
+++ trunk/dports/net/wireshark/Portfile 2014-05-06 20:17:22 UTC (rev 119784)
</span><span class="lines">@@ -32,41 +32,39 @@
</span><span class="cx"> depends_build \
</span><span class="cx"> port:pkgconfig
</span><span class="cx"> depends_lib \
</span><del>- port:adns \
- port:libgcrypt \
- port:libgeoip \
</del><ins>+ port:c-ares \
</ins><span class="cx"> path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span><del>- port:libsmi \
- port:lua \
- port:gnutls \
- port:gtk2 \
- port:openssl \
- port:portaudio \
</del><span class="cx"> port:libpcap \
</span><span class="cx"> port:kerberos5 \
</span><span class="cx"> port:zlib
</span><span class="cx">
</span><span class="cx"> configure.args \
</span><del>- --with-libsmi=${prefix} \
</del><ins>+ --without-libsmi \
</ins><span class="cx"> --disable-usr-local \
</span><del>- --with-adns=${prefix} \
- --without-c-ares \
- --with-geoip=${prefix} \
- --with-gnutls=yes \
- --with-libgcrypt-prefix=${prefix} \
- --with-lua=${prefix} \
- --enable-ipv6 \
</del><ins>+ --without-adns \
+ --with-c-ares=${prefix} \
+ --without-geoip \
+ --without-gnutls \
+ --with-gcrypt=no \
+ --without-lua \
+ --disable-ipv6 \
</ins><span class="cx"> --with-pcap=${prefix} \
</span><span class="cx"> --with-ssl=${prefix} \
</span><span class="cx"> --with-zlib=${prefix} \
</span><span class="cx"> --mandir=\\\${prefix}/share/man \
</span><span class="cx"> --infodir=\\\${prefix}/share/info \
</span><del>- --with-portaudio=${prefix} \
</del><ins>+ --without-portaudio \
</ins><span class="cx"> --disable-warnings-as-errors \
</span><del>- --with-krb5=${prefix}
</del><ins>+ --with-krb5=${prefix} \
+ --without-ssl \
+ --disable-wireshark
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> configure.ldflags-append "-Wl,-search_paths_first"
</span><span class="cx">
</span><ins>+default_variants +adns +gnutls +libgcrypt +ipv6 +lua +libsmi +geoip +rtp +ssl +x11
+
+
</ins><span class="cx"> ## 1.10.0 doesn't include python options in configure
</span><span class="cx"> ## if {[variant_isset no_python]} {
</span><span class="cx"> ## } elseif {[variant_isset python25]} {
</span><span class="lines">@@ -97,48 +95,48 @@
</span><span class="cx"> configure.cflags -fno-var-tracking
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_adns description {don't use adns library for async. dns resolution instead of the default c-ares library} {
- configure.args-append --without-adns \
</del><ins>+variant adns description {use adns library for async. dns resolution instead of the default c-ares library} {
+ configure.args-delete --without-adns \
</ins><span class="cx"> --with-c-ares=${prefix}
</span><del>- configure.args-delete --with-adns=${prefix} \
</del><ins>+ configure.args-append --with-adns=${prefix} \
</ins><span class="cx"> --without-c-ares
</span><del>- depends_lib-delete port:adns
- depends_lib-append port:c-ares
</del><ins>+ depends_lib-append port:adns
+ depends_lib-delete port:c-ares
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_gnutls {
- configure.args-append --without-gnutls
- configure.args-delete --with-gnutls=yes
- depends_lib-delete port:gnutls
</del><ins>+variant gnutls {
+ configure.args-delete --without-gnutls
+ configure.args-append --with-gnutls=yes
+ depends_lib-append port:gnutls
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_libgcrypt {
- configure.args-append --with-gcrypt=no
- configure.args-delete --with-libgcrypt-prefix=${prefix}
- depends_lib-delete port:libgcrypt
</del><ins>+variant libgcrypt {
+ configure.args-delete --with-gcrypt=no
+ configure.args-append --with-libgcrypt-prefix=${prefix}
+ depends_lib-append port:libgcrypt
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_ipv6 {
- configure.args-append --disable-ipv6
- configure.args-delete --enable-ipv6
</del><ins>+variant ipv6 {
+ configure.args-delete --disable-ipv6
+ configure.args-append --enable-ipv6
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_lua {
- configure.args-append --without-lua
- configure.args-delete --with-lua=${prefix}
- depends_lib-delete port:lua
</del><ins>+variant lua {
+ configure.args-delete --without-lua
+ configure.args-append --with-lua=${prefix}
+ depends_lib-append port:lua
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_libsmi {
- configure.args-append --without-libsmi
- configure.args-delete --with-libsmi=${prefix}
- depends_lib-delete port:libsmi
</del><ins>+variant libsmi {
+ configure.args-delete --without-libsmi
+ configure.args-append --with-libsmi=${prefix}
+ depends_lib-append port:libsmi
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_geoip {
- configure.args-append --without-geoip
- configure.args-delete --with-geoip=${prefix}
- depends_lib-delete port:libgeoip
</del><ins>+variant geoip {
+ configure.args-delete --without-geoip
+ configure.args-append --with-geoip=${prefix}
+ depends_lib-append port:libgeoip
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ## 1.10.0 doesn't include python options in configure
</span><span class="lines">@@ -161,21 +159,20 @@
</span><span class="cx"> ## configure.args-append --without-python
</span><span class="cx"> ## }
</span><span class="cx">
</span><del>-variant no_rtp description {remove rtp support} {
- configure.args-append --without-portaudio
- configure.args-delete --with-portaudio=${prefix}
- depends_lib-delete port:portaudio
</del><ins>+variant rtp description {add rtp support} {
+ configure.args-delete --without-portaudio
+ configure.args-append --with-portaudio=${prefix}
+ depends_lib-append port:portaudio
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_ssl {
- configure.args-append --without-ssl
- depends_lib-delete port:openssl
</del><ins>+variant ssl {
+ configure.args-delete --without-ssl
+ depends_lib-append port:openssl
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_x11 {
- depends_lib-delete port:gtk2
- configure.args-delete --disable-gtk2
- configure.args-append --disable-wireshark
</del><ins>+variant x11 {
+ depends_lib-append port:gtk2
+ configure.args-delete --disable-wireshark
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>