[32879] trunk/dports/net/djbdns/Portfile

[ryandesign at macports.org]

Revision: 32879
          http://trac.macosforge.org/projects/macports/changeset/32879
Author:   ryandesign at macports.org
Date:     2008-01-14 02:36:09 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
djbdns: remove usage of nonexistent `exit` command

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

Modified: trunk/dports/net/djbdns/Portfile
===================================================================
--- trunk/dports/net/djbdns/Portfile	2008-01-14 10:33:00 UTC (rev 32878)
+++ trunk/dports/net/djbdns/Portfile	2008-01-14 10:36:09 UTC (rev 32879)
@@ -75,7 +75,7 @@
 }
 
 set ipv6_diff			${distname}-test14.diff
-variant ipv6 {
+variant ipv6 conflicts dumpcache {
 	master_sites-append	http://www.fefe.de/dns/:ipv6
 	distfiles-append	${ipv6_diff}.bz2:ipv6
 	checksums-append	${ipv6_diff}.bz2 md5 52bec93d7ce6226281082367e49157d3
@@ -86,21 +86,15 @@
 }
 
 set dumpcache_diff		patch-dnscache-dumpcache-v4.txt
-variant dumpcache {
+variant dumpcache conflicts ipv6 {
 	master_sites-append	http://efge.free.fr/djbdns/:dumpcache
 	distfiles-append	${dumpcache_diff}:dumpcache \
 						prettycache.pl:dumpcache
 	checksums-append	${dumpcache_diff} md5 61441dec12dd627a7fea7c3059cc2542 \
 						prettycache.pl md5 6318e8e866c78adf9b411b58f5088fc2
 	post-patch {
-		if {[variant_isset ipv6]} {
-			ui_error "The ipv6 and dumpcache variants currently conflict.\n\
-				You can only specify one of them."
-			exit 1
-		} else {
-			ui_info "$UI_PREFIX Applying ${dumpcache_diff}"
-			system "cd ${worksrcpath} && patch -p1 < ${distpath}/${dumpcache_diff}"
-		}
+		ui_info "$UI_PREFIX Applying ${dumpcache_diff}"
+		system "cd ${worksrcpath} && patch -p1 < ${distpath}/${dumpcache_diff}"
 	}
 	post-destroot {
 		xinstall -m 0755 ${distpath}/prettycache.pl ${destroot}${prefix}/bin

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080114/42f15704/attachment-0001.html