[53563] trunk/dports/lang/php5
ryandesign at macports.org
ryandesign at macports.org
Wed Jul 8 03:05:05 PDT 2009
Revision: 53563
http://trac.macports.org/changeset/53563
Author: ryandesign at macports.org
Date: 2009-07-08 03:05:04 -0700 (Wed, 08 Jul 2009)
Log Message:
-----------
php5: update to 5.3.0 (see #20119) and bring over related changes from php5-devel:
* sample php.ini file names have changed
* new mysqlnd variant for the MySQL native driver
* MIME magic is gone; see #18307
* imap variant: cclient is a build dependency only; see #20216
* minor changes to how fastcgi is enabled
* remove ext/date patch that has been integrated upstream
* refresh other patches
Modified Paths:
--------------
trunk/dports/lang/php5/Portfile
trunk/dports/lang/php5/files/patch-bind.diff
trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff
Removed Paths:
-------------
trunk/dports/lang/php5/files/patch-ext-date-php_date.c.diff
Modified: trunk/dports/lang/php5/Portfile
===================================================================
--- trunk/dports/lang/php5/Portfile 2009-07-08 09:58:14 UTC (rev 53562)
+++ trunk/dports/lang/php5/Portfile 2009-07-08 10:05:04 UTC (rev 53563)
@@ -4,8 +4,7 @@
name php5
epoch 1
-version 5.2.10
-revision 1
+version 5.3.0
set major [lindex [split ${version} .] 0]
set my_name php${major}
dist_subdir ${my_name}
@@ -36,9 +35,9 @@
http://se.php.net/distributions/
checksums \
- md5 15c7b5a87f57332d6fc683528e28247b \
- sha1 9a287e2791d28928fb1ee1a1167290c5005feccd \
- rmd160 9a9ec823eda9d6b3c085967e7a71f776071fc78f
+ md5 846760cd655c98dfd86d6d97c3d964b0 \
+ sha1 934700941d216c453376e3bf24347041cf12c6dc \
+ rmd160 9a71b74052b0ca515f2ddf95c051b47a73d33f44
depends_build \
port:pkgconfig \
@@ -65,7 +64,6 @@
port:freetype
patchfiles \
- patch-ext-date-php_date.c.diff \
patch-bind.diff
use_autoconf yes
@@ -103,7 +101,6 @@
--with-openssl=${prefix} \
--with-mhash=${prefix} \
--with-mcrypt=${prefix} \
- --with-mime-magic \
--with-xsl=${prefix} \
--with-curl=${prefix} \
--with-pcre-regex=${prefix} \
@@ -112,6 +109,7 @@
--with-png-dir=${prefix} \
--enable-gd-native-ttf \
--without-pear \
+ --disable-cgi \
--with-freetype-dir=${prefix}
platform darwin 6 {
@@ -177,9 +175,10 @@
# relevant part of the post-destroot phase.
variant fastcgi conflicts no_web description {Add FastCGI web server binary} {
if { ![variant_isset apache] && ![variant_isset apache2] } {
+ configure.args-delete \
+ --disable-cgi
configure.args-append \
- --enable-fastcgi \
- --enable-force-cgi-redirect
+ --enable-cgi
}
}
@@ -196,7 +195,7 @@
}
variant imap description {Add IMAP protocol support} {
- depends_lib-append \
+ depends_build-append \
port:cclient
configure.args-append \
--with-imap=${prefix} \
@@ -246,7 +245,7 @@
--with-snmp=${prefix}
}
-variant mysql3 conflicts mysql4 mysql5 description {Add MySQL 3 support} {
+variant mysql3 conflicts mysql4 mysql5 mysqlnd description {Add MySQL 3 support} {
depends_lib-append \
port:mysql3
configure.args-delete \
@@ -256,7 +255,7 @@
--with-pdo-mysql=${prefix}
}
-variant mysql4 conflicts mysql3 mysql5 description {Add MySQL 4 support} {
+variant mysql4 conflicts mysql3 mysql5 mysqlnd description {Add MySQL 4 support} {
depends_lib-append \
port:mysql4
configure.args-delete \
@@ -266,7 +265,7 @@
--with-pdo-mysql=${prefix}
}
-variant mysql5 conflicts mysql3 mysql4 description {Add MySQL 5 support} {
+variant mysql5 conflicts mysql3 mysql4 mysqlnd description {Add MySQL 5 support} {
depends_lib-append \
path:bin/mysql_config5:mysql5
configure.args-delete \
@@ -283,6 +282,15 @@
}
}
+variant mysqlnd conflicts mysql3 mysql4 mysql5 description {Add MySQL Native Driver support for MySQL 4.1 and up} {
+ configure.args-delete \
+ --without-mysql
+ configure.args-append \
+ --with-mysql=mysqlnd \
+ --with-mysqli=mysqlnd \
+ --with-pdo-mysql=mysqlnd
+}
+
variant oracle description {Add Oracle oci8 database functions with the Oracle Instant Client} {
patchfiles-append \
patch-ext-pdo_oci-config.m4.diff
@@ -425,9 +433,10 @@
# Run the build again to get the FastCGI binary. Keep the options here
# in sync with those in the fastcgi variant.
if { [variant_isset apache] || [variant_isset apache2] } {
+ configure.args-delete \
+ --disable-cgi
configure.args-append \
- --enable-fastcgi \
- --enable-force-cgi-redirect
+ --enable-cgi
ui_msg "$UI_PREFIX Configuring ${name} again for fastcgi"
command_exec configure
ui_msg "$UI_PREFIX Building ${name} again for fastcgi"
@@ -445,8 +454,8 @@
# Copy the default php.ini files.
xinstall -m 755 -d ${destroot}${phpinidir}
xinstall -m 644 -W ${worksrcpath} \
- php.ini-dist \
- php.ini-recommended \
+ php.ini-development \
+ php.ini-production \
${destroot}${phpinidir}
}
@@ -458,14 +467,14 @@
}
if {![file exists ${phpinidir}/php.ini]} {
ui_msg "To customize php, copy"
- ui_msg "${phpinidir}/php.ini-dist (if this is a development server) or"
- ui_msg "${phpinidir}/php.ini-recommended (if this is a production server) to"
+ ui_msg "${phpinidir}/php.ini-development (if this is a development server) or"
+ ui_msg "${phpinidir}/php.ini-production (if this is a production server) to"
ui_msg "${phpinidir}/php.ini and then make changes."
} else {
ui_msg "You may need to update your php.ini for any changes that have been made"
ui_msg "in this version of php. Compare ${phpinidir}/php.ini with"
- ui_msg "${phpinidir}/php.ini-dist (if this is a development server) or"
- ui_msg "${phpinidir}/php.ini-recommended (if this is a production server)."
+ ui_msg "${phpinidir}/php.ini-development (if this is a development server) or"
+ ui_msg "${phpinidir}/php.ini-production (if this is a production server)."
}
if {![variant_isset no_web]} {
Modified: trunk/dports/lang/php5/files/patch-bind.diff
===================================================================
--- trunk/dports/lang/php5/files/patch-bind.diff 2009-07-08 09:58:14 UTC (rev 53562)
+++ trunk/dports/lang/php5/files/patch-bind.diff 2009-07-08 10:05:04 UTC (rev 53563)
@@ -1,15 +1,16 @@
---- ext/standard/config.m4.orig 2007-07-11 06:56:03.000000000 -0500
-+++ ext/standard/config.m4 2008-11-13 02:19:46.000000000 -0600
-@@ -311,9 +311,9 @@
+--- ext/standard/config.m4.orig 2009-01-31 18:05:14.000000000 +0200
++++ ext/standard/config.m4 2009-01-31 18:06:03.000000000 +0200
+@@ -249,10 +249,10 @@
dnl Detect library functions needed by php dns_xxx functions
dnl ext/standard/dns.h will collect these in a single define: HAVE_DNS_FUNCS
dnl
-PHP_CHECK_FUNC(res_nmkquery, resolv, bind, socket)
-PHP_CHECK_FUNC(res_nsend, resolv, bind, socket)
--PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
+PHP_CHECK_FUNC(res_nmkquery, resolv, socket)
+PHP_CHECK_FUNC(res_nsend, resolv, socket)
+ PHP_CHECK_FUNC(res_search, resolv, bind, socket)
+-PHP_CHECK_FUNC(dn_expand, resolv, bind, socket)
+PHP_CHECK_FUNC(dn_expand, resolv, socket)
+ PHP_CHECK_FUNC(dn_skipname, resolv, bind, socket)
dnl
- dnl Check if atof() accepts NAN
Deleted: trunk/dports/lang/php5/files/patch-ext-date-php_date.c.diff
===================================================================
--- trunk/dports/lang/php5/files/patch-ext-date-php_date.c.diff 2009-07-08 09:58:14 UTC (rev 53562)
+++ trunk/dports/lang/php5/files/patch-ext-date-php_date.c.diff 2009-07-08 10:05:04 UTC (rev 53563)
@@ -1,11 +0,0 @@
---- ext/date/php_date.c 2009-06-05 17:34:30.000000000 -0500
-+++ ext/date/php_date.c 2009-06-29 22:39:00.000000000 -0500
-@@ -798,7 +798,7 @@
- /* year */
- case 'L': length = slprintf(buffer, 32, "%d", timelib_is_leap((int) t->y)); break;
- case 'y': length = slprintf(buffer, 32, "%02d", (int) t->y % 100); break;
-- case 'Y': length = slprintf(buffer, 32, "%s%04ld", t->y < 0 ? "-" : "", llabs(t->y)); break;
-+ case 'Y': length = slprintf(buffer, 32, "%s%04lld", t->y < 0 ? "-" : "", llabs(t->y)); break;
-
- /* time */
- case 'a': length = slprintf(buffer, 32, "%s", t->h >= 12 ? "pm" : "am"); break;
Modified: trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff
===================================================================
--- trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff 2009-07-08 09:58:14 UTC (rev 53562)
+++ trunk/dports/lang/php5/files/patch-ext-pdo_oci-config.m4.diff 2009-07-08 10:05:04 UTC (rev 53563)
@@ -1,14 +1,14 @@
See http://bugs.php.net/bug.php?id=39312.
---- ext/pdo_oci/config.m4.orig 2009-01-31 18:26:43.000000000 +0100
-+++ ext/pdo_oci/config.m4 2009-01-31 18:28:46.000000000 +0100
-@@ -97,11 +97,11 @@
+--- ext/pdo_oci/config.m4.orig 2008-10-22 14:29:24.000000000 -0500
++++ ext/pdo_oci/config.m4 2009-06-13 09:00:04.000000000 -0500
+@@ -89,11 +89,11 @@
else
AC_MSG_ERROR([I'm too dumb to figure out where the include dir is in your Instant Client install])
fi
- if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.so" ; then
+ if test -f "$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
- PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
+ PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/lib/oracle/$PDO_OCI_IC_VERS/client/lib"
- elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.so" ; then
+ elif test -f "$PDO_OCI_IC_PREFIX/client/lib/libclntsh.$SHLIB_SUFFIX_NAME" ; then
PDO_OCI_LIB_DIR="$PDO_OCI_IC_PREFIX/client/lib"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090708/d08da637/attachment-0001.html>
More information about the macports-changes
mailing list