[58498] trunk/dports/www
ryandesign at macports.org
ryandesign at macports.org
Tue Sep 29 15:42:37 PDT 2009
Revision: 58498
http://trac.macports.org/changeset/58498
Author: ryandesign at macports.org
Date: 2009-09-29 15:42:36 -0700 (Tue, 29 Sep 2009)
Log Message:
-----------
drupal5: update to 5.20
drupal6: update to 6.14
Depend on php52
Add conflicts between variants
See #21463
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-29 19:54:05 UTC (rev 58497)
+++ trunk/dports/www/drupal5/Portfile 2009-09-29 22:42:36 UTC (rev 58498)
@@ -3,7 +3,7 @@
PortSystem 1.0
name drupal5
-version 5.19
+version 5.20
categories www php
platforms darwin
@@ -18,11 +18,11 @@
distname drupal-${version}
master_sites http://ftp.drupal.org/files/projects/ \
http://ftp.osuosl.org/pub/drupal/files/projects/
-checksums md5 d5e3dbcfd3e7f7ef431dada57a6c846e \
- sha1 e14fe2c2e7f7b39be452ce461af3a1a869ca01a7 \
- rmd160 3043adb3a4529790ddc4cfde16b9327c57af6d38
+checksums md5 c042fdb1e995808efc398437ea7c5de4 \
+ sha1 f05d5bf66988a82c980056528d50401ed0822a25 \
+ rmd160 d0925795dfd29bde731988ead2274367bad39031
depends_lib port:apache2 \
- path:bin/php:php5 \
+ port:php52 \
path:bin/mysql_config5:mysql5
variant apache1 description "use apache 1.x instead of apache 2.x" {
@@ -32,38 +32,40 @@
variant php4 description "use php4 instead of php5" {
depends_lib-append port:php4
- depends_lib-delete path:bin/php:php5
+ depends_lib-delete port:php52
}
-variant mysql4 description "use mysql4 instead of mysql5" {
+variant mysql4 conflicts postgresql postgresql80 postgresql81 postgresql82 postgresql83 postgresql84 description "use mysql4 instead of mysql5" {
depends_lib-append port:mysql4
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql conflicts mysql4 requires postgresql84 description "use postgresql as the drupal database" {
+variant postgresql conflicts mysql4 description "use postgresql as the drupal database" {
+ depends_lib-append port:postgresql84
+ depends_lib-delete port:mysql5
}
-variant postgresql80 conflicts mysql4 description "use postgres80 as the drupal database" {
+variant postgresql80 conflicts mysql4 postgresql81 postgresql82 postgresql83 postgresql84 description "use postgres80 as the drupal database" {
depends_lib-append port:postgresql80
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql81 conflicts mysql4 description "use postgressql81 as the drupal database" {
+variant postgresql81 conflicts mysql4 postgresql80 postgresql82 postgresql83 postgresql84 description "use postgressql81 as the drupal database" {
depends_lib-append port:postgresql81
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql82 conflicts mysql4 description "use postgresql82 as the drupal database" {
+variant postgresql82 conflicts mysql4 postgresql80 postgresql81 postgresql83 postgresql84 description "use postgresql82 as the drupal database" {
depends_lib-append port:postgresql82
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql83 conflicts mysql4 description "use postgresql83 as the drupal database" {
+variant postgresql83 conflicts mysql4 postgresql80 postgresql81 postgresql82 postgresql84 description "use postgresql83 as the drupal database" {
depends_lib-append port:postgresql83
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql84 conflicts mysql4 description "use postgresql84 as the drupal database" {
+variant postgresql84 conflicts mysql4 postgresql80 postgresql81 postgresql82 postgresql83 description "use postgresql84 as the drupal database" {
depends_lib-append port:postgresql84
depends_lib-delete path:bin/mysql_config5:mysql5
}
Modified: trunk/dports/www/drupal6/Portfile
===================================================================
--- trunk/dports/www/drupal6/Portfile 2009-09-29 19:54:05 UTC (rev 58497)
+++ trunk/dports/www/drupal6/Portfile 2009-09-29 22:42:36 UTC (rev 58498)
@@ -3,7 +3,7 @@
PortSystem 1.0
name drupal6
-version 6.13
+version 6.14
categories www php
platforms darwin
@@ -18,11 +18,11 @@
distname drupal-${version}
master_sites http://ftp.drupal.org/files/projects/ \
http://ftp.osuosl.org/pub/drupal/files/projects/
-checksums md5 76dcb6e311fbb98ca3322fd1413f4a04 \
- sha1 ac4df01933267261021cc13ea48dea5e9946529b \
- rmd160 5e08333266cff012c766eac8c62f1c9468d8bb89
+checksums md5 014bb453a8d0adb0233c763e40d63859 \
+ sha1 25d4249e91bb04041e3185be8bf79785f9d91811 \
+ rmd160 c4ae3a65556bae115e7ab003450b68e3f544f2ca
depends_lib port:apache2 \
- path:bin/php:php5 \
+ port:php52 \
path:bin/mysql_config5:mysql5
variant apache1 description "use apache 1.x instead of apache 2.x" {
@@ -32,38 +32,40 @@
variant php4 description "use php4 instead of php5" {
depends_lib-append port:php4
- depends_lib-delete path:bin/php:php5
+ depends_lib-delete port:php52
}
-variant mysql4 description "use mysql4 instead of mysql5" {
+variant mysql4 conflicts postgresql postgresql80 postgresql81 postgresql82 postgresql83 postgresql84 description "use mysql4 instead of mysql5" {
depends_lib-append port:mysql4
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql conflicts mysql4 requires postgresql84 description "use postgresql as the drupal database" {
+variant postgresql conflicts mysql4 description "use postgresql as the drupal database" {
+ depends_lib-append port:postgresql84
+ depends_lib-delete port:mysql5
}
-variant postgresql80 conflicts mysql4 description "use postgres80 as the drupal database" {
+variant postgresql80 conflicts mysql4 postgresql81 postgresql82 postgresql83 postgresql84 description "use postgres80 as the drupal database" {
depends_lib-append port:postgresql80
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql81 conflicts mysql4 description "use postgressql81 as the drupal database" {
+variant postgresql81 conflicts mysql4 postgresql80 postgresql82 postgresql83 postgresql84 description "use postgressql81 as the drupal database" {
depends_lib-append port:postgresql81
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql82 conflicts mysql4 description "use postgresql82 as the drupal database" {
+variant postgresql82 conflicts mysql4 postgresql80 postgresql81 postgresql83 postgresql84 description "use postgresql82 as the drupal database" {
depends_lib-append port:postgresql82
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql83 conflicts mysql4 description "use postgresql83 as the drupal database" {
+variant postgresql83 conflicts mysql4 postgresql80 postgresql81 postgresql82 postgresql84 description "use postgresql83 as the drupal database" {
depends_lib-append port:postgresql83
depends_lib-delete path:bin/mysql_config5:mysql5
}
-variant postgresql84 conflicts mysql4 description "use postgresql84 as the drupal database" {
+variant postgresql84 conflicts mysql4 postgresql80 postgresql81 postgresql82 postgresql83 description "use postgresql84 as the drupal database" {
depends_lib-append port:postgresql84
depends_lib-delete path:bin/mysql_config5:mysql5
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090929/9e80a057/attachment.html>
More information about the macports-changes
mailing list