diff options
author | Rene Ladan <rene@FreeBSD.org> | 2014-03-01 00:06:29 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2014-03-01 00:06:29 +0000 |
commit | ef50dbb213487797f1a2d9f4d0d5636f98bb3894 (patch) | |
tree | a82aa9cd34a90c5daecd9ec479f5a85b36141796 /databases | |
parent | - Fix build with clang (diff) |
PHP 5.2 has reached it end-of-life in the FreeBSD Ports Tree, time
to say goodbye. Upstream unsupported it since 2011-01-06 (see
http://php.net/eol.php )
Strip PHP 5.2 out of Mk/bsd.php.mk
Notes
Notes:
svn path=/head/; revision=346583
Diffstat (limited to 'databases')
27 files changed, 0 insertions, 545 deletions
diff --git a/databases/Makefile b/databases/Makefile index c1e50f598f98..3b6f7b823a73 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -600,25 +600,6 @@ SUBDIR += php5-sqlite3 SUBDIR += php5-sybase_ct SUBDIR += php5-tarantool - SUBDIR += php52-dba - SUBDIR += php52-dbase - SUBDIR += php52-interbase - SUBDIR += php52-mssql - SUBDIR += php52-mysql - SUBDIR += php52-mysqli - SUBDIR += php52-oci8 - SUBDIR += php52-odbc - SUBDIR += php52-pdo - SUBDIR += php52-pdo_dblib - SUBDIR += php52-pdo_firebird - SUBDIR += php52-pdo_mysql - SUBDIR += php52-pdo_oci - SUBDIR += php52-pdo_odbc - SUBDIR += php52-pdo_pgsql - SUBDIR += php52-pdo_sqlite - SUBDIR += php52-pgsql - SUBDIR += php52-sqlite - SUBDIR += php52-sybase_ct SUBDIR += php53-dba SUBDIR += php53-interbase SUBDIR += php53-mssql diff --git a/databases/php52-dba/Makefile b/databases/php52-dba/Makefile deleted file mode 100644 index 8a1de7673f15..000000000000 --- a/databases/php52-dba/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -dba - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-dba/files/patch-config.m4 b/databases/php52-dba/files/patch-config.m4 deleted file mode 100644 index 187871e55052..000000000000 --- a/databases/php52-dba/files/patch-config.m4 +++ /dev/null @@ -1,41 +0,0 @@ ---- ext/dba/config.m4.orig 2010-07-26 00:28:32.111202104 +0200 -+++ ext/dba/config.m4 2010-07-26 00:28:35.656577336 +0200 -@@ -280,6 +280,38 @@ - THIS_PREFIX=$i - THIS_INCLUDE=$i/db4/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/db4.8/db.h"; then - THIS_PREFIX=$i - THIS_INCLUDE=$i/include/db4.8/db.h diff --git a/databases/php52-dbase/Makefile b/databases/php52-dbase/Makefile deleted file mode 100644 index a57d5ff6f1b9..000000000000 --- a/databases/php52-dbase/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -dbase - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-interbase/Makefile b/databases/php52-interbase/Makefile deleted file mode 100644 index 42674de96483..000000000000 --- a/databases/php52-interbase/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -PORTREVISION= 1 -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -interbase - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-mssql/Makefile b/databases/php52-mssql/Makefile deleted file mode 100644 index ba82f9031ea9..000000000000 --- a/databases/php52-mssql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mssql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-mysql/Makefile b/databases/php52-mysql/Makefile deleted file mode 100644 index 34c05980ca0e..000000000000 --- a/databases/php52-mysql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mysql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-mysqli/Makefile b/databases/php52-mysqli/Makefile deleted file mode 100644 index 6ad970f5a168..000000000000 --- a/databases/php52-mysqli/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -mysqli - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-oci8/Makefile b/databases/php52-oci8/Makefile deleted file mode 100644 index 1aee5bde5d05..000000000000 --- a/databases/php52-oci8/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases -PKGNAMESUFFIX= -oci8 - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -BROKEN= Does not compile -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-oci8/files/patch-config.m4 b/databases/php52-oci8/files/patch-config.m4 deleted file mode 100644 index fc9db0f2eb1c..000000000000 --- a/databases/php52-oci8/files/patch-config.m4 +++ /dev/null @@ -1,12 +0,0 @@ ---- ext/oci8/config.m4.orig Wed Apr 5 11:06:00 2006 -+++ ext/oci8/config.m4 Tue Jul 11 08:20:27 2006 -@@ -177,8 +177,7 @@ - ;; - - 8.1) -- PHP_ADD_LIBRARY(clntsh, 1, OCI8_SHARED_LIBADD) -- PHP_ADD_LIBPATH($OCI8_DIR/$OCI8_LIB_DIR, OCI8_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(oci8, ., OCI8_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ diff --git a/databases/php52-odbc/Makefile b/databases/php52-odbc/Makefile deleted file mode 100644 index 0c3871573703..000000000000 --- a/databases/php52-odbc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -odbc - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-odbc/files/patch-config.m4 b/databases/php52-odbc/files/patch-config.m4 deleted file mode 100644 index f2297aef0918..000000000000 --- a/databases/php52-odbc/files/patch-config.m4 +++ /dev/null @@ -1,119 +0,0 @@ ---- ext/odbc/config.m4.orig 2007-09-14 08:03:08.000000000 +0200 -+++ ext/odbc/config.m4 2007-09-14 08:14:21.000000000 +0200 -@@ -101,7 +101,7 @@ - dnl - 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 +128,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 +146,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 +171,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 +208,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 +229,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 +253,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 +291,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 +346,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 +366,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 +387,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 +407,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) - - if test "$PHP_UNIXODBC" != "no"; then - AC_MSG_CHECKING(for unixODBC support) -@@ -428,7 +428,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/php52-pdo/Makefile b/databases/php52-pdo/Makefile deleted file mode 100644 index 1955d2521c20..000000000000 --- a/databases/php52-pdo/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_dblib/Makefile b/databases/php52-pdo_dblib/Makefile deleted file mode 100644 index fc0b68a078ef..000000000000 --- a/databases/php52-pdo_dblib/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_dblib - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_firebird/Makefile b/databases/php52-pdo_firebird/Makefile deleted file mode 100644 index b35af5c29ec3..000000000000 --- a/databases/php52-pdo_firebird/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -PORTREVISION= 1 -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_firebird - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_mysql/Makefile b/databases/php52-pdo_mysql/Makefile deleted file mode 100644 index a28fc67c3828..000000000000 --- a/databases/php52-pdo_mysql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_mysql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_oci/Makefile b/databases/php52-pdo_oci/Makefile deleted file mode 100644 index 5a3223a0c7b2..000000000000 --- a/databases/php52-pdo_oci/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_oci - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_oci/files/patch-config.m4 b/databases/php52-pdo_oci/files/patch-config.m4 deleted file mode 100644 index c9e88e5b2264..000000000000 --- a/databases/php52-pdo_oci/files/patch-config.m4 +++ /dev/null @@ -1,19 +0,0 @@ ---- ext/pdo_oci/config.m4.orig Thu Feb 16 03:03:13 2006 -+++ ext/pdo_oci/config.m4 Wed Feb 7 15:00:58 2007 -@@ -145,7 +145,6 @@ - ;; - - 8.1) -- PHP_ADD_LIBRARY(clntsh, 1, PDO_OCI_SHARED_LIBADD) - ;; - - 9.0) -@@ -163,7 +162,7 @@ - ;; - esac - -- PHP_ADD_LIBPATH($PDO_OCI_LIB_DIR, PDO_OCI_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(oci8, ., PDO_OCI_SHARED_LIBADD) - - PHP_CHECK_LIBRARY(clntsh, OCIEnvCreate, - [ diff --git a/databases/php52-pdo_odbc/Makefile b/databases/php52-pdo_odbc/Makefile deleted file mode 100644 index 5932a361dba5..000000000000 --- a/databases/php52-pdo_odbc/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_odbc - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_pgsql/Makefile b/databases/php52-pdo_pgsql/Makefile deleted file mode 100644 index ced1ede62848..000000000000 --- a/databases/php52-pdo_pgsql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_pgsql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_sqlite/Makefile b/databases/php52-pdo_sqlite/Makefile deleted file mode 100644 index b62ff5faf034..000000000000 --- a/databases/php52-pdo_sqlite/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pdo_sqlite - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pdo_sqlite/files/patch-sqlite_statement.c b/databases/php52-pdo_sqlite/files/patch-sqlite_statement.c deleted file mode 100644 index 699778b05866..000000000000 --- a/databases/php52-pdo_sqlite/files/patch-sqlite_statement.c +++ /dev/null @@ -1,50 +0,0 @@ ---- ext/pdo_sqlite/sqlite_statement.c.orig 2007-12-31 08:20:10.000000000 +0100 -+++ ext/pdo_sqlite/sqlite_statement.c 2008-12-07 11:50:35.000000000 +0100 -@@ -104,6 +104,21 @@ - pdo_sqlite_error_stmt(stmt); - return 0; - -+ case PDO_PARAM_INT: -+ case PDO_PARAM_BOOL: -+ if (Z_TYPE_P(param->parameter) == IS_NULL) { -+ if (sqlite3_bind_null(S->stmt, param->paramno + 1) == SQLITE_OK) { -+ return 1; -+ } -+ } else { -+ convert_to_long(param->parameter); -+ if (SQLITE_OK == sqlite3_bind_int(S->stmt, param->paramno + 1, Z_LVAL_P(param->parameter))) { -+ return 1; -+ } -+ } -+ pdo_sqlite_error_stmt(stmt); -+ return 0; -+ - case PDO_PARAM_LOB: - if (Z_TYPE_P(param->parameter) == IS_RESOURCE) { - php_stream *stm; -@@ -117,8 +132,24 @@ - pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource" TSRMLS_CC); - return 0; - } -+ } else if (Z_TYPE_P(param->parameter) == IS_NULL) { -+ if (sqlite3_bind_null(S->stmt, param->paramno + 1) == SQLITE_OK) { -+ return 1; -+ } -+ pdo_sqlite_error_stmt(stmt); -+ return 0; -+ } else { -+ convert_to_string(param->parameter); -+ } -+ -+ if (SQLITE_OK == sqlite3_bind_blob(S->stmt, param->paramno + 1, -+ Z_STRVAL_P(param->parameter), -+ Z_STRLEN_P(param->parameter), -+ SQLITE_STATIC)) { -+ return 1; - } -- /* fall through */ -+ pdo_sqlite_error_stmt(stmt); -+ return 0; - - case PDO_PARAM_STR: - default: diff --git a/databases/php52-pgsql/Makefile b/databases/php52-pgsql/Makefile deleted file mode 100644 index bb47a2f56b14..000000000000 --- a/databases/php52-pgsql/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -pgsql - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-pgsql/files/patch-pgsql.c b/databases/php52-pgsql/files/patch-pgsql.c deleted file mode 100644 index 8431926386dc..000000000000 --- a/databases/php52-pgsql/files/patch-pgsql.c +++ /dev/null @@ -1,30 +0,0 @@ ---- ext/pgsql/pgsql.c.orig 2007-10-04 01:31:58.000000000 +0200 -+++ ext/pgsql/pgsql.c 2008-01-29 11:10:15.000000000 +0100 -@@ -62,6 +62,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}; \ -@@ -71,7 +72,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) -@@ -272,7 +275,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/php52-sqlite/Makefile b/databases/php52-sqlite/Makefile deleted file mode 100644 index abf6c33d0427..000000000000 --- a/databases/php52-sqlite/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sqlite - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" diff --git a/databases/php52-sqlite/files/patch-config.m4 b/databases/php52-sqlite/files/patch-config.m4 deleted file mode 100644 index cebb380f1e5b..000000000000 --- a/databases/php52-sqlite/files/patch-config.m4 +++ /dev/null @@ -1,44 +0,0 @@ ---- ext/sqlite/config.m4.orig Wed Nov 30 05:50:03 2005 -+++ ext/sqlite/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/php52-sybase_ct/Makefile b/databases/php52-sybase_ct/Makefile deleted file mode 100644 index 162b42c7f40f..000000000000 --- a/databases/php52-sybase_ct/Makefile +++ /dev/null @@ -1,11 +0,0 @@ -# Created by: Alex Keda <admin@lissyara.su> -# $FreeBSD$ - -CATEGORIES= databases - -MASTERDIR= ${.CURDIR}/../../lang/php52 - -PKGNAMESUFFIX= -sybase_ct - -NO_STAGE= yes -.include "${MASTERDIR}/Makefile" |