[33897] trunk/dports/www
ryandesign at macports.org
ryandesign at macports.org
Wed Feb 6 19:22:19 PST 2008
Revision: 33897
http://trac.macosforge.org/projects/macports/changeset/33897
Author: ryandesign at macports.org
Date: 2008-02-06 19:22:18 -0800 (Wed, 06 Feb 2008)
Log Message:
-----------
php4, php5 and php5-devel: allow +mysql5 to work with mysql5-devel port if it's already installed, rather than always requiring mysql5 port; see #13469.
Modified Paths:
--------------
trunk/dports/www/php4/Portfile
trunk/dports/www/php5/Portfile
trunk/dports/www/php5-devel/Portfile
Modified: trunk/dports/www/php4/Portfile
===================================================================
--- trunk/dports/www/php4/Portfile 2008-02-07 02:56:19 UTC (rev 33896)
+++ trunk/dports/www/php4/Portfile 2008-02-07 03:22:18 UTC (rev 33897)
@@ -128,7 +128,7 @@
variant mysql5 conflicts mysql3 mysql4 description {MySQL 5 functions} {
- depends_lib-append port:mysql5
+ depends_lib-append path:${prefix}/bin/mysql_config5:mysql5
configure.args-delete --without-mysql
configure.args-append --with-mysql=${workpath}/mysql5
post-extract {
Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile 2008-02-07 02:56:19 UTC (rev 33896)
+++ trunk/dports/www/php5/Portfile 2008-02-07 03:22:18 UTC (rev 33897)
@@ -224,7 +224,7 @@
variant mysql5 conflicts mysql3 mysql4 description {build MySQL 5 support} {
depends_lib-append \
- port:mysql5
+ path:${prefix}/bin/mysql_config5:mysql5
configure.args-delete \
--without-mysql
configure.args-append \
Modified: trunk/dports/www/php5-devel/Portfile
===================================================================
--- trunk/dports/www/php5-devel/Portfile 2008-02-07 02:56:19 UTC (rev 33896)
+++ trunk/dports/www/php5-devel/Portfile 2008-02-07 03:22:18 UTC (rev 33897)
@@ -217,7 +217,7 @@
variant mysql5 conflicts mysql3 mysql4 description {build MySQL 5 support} {
depends_lib-append \
- port:mysql5
+ path:${prefix}/bin/mysql_config5:mysql5
configure.args-delete \
--without-mysql
configure.args-append \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080206/a9b23262/attachment.html
More information about the macports-changes
mailing list