[115772] trunk/dports/lang/php

[ryandesign at macports.org]

Revision: 115772
          https://trac.macports.org/changeset/115772
Author:   ryandesign at macports.org
Date:     2014-01-10 14:53:20 -0800 (Fri, 10 Jan 2014)
Log Message:
-----------
php54: update to 5.4.24
php55: update to 5.5.8

Modified Paths:
--------------
    trunk/dports/lang/php/Portfile
    trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff
    trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff

Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile	2014-01-10 22:50:51 UTC (rev 115771)
+++ trunk/dports/lang/php/Portfile	2014-01-10 22:53:20 UTC (rev 115772)
@@ -75,23 +75,23 @@
     }
     5.4 {
         epoch           1
-        version         5.4.23
+        version         5.4.24
         use_bzip2       yes
         set suhosin_available       no
         checksums       ${distname}${extract.suffix} \
-                        md5     023857598b92ea5c78137543817f4bc5 \
-                        rmd160  3a5e3b7a6013f5a284c80d41a95989ba2a78b6d4 \
-                        sha256  ae7c070fa9b9e16413ef944d910b68f3ba79192eca4010b0af132b8631bd91cc
+                        md5     acef880cc808b85e216897ee88187ee1 \
+                        rmd160  8248a1314986b071de990f725fc802729ca97e3c \
+                        sha256  97fe70eddaf5b93969714a551870fe03f6b0a387f85b83a6d63a40a76199a327
     }
     5.5 {
         epoch           2
-        version         5.5.7
-        use_xz          yes
+        version         5.5.8
+        use_bzip2       yes
         set suhosin_available       no
         checksums       ${distname}${extract.suffix} \
-                        md5     0c02437f661105221e99a301a5275a41 \
-                        rmd160  02394608b517056b2e1c1bf3474a139a80b3f4dd \
-                        sha256  b7bae5d878b8fc3f4b481eb8f2179b5e71d30dfb3bc3640a5068c1b46633f08c
+                        md5     42fe814a3cbbf34b21a2c39f66ee0001 \
+                        rmd160  7779602dfa1683a7938ed41d1713916bcb7ce296 \
+                        sha256  6d5f45659d13383fc8429f185cc9da0b30c7bb72dcae9baf568f0511eb7f8b68
     }
     5.6 {
         # When this becomes a stable version, remove the overrides for homepage,
@@ -516,7 +516,9 @@
 }
 
 subport ${php}-gd {
-    revision                1
+    if {[vercmp ${php.branch} 5.4] < 0} {
+        revision            1
+    }
     
     categories-append       graphics
     

Modified: trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff	2014-01-10 22:50:51 UTC (rev 115771)
+++ trunk/dports/lang/php/files/patch-php54-ext-gd-config.m4.diff	2014-01-10 22:53:20 UTC (rev 115772)
@@ -1,5 +1,5 @@
---- ext/gd/config.m4.orig	2013-11-13 00:46:59.000000000 -0600
-+++ ext/gd/config.m4	2013-11-28 23:55:35.000000000 -0600
+--- ext/gd/config.m4.orig	2014-01-07 20:57:08.000000000 -0600
++++ ext/gd/config.m4	2014-01-10 15:46:18.000000000 -0600
 @@ -76,7 +76,7 @@
  AC_DEFUN([PHP_GD_VPX],[
    if test "$PHP_VPX_DIR" != "no"; then
@@ -36,21 +36,16 @@
        test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME || test -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break
      done
  
-@@ -192,12 +192,10 @@
+@@ -192,7 +192,7 @@
  AC_DEFUN([PHP_GD_FREETYPE2],[
    if test "$PHP_FREETYPE_DIR" != "no"; then
  
 -    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
--      if test -f "$i/include/freetype2/freetype/freetype.h"; then
 +    for i in $PHP_FREETYPE_DIR; do
+       if test -f "$i/bin/freetype-config"; then
          FREETYPE2_DIR=$i
-         FREETYPE2_INC_DIR=$i/include/freetype2
-         break
--      fi
-     done
- 
-     if test -z "$FREETYPE2_DIR"; then
-@@ -225,7 +223,7 @@
+         FREETYPE2_CONFIG="$i/bin/freetype-config"
+@@ -220,7 +220,7 @@
  AC_DEFUN([PHP_GD_T1LIB],[
    if test "$PHP_T1LIB" != "no"; then
  

Modified: trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff	2014-01-10 22:50:51 UTC (rev 115771)
+++ trunk/dports/lang/php/files/patch-php55-ext-gd-config.m4.diff	2014-01-10 22:53:20 UTC (rev 115772)
@@ -1,5 +1,5 @@
---- ext/gd/config.m4.orig	2013-11-12 08:17:27.000000000 -0600
-+++ ext/gd/config.m4	2013-11-28 23:53:42.000000000 -0600
+--- ext/gd/config.m4.orig	2014-01-08 04:15:20.000000000 -0600
++++ ext/gd/config.m4	2014-01-10 15:48:08.000000000 -0600
 @@ -75,7 +75,7 @@
  AC_DEFUN([PHP_GD_VPX],[
    if test "$PHP_VPX_DIR" != "no"; then
@@ -36,21 +36,16 @@
        test -f $i/include/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i && break
        test -f $i/include/X11/xpm.h && GD_XPM_DIR=$i && GD_XPM_INC=$i/X11 && break
      done
-@@ -184,12 +184,10 @@
+@@ -184,7 +184,7 @@
  AC_DEFUN([PHP_GD_FREETYPE2],[
    if test "$PHP_FREETYPE_DIR" != "no"; then
  
 -    for i in $PHP_FREETYPE_DIR /usr/local /usr; do
--      if test -f "$i/include/freetype2/freetype/freetype.h"; then
 +    for i in $PHP_FREETYPE_DIR; do
+       if test -f "$i/bin/freetype-config"; then
          FREETYPE2_DIR=$i
-         FREETYPE2_INC_DIR=$i/include/freetype2
-         break
--      fi
-     done
- 
-     if test -z "$FREETYPE2_DIR"; then
-@@ -217,7 +215,7 @@
+         FREETYPE2_CONFIG="$i/bin/freetype-config"
+@@ -212,7 +212,7 @@
  AC_DEFUN([PHP_GD_T1LIB],[
    if test "$PHP_T1LIB" != "no"; then
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140110/1fdcc092/attachment.html>