[90672] trunk/dports/_resources/port1.0/group/php-1.0.tcl

[ryandesign at macports.org]

Revision: 90672
          http://trac.macports.org/changeset/90672
Author:   ryandesign at macports.org
Date:     2012-03-11 18:37:46 -0700 (Sun, 11 Mar 2012)
Log Message:
-----------
php-1.0.tcl: rename php.php_ini to php.ini

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

Modified: trunk/dports/_resources/port1.0/group/php-1.0.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/php-1.0.tcl	2012-03-12 01:35:55 UTC (rev 90671)
+++ trunk/dports/_resources/port1.0/group/php-1.0.tcl	2012-03-12 01:37:46 UTC (rev 90672)
@@ -75,10 +75,10 @@
 default php.config              {${prefix}/bin/php-config${php.version}}
 options php.extension_dir
 default php.extension_dir       {[exec ${php.config} --extension-dir 2>/dev/null]}
+options php.ini
+default php.ini                 {${prefix}/etc/${php}/php.ini}
 options php.inidir
 default php.inidir              {${prefix}/var/db/${php}}
-options php.php_ini
-default php.php_ini             {${prefix}/etc/${php}/php.ini}
 options php.phpize
 default php.phpize              {${prefix}/bin/phpize${php.version}}
 options php.version
@@ -185,7 +185,7 @@
             set fp [open ${destroot}${php.inidir}/${php.extension_ini} w]
             puts $fp "; Do not edit this file; it is automatically generated by MacPorts."
             puts $fp "; Any changes you make will be lost if you upgrade or uninstall ${name}."
-            puts $fp "; To configure PHP, edit ${php.php_ini}."
+            puts $fp "; To configure PHP, edit ${php.ini}."
             foreach extension ${php.extensions} {
                 puts $fp "${extension_prefix}${extension}.so"
             }
@@ -193,19 +193,19 @@
         }
         
         post-install {
-            if {[file exists ${php.php_ini}]} {
+            if {[file exists ${php.ini}]} {
                 set count 0
-                set fp [open ${php.php_ini} r]
+                set fp [open ${php.ini} r]
                 while {![eof $fp]} {
                     set line [gets $fp]
                     regexp {^extension_dir *= *"?([^\"]*)"?} $line -> phpiniextensiondir
                     if {[info exists phpiniextensiondir]} {
-                        ui_debug "Found extension_dir ${phpiniextensiondir} in ${php.php_ini}"
+                        ui_debug "Found extension_dir ${phpiniextensiondir} in ${php.ini}"
                         if {${phpiniextensiondir} != ${php.extension_dir}} {
                             if {0 == ${count}} {
                                 ui_msg "Your php.ini contains a line that will prevent ${name}"
                                 ui_msg "and other PHP extensions from working. To fix this,"
-                                ui_msg "edit ${php.php_ini} and delete this line:"
+                                ui_msg "edit ${php.ini} and delete this line:"
                                 ui_msg ""
                             }
                             ui_msg ${line}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120311/a27f727d/attachment.html>