[56512] trunk/dports/www/mediawiki/Portfile

[blb at macports.org]

Revision: 56512
          http://trac.macports.org/changeset/56512
Author:   blb at macports.org
Date:     2009-08-29 01:24:24 -0700 (Sat, 29 Aug 2009)
Log Message:
-----------
www/mediawiki - update PHP-related dependencies to deal with new PHP5 port setup, ticket #20854; also, PHP ports are runtime dependencies

Modified Paths:
--------------
    trunk/dports/www/mediawiki/Portfile

Modified: trunk/dports/www/mediawiki/Portfile
===================================================================
--- trunk/dports/www/mediawiki/Portfile	2009-08-29 07:55:28 UTC (rev 56511)
+++ trunk/dports/www/mediawiki/Portfile	2009-08-29 08:24:24 UTC (rev 56512)
@@ -26,10 +26,9 @@
 depends_run         port:libiconv port:jpeg port:jasper port:tiff port:lcms \
                     port:libpng port:freetype port:libxml2 port:jbigkit \
                     port:expat port:fontconfig port:ghostscript \
-                    port:ImageMagick port:pkgconfig port:aspell
+                    port:ImageMagick port:pkgconfig port:aspell \
+                    port:php5-web
 
-depends_lib         path:bin/php:php5 path:bin/mysql_config5:mysql5
-
 # Fix an outdated KHTML hack which affects newer WebKit
 # https://bugs.webkit.org/show_bug.cgi?id=28350
 patchfiles          patch-skins_common_wikibits.js.diff
@@ -65,18 +64,27 @@
    }
 }
 
-variant mysql4 conflicts postgresql83 postgresql84 description "use mysql4 instead of mysql5" {
-   depends_lib-append   port:mysql4
-   depends_lib-delete   path:bin/mysql_config5:mysql5
+variant mysql4 description "Deprecated variant, use just +mysql" {}
+if {[variant_isset mysql4]} {
+   variant_set mysql
 }
 
-variant postgresql83 conflicts mysql4 postgresql84 description "Use postgreslq83 instead of mysql5" {
-   depends_lib-append   port:postgresql83
-   depends_lib-delete   path:bin/mysql_config5:mysql5
+variant postgresql83 description "Deprecated variant, use just +postgresql" {}
+variant postgresql84 description "Deprecated variant, use just +postgresql" {}
+if {[variant_isset postgresql83] || [variant_isset postgresql84]} {
+   variant_set postgresql
 }
 
-variant postgresql84 conflicts mysql4 postgresql83 description "Use postgreslq84 instead of mysql5" {
-   depends_lib-append   port:postgresql84
-   depends_lib-delete   path:bin/mysql_config5:mysql5
+variant mysql description "Use MySQL as the database backend" {
+   depends_run-append   port:php5-mysql
 }
 
+variant postgresql description "Use PostGreSQL as the database backend" {
+   depends_run-append   port:php5-postgresql
+}
+
+# Default to +mysql since that was previously the built-in setting
+if {![variant_isset mysql] && ![variant_isset postgresql]} {
+   default_variants     +mysql
+}
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090829/d391a6d9/attachment-0001.html>