[115745] trunk/dports/net/dnsmasq/Portfile

snc at macports.org snc at macports.org
Fri Jan 10 08:40:30 PST 2014


Revision: 115745
          https://trac.macports.org/changeset/115745
Author:   snc at macports.org
Date:     2014-01-10 08:40:30 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
dnsmasq: convert no_* variants

Modified Paths:
--------------
    trunk/dports/net/dnsmasq/Portfile

Modified: trunk/dports/net/dnsmasq/Portfile
===================================================================
--- 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)
@@ -51,6 +51,7 @@
 variant universal {}
 
 build.env-append    CC="${configure.cc} [get_canonical_archflags]"
+build.args-append   -DNO_DHCP -DNO_TFTP -DNO_IPV6
 
 destroot.args       PREFIX=${prefix}
 destroot.keepdirs   ${destroot}${prefix}/var/run/${name}
@@ -59,22 +60,28 @@
 livecheck.url       ${master_sites}
 livecheck.regex     LATEST_IS_(\\d\\.\\d+)
 
-set COPTS ""
-variant no_dhcp description { Disable built in DHCP server } {
-    set COPTS "${COPTS} -DNO_DHCP"
-    build.args COPTS="${COPTS}"
+# 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
 }
 
-variant no_tftp description { Disable built in TFTP server } {
-    set COPTS "${COPTS} -DNO_TFTP"
-    build.args COPTS="${COPTS}"
+variant no_dhcp conflicts dhcp description { obsolete } {}
+variant dhcp conflicts no_dhcp description { Provide built-in DHCP server } {
+    build.args-delete   -DNO_DHCP
 }
 
-variant no_ipv6 description { Disable IPV6 support } {
-    set COPTS "${COPTS} -DNO_IPV6"
-    build.args COPTS="${COPTS}"
+variant no_tftp conflicts tftp description { obsolete } {}
+variant tftp conflicts no_tftp description { Provide built-in TFTP server } {
+    build.args-delete   -DNO_TFTP
 }
 
+variant no_ipv6 conflicts ipv6 description { obsolete } {}
+variant ipv6 conflicts no_ipv6 description { Provide IPV6 support } {
+    build.args-delete   -DNO_IPV6
+}
+
 post-destroot {
     copy ${worksrcpath}/dnsmasq.conf.example ${destroot}${prefix}/etc/dnsmasq.conf.example
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140110/be0b0902/attachment.html>


More information about the macports-changes mailing list