[104120] trunk/dports
ryandesign at macports.org
ryandesign at macports.org
Sat Mar 16 12:39:15 PDT 2013
Revision: 104120
https://trac.macports.org/changeset/104120
Author: ryandesign at macports.org
Date: 2013-03-16 12:39:15 -0700 (Sat, 16 Mar 2013)
Log Message:
-----------
php53: update to 5.3.23
php54: update to 5.4.13
php55: update to 5.5.0alpha6 and remove intl and sockets patches now integrated upstream
php-eaccelerator: revbump to rebuild with new version
Modified Paths:
--------------
trunk/dports/lang/php/Portfile
trunk/dports/lang/php/files/patch-php53-suhosin-before.diff
trunk/dports/php/php-eaccelerator/Portfile
Removed Paths:
-------------
trunk/dports/lang/php/files/patch-php55-intl.diff
trunk/dports/lang/php/files/patch-php55-sockets.diff
Modified: trunk/dports/lang/php/Portfile
===================================================================
--- trunk/dports/lang/php/Portfile 2013-03-16 18:10:46 UTC (rev 104119)
+++ trunk/dports/lang/php/Portfile 2013-03-16 19:39:15 UTC (rev 104120)
@@ -60,38 +60,38 @@
# Remember to increment revision of ${php}-eaccelerator when updating version of ${php}.
switch ${subport_branch} {
5.3 {
- version 5.3.22
+ version 5.3.23
set suhosin_available yes
set suhosin_patch_version 5.3.9-0.9.10
set suhosin_patch suhosin-patch-${suhosin_patch_version}.patch.gz
checksums [suffix ${distname}] \
- rmd160 dc51c94f4201aeb3bef03df8d1def780a1ab60f5 \
- sha256 2da5fefdd24dafd8a94b6e41ba2c308ee216f97b3d605abde513d0cdc680d588 \
+ rmd160 a537ed70a94ebbc8c1ee12a897f2f78b98a1dee4 \
+ sha256 69473eae7c752987a8fc7619bae9f7121cfe7c6603a2ebf13c8e036dff6a4944 \
${suhosin_patch} \
rmd160 ce43921fd9b183b154713ecda98294f6c68d5f22 \
sha256 4438caeab0a10c6c94aee9f7eaa703f5799f97d4e0579f43a947bb7314e38317
}
5.4 {
epoch 1
- version 5.4.12
+ version 5.4.13
set suhosin_available no
checksums [suffix ${distname}] \
- rmd160 51fb60f669ff5410fefcb5a00369fbc4707a5044 \
- sha256 413e5036b2784918922c14e094cbbc6f28289a3e8e559479c688ab07027ef719
+ rmd160 b2b40fe8bc939b2c315f34a79fa08884c64d3ff9 \
+ sha256 f80c9452f63a6d259d4edd5228be2136da98122ffb79cb1d9d6b7f9026e84f00
}
5.5 {
# 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.5.0alpha5
+ version 5.5.0alpha6
homepage http://qa.php.net/
master_sites http://downloads.php.net/dsp/
use_bzip2 no
use_xz yes
set suhosin_available no
checksums [suffix ${distname}] \
- rmd160 dbf5da912deb5788e572aa3a553b21f24b75f076 \
- sha256 1c57575a484a99cca7495f5b3ee1935a3ca4e0e222ec4af7c68f8c29459ed653
+ rmd160 dbc6c593dd2e1f567b5b6cc0ca0b9babc0213b46 \
+ sha256 c66f07c9689cd2e526b505fb1b4515c2b16e681df93a095f554b761c62ae1df0
livecheck.url ${homepage}
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
}
@@ -591,11 +591,6 @@
library functionality in PHP.
depends_lib-append port:icu
-
- if {${php.branch} == "5.5"} {
- patch.pre_args -p1
- patchfiles-append patch-${subport}.diff
- }
}
subport ${php}-ldap {
@@ -936,11 +931,6 @@
functions
long_description ${description}
-
- if {${php.branch} == "5.5"} {
- patch.pre_args -p1
- patchfiles-append patch-${subport}.diff
- }
}
subport ${php}-sqlite {
Modified: trunk/dports/lang/php/files/patch-php53-suhosin-before.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php53-suhosin-before.diff 2013-03-16 18:10:46 UTC (rev 104119)
+++ trunk/dports/lang/php/files/patch-php53-suhosin-before.diff 2013-03-16 19:39:15 UTC (rev 104120)
@@ -1,3 +1,23 @@
+--- a/configure.orig 2013-03-14 12:17:01.000000000 -0500
++++ b/configure 2013-03-15 18:27:29.000000000 -0500
+@@ -146949,7 +146952,7 @@
+ strlcat.c mergesort.c reentrancy.c php_variables.c php_ticks.c \
+ network.c php_open_temporary_file.c php_logos.c \
+ output.c getopt.c; do
+-
++
+ IFS=.
+ set $ac_src
+ ac_obj=$1
+@@ -147153,7 +147156,7 @@
+ zend_ini.c zend_qsort.c zend_multibyte.c zend_ts_hash.c zend_stream.c \
+ zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
+ zend_closures.c zend_float.c; do
+-
++
+ IFS=.
+ set $ac_src
+ ac_obj=$1
--- a/sapi/cgi/cgi_main.c.orig 2013-01-16 10:34:41.000000000 -0600
+++ b/sapi/cgi/cgi_main.c 2013-01-19 02:05:49.000000000 -0600
@@ -1956,9 +1956,9 @@
Deleted: trunk/dports/lang/php/files/patch-php55-intl.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php55-intl.diff 2013-03-16 18:10:46 UTC (rev 104119)
+++ trunk/dports/lang/php/files/patch-php55-intl.diff 2013-03-16 19:39:15 UTC (rev 104120)
@@ -1,26 +0,0 @@
-From 97f22702c4b3af574049160f20982d1e38424296 Mon Sep 17 00:00:00 2001
-From: Gustavo Lopes <glopes at nebm.ist.utl.pt>
-Date: Sun, 24 Feb 2013 00:30:08 +0100
-Subject: [PATCH] Fix ext/intl build with phpize
-
-Fixes bug #64284.
----
- ext/intl/converter/converter.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
-index 387760a..5f2d1e7 100644
---- a/ext/intl/converter/converter.c
-+++ b/ext/intl/converter/converter.c
-@@ -21,7 +21,7 @@
- #include <unicode/ucnv.h>
- #include <unicode/ustring.h>
-
--#include "ext/intl/intl_error.h"
-+#include "../intl_error.h"
-
- typedef struct _php_converter_object {
- zend_object obj;
---
-1.7.11.5
-
Deleted: trunk/dports/lang/php/files/patch-php55-sockets.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php55-sockets.diff 2013-03-16 18:10:46 UTC (rev 104119)
+++ trunk/dports/lang/php/files/patch-php55-sockets.diff 2013-03-16 19:39:15 UTC (rev 104120)
@@ -1,71 +0,0 @@
-From 189fbfd53b087099689b9198407ee0c50b17fc61 Mon Sep 17 00:00:00 2001
-From: Gustavo Lopes <glopes at nebm.ist.utl.pt>
-Date: Sun, 24 Feb 2013 00:47:44 +0100
-Subject: [PATCH] Fix ext/sockets build with phpize
-
-Fixes bug #64285
----
- ext/sockets/multicast.c | 4 ----
- ext/sockets/php_sockets.h | 4 ++++
- ext/sockets/sockets.c | 4 ----
- 3 files changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/ext/sockets/multicast.c b/ext/sockets/multicast.c
-index 94f845d..7466c62 100644
---- a/ext/sockets/multicast.c
-+++ b/ext/sockets/multicast.c
-@@ -24,8 +24,6 @@
-
- #include "php.h"
-
--#if HAVE_SOCKETS
--
- #include "php_network.h"
- #ifdef PHP_WIN32
- # include "windows_common.h"
-@@ -836,5 +834,3 @@ err:
- return FAILURE;
- }
- #endif
--
--#endif /* HAVE_SOCKETS */
-diff --git a/ext/sockets/php_sockets.h b/ext/sockets/php_sockets.h
-index dd2b993..17abf95 100644
---- a/ext/sockets/php_sockets.h
-+++ b/ext/sockets/php_sockets.h
-@@ -24,6 +24,10 @@
-
- /* $Id$ */
-
-+#if HAVE_CONFIG_H
-+# include "config.h"
-+#endif
-+
- #if HAVE_SOCKETS
-
- #include <php.h>
-diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
-index 7f5d49e..5ecc014 100644
---- a/ext/sockets/sockets.c
-+++ b/ext/sockets/sockets.c
-@@ -28,8 +28,6 @@
-
- #include "php.h"
-
--#if HAVE_SOCKETS
--
- #include "php_network.h"
- #include "ext/standard/file.h"
- #include "ext/standard/info.h"
-@@ -2278,8 +2276,6 @@ PHP_FUNCTION(socket_import_stream)
- }
- /* }}} */
-
--#endif
--
- /*
- * Local variables:
- * tab-width: 4
---
-1.7.11.5
-
Modified: trunk/dports/php/php-eaccelerator/Portfile
===================================================================
--- trunk/dports/php/php-eaccelerator/Portfile 2013-03-16 18:10:46 UTC (rev 104119)
+++ trunk/dports/php/php-eaccelerator/Portfile 2013-03-16 19:39:15 UTC (rev 104120)
@@ -7,7 +7,7 @@
github.setup eaccelerator eaccelerator 0.9.6.1
name php-eaccelerator
-revision 9
+revision 10
categories php www devel
platforms darwin freebsd openbsd
maintainers ryandesign openmaintainer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130316/4fd13eaa/attachment.html>
More information about the macports-changes
mailing list