[56428] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Thu Aug 27 04:21:37 PDT 2009
Revision: 56428
http://trac.macports.org/changeset/56428
Author: ryandesign at macports.org
Date: 2009-08-27 04:21:37 -0700 (Thu, 27 Aug 2009)
Log Message:
-----------
Remove mysql3 variants because mysql3 port will be removed; see #20700
Modified Paths:
--------------
trunk/dports/databases/libgda3/Portfile
trunk/dports/databases/mysqlxx/Portfile
trunk/dports/lang/php4/Portfile
trunk/dports/perl/p5-dbd-mysql/Portfile
trunk/dports/python/py25-mysql/Portfile
trunk/dports/python/py26-mysql/Portfile
Modified: trunk/dports/databases/libgda3/Portfile
===================================================================
--- trunk/dports/databases/libgda3/Portfile 2009-08-27 11:05:06 UTC (rev 56427)
+++ trunk/dports/databases/libgda3/Portfile 2009-08-27 11:21:37 UTC (rev 56428)
@@ -54,19 +54,13 @@
default_variants +with_bdb46
-variant with_mysql3 conflicts with_mysql4 with_mysql5 \
- description {support for MySQL 3.x} {
- depends_lib-append port:mysql3
- configure.args-append --with-mysql=${prefix}
-}
-
-variant with_mysql4 conflicts with_mysql3 with_mysql5 \
+variant with_mysql4 conflicts with_mysql5 \
description {support for MySQL 4.x} {
depends_lib-append port:mysql4
configure.args-append --with-mysql=${prefix}
}
-variant with_mysql5 conflicts with_mysql3 with_mysql4 \
+variant with_mysql5 conflicts with_mysql4 \
description {support for current MySQL 5.x} {
depends_lib-append port:mysql5
configure.env-append \
Modified: trunk/dports/databases/mysqlxx/Portfile
===================================================================
--- trunk/dports/databases/mysqlxx/Portfile 2009-08-27 11:05:06 UTC (rev 56427)
+++ trunk/dports/databases/mysqlxx/Portfile 2009-08-27 11:21:37 UTC (rev 56428)
@@ -21,11 +21,6 @@
depends_lib port:gettext \
port:zlib
-variant mysql3 description {Build with MySQL 3 support} {
- depends_lib-append port:mysql3
- configure.args --with-mysql=${prefix}
-}
-
variant mysql4 description {Build with MySQL 4 support} {
depends_lib-append port:mysql4
configure.args --with-mysql=${prefix}
@@ -37,7 +32,7 @@
--with-mysql-include=${prefix}/include/mysql5/mysql
}
-if { ![variant_isset mysql3] && ![variant_isset mysql4] } {
+if {![variant_isset mysql4]} {
default_variants +mysql5
}
Modified: trunk/dports/lang/php4/Portfile
===================================================================
--- trunk/dports/lang/php4/Portfile 2009-08-27 11:05:06 UTC (rev 56427)
+++ trunk/dports/lang/php4/Portfile 2009-08-27 11:21:37 UTC (rev 56428)
@@ -157,21 +157,14 @@
}
}
-variant mysql3 conflicts mysql4 mysql5 description {Add MySQL 3 support} {
+variant mysql4 conflicts mysql5 description {Add MySQL 4 support} {
depends_lib-append \
- port:mysql3
- configure.args-append \
- --with-mysql=${prefix}
-}
-
-variant mysql4 conflicts mysql3 mysql5 description {Add MySQL 4 support} {
- depends_lib-append \
port:mysql4
configure.args-append \
--with-mysql=${prefix}
}
-variant mysql5 conflicts mysql3 mysql4 description {Add MySQL 5 support} {
+variant mysql5 conflicts mysql4 description {Add MySQL 5 support} {
depends_lib-append \
path:bin/mysql_config5:mysql5
configure.args-delete \
Modified: trunk/dports/perl/p5-dbd-mysql/Portfile
===================================================================
--- trunk/dports/perl/p5-dbd-mysql/Portfile 2009-08-27 11:05:06 UTC (rev 56427)
+++ trunk/dports/perl/p5-dbd-mysql/Portfile 2009-08-27 11:21:37 UTC (rev 56428)
@@ -16,25 +16,21 @@
depends_lib-append port:p5-dbi
-variant mysql3 conflicts mysql4 mysql5 description {build with mysql3 port} {
- depends_lib-append port:mysql3
-}
-
-variant mysql4 conflicts mysql3 mysql5 description {build with mysql4 port} {
+variant mysql4 conflicts mysql5 description {build with mysql4 port} {
depends_lib-append port:mysql4
}
-variant mysql5 conflicts mysql3 mysql4 description {build with mysql5 port (default)} {
+variant mysql5 conflicts mysql4 description {build with mysql5 port (default)} {
depends_lib-append path:bin/mysql_config5:mysql5
configure.args-append --mysql_config=${prefix}/bin/mysql_config5
}
-if {![variant_isset mysql3] && ![variant_isset mysql4]} {
+if {![variant_isset mysql4]} {
default_variants +mysql5
}
pre-fetch {
- if {![variant_isset mysql3] && ![variant_isset mysql4] && ![variant_isset mysql5]} {
- return -code error "you must select either mysql3, mysql4 or mysql5"
+ if {![variant_isset mysql4] && ![variant_isset mysql5]} {
+ return -code error "you must select either mysql4 or mysql5"
}
}
Modified: trunk/dports/python/py25-mysql/Portfile
===================================================================
--- trunk/dports/python/py25-mysql/Portfile 2009-08-27 11:05:06 UTC (rev 56427)
+++ trunk/dports/python/py25-mysql/Portfile 2009-08-27 11:21:37 UTC (rev 56428)
@@ -19,25 +19,21 @@
depends_lib-append port:py25-setuptools
-variant mysql3 conflicts mysql4 mysql5 description {Build with MySQL 3} {
- depends_lib-append port:mysql3
-}
-
-variant mysql4 conflicts mysql3 mysql5 description {Build with MySQL 4} {
+variant mysql4 conflicts mysql5 description {Build with MySQL 4} {
depends_lib-append port:mysql4
}
-variant mysql5 conflicts mysql3 mysql4 description {Build with MySQL 5 (default)} {
+variant mysql5 conflicts mysql4 description {Build with MySQL 5 (default)} {
patchfiles-append patch-setup_posix.py.diff
depends_lib-append path:bin/mysql_config5:mysql5
}
-if {![variant_isset mysql3] && ![variant_isset mysql4]} {
+if {![variant_isset mysql4]} {
default_variants +mysql5
}
pre-fetch {
- if {![variant_isset mysql3] && ![variant_isset mysql4] && ![variant_isset mysql5]} {
- return -code error "you must select either mysql3, mysql4 or mysql5"
+ if {![variant_isset mysql4] && ![variant_isset mysql5]} {
+ return -code error "you must select either mysql4 or mysql5"
}
}
Modified: trunk/dports/python/py26-mysql/Portfile
===================================================================
--- trunk/dports/python/py26-mysql/Portfile 2009-08-27 11:05:06 UTC (rev 56427)
+++ trunk/dports/python/py26-mysql/Portfile 2009-08-27 11:21:37 UTC (rev 56428)
@@ -19,25 +19,21 @@
depends_lib-append port:py26-setuptools
-variant mysql3 conflicts mysql4 mysql5 description {Build with MySQL 3} {
- depends_lib-append port:mysql3
-}
-
-variant mysql4 conflicts mysql3 mysql5 description {Build with MySQL 4} {
+variant mysql4 conflicts mysql5 description {Build with MySQL 4} {
depends_lib-append port:mysql4
}
-variant mysql5 conflicts mysql3 mysql4 description {Build with MySQL 5 (default)} {
+variant mysql5 conflicts mysql4 description {Build with MySQL 5 (default)} {
patchfiles-append patch-setup_posix.py.diff
depends_lib-append path:bin/mysql_config5:mysql5
}
-if {![variant_isset mysql3] && ![variant_isset mysql4]} {
+if {![variant_isset mysql4]} {
default_variants +mysql5
}
pre-fetch {
- if {![variant_isset mysql3] && ![variant_isset mysql4] && ![variant_isset mysql5]} {
- return -code error "you must select either mysql3, mysql4 or mysql5"
+ if {![variant_isset mysql4] && ![variant_isset mysql5]} {
+ return -code error "you must select either mysql4 or mysql5"
}
}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090827/22c9e192/attachment.html>
More information about the macports-changes
mailing list