Modified: trunk/dports/php/php5-pear/Portfile (87342 => 87343)

--- trunk/dports/php/php5-pear/Portfile	2011-11-17 16:57:37 UTC (rev 87342)
+++ trunk/dports/php/php5-pear/Portfile	2011-11-17 17:26:19 UTC (rev 87343)
@@ -5,7 +5,7 @@
 
 name                php5-pear
 version             20110901
-revision            1
+revision            2
 categories          php www
 platforms           darwin
 maintainers         pixilla
@@ -29,21 +29,20 @@
 
 extract.mkdir       yes
 extract {
-    xinstall -d ${buildpath}/${libpath}
-    file copy ${distpath}/install-pear-nozlib.phar ${buildpath}/${libpath}
+    xinstall -d ${buildpath}${libpath}
+    file copy ${distpath}/install-pear-nozlib.phar ${buildpath}${libpath}
 }
 use_configure       no
 build {
-    xinstall -d ${buildpath}/${libpath}
-    set fp [open ${buildpath}/${libpath}/pear-ini.php w]
+    xinstall -d ${buildpath}${libpath}
+    set fp [open ${buildpath}${libpath}/pear-ini.php w]
     puts $fp "<?php"
     puts $fp "# Automatically add the PEAR repository path to PHP's include_path."
     puts $fp "set_include_path ( get_include_path (  ) . PATH_SEPARATOR . '${prefix}/lib/php/pear' ) ;"
-    puts $fp "?>"
     close $fp
 
-    xinstall -d ${buildpath}/${dbpath}
-    set fp [open ${buildpath}/${dbpath}/pear.ini w]
+    xinstall -d ${buildpath}${dbpath}
+    set fp [open ${buildpath}${dbpath}/pear.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 php5-pear."
     puts $fp "; To configure PHP, edit ${prefix}/etc/php5/php.ini."
@@ -52,9 +51,9 @@
 }
 
 destroot {
-    xinstall -d ${destroot}${prefix}/${libpath}
-    xinstall -d ${destroot}${prefix}/${dbpath}
-    file copy ${buildpath}/${libpath}/pear-ini.php ${destroot}${prefix}/${libpath}/pear-ini.php
-    file copy ${buildpath}/${dbpath}/pear.ini ${destroot}${prefix}/${dbpath}/pear.ini
-    file copy ${buildpath}/${libpath}/install-pear-nozlib.phar ${destroot}${prefix}/${libpath}
+    xinstall -d ${destroot}${prefix}${libpath}
+    xinstall -d ${destroot}${prefix}${dbpath}
+    file copy ${buildpath}${libpath}/pear-ini.php ${destroot}${prefix}${libpath}/pear-ini.php
+    file copy ${buildpath}${dbpath}/pear.ini ${destroot}${prefix}${dbpath}/pear.ini
+    file copy ${buildpath}${libpath}/install-pear-nozlib.phar ${destroot}${prefix}${libpath}
 }