<!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>[124928] trunk/dports</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/124928">124928</a></dd>
<dt>Author</dt> <dd>ryandesign@macports.org</dd>
<dt>Date</dt> <dd>2014-08-31 11:30:02 -0700 (Sun, 31 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>php: update php56 to 5.6.0 (#44821)
php-1.1.tcl: use php56 by default; use eq and ne instead of == and != respectively for string comparisons</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdports_resourcesport10groupphp11tcl">trunk/dports/_resources/port1.0/group/php-1.1.tcl</a></li>
<li><a href="#trunkdportslangphpPortfile">trunk/dports/lang/php/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdports_resourcesport10groupphp11tcl"></a>
<div class="modfile"><h4>Modified: trunk/dports/_resources/port1.0/group/php-1.1.tcl (124927 => 124928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/_resources/port1.0/group/php-1.1.tcl 2014-08-31 18:14:32 UTC (rev 124927)
+++ trunk/dports/_resources/port1.0/group/php-1.1.tcl 2014-08-31 18:30:02 UTC (rev 124928)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> # -*- 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
</span><span class="cx"> # $Id$
</span><span class="cx"> #
</span><del>-# Copyright (c) 2009-2013 The MacPorts Project
</del><ins>+# Copyright (c) 2009-2014 The MacPorts Project
</ins><span class="cx"> # All rights reserved.
</span><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -41,11 +41,11 @@
</span><span class="cx"> # built. For unified extension ports (name begins with "php-") setting
</span><span class="cx"> # php.branches is mandatory; there is no default. Example:
</span><span class="cx"> #
</span><del>-# php.branches 5.3 5.4
</del><ins>+# php.branches 5.3 5.4 5.5 5.6
</ins><span class="cx"> #
</span><span class="cx"> # For unified ports, setting php.branches will create the subports.
</span><span class="cx"> #
</span><del>-# For single-branch extension ports (name begins with e.g. "php54-")
</del><ins>+# For single-branch extension ports (name begins with e.g. "php56-")
</ins><span class="cx"> # php.branches is set automatically based on the port name and should not be
</span><span class="cx"> # changed.
</span><span class="cx">
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> option_proc php.branches php._set_branches
</span><span class="cx">
</span><span class="cx"> proc php._set_branches {option action args} {
</span><del>- if {"set" != ${action}} {
</del><ins>+ if {"set" ne ${action}} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> if {[regexp {^php\d*-} ${name}]} {
</span><span class="cx"> # Legacy dist_subdir to match old php5- port layout.
</span><del>- if {[lindex [split [lindex [option ${option}] 0] .] 0] == "5"} {
</del><ins>+ if {[lindex [split [lindex [option ${option}] 0] .] 0] eq "5"} {
</ins><span class="cx"> dist_subdir php5-${php.rootname}
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -73,7 +73,7 @@
</span><span class="cx"> php.create_subports
</span><span class="cx">
</span><span class="cx"> # Set up stub port.
</span><del>- if {${name} == ${subport}} {
</del><ins>+ if {${name} eq ${subport}} {
</ins><span class="cx"> supported_archs noarch
</span><span class="cx"> depends_run port:php[php.suffix_from_branch ${php.default_branch}]-${php.rootname}
</span><span class="cx">
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> option_proc name php._set_name
</span><span class="cx">
</span><span class="cx"> proc php._set_name {option action args} {
</span><del>- if {"set" != ${action}} {
</del><ins>+ if {"set" ne ${action}} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> # when the php port is updated.
</span><span class="cx">
</span><span class="cx"> options php.latest_stable_branch
</span><del>-default php.latest_stable_branch 5.5
</del><ins>+default php.latest_stable_branch 5.6
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> # php.default_branch: the branch of PHP for which the port should be installed
</span><span class="lines">@@ -145,13 +145,13 @@
</span><span class="cx"> option_proc php.default_branch php._set_default_branch
</span><span class="cx">
</span><span class="cx"> proc php._set_default_branch {option action args} {
</span><del>- if {"set" != ${action}} {
</del><ins>+ if {"set" ne ${action}} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> global name subport php.rootname
</span><span class="cx">
</span><del>- if {[regexp {^php-} ${name}] && ${name} == ${subport}} {
</del><ins>+ if {[regexp {^php-} ${name}] && ${name} eq ${subport}} {
</ins><span class="cx"> depends_run port:php[php.suffix_from_branch [option ${option}]]-${php.rootname}
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> option_proc php.pecl php._set_pecl
</span><span class="cx">
</span><span class="cx"> proc php._set_pecl {option action args} {
</span><del>- if {"set" != ${action}} {
</del><ins>+ if {"set" ne ${action}} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> option_proc php.pecl.name php._set_pecl_name
</span><span class="cx">
</span><span class="cx"> proc php._set_pecl_name {option action args} {
</span><del>- if {"set" != ${action}} {
</del><ins>+ if {"set" ne ${action}} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> option_proc php.pecl.prerelease php._set_pecl_prerelease
</span><span class="cx">
</span><span class="cx"> proc php._set_pecl_prerelease {option action args} {
</span><del>- if {"set" != ${action}} {
</del><ins>+ if {"set" ne ${action}} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -358,7 +358,7 @@
</span><span class="cx"> option_proc version php._set_version
</span><span class="cx">
</span><span class="cx"> proc php._set_version {option action args} {
</span><del>- if {"set" != ${action}} {
</del><ins>+ if {"set" ne ${action}} {
</ins><span class="cx"> return
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx">
</span><span class="cx"> pre-livecheck {
</span><span class="cx"> global name subport version php._first_version
</span><del>- if {${name} != ${subport} && ${name} != "php" && ${version} == ${php._first_version}} {
</del><ins>+ if {${name} ne ${subport} && ${name} ne "php" && ${version} eq ${php._first_version}} {
</ins><span class="cx"> livecheck.type none
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -490,7 +490,7 @@
</span><span class="cx"> regexp {^extension_dir *= *"?([^\"]*)"?} $line -> php_ini_extension_dir
</span><span class="cx"> if {[info exists php_ini_extension_dir]} {
</span><span class="cx"> ui_debug "Found extension_dir ${php_ini_extension_dir} in ${php.ini}"
</span><del>- if {${php_ini_extension_dir} != ${php.extension_dir}} {
</del><ins>+ if {${php_ini_extension_dir} ne ${php.extension_dir}} {
</ins><span class="cx"> if {0 == ${count}} {
</span><span class="cx"> ui_msg "Your php.ini contains a line that will prevent ${subport}"
</span><span class="cx"> ui_msg "and other ${php} extensions from working. To fix this,"
</span></span></pre></div>
<a id="trunkdportslangphpPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/lang/php/Portfile (124927 => 124928)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/lang/php/Portfile 2014-08-31 18:14:32 UTC (rev 124927)
+++ trunk/dports/lang/php/Portfile 2014-08-31 18:30:02 UTC (rev 124928)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> 5.5 {
</span><span class="cx"> epoch 2
</span><span class="cx"> version 5.5.16
</span><ins>+ # switch to use_xz yes at next update
</ins><span class="cx"> use_bzip2 yes
</span><span class="cx"> set suhosin_available no
</span><span class="cx"> checksums ${distname}${extract.suffix} \
</span><span class="lines">@@ -94,23 +95,32 @@
</span><span class="cx"> sha256 a1d7c4556a80bed744a348211b33bc35303edd56dd0a34e0a75a948c879cc5f6
</span><span class="cx"> }
</span><span class="cx"> 5.6 {
</span><del>- # When this becomes a stable version, remove the overrides for homepage,
- # master_sites and livecheck, and update php.latest_stable_branch in the
- # php-1.1 portgroup.
- epoch 1
- version 5.6.0RC4
- homepage http://qa.php.net/
- master_sites http://downloads.php.net/tyrael/
</del><ins>+ epoch 2
+ version 5.6.0
</ins><span class="cx"> use_xz yes
</span><span class="cx"> set suhosin_available no
</span><span class="cx"> checksums ${distname}${extract.suffix} \
</span><del>- md5 4430707c7ee075748071ecf803fe6af6 \
- rmd160 1d35f01047cf68d141852e816aa7ae11b003906f \
- sha256 615d0178407fdda1bb77fe6be9c03da04e20757f36a4b026634a4319eb3db008
- livecheck.url ${homepage}
- livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
</del><ins>+ md5 642825d75ce2634d9513d5b21dbee521 \
+ rmd160 e2a0a4edfafbe7973761deaa325b8a4935d4685b \
+ sha256 8fc5411cd05cc6cc663247e588931fe67b1dc0e42550fa28ab2c943ad84eda02
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+# 5.7 {
+# # When this becomes a stable version, remove the overrides for homepage,
+# # master_sites and livecheck, and update php.latest_stable_branch in the
+# # php-1.1 portgroup.
+# version 5.7
+# homepage http://qa.php.net/
+# master_sites http://downloads.php.net/tyrael/
+# use_xz yes
+# set suhosin_available no
+# checksums ${distname}${extract.suffix} \
+# md5 0123456789 \
+# rmd160 0123456789 \
+# sha256 0123456789
+# livecheck.url ${homepage}
+# livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
+# }
</ins><span class="cx">
</span><span class="cx"> # Iterate through branches in reverse order, so that the list of subports in
</span><span class="cx"> # "port info" will show newer versions before older versions.
</span><span class="lines">@@ -1168,7 +1178,6 @@
</span><span class="cx"> if {${name} eq ${subport}} {
</span><span class="cx"> # Set up the stub port.
</span><span class="cx"> version ${branch}
</span><del>- revision 1
</del><span class="cx"> supported_archs noarch
</span><span class="cx"> distfiles
</span><span class="cx"> depends_run port:${php}
</span></span></pre>
</div>
</div>
</body>
</html>