[103406] trunk/dports/lang/php
ryandesign at macports.org
ryandesign at macports.org
Sun Feb 24 15:11:50 PST 2013
Revision: 103406
https://trac.macports.org/changeset/103406
Author: ryandesign at macports.org
Date: 2013-02-24 15:11:50 -0800 (Sun, 24 Feb 2013)
Log Message:
-----------
php55: update to 5.5.0alpha5
Modified Paths:
--------------
trunk/dports/lang/php/Portfile
Added 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-02-24 22:57:54 UTC (rev 103405)
+++ trunk/dports/lang/php/Portfile 2013-02-24 23:11:50 UTC (rev 103406)
@@ -83,15 +83,15 @@
# 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.0alpha4
+ version 5.5.0alpha5
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 b3fc61faabbd647f2e183146f09a2865c03f4ba7 \
- sha256 d24f9a2a5b05e2352fdaed2406323d0c695afac33f3d71ce68c32b0c929fb78f
+ rmd160 dbf5da912deb5788e572aa3a553b21f24b75f076 \
+ sha256 1c57575a484a99cca7495f5b3ee1935a3ca4e0e222ec4af7c68f8c29459ed653
livecheck.url ${homepage}
livecheck.regex php-([strsed ${subport_branch} {g/\\./\\./}](?:\\.\[0-9.\]+)*(?:(?:alpha|beta|RC)\\d+|-latest))\\.tar
}
@@ -264,6 +264,10 @@
default_variants +libedit
}
+ if {[vercmp ${php.branch} ${php.latest_stable_branch}] > 0} {
+ notes-append "${php} @${version}_${revision} is a development preview—do not use it in production!\n\n\n"
+ }
+
if {![file exists ${phpinidir}/php.ini]} {
notes-append "
To customize ${php}, copy\
@@ -498,10 +502,6 @@
}
subport ${php}-gd {
- if {${php.branch} == "5.5"} {
- revision 1
- }
-
categories-append graphics
description a PHP interface to the gd library
@@ -566,10 +566,6 @@
}
subport ${php}-imap {
- if {${php.branch} == "5.5"} {
- revision 1
- }
-
categories-append mail
description a PHP interface to the IMAP protocol
@@ -595,6 +591,11 @@
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 {
@@ -751,10 +752,6 @@
}
subport ${php}-openssl {
- if {${php.branch} == "5.5"} {
- revision 1
- }
-
categories-append devel security
description a PHP interface to OpenSSL signature-generation \
@@ -939,6 +936,11 @@
functions
long_description ${description}
+
+ if {${php.branch} == "5.5"} {
+ patch.pre_args -p1
+ patchfiles-append patch-${subport}.diff
+ }
}
subport ${php}-sqlite {
Added: trunk/dports/lang/php/files/patch-php55-intl.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php55-intl.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-intl.diff 2013-02-24 23:11:50 UTC (rev 103406)
@@ -0,0 +1,26 @@
+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
+
Added: trunk/dports/lang/php/files/patch-php55-sockets.diff
===================================================================
--- trunk/dports/lang/php/files/patch-php55-sockets.diff (rev 0)
+++ trunk/dports/lang/php/files/patch-php55-sockets.diff 2013-02-24 23:11:50 UTC (rev 103406)
@@ -0,0 +1,71 @@
+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
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130224/8ccfc48e/attachment.html>
More information about the macports-changes
mailing list