[41195] trunk/dports/www

[ryandesign at macports.org]

Revision: 41195
          http://trac.macports.org/changeset/41195
Author:   ryandesign at macports.org
Date:     2008-10-27 13:24:07 -0700 (Mon, 27 Oct 2008)
Log Message:
-----------
php4, php5, php5-devel: Issue a fatal error if apr-util is installed with the +mysql5 variant, because the PHP install would fail. See #16925.

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-10-27 19:51:18 UTC (rev 41194)
+++ trunk/dports/www/php4/Portfile	2008-10-27 20:24:07 UTC (rev 41195)
@@ -30,6 +30,9 @@
     sha1 ab3d2205d756ddf93452b57bd6ce6a2014b1c374 \
     rmd160 0d77092efaccd8fe6efc16635be98c5d4ccfec66
 
+depends_build \
+    port:pkgconfig
+
 depends_lib	port:libiconv \
     port:expat  \
     port:gettext \
@@ -94,6 +97,11 @@
 }
 
 variant apache2 conflicts apache apache20 no_web description {Add Apache 2.2 web server module (default)} {
+    pre-fetch {
+        if {[string match "*libmysqlclient_r.la*" [exec pkg-config --libs apr-util-1]]} {
+            return -code error "${name} +apache2 can't be built while apr-util is installed with the +mysql5 variant. Deactivate or uninstall apr-util, reinstall apr-util without the +mysql5 variant, then clean ${name} and try installing it again."
+        }
+    }
     destroot.violate_mtree yes
     depends_lib-append	port:apache2
     configure.args-append 	--with-apxs2=${prefix}/apache2/bin/apxs

Modified: trunk/dports/www/php5/Portfile
===================================================================
--- trunk/dports/www/php5/Portfile	2008-10-27 19:51:18 UTC (rev 41194)
+++ trunk/dports/www/php5/Portfile	2008-10-27 20:24:07 UTC (rev 41195)
@@ -36,6 +36,9 @@
     sha1 2a2b1afa657a7739a23784c869d57c3e0a7ad6b4 \
     rmd160 27f730d4b1ceb1c42ff03618dbfa0dc87a00990b
 
+depends_build \
+    port:pkgconfig
+
 depends_lib \
     port:libtool \
     port:libxml2 \
@@ -140,6 +143,11 @@
 # Build an Apache 2.2 module. Keep the options here in sync with those in the
 # relevant part of the post-destroot phase.
 variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module (default)} {
+    pre-fetch {
+        if {[string match "*libmysqlclient_r.la*" [exec pkg-config --libs apr-util-1]]} {
+            return -code error "${name} +apache2 can't be built while apr-util is installed with the +mysql5 variant. Deactivate or uninstall apr-util, reinstall apr-util without the +mysql5 variant, then clean ${name} and try installing it again."
+        }
+    }
     destroot.violate_mtree yes
     depends_lib-append \
         path:${prefix}/apache2/bin/apxs:apache2

Modified: trunk/dports/www/php5-devel/Portfile
===================================================================
--- trunk/dports/www/php5-devel/Portfile	2008-10-27 19:51:18 UTC (rev 41194)
+++ trunk/dports/www/php5-devel/Portfile	2008-10-27 20:24:07 UTC (rev 41195)
@@ -30,6 +30,9 @@
     sha1 4f9ec2637f2bce84775605658ecccde5cf1be8a2 \
     rmd160 27ea92dae3490c495803fd55786c3dfd4535010b
 
+depends_build \
+    port:pkgconfig
+
 depends_lib \
     port:libtool \
     port:libxml2 \
@@ -134,6 +137,11 @@
 # Build an Apache 2.2 module. Keep the options here in sync with those in the
 # relevant part of the post-destroot phase.
 variant apache2 conflicts apache no_web description {Add Apache 2.2 web server module (default)} {
+    pre-fetch {
+        if {[string match "*libmysqlclient_r.la*" [exec pkg-config --libs apr-util-1]]} {
+            return -code error "${name} +apache2 can't be built while apr-util is installed with the +mysql5 variant. Deactivate or uninstall apr-util, reinstall apr-util without the +mysql5 variant, then clean ${name} and try installing it again."
+        }
+    }
     destroot.violate_mtree yes
     depends_lib-append \
         port:apache2
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081027/9720c41e/attachment-0001.html>