[91178] trunk/dports/databases/db53/Portfile

[afb at macports.org]

Revision: 91178
          https://trac.macports.org/changeset/91178
Author:   afb at macports.org
Date:     2012-03-25 00:57:31 -0700 (Sun, 25 Mar 2012)
Log Message:
-----------
db53: remove legacy compatibility variants

Modified Paths:
--------------
    trunk/dports/databases/db53/Portfile

Modified: trunk/dports/databases/db53/Portfile
===================================================================
--- trunk/dports/databases/db53/Portfile	2012-03-25 07:34:58 UTC (rev 91177)
+++ trunk/dports/databases/db53/Portfile	2012-03-25 07:57:31 UTC (rev 91178)
@@ -50,13 +50,13 @@
 		move ${destroot}${prefix}/bin/${bin} \
 			${destroot}${prefix}/bin/${newbin}
 	}
-	if { ![variant_isset no_sql] } {
+	if { [variant_isset sql] } {
 		move ${destroot}${prefix}/bin/dbsql \
 			${destroot}${prefix}/bin/db${branch}sql
 	}
 }
 
-variant java conflicts no_java description {Build the Java API} {
+variant java description {Build the Java API} {
     configure.args-append  --enable-java
     platform macosx {
         pre-configure {
@@ -74,23 +74,15 @@
         }
     }
 }
-variant no_java conflicts java description {Legacy compatibility variant} {}
-if {[variant_isset no_java]} {
-    default_variants -java
-} elseif {${os.subplatform} == "macosx" && ${os.major} < 11} {
+if {${os.subplatform} == "macosx" && ${os.major} < 11} {
     default_variants +java
 }
 
-variant sql conflicts no_sql description {Build the SQL API} {
+variant sql description {Build the SQL API} {
     patchfiles-append      patch-sqlite.diff
     configure.args-append  --enable-sql
 }
-variant no_sql conflicts sql description {Legacy compatibility variant} {}
-if {[variant_isset no_sql]} {
-    default_variants -sql
-} else {
-    default_variants +sql
-}
+default_variants +sql
 
 variant tcl description {build Tcl API} {
     depends_lib-append     port:tcl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120325/6e811276/attachment.html>