Revision
89511
Author
jwa@macports.org
Date
2012-02-01 07:58:26 -0800 (Wed, 01 Feb 2012)

Log Message

simplify legacy variants, thanks Ryan, I expected something like that to be there, would have to be invented if not, bdb variant still needing improvements

Modified Paths

Diff

Modified: trunk/dports/databases/libgda5/Portfile (89510 => 89511)


--- trunk/dports/databases/libgda5/Portfile	2012-02-01 15:53:35 UTC (rev 89510)
+++ trunk/dports/databases/libgda5/Portfile	2012-02-01 15:58:26 UTC (rev 89511)
@@ -128,44 +128,24 @@
 #
 # the following are legacy variants to be removed after a few update cycles
 
-variant with_mysql5 \
-    description {support for current MySQL 5.x} {
-	depends_lib-append	path:bin/mysql_config5:mysql5
-	configure.env-append	\
-		MYSQL_CONFIG=${prefix}/lib/mysql5/bin/mysql_config
-	configure.args-delete   --without-mysql
-	configure.args-append	--with-mysql=${prefix}/lib/mysql5
-	configure.cppflags-append	"-I${prefix}/include/mysql5/mysql"
-}
+variant with_mysql5 requires mysql5 \
+    description {Legacy compatibility variant current MySQL 5.x} {}
 
-variant with_postgresql83 conflicts with_postgresql84 with_postgresql90 \
-    description {support for PostgreSQL 8.3.x} {
-	configure.cppflags-append	"-I${prefix}/include/postgresql83"
-	depends_lib-append	port:postgresql83
-	configure.args-delete   --without-postgres
-	configure.args-append	--with-postgres=${prefix}/lib/postgresql83
-}
+variant with_postgresql83 requires postgresql83 \
+    description {Legacy compatibility variant PostgreSQL 8.3.x} {}
 
-variant with_postgresql84 conflicts with_postgresql83 with_postgresql90 \
-    description {support for PostgreSQL 8.4.x} {
-	configure.cppflags-append	"-I${prefix}/include/postgresql84"
-	depends_lib-append	port:postgresql84
-	configure.args-delete   --without-postgres
-	configure.args-append	--with-postgres=${prefix}/lib/postgresql84
-}
+variant with_postgresql84 requires postgresql84 \
+    description {Legacy compatibility variant PostgreSQL 8.4.x} {}
 
-variant with_postgresql90 conflicts with_postgresql83 with_postgresql84 \
-    description {support for PostgreSQL 9.0.x} {
-	configure.cppflags-append	"-I${prefix}/include/postgresql90"
-	depends_lib-append	port:postgresql90
-	configure.args-delete   --without-postgres
-	configure.args-append	--with-postgres=${prefix}/lib/postgresql90
-}
+variant with_postgresql90 requires postgresql90 \
+    description {Legacy compatibility variant PostgreSQL 9.0.x} {}
 
-variant without_bdb \
-    description {remove support for Berkeley DB} {
-	configure.args-delete   --with-bdb=${prefix}
-	configure.args-append	--without-bdb
+variant without_bdb conflicts bdb \
+    description {Legacy compatibility variant} {}
+if {[variant_isset without_bdb]} {
+    default_variants	-bdb
+} else {
+    default_variants	+bdb
 }
 
 post-activate {