diff --git a/databases/php55-odbc/files/patch-config.m4 b/databases/php55-odbc/files/patch-config.m4 index c809732b1047..6288933275d1 100644 --- a/databases/php55-odbc/files/patch-config.m4 +++ b/databases/php55-odbc/files/patch-config.m4 @@ -1,5 +1,5 @@ ---- config.m4.orig 2007-07-31 15:02:00.000000000 +0200 -+++ config.m4 2011-04-26 13:57:31.000000000 +0200 +--- config.m4.orig 2013-08-20 06:46:43.000000000 +0200 ++++ config.m4 2013-08-27 16:04:54.000000000 +0200 @@ -99,9 +99,12 @@ dnl dnl configure options @@ -9,8 +9,8 @@ + if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(adabas,, --[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) -+[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no) +-[ --with-adabas[=DIR] Include Adabas D support [/usr/local]]) ++[ --with-adabas[=DIR] Include Adabas D support [/usr/local]], no, no) if test "$PHP_ADABAS" != "no"; then AC_MSG_CHECKING([for Adabas support]) @@ -18,8 +18,8 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(sapdb,, --[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) -+[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) +-[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]]) ++[ --with-sapdb[=DIR] Include SAP DB support [/usr/local]], no, no) if test "$PHP_SAPDB" != "no"; then AC_MSG_CHECKING([for SAP DB support]) @@ -27,8 +27,8 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(solid,, --[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) -+[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) +-[ --with-solid[=DIR] Include Solid support [/usr/local/solid]]) ++[ --with-solid[=DIR] Include Solid support [/usr/local/solid]], no, no) if test "$PHP_SOLID" != "no"; then AC_MSG_CHECKING(for Solid support) @@ -36,8 +36,8 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(ibm-db2,, --[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) -+[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) +-[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]]) ++[ --with-ibm-db2[=DIR] Include IBM DB2 support [/home/db2inst1/sqllib]], no, no) if test "$PHP_IBM_DB2" != "no"; then AC_MSG_CHECKING(for IBM DB2 support) @@ -45,15 +45,15 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(ODBCRouter,, --[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) -+[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no) +-[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]]) ++[ --with-ODBCRouter[=DIR] Include ODBCRouter.com support [/usr]], no, no) if test "$PHP_ODBCROUTER" != "no"; then AC_MSG_CHECKING(for ODBCRouter.com support) @@ -229,7 +232,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(empress,, - [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] + [ --with-empress[=DIR] Include Empress support [\$EMPRESSPATH] - (Empress Version >= 8.60 required)]) + (Empress Version >= 8.60 required)], no, no) @@ -72,53 +72,53 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(birdstep,, --[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) -+[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) +-[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]]) ++[ --with-birdstep[=DIR] Include Birdstep support [/usr/local/birdstep]], no, no) if test "$PHP_BIRDSTEP" != "no"; then AC_MSG_CHECKING(for Birdstep support) -@@ -346,7 +349,7 @@ +@@ -345,7 +348,7 @@ running this configure script: - CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" - LDFLAGS=-lunix -- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) -+ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) + CPPFLAGS=\"-DODBC_QNX -DSQLANY_BUG\" + LDFLAGS=-lunix +- CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"]) ++ CUSTOM_ODBC_LIBS=\"-ldblib -lodbc\"], no, no) if test "$PHP_CUSTOM_ODBC" != "no"; then AC_MSG_CHECKING(for a custom ODBC support) -@@ -366,7 +369,7 @@ +@@ -365,7 +368,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(iodbc,, --[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) -+[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) +-[ --with-iodbc[=DIR] Include iODBC support [/usr/local]]) ++[ --with-iodbc[=DIR] Include iODBC support [/usr/local]], no, no) if test "$PHP_IODBC" != "no"; then AC_MSG_CHECKING(for iODBC support) -@@ -387,7 +390,7 @@ +@@ -386,7 +389,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(esoob,, --[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) -+[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) +-[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]]) ++[ --with-esoob[=DIR] Include Easysoft OOB support [/usr/local/easysoft/oob/client]], no, no) if test "$PHP_ESOOB" != "no"; then AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) -@@ -407,7 +410,7 @@ +@@ -406,7 +409,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(unixODBC,, --[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) -+[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no) +-[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]]) ++[ --with-unixODBC[=DIR] Include unixODBC support [/usr/local]], no, no) if test "$PHP_UNIXODBC" != "no"; then AC_MSG_CHECKING(for unixODBC support) -@@ -428,7 +431,7 @@ +@@ -427,7 +430,7 @@ if test -z "$ODBC_TYPE"; then PHP_ARG_WITH(dbmaker,, --[ --with-dbmaker[=DIR] Include DBMaker support]) -+[ --with-dbmaker[=DIR] Include DBMaker support], no, no) +-[ --with-dbmaker[=DIR] Include DBMaker support]) ++[ --with-dbmaker[=DIR] Include DBMaker support], no, no) if test "$PHP_DBMAKER" != "no"; then AC_MSG_CHECKING(for DBMaker support) diff --git a/devel/php55-readline/files/patch-config.m4 b/devel/php55-readline/files/patch-config.m4 index 9c0d4fc95033..5edf376bf0e2 100644 --- a/devel/php55-readline/files/patch-config.m4 +++ b/devel/php55-readline/files/patch-config.m4 @@ -1,12 +1,12 @@ ---- config.m4.orig 2011-09-06 17:07:24.000000000 +0200 -+++ config.m4 2012-03-02 14:29:51.000000000 +0100 +--- config.m4.orig 2013-08-20 06:46:43.000000000 +0200 ++++ config.m4 2013-08-27 16:01:29.000000000 +0200 @@ -5,13 +5,8 @@ PHP_ARG_WITH(libedit,for libedit readline replacement, - [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) + [ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)]) -if test "$PHP_LIBEDIT" = "no"; then PHP_ARG_WITH(readline,for readline support, - [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) + [ --with-readline[=DIR] Include readline support (CLI/CGI only)]) -else - dnl "register" the --with-readline option to preven invalid "unknown configure option" warning - php_with_readline=no diff --git a/lang/php55/Makefile b/lang/php55/Makefile index f329730038f6..f70a9b915b41 100644 --- a/lang/php55/Makefile +++ b/lang/php55/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= php55 -PORTVERSION= 5.5.1 +PORTVERSION= 5.5.3 PORTREVISION?= 0 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP} diff --git a/lang/php55/distinfo b/lang/php55/distinfo index 6002c6983d05..07503f9f489c 100644 --- a/lang/php55/distinfo +++ b/lang/php55/distinfo @@ -1,4 +1,4 @@ -SHA256 (php-5.5.1.tar.bz2) = 4c221b9ba65e2084ae8900ef00c7f23966702e943203299b278bdc758fcfc733 -SIZE (php-5.5.1.tar.bz2) = 12004597 +SHA256 (php-5.5.3.tar.bz2) = 93080dd06dff7c4e54254f4bd6910e7cc4049d6226e6ac4c9bc52c16ebd5939a +SIZE (php-5.5.3.tar.bz2) = 12030241 SHA256 (php-5.5.x-mail-header.patch) = b0b5a7c961b2052eb14d9528e76155cbeaa881fb9b4a49f452f9dab07b6fb1c4 SIZE (php-5.5.x-mail-header.patch) = 3379