diff options
author | Rene Ladan <rene@FreeBSD.org> | 2015-04-17 21:00:10 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2015-04-17 21:00:10 +0000 |
commit | 2af5dcc160f59e3915e6f8a0c19b7650638cbd46 (patch) | |
tree | 1fdf47022a8f664140594ff7b238feaa6d0dd6db /databases | |
parent | Update to experimental-20150409 (diff) |
Remove expired ports:
2015-04-15 databases/php53-sqlite3: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-simplexml: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sybase_ct: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-ctype: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-wddx: security EOL reached 14 Aug 2014
2015-04-15 security/php53-filter: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-ftp: security EOL reached 14 Aug 2014
2015-04-15 net/php53-soap: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-recode: security EOL reached 14 Aug 2014
2015-04-15 security/php53-openssl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-dba: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_pgsql: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-fileinfo: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_odbc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-sqlite: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-readline: security EOL reached 14 Aug 2014
2015-04-15 mail/php53-imap: security EOL reached 14 Aug 2014
2015-04-15 sysutils/php53-posix: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-phar: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-gd: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xsl: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo_firebird: security EOL reached 14 Aug 2014
2015-04-15 devel/mingw64-binutils: Obsolete. Migrate to devel/binutils based ports
2015-04-15 devel/cross-binutils: Obsolete. Migrate to devel/binutils based ports
2015-04-15 databases/php53-pdo_dblib: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvshm: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-json: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-redis: requires php53, security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-pspell: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pgsql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlreader: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-iconv: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-odbc: security EOL reached 14 Aug 2014
2015-04-15 ftp/php53-curl: security EOL reached 14 Aug 2014
2015-04-15 math/php53-gmp: security EOL reached 14 Aug 2014
2015-04-15 security/php53-mcrypt: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-shmop: security EOL reached 14 Aug 2014
2015-04-15 math/php53-bcmath: security EOL reached 14 Aug 2014
2015-04-15 security/php53-hash: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvsem: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zip: security EOL reached 14 Aug 2014
2015-04-15 graphics/php53-exif: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-gettext: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysql: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xmlwriter: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-xml: security EOL reached 14 Aug 2014
2015-04-15 converters/php53-mbstring: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-sysvmsg: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mysqli: security EOL reached 14 Aug 2014
2015-04-15 misc/php53-calendar: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-tokenizer: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-pdo: security EOL reached 14 Aug 2014
2015-04-15 net/php53-xmlrpc: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-interbase: security EOL reached 14 Aug 2014
2015-04-15 www/php53-session: security EOL reached 14 Aug 2014
2015-04-15 databases/php53-mssql: security EOL reached 14 Aug 2014
2015-04-15 www/php53-tidy: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-zlib: security EOL reached 14 Aug 2014
2015-04-15 net/php53-ldap: security EOL reached 14 Aug 2014
2015-04-15 net-mgmt/php53-snmp: security EOL reached 14 Aug 2014
2015-04-15 textproc/php53-dom: security EOL reached 14 Aug 2014
2015-04-15 devel/php53-pcntl: security EOL reached 14 Aug 2014
2015-04-15 archivers/php53-bz2: security EOL reached 14 Aug 2014
2015-04-15 net/php53-sockets: security EOL reached 14 Aug 2014
2015-04-15 lang/php53: security EOL reached 14 Aug 2014
2015-04-15 devel/pecl-uuid: requires php53, security EOL reached 14 Aug 2014
2015-04-15 lang/php53-extensions: security EOL reached 14 Aug 2014
2015-04-15 german/pecl-konto_check: requires php53, security EOL reached 14 Aug 2014
2015-04-17 www/moodle26: Deprecated by upstream, use www/moodle2{7,8} instead
Notes
Notes:
svn path=/head/; revision=384186
Diffstat (limited to 'databases')
26 files changed, 0 insertions, 1498 deletions
diff --git a/databases/Makefile b/databases/Makefile index 967a103a09ce..202e9ca4d7d9 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -585,24 +585,7 @@ SUBDIR += php5-sqlite3 SUBDIR += php5-sybase_ct SUBDIR += php5-tarantool - SUBDIR += php53-dba - SUBDIR += php53-interbase - SUBDIR += php53-mssql - SUBDIR += php53-mysql - SUBDIR += php53-mysqli - SUBDIR += php53-odbc - SUBDIR += php53-pdo - SUBDIR += php53-pdo_dblib - SUBDIR += php53-pdo_firebird - SUBDIR += php53-pdo_mysql - SUBDIR += php53-pdo_odbc - SUBDIR += php53-pdo_pgsql SUBDIR += php53-pdo_sqlite - SUBDIR += php53-pgsql - SUBDIR += php53-redis - SUBDIR += php53-sqlite - SUBDIR += php53-sqlite3 - SUBDIR += php53-sybase_ct SUBDIR += php55-dba SUBDIR += php55-interbase SUBDIR += php55-mssql diff --git a/databases/php53-dba/Makefile b/databases/php53-dba/Makefile deleted file mode 100644 index 520f4ecd8491..000000000000 --- a/databases/php53-dba/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -dba - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-dba/files/patch-config.m4 b/databases/php53-dba/files/patch-config.m4 deleted file mode 100644 index 4bb0ed06fc48..000000000000 --- a/databases/php53-dba/files/patch-config.m4 +++ /dev/null @@ -1,62 +0,0 @@ ---- config.m4.orig 2011-06-27 22:28:30.000000000 +0200 -+++ config.m4 2011-08-26 09:32:43.000000000 +0200 -@@ -285,6 +285,50 @@ - THIS_PREFIX=$i - THIS_INCLUDE=$i/db4/db.h - break -+ elif test -f "$i/include/db5/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db5/db.h -+ break -+ elif test -f "$i/include/db51/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db51/db.h -+ break -+ elif test -f "$i/include/db50/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db50/db.h -+ break -+ elif test -f "$i/include/db48/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db48/db.h -+ break -+ elif test -f "$i/include/db47/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db47/db.h -+ break -+ elif test -f "$i/include/db46/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db46/db.h -+ break -+ elif test -f "$i/include/db45/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db45/db.h -+ break -+ elif test -f "$i/include/db44/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db44/db.h -+ break -+ elif test -f "$i/include/db43/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db43/db.h -+ break -+ elif test -f "$i/include/db42/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db42/db.h -+ break -+ elif test -f "$i/include/db41/db.h"; then -+ THIS_PREFIX=$i -+ THIS_INCLUDE=$i/include/db41/db.h -+ break - elif test -f "$i/include/db5.1/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db5.1/db.h -@@ -327,7 +371,7 @@ - break - fi - done -- PHP_DBA_DB_CHECK(4, db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) -+ PHP_DBA_DB_CHECK(4, db-5.2 db-5.1 db-5.0 db-4.8 db-4.7 db-4.6 db-4.5 db-4.4 db-4.3 db-4.2 db-4.1 db-4.0 db-4 db4 db, [(void)db_create((DB**)0, (DB_ENV*)0, 0)]) - fi - PHP_DBA_STD_RESULT(db4,Berkeley DB4) - diff --git a/databases/php53-interbase/Makefile b/databases/php53-interbase/Makefile deleted file mode 100644 index 4f41c0fe5dbe..000000000000 --- a/databases/php53-interbase/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -interbase - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mssql/Makefile b/databases/php53-mssql/Makefile deleted file mode 100644 index 7fea4999caec..000000000000 --- a/databases/php53-mssql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mssql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mysql/Makefile b/databases/php53-mysql/Makefile deleted file mode 100644 index f41c1479f81e..000000000000 --- a/databases/php53-mysql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mysql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mysqli/Makefile b/databases/php53-mysqli/Makefile deleted file mode 100644 index bb07e6e10151..000000000000 --- a/databases/php53-mysqli/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -mysqli - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-mysqli/files/patch-php_mysqli_structs.h b/databases/php53-mysqli/files/patch-php_mysqli_structs.h deleted file mode 100644 index d0daeee9ee54..000000000000 --- a/databases/php53-mysqli/files/patch-php_mysqli_structs.h +++ /dev/null @@ -1,10 +0,0 @@ ---- php_mysqli_structs.h.orig 2010-07-26 15:52:54.000000000 +0200 -+++ php_mysqli_structs.h 2010-07-26 15:53:14.000000000 +0200 -@@ -54,6 +54,7 @@ - #define WE_HAD_MBSTATE_T - #endif - -+#define HAVE_ULONG 1 - #include <my_global.h> - - #if !defined(HAVE_MBRLEN) && defined(WE_HAD_MBRLEN) diff --git a/databases/php53-odbc/Makefile b/databases/php53-odbc/Makefile deleted file mode 100644 index 44bce3fbfed7..000000000000 --- a/databases/php53-odbc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-odbc/files/patch-config.m4 b/databases/php53-odbc/files/patch-config.m4 deleted file mode 100644 index c809732b1047..000000000000 --- a/databases/php53-odbc/files/patch-config.m4 +++ /dev/null @@ -1,124 +0,0 @@ ---- config.m4.orig 2007-07-31 15:02:00.000000000 +0200 -+++ config.m4 2011-04-26 13:57:31.000000000 +0200 -@@ -99,9 +99,12 @@ - dnl - dnl configure options - dnl -+PHP_ARG_ENABLE(odbc,, -+[ --enable-odbc Enable ODBC support with selected driver]) -+ - 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) - - if test "$PHP_ADABAS" != "no"; then - AC_MSG_CHECKING([for Adabas support]) -@@ -128,7 +131,7 @@ - - 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) - - if test "$PHP_SAPDB" != "no"; then - AC_MSG_CHECKING([for SAP DB support]) -@@ -146,7 +149,7 @@ - - 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) - - if test "$PHP_SOLID" != "no"; then - AC_MSG_CHECKING(for Solid support) -@@ -171,7 +174,7 @@ - - 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) - - if test "$PHP_IBM_DB2" != "no"; then - AC_MSG_CHECKING(for IBM DB2 support) -@@ -208,7 +211,7 @@ - - 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) - - 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] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) - - if test "$PHP_EMPRESS" != "no"; then - AC_MSG_CHECKING(for Empress support) -@@ -253,7 +256,7 @@ - PHP_ARG_WITH(empress-bcs,, - [ --with-empress-bcs[=DIR] - Include Empress Local Access support [\$EMPRESSPATH] -- (Empress Version >= 8.60 required)]) -+ (Empress Version >= 8.60 required)], no, no) - - if test "$PHP_EMPRESS_BCS" != "no"; then - AC_MSG_CHECKING(for Empress local access support) -@@ -291,7 +294,7 @@ - - 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) - - if test "$PHP_BIRDSTEP" != "no"; then - AC_MSG_CHECKING(for Birdstep support) -@@ -346,7 +349,7 @@ - running this configure script: - 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 @@ - - 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) - - if test "$PHP_IODBC" != "no"; then - AC_MSG_CHECKING(for iODBC support) -@@ -387,7 +390,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) - - if test "$PHP_ESOOB" != "no"; then - AC_MSG_CHECKING(for Easysoft ODBC-ODBC Bridge support) -@@ -407,7 +410,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) - - if test "$PHP_UNIXODBC" != "no"; then - AC_MSG_CHECKING(for unixODBC support) -@@ -428,7 +431,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) - - if test "$PHP_DBMAKER" != "no"; then - AC_MSG_CHECKING(for DBMaker support) diff --git a/databases/php53-pdo/Makefile b/databases/php53-pdo/Makefile deleted file mode 100644 index 397da552b4f5..000000000000 --- a/databases/php53-pdo/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_dblib/Makefile b/databases/php53-pdo_dblib/Makefile deleted file mode 100644 index 46ba5a3761ad..000000000000 --- a/databases/php53-pdo_dblib/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_dblib - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_firebird/Makefile b/databases/php53-pdo_firebird/Makefile deleted file mode 100644 index fa681efb884f..000000000000 --- a/databases/php53-pdo_firebird/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_firebird - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_mysql/Makefile b/databases/php53-pdo_mysql/Makefile deleted file mode 100644 index fa178f06476e..000000000000 --- a/databases/php53-pdo_mysql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_mysql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_odbc/Makefile b/databases/php53-pdo_odbc/Makefile deleted file mode 100644 index decb1e868695..000000000000 --- a/databases/php53-pdo_odbc/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_odbc - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pdo_pgsql/Makefile b/databases/php53-pdo_pgsql/Makefile deleted file mode 100644 index 27d12cecc4b6..000000000000 --- a/databases/php53-pdo_pgsql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pdo_pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pgsql/Makefile b/databases/php53-pgsql/Makefile deleted file mode 100644 index c7fe3f4dacf6..000000000000 --- a/databases/php53-pgsql/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -pgsql - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-pgsql/files/patch-pgsql.c b/databases/php53-pgsql/files/patch-pgsql.c deleted file mode 100644 index a4abfc39dff3..000000000000 --- a/databases/php53-pgsql/files/patch-pgsql.c +++ /dev/null @@ -1,30 +0,0 @@ ---- pgsql.c.orig 2010-01-03 10:23:27.000000000 +0100 -+++ pgsql.c 2010-03-08 11:00:26.000000000 +0100 -@@ -63,6 +63,7 @@ - #define PGSQL_MAX_LENGTH_OF_LONG 30 - #define PGSQL_MAX_LENGTH_OF_DOUBLE 60 - -+#if UINT_MAX > LONG_MAX - #define PGSQL_RETURN_OID(oid) do { \ - if (oid > LONG_MAX) { \ - smart_str s = {0}; \ -@@ -72,7 +73,9 @@ - } \ - RETURN_LONG((long)oid); \ - } while(0) -- -+#else -+#define PGSQL_RETURN_OID(oid) RETURN_LONG((long)oid) -+#endif - - #if HAVE_PQSETNONBLOCKING - #define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag) -@@ -728,7 +731,7 @@ - static int le_link, le_plink, le_result, le_lofp, le_string; - - /* {{{ _php_pgsql_trim_message */ --static char * _php_pgsql_trim_message(const char *message, int *len) -+static char * _php_pgsql_trim_message(const char *message, size_t *len) - { - register int i = strlen(message)-1; - diff --git a/databases/php53-redis/Makefile b/databases/php53-redis/Makefile deleted file mode 100644 index 2d634ddcbcbf..000000000000 --- a/databases/php53-redis/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# Created by: Glen Barber <gjb@FreeBSD.org> -# $FreeBSD$ - -PORTNAME= redis -PORTVERSION= 2.2.1 -CATEGORIES= databases -MASTER_SITES= https://github.com/nicolasff/phpredis/tarball/${PORTVERSION}/ -PKGNAMEPREFIX= php53- -DISTNAME= nicolasff-phpredis-${PORTVERSION}-0-g${GITVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= PHP5-Extension for Redis - -LICENSE= PHP301 - -DEPRECATED= requires php53, security EOL reached 14 Aug 2014 -EXPIRATION_DATE= 2015-04-15 - -GITVERSION= g882c7dc -WRKSRC= ${WRKDIR}/nicolasff-phpredis-250e81b - -USE_PHP= session -USE_PHP_BUILD= yes -USE_PHPEXT= yes -IGNORE_WITH_PHP=5 55 56 - -PHP_MODNAME= redis - -.include <bsd.port.mk> diff --git a/databases/php53-redis/distinfo b/databases/php53-redis/distinfo deleted file mode 100644 index 071f6fb97e85..000000000000 --- a/databases/php53-redis/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (nicolasff-phpredis-2.2.1-0-gg882c7dc.tar.gz) = ef72e795c7d9038e8a4b83a948e6952eb9e424cf4b8313bfa6403176701efd3a -SIZE (nicolasff-phpredis-2.2.1-0-gg882c7dc.tar.gz) = 113427 diff --git a/databases/php53-redis/files/patch-echo-nothrow b/databases/php53-redis/files/patch-echo-nothrow deleted file mode 100644 index 9244aa6507e0..000000000000 --- a/databases/php53-redis/files/patch-echo-nothrow +++ /dev/null @@ -1,1027 +0,0 @@ -diff --git a/README.markdown b/README.markdown -index 265ff2a..c49e5b6 100644 ---- a/README.markdown -+++ README.markdown -@@ -186,7 +186,6 @@ Parameter value. - $redis->getOption(Redis::OPT_SERIALIZER); // return Redis::SERIALIZER_NONE, Redis::SERIALIZER_PHP, or Redis::SERIALIZER_IGBINARY. - </pre> - -- - ## ping - ##### *Description* - -@@ -201,6 +200,20 @@ Check the current connection status - *STRING*: `+PONG` on success. Throws a RedisException object on connectivity error, as described above. - - -+## echo -+##### *Description* -+ -+Sends a string to Redis, which replies with the same string -+ -+##### *Parameters* -+ -+*STRING*: The message to send. -+ -+##### *Return Value* -+ -+*STRING*: the same message. -+ -+ - ## get - ##### *Description* - -@@ -761,9 +774,9 @@ Adds a value to the set value stored at key. If this value is already in the set - *BOOL* `TRUE` if value didn't exist and was added successfully, `FALSE` if the value is already present. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); /* TRUE, 'key1' => {'set1'} */ --$redis->sAdd('key1' , 'set2'); /* TRUE, 'key1' => {'set1', 'set2'}*/ --$redis->sAdd('key1' , 'set2'); /* FALSE, 'key1' => {'set1', 'set2'}*/ -+$redis->sAdd('key1' , 'member1'); /* TRUE, 'key1' => {'member1'} */ -+$redis->sAdd('key1' , 'member2'); /* TRUE, 'key1' => {'member1', 'member2'}*/ -+$redis->sAdd('key1' , 'member2'); /* FALSE, 'key1' => {'member1', 'member2'}*/ - </pre> - - ## sRem, sRemove -@@ -776,10 +789,10 @@ Removes the specified member from the set value stored at key. - *BOOL* `TRUE` if the member was present in the set, `FALSE` if it didn't. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set1', 'set2', 'set3'}*/ --$redis->sRem('key1', 'set2'); /* 'key1' => {'set1', 'set3'} */ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member1', 'member2', 'member3'}*/ -+$redis->sRem('key1', 'member2'); /* 'key1' => {'member1', 'member3'} */ - </pre> - - ## sMove -@@ -793,13 +806,13 @@ Moves the specified member from the set at srcKey to the set at dstKey. - *BOOL* If the operation is successful, return `TRUE`. If the srcKey and/or dstKey didn't exist, and/or the member didn't exist in srcKey, `FALSE` is returned. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set11'); --$redis->sAdd('key1' , 'set12'); --$redis->sAdd('key1' , 'set13'); /* 'key1' => {'set11', 'set12', 'set13'}*/ --$redis->sAdd('key2' , 'set21'); --$redis->sAdd('key2' , 'set22'); /* 'key2' => {'set21', 'set22'}*/ --$redis->sMove('key1', 'key2', 'set13'); /* 'key1' => {'set11', 'set12'} */ -- /* 'key2' => {'set21', 'set22', 'set13'} */ -+$redis->sAdd('key1' , 'member11'); -+$redis->sAdd('key1' , 'member12'); -+$redis->sAdd('key1' , 'member13'); /* 'key1' => {'member11', 'member12', 'member13'}*/ -+$redis->sAdd('key2' , 'member21'); -+$redis->sAdd('key2' , 'member22'); /* 'key2' => {'member21', 'member22'}*/ -+$redis->sMove('key1', 'key2', 'member13'); /* 'key1' => {'member11', 'member12'} */ -+ /* 'key2' => {'member21', 'member22', 'member13'} */ - - </pre> - -@@ -814,12 +827,12 @@ Checks if `value` is a member of the set stored at the key `key`. - *BOOL* `TRUE` if `value` is a member of the set at key `key`, `FALSE` otherwise. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set1', 'set2', 'set3'}*/ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member1', 'member2', 'member3'}*/ - --$redis->sIsMember('key1', 'set1'); /* TRUE */ --$redis->sIsMember('key1', 'setX'); /* FALSE */ -+$redis->sIsMember('key1', 'member1'); /* TRUE */ -+$redis->sIsMember('key1', 'memberX'); /* FALSE */ - - </pre> - -@@ -832,9 +845,9 @@ Returns the cardinality of the set identified by key. - *LONG* the cardinality of the set identified by key, 0 if the set doesn't exist. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set1', 'set2', 'set3'}*/ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member1', 'member2', 'member3'}*/ - $redis->sCard('key1'); /* 3 */ - $redis->sCard('keyX'); /* 0 */ - </pre> -@@ -849,11 +862,11 @@ Removes and returns a random element from the set value at Key. - *Bool* `FALSE` if set identified by key is empty or doesn't exist. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set3', 'set1', 'set2'}*/ --$redis->sPop('key1'); /* 'set1', 'key1' => {'set3', 'set2'} */ --$redis->sPop('key1'); /* 'set3', 'key1' => {'set2'} */ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member3', 'member1', 'member2'}*/ -+$redis->sPop('key1'); /* 'member1', 'key1' => {'member3', 'member2'} */ -+$redis->sPop('key1'); /* 'member3', 'key1' => {'member2'} */ - </pre> - - ## sRandMember -@@ -866,11 +879,11 @@ Returns a random element from the set value at Key, without removing it. - *Bool* `FALSE` if set identified by key is empty or doesn't exist. - ##### *Example* - <pre> --$redis->sAdd('key1' , 'set1'); --$redis->sAdd('key1' , 'set2'); --$redis->sAdd('key1' , 'set3'); /* 'key1' => {'set3', 'set1', 'set2'}*/ --$redis->sRandMember('key1'); /* 'set1', 'key1' => {'set3', 'set1', 'set2'} */ --$redis->sRandMember('key1'); /* 'set3', 'key1' => {'set3', 'set1', 'set2'} */ -+$redis->sAdd('key1' , 'member1'); -+$redis->sAdd('key1' , 'member2'); -+$redis->sAdd('key1' , 'member3'); /* 'key1' => {'member3', 'member1', 'member2'}*/ -+$redis->sRandMember('key1'); /* 'member1', 'key1' => {'member3', 'member1', 'member2'} */ -+$redis->sRandMember('key1'); /* 'member3', 'key1' => {'member3', 'member1', 'member2'} */ - </pre> - - ## sInter -diff --git a/php_redis.h b/php_redis.h -index 1dfaa0f..fd8f024 100755 ---- a/php_redis.h -+++ php_redis.h -@@ -29,6 +29,7 @@ PHP_METHOD(Redis, connect); - PHP_METHOD(Redis, pconnect); - PHP_METHOD(Redis, close); - PHP_METHOD(Redis, ping); -+PHP_METHOD(Redis, echo); - PHP_METHOD(Redis, get); - PHP_METHOD(Redis, set); - PHP_METHOD(Redis, setex); -diff --git a/redis.c b/redis.c -index 9ca3a14..3e15d73 100755 ---- a/redis.c -+++ redis.c -@@ -76,6 +76,7 @@ static zend_function_entry redis_functions[] = { - PHP_ME(Redis, pconnect, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, close, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, ping, NULL, ZEND_ACC_PUBLIC) -+ PHP_ME(Redis, echo, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, get, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, set, NULL, ZEND_ACC_PUBLIC) - PHP_ME(Redis, setex, NULL, ZEND_ACC_PUBLIC) -@@ -324,7 +325,7 @@ static void redis_destructor_redis_sock(zend_rsrc_list_entry * rsrc TSRMLS_DC) - /** - * redis_sock_get - */ --PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC) -+PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC, int no_throw) - { - - zval **socket; -@@ -332,15 +333,21 @@ PHPAPI int redis_sock_get(zval *id, RedisSock **redis_sock TSRMLS_DC) - - if (Z_TYPE_P(id) != IS_OBJECT || zend_hash_find(Z_OBJPROP_P(id), "socket", - sizeof("socket"), (void **) &socket) == FAILURE) { -- zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -+ // Throw an exception unless we've been requested not to -+ if(!no_throw) { -+ zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -+ } - return -1; - } - - *redis_sock = (RedisSock *) zend_list_find(Z_LVAL_PP(socket), &resource_type); - - if (!*redis_sock || resource_type != le_redis_sock) { -- zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -- return -1; -+ // Throw an exception unless we've been requested not to -+ if(!no_throw) { -+ zend_throw_exception(redis_exception_ce, "Redis server went away", 0 TSRMLS_CC); -+ } -+ return -1; - } - - return Z_LVAL_PP(socket); -@@ -471,7 +478,7 @@ PHP_METHOD(Redis,__destruct) { - - // Grab our socket - RedisSock *redis_sock; -- if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 1) < 0) { - RETURN_FALSE; - } - -@@ -504,7 +511,7 @@ PHP_METHOD(Redis, pconnect) - } else { - /* reset multi/exec state if there is one. */ - RedisSock *redis_sock; -- if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -547,7 +554,7 @@ PHPAPI int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) { - } - - /* if there is a redis sock already we have to remove it from the list */ -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) > 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) > 0) { - if (zend_hash_find(Z_OBJPROP_P(object), "socket", - sizeof("socket"), (void **) &socket) == FAILURE) { - /* maybe there is a socket but the id isn't known.. what to do? */ -@@ -587,7 +594,7 @@ PHP_METHOD(Redis, close) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -617,7 +624,7 @@ PHP_METHOD(Redis, set) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -656,7 +663,7 @@ PHP_METHOD(Redis, setex) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -691,7 +698,7 @@ PHP_METHOD(Redis, setnx) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -729,7 +736,7 @@ PHP_METHOD(Redis, getSet) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -763,7 +770,7 @@ PHP_METHOD(Redis, randomKey) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -778,6 +785,39 @@ PHP_METHOD(Redis, randomKey) - } - /* }}} */ - -+/* {{{ proto string Redis::echo(string key) -+ */ -+PHP_METHOD(Redis, echo) -+{ -+ zval *object; -+ RedisSock *redis_sock; -+ char *key = NULL, *cmd; -+ int key_len, cmd_len; -+ int key_free; -+ -+ if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Os", -+ &object, redis_ce, -+ &key, &key_len) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { -+ RETURN_FALSE; -+ } -+ -+ key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC); -+ cmd_len = redis_cmd_format_static(&cmd, "ECHO", "s", key, key_len); -+ if(key_free) efree(key); -+ -+ REDIS_PROCESS_REQUEST(redis_sock, cmd, cmd_len); -+ IF_ATOMIC() { -+ redis_string_response(INTERNAL_FUNCTION_PARAM_PASSTHRU, redis_sock, NULL, NULL); -+ } -+ REDIS_PROCESS_RESPONSE(redis_string_response); -+ -+} -+/* }}} */ -+ - /* {{{ proto string Redis::renameKey(string key_src, string key_dst) - */ - PHP_METHOD(Redis, renameKey) -@@ -796,7 +836,7 @@ PHP_METHOD(Redis, renameKey) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -833,7 +873,7 @@ PHP_METHOD(Redis, renameNx) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -868,7 +908,7 @@ PHP_METHOD(Redis, get) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -900,7 +940,7 @@ PHP_METHOD(Redis, ping) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -929,7 +969,7 @@ PHPAPI void redis_atomic_increment(INTERNAL_FUNCTION_PARAMETERS, char *keyword, - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC); -@@ -1055,7 +1095,7 @@ PHP_METHOD(Redis, getMultiple) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1141,7 +1181,7 @@ PHP_METHOD(Redis, exists) - &key, &key_len) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1240,7 +1280,7 @@ PHP_METHOD(Redis, getKeys) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1274,7 +1314,7 @@ PHP_METHOD(Redis, type) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1304,7 +1344,7 @@ PHP_METHOD(Redis, append) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1333,7 +1373,7 @@ PHP_METHOD(Redis, getRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1361,7 +1401,7 @@ PHP_METHOD(Redis, setRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1389,7 +1429,7 @@ PHP_METHOD(Redis, getBit) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1418,7 +1458,7 @@ PHP_METHOD(Redis, setBit) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1447,7 +1487,7 @@ PHP_METHOD(Redis, strlen) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1477,7 +1517,7 @@ generic_push_function(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_l - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1550,7 +1590,7 @@ PHP_METHOD(Redis, lInsert) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1599,7 +1639,7 @@ generic_pop_function(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_le - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1689,7 +1729,7 @@ PHP_METHOD(Redis, lSize) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1725,7 +1765,7 @@ PHP_METHOD(Redis, lRemove) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1761,7 +1801,7 @@ PHP_METHOD(Redis, listTrim) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1794,7 +1834,7 @@ PHP_METHOD(Redis, lGet) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1827,7 +1867,7 @@ PHP_METHOD(Redis, lGetRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1878,7 +1918,7 @@ PHP_METHOD(Redis, sSize) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1930,7 +1970,7 @@ PHP_METHOD(Redis, sMove) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -1985,7 +2025,7 @@ PHP_METHOD(Redis, sContains) - return; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2018,7 +2058,7 @@ PHP_METHOD(Redis, sMembers) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2059,7 +2099,7 @@ PHPAPI int generic_multiple_args_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword - } - - /* get redis socket */ -- if (redis_sock_get(getThis(), out_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), out_sock TSRMLS_CC, 0) < 0) { - ZVAL_BOOL(return_value, 0); - return FAILURE; - } -@@ -2392,7 +2432,7 @@ PHP_METHOD(Redis, sort) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2603,7 +2643,7 @@ PHPAPI void generic_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sort, int use_a - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - if(key_len == 0) { -@@ -2798,7 +2838,7 @@ PHPAPI void generic_expire_cmd(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2847,7 +2887,7 @@ PHP_METHOD(Redis, lSet) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2874,7 +2914,7 @@ PHPAPI void generic_empty_cmd_impl(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2921,7 +2961,7 @@ PHPAPI void generic_empty_long_cmd(INTERNAL_FUNCTION_PARAMETERS, char *cmd, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -2988,7 +3028,7 @@ PHP_METHOD(Redis, auth) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3017,7 +3057,7 @@ PHP_METHOD(Redis, persist) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3048,7 +3088,7 @@ PHP_METHOD(Redis, ttl) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3079,7 +3119,7 @@ PHP_METHOD(Redis, info) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3118,7 +3158,7 @@ PHP_METHOD(Redis, select) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3148,7 +3188,7 @@ PHP_METHOD(Redis, move) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3183,7 +3223,7 @@ generic_mset(INTERNAL_FUNCTION_PARAMETERS, char *kw, void (*fun)(INTERNAL_FUNCTI - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3307,7 +3347,7 @@ PHP_METHOD(Redis, rpoplpush) - zval *object; - RedisSock *redis_sock; - char *srckey = NULL, *dstkey = NULL; -- int srckey_len, dstkey_len, cmd_len; -+ int srckey_len, dstkey_len; - - if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Oss", - &object, redis_ce, &srckey, &srckey_len, -@@ -3315,7 +3355,7 @@ PHP_METHOD(Redis, rpoplpush) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3339,7 +3379,7 @@ PHP_METHOD(Redis, brpoplpush) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3367,7 +3407,7 @@ PHP_METHOD(Redis, zAdd) { - int argc = ZEND_NUM_ARGS(), i; - - /* get redis socket */ -- if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(getThis(), &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3466,7 +3506,7 @@ PHP_METHOD(Redis, zRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3529,7 +3569,7 @@ PHP_METHOD(Redis, zDeleteRangeByScore) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3562,7 +3602,7 @@ PHP_METHOD(Redis, zDeleteRangeByRank) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3596,7 +3636,7 @@ PHP_METHOD(Redis, zReverseRange) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3649,7 +3689,7 @@ redis_generic_zrange_by_score(INTERNAL_FUNCTION_PARAMETERS, char *keyword) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3755,7 +3795,7 @@ PHP_METHOD(Redis, zCount) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3786,7 +3826,7 @@ PHP_METHOD(Redis, zCard) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3820,7 +3860,7 @@ PHP_METHOD(Redis, zScore) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3853,7 +3893,7 @@ PHPAPI void generic_rank_method(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3903,7 +3943,7 @@ PHPAPI void generic_incrby_method(INTERNAL_FUNCTION_PARAMETERS, char *keyword, i - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -3948,7 +3988,7 @@ PHPAPI void generic_z_command(INTERNAL_FUNCTION_PARAMETERS, char *command, int c - RETURN_FALSE; - } - -- if(redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if(redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4126,7 +4166,7 @@ generic_hset(INTERNAL_FUNCTION_PARAMETERS, char *kw, void (*fun)(INTERNAL_FUNCTI - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4170,7 +4210,7 @@ PHP_METHOD(Redis, hGet) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - key_free = redis_key_prefix(redis_sock, &key, &key_len TSRMLS_CC); -@@ -4200,7 +4240,7 @@ PHP_METHOD(Redis, hLen) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4232,7 +4272,7 @@ generic_hash_command_2(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_ - return NULL; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - ZVAL_BOOL(return_value, 0); - return NULL; - } -@@ -4293,7 +4333,7 @@ generic_hash_command_1(INTERNAL_FUNCTION_PARAMETERS, char *keyword, int keyword_ - return NULL; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - ZVAL_BOOL(return_value, 0); - return NULL; - } -@@ -4441,7 +4481,7 @@ PHP_METHOD(Redis, hIncrBy) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4492,7 +4532,7 @@ PHP_METHOD(Redis, hMget) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - nb_fields = zend_hash_num_elements(Z_ARRVAL_P(z_array)); -@@ -4572,7 +4612,7 @@ PHP_METHOD(Redis, hMset) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4681,7 +4721,7 @@ PHP_METHOD(Redis, multi) - - /* if the flag is activated, send the command, the reply will be "QUEUED" or -ERR */ - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4730,7 +4770,7 @@ PHP_METHOD(Redis, discard) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4832,7 +4872,7 @@ PHP_METHOD(Redis, exec) - &object, redis_ce) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -4931,7 +4971,7 @@ PHP_METHOD(Redis, pipeline) - } - - /* if the flag is activated, send the command, the reply will be "QUEUED" or -ERR */ -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - redis_sock->mode = PIPELINE; -@@ -4963,7 +5003,7 @@ PHP_METHOD(Redis, publish) - RETURN_NULL(); - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5004,7 +5044,7 @@ PHP_METHOD(Redis, subscribe) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5164,7 +5204,7 @@ PHP_METHOD(Redis, unsubscribe) - &object, redis_ce, &array) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5248,7 +5288,7 @@ PHP_METHOD(Redis, slaveof) - &object, redis_ce, &host, &host_len, &port) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5280,7 +5320,7 @@ PHP_METHOD(Redis, object) - &object, redis_ce, &info, &info_len, &key, &key_len) == FAILURE) { - RETURN_FALSE; - } -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5318,7 +5358,7 @@ PHP_METHOD(Redis, getOption) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5354,7 +5394,7 @@ PHP_METHOD(Redis, setOption) { - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -@@ -5414,7 +5454,7 @@ PHP_METHOD(Redis, config) - RETURN_FALSE; - } - -- if (redis_sock_get(object, &redis_sock TSRMLS_CC) < 0) { -+ if (redis_sock_get(object, &redis_sock TSRMLS_CC, 0) < 0) { - RETURN_FALSE; - } - -diff --git a/tests/TestRedis.php b/tests/TestRedis.php -index 1033b01..46af355 100644 ---- a/tests/TestRedis.php -+++ tests/TestRedis.php -@@ -115,6 +115,12 @@ class Redis_Test extends TestSuite - $this->assertEquals($s, $this->redis->get('x')); - } - -+ public function testEcho() { -+ $this->assertEquals($this->redis->echo("hello"), "hello"); -+ $this->assertEquals($this->redis->echo(""), ""); -+ $this->assertEquals($this->redis->echo(" 0123 "), " 0123 "); -+ } -+ - public function testErr() { - - $this->redis->set('x', '-ERR'); diff --git a/databases/php53-redis/pkg-descr b/databases/php53-redis/pkg-descr deleted file mode 100644 index 9d73cce42f8d..000000000000 --- a/databases/php53-redis/pkg-descr +++ /dev/null @@ -1,8 +0,0 @@ -This extension provides an API for communicating with Redis database, -a persistent key-value database with built-in net interface written -in ANSI-C for Posix systems. - -It is a fork of alfonsojimenez's phpredis, adding many methods and -fixing a lot of issues. - -WWW: https://github.com/nicolasff/phpredis diff --git a/databases/php53-sqlite/Makefile b/databases/php53-sqlite/Makefile deleted file mode 100644 index 07e5a2ca34e1..000000000000 --- a/databases/php53-sqlite/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sqlite - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-sqlite/files/patch-config.m4 b/databases/php53-sqlite/files/patch-config.m4 deleted file mode 100644 index c8cf2bc00557..000000000000 --- a/databases/php53-sqlite/files/patch-config.m4 +++ /dev/null @@ -1,44 +0,0 @@ ---- config.m4.orig Wed Nov 30 05:50:03 2005 -+++ config.m4 Tue Jan 17 12:51:21 2006 -@@ -48,14 +48,6 @@ - - - if test "$PHP_SQLITE" != "no"; then -- if test "$PHP_PDO" != "no"; then -- PHP_CHECK_PDO_INCLUDES([], [AC_MSG_WARN([Cannot find php_pdo_driver.h.])]) -- if test -n "$pdo_inc_path"; then -- AC_DEFINE([PHP_SQLITE2_HAVE_PDO], [1], [Have PDO]) -- pdo_inc_path="-I$pdo_inc_path" -- fi -- fi -- - if test "$PHP_SQLITE" != "yes"; then - SEARCH_PATH="/usr/local /usr" - SEARCH_FOR="/include/sqlite.h" -@@ -85,13 +77,12 @@ - -L$SQLITE_DIR/$PHP_LIBDIR -lm - ]) - SQLITE_MODULE_TYPE=external -- PHP_SQLITE_CFLAGS=$pdo_inc_path - sqlite_extra_sources="libsqlite/src/encode.c" - else - # use bundled library - PHP_PROG_LEMON - SQLITE_MODULE_TYPE=builtin -- PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" -+ PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src" - sqlite_extra_sources="libsqlite/src/opcodes.c \ - libsqlite/src/parse.c libsqlite/src/encode.c \ - libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ -@@ -109,10 +100,9 @@ - dnl - dnl Common for both bundled/external - dnl -- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" -+ sqlite_sources="sqlite.c sess_sqlite.c $sqlite_extra_sources" - PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS) - PHP_ADD_EXTENSION_DEP(sqlite, spl, true) -- PHP_ADD_EXTENSION_DEP(sqlite, pdo, true) - - PHP_ADD_MAKEFILE_FRAGMENT - PHP_SUBST(SQLITE_SHARED_LIBADD) diff --git a/databases/php53-sqlite3/Makefile b/databases/php53-sqlite3/Makefile deleted file mode 100644 index c8faa8a5a6a7..000000000000 --- a/databases/php53-sqlite3/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD$ - -PORTREVISION= 3 -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sqlite3 - -.include "${MASTERDIR}/Makefile" diff --git a/databases/php53-sybase_ct/Makefile b/databases/php53-sybase_ct/Makefile deleted file mode 100644 index a70c7110d9c8..000000000000 --- a/databases/php53-sybase_ct/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php53 - -PKGNAMESUFFIX= -sybase_ct - -.include "${MASTERDIR}/Makefile" |