[57560] trunk/dports/www

[and.damore at macports.org]

Revision: 57560
          http://trac.macports.org/changeset/57560
Author:   and.damore at macports.org
Date:     2009-09-13 00:37:14 -0700 (Sun, 13 Sep 2009)
Log Message:
-----------
drupal5 and drupal6 update, added conflicts between postgresql and mysql variants

Modified Paths:
--------------
    trunk/dports/www/drupal5/Portfile
    trunk/dports/www/drupal6/Portfile

Modified: trunk/dports/www/drupal5/Portfile
===================================================================
--- trunk/dports/www/drupal5/Portfile	2009-09-13 07:01:46 UTC (rev 57559)
+++ trunk/dports/www/drupal5/Portfile	2009-09-13 07:37:14 UTC (rev 57560)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                drupal5
-version             5.16
+version             5.19
 categories          www php
 platforms           darwin
 
@@ -18,9 +18,9 @@
 distname            drupal-${version}
 master_sites        http://ftp.drupal.org/files/projects/ \
                     http://ftp.osuosl.org/pub/drupal/files/projects/
-checksums           md5     b8b603a5dbf5e7f280ed6e1521ca9bae \
-                    sha1    3dd95ece9570e5a889b9869a50608797b2976b19 \
-                    rmd160  e79aa1fa15f5822dc32790d3f0f86ed4c9f6a8b0
+checksums           md5     d5e3dbcfd3e7f7ef431dada57a6c846e \
+                    sha1    e14fe2c2e7f7b39be452ce461af3a1a869ca01a7 \
+                    rmd160  3043adb3a4529790ddc4cfde16b9327c57af6d38
 depends_lib         port:apache2 \
                     port:php5 \
                     port:mysql5
@@ -40,31 +40,34 @@
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql description "use postgresql as the drupal database" {
-  depends_lib-append      port:postgresql83
-  depends_lib-delete      port:mysql5
+variant postgresql conflicts mysql4 requires postgresql84 description "use postgresql as the drupal database" {
 }
 
-variant postgresql80 description "use postgres80 as the drupal database" {
+variant postgresql80 conflicts mysql4 description "use postgres80 as the drupal database" {
   depends_lib-append      port:postgresql80
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql81 description "use postgressql81 as the drupal database" {
+variant postgresql81 conflicts mysql4 description "use postgressql81 as the drupal database" {
   depends_lib-append      port:postgresql81
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql82 description "use postgresql82 as the drupal database" {
+variant postgresql82 conflicts mysql4 description "use postgresql82 as the drupal database" {
   depends_lib-append      port:postgresql82
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql83 description "use postgresql83 as the drupal database" {
+variant postgresql83 conflicts mysql4 description "use postgresql83 as the drupal database" {
   depends_lib-append      port:postgresql83
   depends_lib-delete      port:mysql5
 }
 
+variant postgresql84 conflicts mysql4 description "use postgresql84 as the drupal database" {
+  depends_lib-append      port:postgresql84
+  depends_lib-delete      port:mysql5
+}
+
 use_configure       no
 build               {}
 

Modified: trunk/dports/www/drupal6/Portfile
===================================================================
--- trunk/dports/www/drupal6/Portfile	2009-09-13 07:01:46 UTC (rev 57559)
+++ trunk/dports/www/drupal6/Portfile	2009-09-13 07:37:14 UTC (rev 57560)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 
 name                drupal6
-version             6.10
+version             6.13
 categories          www php
 platforms           darwin
 
@@ -18,9 +18,9 @@
 distname            drupal-${version}
 master_sites        http://ftp.drupal.org/files/projects/ \
                     http://ftp.osuosl.org/pub/drupal/files/projects/
-checksums           md5     d8f222c260556b5d7c3ff41bdd251b3c \
-                    sha1    fcdaa4f1eb10678a11e888c70aeeb0b9c84da6c6 \
-                    rmd160  5ebc65ceea59633fd0cd348d3bf420edf9b4c8ff
+checksums           md5     76dcb6e311fbb98ca3322fd1413f4a04 \
+                    sha1    ac4df01933267261021cc13ea48dea5e9946529b \
+                    rmd160  5e08333266cff012c766eac8c62f1c9468d8bb89
 depends_lib         port:apache2 \
                     port:php5 \
                     port:mysql5
@@ -40,31 +40,34 @@
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql description "use postgresql as the drupal database" {
-  depends_lib-append      port:postgresql83
-  depends_lib-delete      port:mysql5
+variant postgresql conflicts mysql4 requires postgresql84 description "use postgresql as the drupal database" {
 }
 
-variant postgresql80 description "use postgres80 as the drupal database" {
+variant postgresql80 conflicts mysql4 description "use postgres80 as the drupal database" {
   depends_lib-append      port:postgresql80
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql81 description "use postgressql81 as the drupal database" {
+variant postgresql81 conflicts mysql4 description "use postgressql81 as the drupal database" {
   depends_lib-append      port:postgresql81
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql82 description "use postgresql82 as the drupal database" {
+variant postgresql82 conflicts mysql4 description "use postgresql82 as the drupal database" {
   depends_lib-append      port:postgresql82
   depends_lib-delete      port:mysql5
 }
 
-variant postgresql83 description "use postgresql83 as the drupal database" {
+variant postgresql83 conflicts mysql4 description "use postgresql83 as the drupal database" {
   depends_lib-append      port:postgresql83
   depends_lib-delete      port:mysql5
 }
 
+variant postgresql84 conflicts mysql4 description "use postgresql84 as the drupal database" {
+  depends_lib-append      port:postgresql84
+  depends_lib-delete      port:mysql5
+}
+
 use_configure       no
 build               {}
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090913/2f5b262e/attachment.html>