<!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>[115745] trunk/dports/net/dnsmasq/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/115745">115745</a></dd>
<dt>Author</dt> <dd>snc@macports.org</dd>
<dt>Date</dt> <dd>2014-01-10 08:40:30 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>dnsmasq: convert no_* variants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetdnsmasqPortfile">trunk/dports/net/dnsmasq/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetdnsmasqPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/dnsmasq/Portfile (115744 => 115745)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/net/dnsmasq/Portfile 2014-01-10 16:19:37 UTC (rev 115744)
+++ trunk/dports/net/dnsmasq/Portfile 2014-01-10 16:40:30 UTC (rev 115745)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> variant universal {}
</span><span class="cx">
</span><span class="cx"> build.env-append CC="${configure.cc} [get_canonical_archflags]"
</span><ins>+build.args-append -DNO_DHCP -DNO_TFTP -DNO_IPV6
</ins><span class="cx">
</span><span class="cx"> destroot.args PREFIX=${prefix}
</span><span class="cx"> destroot.keepdirs ${destroot}${prefix}/var/run/${name}
</span><span class="lines">@@ -59,22 +60,28 @@
</span><span class="cx"> livecheck.url ${master_sites}
</span><span class="cx"> livecheck.regex LATEST_IS_(\\d\\.\\d+)
</span><span class="cx">
</span><del>-set COPTS ""
-variant no_dhcp description { Disable built in DHCP server } {
- set COPTS "${COPTS} -DNO_DHCP"
- build.args COPTS="${COPTS}"
</del><ins>+# TODO: remove no_* variants after 2015-01-09
+if { ! [variant_isset no_dhcp] \
+ && ! [variant_isset no_tftp] \
+ && ! [variant_isset no_ipv6] } {
+ default_variants +dhcp +tftp +ipv6
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_tftp description { Disable built in TFTP server } {
- set COPTS "${COPTS} -DNO_TFTP"
- build.args COPTS="${COPTS}"
</del><ins>+variant no_dhcp conflicts dhcp description { obsolete } {}
+variant dhcp conflicts no_dhcp description { Provide built-in DHCP server } {
+ build.args-delete -DNO_DHCP
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_ipv6 description { Disable IPV6 support } {
- set COPTS "${COPTS} -DNO_IPV6"
- build.args COPTS="${COPTS}"
</del><ins>+variant no_tftp conflicts tftp description { obsolete } {}
+variant tftp conflicts no_tftp description { Provide built-in TFTP server } {
+ build.args-delete -DNO_TFTP
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+variant no_ipv6 conflicts ipv6 description { obsolete } {}
+variant ipv6 conflicts no_ipv6 description { Provide IPV6 support } {
+ build.args-delete -DNO_IPV6
+}
+
</ins><span class="cx"> post-destroot {
</span><span class="cx"> copy ${worksrcpath}/dnsmasq.conf.example ${destroot}${prefix}/etc/dnsmasq.conf.example
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>