<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[94192] trunk/dports/php</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/94192">94192</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2012-06-11 16:12:55 -0700 (Mon, 11 Jun 2012)</dd>
</dl>

<h3>Log Message</h3>
<pre>php/pear-install-phar:
- Copy php5-pear to pear-install-phar.
- Pear-install-phar contains subports for php5, php53 and php54.
php/php5-pear:
- Move port to pear-install-phar subport.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsphppearinstallpharPortfile">trunk/dports/php/pear-install-phar/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/php/pear-install-phar/</li>
</ul>

<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsphppearinstallpharPortfilenew">trunk/dports/php/pear-install-phar/Portfile.new</a></li>
<li>trunk/dports/php/php5-pear/</li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsphppearinstallpharPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/php/pear-install-phar/Portfile (94017 => 94192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/php/php5-pear/Portfile      2012-06-06 21:36:29 UTC (rev 94017)
+++ trunk/dports/php/pear-install-phar/Portfile 2012-06-11 23:12:55 UTC (rev 94192)
</span><span class="lines">@@ -3,14 +3,12 @@
</span><span class="cx"> 
</span><span class="cx"> PortSystem          1.0
</span><span class="cx"> 
</span><del>-name                php5-pear
</del><ins>+name                pear-install-phar
</ins><span class="cx"> version             20110901
</span><del>-revision            2
</del><ins>+revision            3
</ins><span class="cx"> categories          php www
</span><span class="cx"> platforms           darwin
</span><span class="cx"> maintainers         pixilla
</span><del>-description         PEAR build and repository support for php5
-long_description    ${description}
</del><span class="cx"> homepage            http://pear.php.net
</span><span class="cx"> master_sites        http://pear.php.net
</span><span class="cx"> livecheck.type      moddate
</span><span class="lines">@@ -25,35 +23,72 @@
</span><span class="cx"> 
</span><span class="cx"> set buildpath       ${worksrcpath}/build
</span><span class="cx"> set libpath         /lib/php/pear
</span><del>-set dbpath          /var/db/php5
</del><span class="cx"> 
</span><del>-extract.mkdir       yes
-extract {
-    xinstall -d ${buildpath}${libpath}
-    file copy ${distpath}/install-pear-nozlib.phar ${buildpath}${libpath}
</del><ins>+subport php5-pear {
+
+    set dbpath          /var/db/php5
</ins><span class="cx"> }
</span><del>-use_configure       no
-build {
-    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' ) ;"
-    close $fp
</del><span class="cx"> 
</span><del>-    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."
-    puts $fp "auto_prepend_file = '${prefix}/lib/php/pear/pear-ini.php'"
-    close $fp
</del><ins>+subport php53-pear {
+
+    set dbpath          /var/db/php53
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-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}
</del><ins>+subport php54-pear {
+
+    set dbpath          /var/db/php54
</ins><span class="cx"> }
</span><ins>+
+use_configure       no
+
+if {${name} == ${subport}} {
+
+    description         PEAR installer phar
+    long_description    ${description}
+
+    extract.mkdir       yes
+    extract {
+
+        xinstall -d ${buildpath}${libpath}
+        file copy ${distpath}/install-pear-nozlib.phar ${buildpath}${libpath}
+    }
+
+    build {}
+    destroot {
+
+        xinstall -d ${destroot}${prefix}${libpath}
+        file copy ${buildpath}${libpath}/install-pear-nozlib.phar ${destroot}${prefix}${libpath}
+    }
+} else {
+
+    description         PEAR build and repository support for php
+    long_description    ${description}
+
+    depends_lib         port:pear-install-phar
+
+    distfiles
+
+    build {
+
+        xinstall -d ${buildpath}${dbpath}
+        set fp [open ${buildpath}${dbpath}/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' ) ;"
+        close $fp
+    
+        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 ${subport}-pear."
+        puts $fp "; To configure PHP, edit ${prefix}/etc/${subport}/php.ini."
+        puts $fp "auto_prepend_file = '${prefix}${dbpath}/pear/pear-ini.php'"
+        close $fp
+    }
+
+    destroot {
+
+        xinstall -d ${destroot}${prefix}${dbpath}/pear
+        file copy ${buildpath}${dbpath}/pear-ini.php ${destroot}${prefix}${dbpath}/pear/pear-ini.php
+        file copy ${buildpath}${dbpath}/pear.ini ${destroot}${prefix}${dbpath}/pear.ini
+    }
+}
</ins></span></pre></div>
<a id="trunkdportsphppearinstallpharPortfilenew"></a>
<div class="delfile"><h4>Deleted: trunk/dports/php/pear-install-phar/Portfile.new (94017 => 94192)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/php/php5-pear/Portfile.new  2012-06-06 21:36:29 UTC (rev 94017)
+++ trunk/dports/php/pear-install-phar/Portfile.new     2012-06-11 23:12:55 UTC (rev 94192)
</span><span class="lines">@@ -1,59 +0,0 @@
</span><del>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id: Portfile 84512 2011-09-27 14:19:06Z snc@macports.org $
-
-PortSystem          1.0
-
-name                php5-pear
-version             20110901
-categories          php www
-platforms           darwin
-maintainers         pixilla
-description         PEAR build and repository support for php5
-long_description    ${description}
-homepage            http://pear.php.net
-master_sites        http://pear.php.net
-livecheck.type      moddate
-
-depends_lib         port:php5
-
-dist_subdir         ${name}-${version}
-distfiles           install-pear-nozlib.phar
-
-checksums           rmd160  1eef5e3a68b5521e2d42e68d031fd79828709923 \
-                    sha256  06757ae34c93d4aad8a3abc63958106ca11bb1a9a5f85e7e013d70077e4aafa1
-
-set buildpath       ${worksrcpath}/build
-set libpath         /lib/php/pear
-set dbpath          /var/db/php5
-
-extract.mkdir       yes
-extract {
-    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]
-    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]
-    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."
-    puts $fp "auto_prepend_file = '${prefix}/lib/php/pear/pear-ini.php'"
-    close $fp
-}
-
-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}
-}
</del></span></pre>
</div>
</div>

</body>
</html>