[27604] trunk/dports/textproc/htmldoc/Portfile

source_changes at macosforge.org source_changes at macosforge.org
Fri Aug 10 08:57:35 PDT 2007


Revision: 27604
          http://trac.macosforge.org/projects/macports/changeset/27604
Author:   jmpp at macports.org
Date:     2007-08-10 08:57:35 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Mark variants as conflicting among them and thus remove calls to the exit routine.

Modified Paths:
--------------
    trunk/dports/textproc/htmldoc/Portfile

Modified: trunk/dports/textproc/htmldoc/Portfile
===================================================================
--- trunk/dports/textproc/htmldoc/Portfile	2007-08-10 15:56:25 UTC (rev 27603)
+++ trunk/dports/textproc/htmldoc/Portfile	2007-08-10 15:57:35 UTC (rev 27604)
@@ -41,31 +41,19 @@
 destroot.destdir prefix=${destroot}${prefix} exec_prefix=${destroot}${prefix} \
 		 bindir=${destroot}${prefix}/bin
 
-variant ssl {
-	if {[variant_isset gnutls] || [variant_isset cdsassl]} {
-		ui_error "Only one of +ssl, +gnutls, or +cdsassl can be specified!"
-		exit(1)
-	}
+variant ssl conflicts gnutls cdsassl {
 	depends_lib-append	port:openssl
 	configure.args-delete	--disable-ssl
 	configure.args-append	--enable-openssl --disable-gnutls --disable-cdsassl
 }
 
-variant gnutls {
-	if {[variant_isset ssl] || [variant_isset cdsassl]} {
-		ui_error "Only one of +ssl, +gnutls, or +cdsassl can be specified!"
-		exit 1
-	}
+variant gnutls conflicts ssl cdsassl {
 	depends_lib-append	port:gnutls
 	configure.args-delete	--disable-ssl
 	configure.args-append	--disable-openssl --enable-gnutls --disable-cdsassl
 }
 
-variant cdsassl {
-	if {[variant_isset ssl] || [variant_isset gnutls]} {
-		ui_error "Only one of +ssl, +gnutls, or +cdsassl can be specified!"
-		exit 1
-	}
+variant cdsassl conflicts ssl gnutls {
 	configure.args-delete	--disable-ssl
 	configure.args-append	--disable-openssl --disable-gnutls --enable-cdsassl
 }

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070810/75a68c8a/attachment.html


More information about the macports-changes mailing list