Revision
87532
Author
hum@macports.org
Date
2011-11-24 06:38:26 -0800 (Thu, 24 Nov 2011)

Log Message

pficommon: mark various postgresql variants as conflicting with one another; deprecate mysql and postgresql varinats; see http://lists.macosforge.org/pipermail/macports-dev/2011-November/016878.html.

Modified Paths

Diff

Modified: trunk/dports/devel/pficommon/Portfile (87531 => 87532)


--- trunk/dports/devel/pficommon/Portfile	2011-11-24 14:16:08 UTC (rev 87531)
+++ trunk/dports/devel/pficommon/Portfile	2011-11-24 14:38:26 UTC (rev 87532)
@@ -21,7 +21,7 @@
 
 patchfiles          patch-wscript.diff
 
-# database version: my = MySQL, pg = PostgreSQL.
+# optional database version: my = MySQL, pg = PostgreSQL.
 set my_version      5
 set pg_version      91
 
@@ -42,33 +42,27 @@
                           --disable-fcgi \
                           --disable-magickpp 
 
-variant mysql description {Enable MySQL} {
-    depends_lib-append    port:mysql5
-    configure.args-delete --disable-mysql
-}
+variant mysql requires mysql5 description {Obsolete compatibility variant} {}
 
 variant mysql5 description {Enable MySQL 5} {
     depends_lib-append    port:mysql5
     configure.args-delete --disable-mysql
 }
 
-variant postgresql description {Enable PostgreSQL} {
-    depends_lib-append    port:postgresql91
-    configure.args-delete --disable-postgresql
-}
+variant postgresql requires postgresql91 description {Obsolete compatibility variant} {}
 
-variant postgresql91 description {Enable PostgreSQL 9.1} {
+variant postgresql91 conflicts postgresql90 postgresql84 description {Enable PostgreSQL 9.1} {
     depends_lib-append    port:postgresql91
     configure.args-delete --disable-postgresql
 }
 
-variant postgresql90 description {Enable PostgreSQL 9.0} {
+variant postgresql90 conflicts postgresql91 postgresql84 description {Enable PostgreSQL 9.0} {
     depends_lib-append    port:postgresql90
     set pg_version        90
     configure.args-delete --disable-postgresql
 }
 
-variant postgresql84 description {Enable PostgreSQL 8.4} {
+variant postgresql84 conflicts postgresql91 postgresql90 description {Enable PostgreSQL 8.4} {
     depends_lib-append    port:postgresql84
     set pg_version        84
     configure.args-delete --disable-postgresql