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

[ryandesign at macports.org]

Revision: 90674
          http://trac.macports.org/changeset/90674
Author:   ryandesign at macports.org
Date:     2012-03-11 18:41:34 -0700 (Sun, 11 Mar 2012)
Log Message:
-----------
php-1.0.tcl: rename php.inidir to php.ini_dir

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:40:10 UTC (rev 90673)
+++ trunk/dports/_resources/port1.0/group/php-1.0.tcl	2012-03-12 01:41:34 UTC (rev 90674)
@@ -77,15 +77,15 @@
 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.ini_dir
+default php.ini_dir             {${prefix}/var/db/${php}}
 options php.ize
 default php.ize                 {${prefix}/bin/phpize${php.version}}
 options php.version
 
 
 proc php.setup {extensions version {source ""}} {
-    global php php.build_dirs php.bundled php.config php.extension_ini php.extensions php.homepage php.inidir php.rootname php.source php.version php.versions
+    global php php.build_dirs php.bundled php.config php.extension_ini php.extensions php.homepage php.ini_dir php.rootname php.source php.version php.versions
     global destroot name subport
     
     # Use "set" to preserve the list structure.
@@ -176,13 +176,13 @@
                 ui_debug "Staging in [file tail ${destroot.dir}]"
                 portdestroot::destroot_main
             }
-            xinstall -m 755 -d ${destroot}${php.inidir}
+            xinstall -m 755 -d ${destroot}${php.ini_dir}
             if {"zend" == ${php.type}} {
                 set extension_prefix "zend_extension=${php.extension_dir}/"
             } else {
                 set extension_prefix "extension="
             }
-            set fp [open ${destroot}${php.inidir}/${php.extension_ini} w]
+            set fp [open ${destroot}${php.ini_dir}/${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.ini}."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120311/53bfe357/attachment-0001.html>