Revision
70327
Author
ryandesign@macports.org
Date
2010-08-05 19:17:27 -0700 (Thu, 05 Aug 2010)

Log Message

php5extension-1.0.tcl: only require bundled extensions to match the PHP branch version, not the entire PHP version; see #25789

Modified Paths

Diff

Modified: trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl (70326 => 70327)


--- trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl	2010-08-06 01:54:19 UTC (rev 70326)
+++ trunk/dports/_resources/port1.0/group/php5extension-1.0.tcl	2010-08-06 02:17:27 UTC (rev 70327)
@@ -190,8 +190,10 @@
         
         pre-configure {
             set php_version [exec ${prefix}/bin/php-config --version]
-            if {${version} != ${php_version}} {
-                ui_error "${name} ${version} requires PHP ${version} but you have PHP ${php_version}."
+            set php_branch [join [lrange [split ${php_version} .] 0 1] .]
+            set port_branch [join [lrange [split ${version} .] 0 1] .]
+            if {${port_branch} != ${php_branch}} {
+                ui_error "${name} ${version} requires PHP ${port_branch}.x but you have PHP ${php_version}."
                 return -code error "incompatible PHP installation"
             }
         }