[124928] trunk/dports

31 Aug 2014

Revision: 124928
          https://trac.macports.org/changeset/124928
Author:   ryandesign@macports.org
Date:     2014-08-31 11:30:02 -0700 (Sun, 31 Aug 2014)
Log Message:
-----------
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

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/php-1.1.tcl
    trunk/dports/lang/php/Portfile

Modified: trunk/dports/_resources/port1.0/group/php-1.1.tcl
===================================================================

--- 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)
@@ -1,7 +1,7 @@
 # -*- 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$
 #
-# Copyright (c) 2009-2013 The MacPorts Project
+# Copyright (c) 2009-2014 The MacPorts Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -41,11 +41,11 @@
 # built. For unified extension ports (name begins with "php-") setting
 # php.branches is mandatory; there is no default. Example:
 #
-#   php.branches                5.3 5.4
+#   php.branches                5.3 5.4 5.5 5.6
 #
 # For unified ports, setting php.branches will create the subports.
 #
-# For single-branch extension ports (name begins with e.g. "php54-")
+# For single-branch extension ports (name begins with e.g. "php56-")
 # php.branches is set automatically based on the port name and should not be
 # changed.
 
@@ -53,7 +53,7 @@
 option_proc php.branches        php._set_branches
 
 proc php._set_branches {option action args} {
-    if {"set" != ${action}} {
+    if {"set" ne ${action}} {
         return
     }
 
@@ -64,7 +64,7 @@
 
     if {[regexp {^php\d*-} ${name}]} {
         # Legacy dist_subdir to match old php5- port layout.
-        if {[lindex [split [lindex [option ${option}] 0] .] 0] == "5"} {
+        if {[lindex [split [lindex [option ${option}] 0] .] 0] eq "5"} {
             dist_subdir php5-${php.rootname}
         }
 
@@ -73,7 +73,7 @@
             php.create_subports
 
             # Set up stub port.
-            if {${name} == ${subport}} {
+            if {${name} eq ${subport}} {
                 supported_archs     noarch
                 depends_run         port:php[php.suffix_from_branch ${php.default_branch}]-${php.rootname}
 
@@ -116,7 +116,7 @@
 option_proc name                php._set_name
 
 proc php._set_name {option action args} {
-    if {"set" != ${action}} {
+    if {"set" ne ${action}} {
         return
     }
 
@@ -131,7 +131,7 @@
 # when the php port is updated.
 
 options php.latest_stable_branch
-default php.latest_stable_branch 5.5
+default php.latest_stable_branch 5.6
 
 
 # php.default_branch: the branch of PHP for which the port should be installed
@@ -145,13 +145,13 @@
 option_proc php.default_branch  php._set_default_branch
 
 proc php._set_default_branch {option action args} {
-    if {"set" != ${action}} {
+    if {"set" ne ${action}} {
         return
     }
 
     global name subport php.rootname
 
-    if {[regexp {^php-} ${name}] && ${name} == ${subport}} {
+    if {[regexp {^php-} ${name}] && ${name} eq ${subport}} {
         depends_run             port:php[php.suffix_from_branch [option ${option}]]-${php.rootname}
     }
 }
@@ -234,7 +234,7 @@
 option_proc php.pecl            php._set_pecl
 
 proc php._set_pecl {option action args} {
-    if {"set" != ${action}} {
+    if {"set" ne ${action}} {
         return
     }
 
@@ -260,7 +260,7 @@
 option_proc php.pecl.name       php._set_pecl_name
 
 proc php._set_pecl_name {option action args} {
-    if {"set" != ${action}} {
+    if {"set" ne ${action}} {
         return
     }
 
@@ -285,7 +285,7 @@
 option_proc php.pecl.prerelease php._set_pecl_prerelease
 
 proc php._set_pecl_prerelease {option action args} {
-    if {"set" != ${action}} {
+    if {"set" ne ${action}} {
         return
     }
 
@@ -358,7 +358,7 @@
 option_proc version             php._set_version
 
 proc php._set_version {option action args} {
-    if {"set" != ${action}} {
+    if {"set" ne ${action}} {
         return
     }
 
@@ -374,7 +374,7 @@
 
 pre-livecheck {
     global name subport version php._first_version
-    if {${name} != ${subport} && ${name} != "php" && ${version} == ${php._first_version}} {
+    if {${name} ne ${subport} && ${name} ne "php" && ${version} eq ${php._first_version}} {
         livecheck.type          none
     }
 }
@@ -490,7 +490,7 @@
                 regexp {^extension_dir *= *"?([^\"]*)"?} $line -> php_ini_extension_dir
                 if {[info exists php_ini_extension_dir]} {
                     ui_debug "Found extension_dir ${php_ini_extension_dir} in ${php.ini}"
-                    if {${php_ini_extension_dir} != ${php.extension_dir}} {
+                    if {${php_ini_extension_dir} ne ${php.extension_dir}} {
                         if {0 == ${count}} {
                             ui_msg "Your php.ini contains a line that will prevent ${subport}"
                             ui_msg "and other ${php} extensions from working. To fix this,"

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- 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)
@@ -86,6 +86,7 @@
     5.5 {
         epoch           2
         version         5.5.16
+        # switch to use_xz yes at next update
         use_bzip2       yes
         set suhosin_available       no
         checksums       ${distname}${extract.suffix} \
@@ -94,23 +95,32 @@
                         sha256  a1d7c4556a80bed744a348211b33bc35303edd56dd0a34e0a75a948c879cc5f6
     }
     5.6 {
-        # 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/
+        epoch           2
+        version         5.6.0
         use_xz          yes
         set suhosin_available       no
         checksums       ${distname}${extract.suffix} \
-                        md5     4430707c7ee075748071ecf803fe6af6 \
-                        rmd160  1d35f01047cf68d141852e816aa7ae11b003906f \
-                        sha256  615d0178407fdda1bb77fe6be9c03da04e20757f36a4b026634a4319eb3db008
-        livecheck.url   ${homepage}
-        livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
+                        md5     642825d75ce2634d9513d5b21dbee521 \
+                        rmd160  e2a0a4edfafbe7973761deaa325b8a4935d4685b \
+                        sha256  8fc5411cd05cc6cc663247e588931fe67b1dc0e42550fa28ab2c943ad84eda02
     }
 }
+#     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
+#     }
 
 # Iterate through branches in reverse order, so that the list of subports in
 # "port info" will show newer versions before older versions.
@@ -1168,7 +1178,6 @@
 if {${name} eq ${subport}} {
     # Set up the stub port.
     version             ${branch}
-    revision            1
     supported_archs     noarch
     distfiles
     depends_run         port:${php}

    

ryandesign＠macports.org

tags

participants (1)