[92759] trunk/dports

[ryandesign at macports.org]

Revision: 92759
          https://trac.macports.org/changeset/92759
Author:   ryandesign at macports.org
Date:     2012-05-05 15:56:25 -0700 (Sat, 05 May 2012)
Log Message:
-----------
php: move some code that relates only to the bundled extensions from the php portgroup to the php port

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/php-1.0.tcl
    trunk/dports/lang/php/Portfile

Modified: trunk/dports/_resources/port1.0/group/php-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/php-1.0.tcl	2012-05-05 22:47:41 UTC (rev 92758)
+++ trunk/dports/_resources/port1.0/group/php-1.0.tcl	2012-05-05 22:56:25 UTC (rev 92759)
@@ -253,37 +253,6 @@
         livecheck.url           ${php.homepage}
         livecheck.regex         {>([0-9.]+)</a></th>\s*<[^>]+>stable<}
     }
-    
-    if {${php._bundled}} {
-        default homepage        http://www.php.net/${php.rootname}
-        
-        pre-extract {
-            # Speed up extraction by extracting only the modules we're going to be building.
-            foreach extension ${php.extensions} {
-                extract.post_args-append ${worksrcdir}/ext/${extension}
-            }
-        }
-        
-        post-extract {
-            # The PDO extensions need the PDO headers which are installed by the ${php} port.
-            foreach extension ${php.extensions} {
-                if {[regexp {^pdo_} ${extension}]} {
-                    file mkdir ${worksrcpath}/ext/${extension}/ext
-                    ln -s ${prefix}/include/${php}/php/ext/pdo ${worksrcpath}/ext/${extension}/ext
-                }
-            }
-        }
-        
-        pre-configure {
-            set php_version [exec ${php.config} --version 2>/dev/null]
-            if {${version} != ${php_version}} {
-                ui_error "${subport} @${version} requires ${php} @${version} but you have ${php} @${php_version}."
-                return -code error "incompatible ${php} installation"
-            }
-        }
-        
-        destroot.target         install-modules install-headers
-    }
 }
 
 # Return the list of directories we need to phpize / configure / make in.

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2012-05-05 22:47:41 UTC (rev 92758)
+++ trunk/dports/lang/php/Portfile	2012-05-05 22:56:25 UTC (rev 92759)
@@ -969,4 +969,33 @@
         php.extensions ${php.rootname}
     }
     php.setup ${php.extensions} ${version}
+    
+    default homepage    http://www.php.net/${php.rootname}
+    
+    pre-extract {
+        # Speed up extraction by extracting only the modules we're going to be building.
+        foreach extension ${php.extensions} {
+            extract.post_args-append ${worksrcdir}/ext/${extension}
+        }
+    }
+    
+    post-extract {
+        # The PDO extensions need the PDO headers which are installed by the ${php} port.
+        foreach extension ${php.extensions} {
+            if {[regexp {^pdo_} ${extension}]} {
+                file mkdir ${worksrcpath}/ext/${extension}/ext
+                ln -s ${prefix}/include/${php}/php/ext/pdo ${worksrcpath}/ext/${extension}/ext
+            }
+        }
+    }
+    
+    pre-configure {
+        set php_version [exec ${php.config} --version 2>/dev/null]
+        if {${version} != ${php_version}} {
+            ui_error "${subport} @${version} requires ${php} @${version} but you have ${php} @${php_version}."
+            return -code error "incompatible ${php} installation"
+        }
+    }
+    
+    destroot.target     install-modules install-headers
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120505/2c01df2c/attachment.html>