Attachment #101253 for bug #140678

View | Details | Raw Unified | Return to bug 140678
Collapse All | Expand All

Lines 4197-4199 Link Here

(-)MOVED (+7 lines)
4197	emulators/fceu\|emulators/fceux\|2009-11-04\|Repocopied to new location	4197	emulators/fceu\|emulators/fceux\|2009-11-04\|Repocopied to new location
4198	net/p5-Net-EPP-Frame\|net/p5-Net-EPP\|2009-11-11\|Please use net/p5-Net-EPP	4198	net/p5-Net-EPP-Frame\|net/p5-Net-EPP\|2009-11-11\|Please use net/p5-Net-EPP
4199	net/p5-Net-EPP-Client\|net/p5-Net-EPP\|2009-11-11\|Please use net/p5-Net-EPP	4199	net/p5-Net-EPP-Client\|net/p5-Net-EPP\|2009-11-11\|Please use net/p5-Net-EPP
		4200	devel/php5-pcre\|lang/php5\|2009-11-17\|Required core module as of PHP 5.3.0
		4201	devel/php5-spl\|lang/php5\|2009-11-17\|Required core module as of PHP 5.3.0
		4202	security/php5-mhash\|security/php5-hash\|2009-11-17\|Replaced by php5-hash as of PHP 5.3.0
		4203	databases/php5-dbase\|\|2009-11-17\|Has expired: the extension was removed from PHP 5.3.0
		4204	graphics/php5-ming\|\|2009-11-17\|Has expired: the extension was removed from PHP 5.3.0
		4205	devel/php5-ncurses\|\|2009-11-17\|Has expired: the extension was removed from PHP 5.3.0
		4206




# New ports collection makefile for:	php5-dbase
# Date created:			7 Jul 2004
# Whom:				Alex Dupre <ale@FreeBSD.org>
#
# $FreeBSD: ports/databases/php5-dbase/Makefile,v 1.1 2004/07/19 08:49:04 ale Exp $
#

CATEGORIES=	databases

MASTERDIR=	${.CURDIR}/../../lang/php5

PKGNAMESUFFIX=	-dbase

.include "${MASTERDIR}/Makefile"




--- sqlite_statement.c.orig	2007-12-31 08:20:10.000000000 +0100
+++ 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:




--- pgsql.c.orig	2009-05-19 18:03:36.000000000 +0200
+++ pgsql.c	2009-11-18 16:36:41.178716287 +0100
@@ -63,6 +63,7 @@
 #define PGSQL_MAX_LENGTH_OF_LONG   30
 #define PGSQL_MAX_LENGTH_OF_DOUBLE 60
 

 #define PGSQL_RETURN_OID(oid) do { \
 	if (oid > LONG_MAX) { \
 		smart_str s = {0}; \
@@ -72,7 +73,9 @@
 	} \
 	RETURN_LONG((long)oid); \
 } while(0)

 
 #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 */

 {
 	register int i = strlen(message)-1;
 
@@ -819,7 +822,7 @@
 		if (PGG(log_notices)) {
 			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", notice->message);
 		}

 	}
 }
 /* }}} */
@@ -1217,13 +1220,14 @@
 		 */
 		if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)
 			&& zend_hash_find(&EG(regular_list),str.c,str.len+1,(void **) &index_ptr)==SUCCESS) {

 			ptr = zend_list_find(link,&type);   /* check if the link is still there */
 			if (ptr && (type==le_link || type==le_plink)) {
 				Z_LVAL_P(return_value) = link;
@@ -2166,12 +2170,15 @@
 
 
 	if (return_oid) {

 			RETURN_LONG((long)oid);
 		}
 	}
@@ -2272,6 +2279,7 @@
 			
 			oid = PQftype(pgsql_result, field);
 
+#if UINT_MAX > LONG_MAX
 			if (oid > LONG_MAX) {
 				smart_str s = {0};
 				smart_str_append_unsigned(&s, oid);
@@ -2279,7 +2287,10 @@
 				Z_STRVAL_P(return_value) = s.c;
 				Z_STRLEN_P(return_value) = s.len;
 				Z_TYPE_P(return_value) = IS_STRING;
-			} else {
+			}
+			else
+#endif
+			{
 				Z_LVAL_P(return_value) = (long)oid;
 				Z_TYPE_P(return_value) = IS_LONG;
 			}
 {
 	zval *row;
 	char *field_name, *element, *data;
-	size_t num_fields, element_len, data_len;
-	int pg_numrows, pg_row;
+	size_t num_fields, element_len;
+	int pg_numrows, pg_row, data_len;
 	uint i;
 	assert(Z_TYPE_P(ret_array) == IS_ARRAY);
 




# New ports collection makefile for:	php5-ncurses
# Date created:			7 Jul 2004
# Whom:				Alex Dupre <ale@FreeBSD.org>
#
# $FreeBSD: ports/devel/php5-ncurses/Makefile,v 1.1 2004/07/19 09:03:10 ale Exp $
#

CATEGORIES=	devel

MASTERDIR=	${.CURDIR}/../../lang/php5

PKGNAMESUFFIX=	-ncurses

.include "${MASTERDIR}/Makefile"




# New ports collection makefile for:	php5-pcre
# Date created:			7 Jul 2004
# Whom:				Alex Dupre <ale@FreeBSD.org>
#
# $FreeBSD: ports/devel/php5-pcre/Makefile,v 1.6 2009/03/06 10:08:33 ale Exp $
#

CATEGORIES=	devel

MASTERDIR=	${.CURDIR}/../../lang/php5

PKGNAMESUFFIX=	-pcre

.include "${MASTERDIR}/Makefile"

Lines 1-13 Link Here

(-)devel/php5-pcre/files/patch-php_pcre.c (-13 lines)
1	--- php_pcre.c.orig 2009-03-06 10:58:43.000000000 +0100
2	+++ php_pcre.c 2009-03-06 10:58:56.000000000 +0100
3	@@ -18,6 +18,10 @@
4
5	/* $Id: php_pcre.c,v 1.168.2.9.2.30 2009/01/13 19:23:31 andrei Exp $ */
6
7	+#ifdef HAVE_CONFIG_H
8	+#include "config.h"
9	+#endif
10	+
11	#include "php.h"
12	#include "php_ini.h"
13	#include "php_globals.h"




--- config.m4.orig	2009-05-14 15:40:51.000000000 +0200
+++ config.m4	2009-11-18 16:45:23.686386117 +0100
@@ -5,10 +5,8 @@
 PHP_ARG_WITH(libedit,for libedit readline replacement, 
 [  --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)])
-else
-  dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
-  php_with_readline=no
-fi
 
 if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
   for i in $PHP_READLINE /usr/local /usr; do
@@ -50,6 +48,13 @@
     -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
   ])
 

   AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
 
 elif test "$PHP_LIBEDIT" != "no"; then
@@ -87,7 +92,6 @@
 fi
 
 if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then




# New ports collection makefile for:	php5-spl
# Date created:			7 Feb 2007
# Whom:				Alex Dupre <ale@FreeBSD.org>
#
# $FreeBSD: ports/devel/php5-spl/Makefile,v 1.1 2007/02/09 08:31:42 ale Exp $
#

CATEGORIES=	devel

MASTERDIR=	${.CURDIR}/../../lang/php5

PKGNAMESUFFIX=	-spl

.include "${MASTERDIR}/Makefile"




--- config.m4.orig	Mon Dec  4 19:01:53 2006
+++ config.m4	Wed Feb  7 12:21:20 2007
@@ -4,6 +4,11 @@
 PHP_ARG_ENABLE(spl, enable SPL suppport,
 [  --disable-spl           Disable Standard PHP Library], yes)
 
+if test -z "$PHP_LIBXML_DIR"; then
+  PHP_ARG_WITH(libxml-dir, libxml2 install dir,
+  [  --with-libxml-dir=DIR     SPL: libxml2 install prefix], no, no)
+fi
+
 if test "$PHP_SPL" != "no"; then
   AC_MSG_CHECKING(whether zend_object_value is packed)
   old_CPPFLAGS=$CPPFLAGS
@@ -25,8 +30,12 @@
   ])
   CPPFLAGS=$old_CPPFLAGS
   AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
+  PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
   AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support]) 
-  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, no)
+  PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, yes)
   PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_sxe.h])
   PHP_ADD_EXTENSION_DEP(spl, pcre, true)
+  ], [
+    AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
+  ])
 fi




# New ports collection makefile for:	php5-ming
# Date created:			7 Jul 2004
# Whom:				Alex Dupre <ale@FreeBSD.org>
#
# $FreeBSD: ports/graphics/php5-ming/Makefile,v 1.1 2004/07/19 09:11:12 ale Exp $
#

CATEGORIES=	graphics

MASTERDIR=	${.CURDIR}/../../lang/php5

PKGNAMESUFFIX=	-ming

.include "${MASTERDIR}/Makefile"




#

PORTNAME=	php5
PORTVERSION=	5.3.0
#PORTREVISION?=	1
CATEGORIES?=	lang devel www
MASTER_SITES=	${MASTER_SITE_PHP}
MASTER_SITE_SUBDIR=	distributions

		FASTCGI "Enable fastcgi support (CGI only)" on \
		PATHINFO "Enable path-info-check support (CGI only)" on

CONFLICTS=	php4-4* 
#php5-pcre-* php5-spl-* php5-mhash-*

MAN1=		php-config.1 phpize.1


PATCH_DIST_STRIP=	-p1

.if !defined(WITHOUT_SUHOSIN)
PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.8.patch.gz:suhosin
PATCH_SITES+=	http://download.suhosin.org/:suhosin
PLIST_SUB+=	SUHOSIN=""
.else


.if defined(WITH_MAILHEAD)
#PATCHFILES+=	php-${PORTVERSION}-mail-header.patch:mail
PATCHFILES+=	php-5.3.0-mail-header.patch:mail
PATCH_SITES+=	http://choon.net/opensource/php/:mail
.endif


	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf

post-install:
	@${INSTALL_DATA} ${WRKSRC}/php.ini-production ${PREFIX}/etc
	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${PREFIX}/etc
	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
.if defined(WITH_APACHE)




PHP_HEADER_DIRS=	libcdb libflatfile libinifile
.endif

.if ${PHP_MODNAME} == "dbase"
CONFIGURE_ARGS+=--enable-dbase
.endif

.if ${PHP_MODNAME} == "dom"
CONFIGURE_ARGS+=--enable-dom \
		--with-libxml-dir=${LOCALBASE}

USE_GNOME=	libxml2

USE_PHP=	spl
USE_PHP_BUILD=	yes
.endif


CONFIGURE_ARGS+=--enable-filter \
		--with-pcre-dir=${LOCALBASE}

USE_PHP=	pcre
USE_PHP_BUILD=	yes
.endif


CONFIGURE_ARGS+=--with-mhash=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "ming"
LIB_DEPENDS+=	ming.4:${PORTSDIR}/graphics/ming

CONFIGURE_ARGS+=--with-ming=${LOCALBASE}
.endif

.if ${PHP_MODNAME} == "mssql"
LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds-msdblib


USE_MYSQL=	yes
BROKEN_WITH_MYSQL=	323 40

USE_PHP=	spl
USE_PHP_BUILD=	yes
.endif

.if ${PHP_MODNAME} == "ncurses"
CONFIGURE_ARGS+=--with-ncurses=/usr
.endif

.if ${PHP_MODNAME} == "oci8"
BUILD_DEPENDS+=	${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client


.endif

.if ${PHP_MODNAME} == "pdo_sqlite"
.      if defined(WITH_SQLITE_PORT)
USE_SQLITE=    yes
CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
.      else
CONFIGURE_ARGS+=--with-pdo-sqlite
.      endif

USE_PHP=	pdo
USE_PHP_BUILD=	yes
PHP_HEADER_DIRS=sqlite/src
.endif



USE_PHP_BUILD=	yes
.endif

.if ${PHP_MODNAME} == "spl"
CONFIGURE_ARGS+=--enable-spl \
		--with-libxml-dir=${LOCALBASE}

USE_GNOME=	libxml2

USE_PHP=	pcre simplexml
USE_PHP_BUILD=	yes
.endif

.if ${PHP_MODNAME} == "sockets"
CONFIGURE_ARGS+=--enable-sockets
.endif

USE_PHP_BUILD=	yes
PHP_HEADER_DIRS=libsqlite/src

USE_PHP=	spl
USE_PHP_BUILD=	yes

OPTIONS=	UTF8 "Enable UTF-8 support" off

	/usr/bin/ar rcs liboci8.a *.o
.endif

.if ${PHP_MODNAME} == "pcre"  	 
.	if defined(WITH_BUNDLED_PCRE)
CONFIGURE_ARGS+=--with-pcre-regex=yes

PHP_HEADER_DIRS=pcrelib
.	else
LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre

CONFIGURE_ARGS+=--with-pcre-regex=${LOCALBASE}
.	endif

post-extract:  	 
	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
.endif

.if ${PHP_MODNAME} == "pdo_dblib"
.if defined(WITH_MSSQL)
LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds-msdblib

Lines 1-9 Link Here

(-)lang/php5/distinfo (-9 / +10 lines)
1	MD5 (php-5.2.11.tar.bz2) = 286bf34630f5643c25ebcedfec5e0a09	1	MD5 (php-5.3.0.tar.bz2) = 846760cd655c98dfd86d6d97c3d964b0
2	SHA256 (php-5.2.11.tar.bz2) = 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23	2	SHA256 (php-5.3.0.tar.bz2) = 83c9d86f830f8b188c70d3554d07b7416af90fd9e06d84340ffda58c09e58357
3	SIZE (php-5.2.11.tar.bz2) = 9030787	3	SIZE (php-5.3.0.tar.bz2) = 10097840
4	MD5 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 8f9de4d97fae6eba163cf3699509a260	4	MD5 (suhosin-patch-5.3.0-0.9.8.patch.gz) = a23a3d54e177ac0ad30f78d928ba8177
5	SHA256 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b	5	SHA256 (suhosin-patch-5.3.0-0.9.8.patch.gz) = 1825c80b77a69044efa855453c1844619827c8398c82280c6060840b238d5a5b
6	SIZE (suhosin-patch-5.2.11-0.9.7.patch.gz) = 23050	6	SIZE (suhosin-patch-5.3.0-0.9.8.patch.gz) = 38026
7	MD5 (php-5.2.10-mail-header.patch) = 7f73682e78d32e22989c3fb3678d668b	7	MD5 (php-5.3.0-mail-header.patch) = c205f2b93eb180dc7c256ebde9313c2c
8	SHA256 (php-5.2.10-mail-header.patch) = a61d50540f4aae32390118453845c380fe935b6d1e46cef6819c8561946e942f	8	SHA256 (php-5.3.0-mail-header.patch) = 6c748284efa0a129538e0520f52cb1e72eae885cbf5f658e4112b64a3cf63f41
9	SIZE (php-5.2.10-mail-header.patch) = 3383	9	SIZE (php-5.3.0-mail-header.patch) = 3350
		10

Lines 1-11 Link Here

(-)lang/php5/files/patch-Zend::zend.h (-7 / +7 lines)
1	--- Zend/zend.h.orig Tue Nov 15 14:35:22 2005	1	--- Zend/zend.h.orig 2009-11-02 19:45:53.000000000 +0100
2	+++ Zend/zend.h Fri Nov 25 09:31:48 2005	2	+++ Zend/zend.h 2009-11-02 19:49:11.000000000 +0100
3	@@ -178,7 +178,7 @@	3	@@ -198,7 +198,7 @@
4	#endif	4	#endif
5		5	#define restrict __restrict__
6		6
7	-#if (HAVE_ALLOCA \|\| (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)	7	-#if (HAVE_ALLOCA \|\| (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
8	+#if (HAVE_ALLOCA \|\| (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__))	8	+#if (HAVE_ALLOCA \|\| (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN) && !(defined(ZTS) && defined(__FreeBSD__))
9	# define do_alloca(p) alloca(p)	9	# define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
10	# define free_alloca(p)	10	# define ALLOCA_FLAG(name) \
11	#else	11	zend_bool name;




--- configure.in.orig	2009-11-02 19:51:47.000000000 +0100
+++ configure.in	2009-11-02 19:56:29.000000000 +0100
@@ -320,7 +320,6 @@
 dnl .
 dnl -------------------------------------------------------------------------
 

 PHP_HELP_SEPARATOR([SAPI modules:])
 PHP_SHLIB_SUFFIX_NAMES
 PHP_SAPI=default
@@ -345,7 +344,6 @@
 
 if test "$enable_maintainer_zts" = "yes"; then
   PTHREADS_ASSIGN_VARS

 fi
 
 divert(3)
@@ -1188,7 +1186,7 @@
 EXPANDED_DATADIR=$datadir
 EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
 EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`

 
 exec_prefix=$old_exec_prefix
 libdir=$old_libdir
@@ -1396,22 +1394,19 @@
   pharcmd_install=
 fi;
 
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) $pharcmd"
+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
 
 case $PHP_SAPI in
-  cli)

 PHP_SUBST(all_targets)
 PHP_SUBST(install_targets)
 
-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
 
 PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
 




--- ext/standard/array.c.orig	2009-05-15 19:03:03.000000000 +0200
+++ ext/standard/array.c	2009-11-02 20:04:20.000000000 +0100
@@ -300,6 +300,7 @@
 PHP_FUNCTION(count)
 {
 	zval *array;
+	zend_class_entry **ce_Countable;
 	long mode = COUNT_NORMAL;
 
 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z|l", &array, &mode) == FAILURE) {
@@ -314,9 +315,7 @@
 			RETURN_LONG (php_count_recursive (array, mode TSRMLS_CC));
 			break;
 		case IS_OBJECT: {
-#ifdef HAVE_SPL
 			/* it the object implements Countable we call its count() method */
 			zval *retval;
-#endif
 			/* first, we check if the handler is defined */
 			if (Z_OBJ_HT_P(array)->count_elements) {
 				RETVAL_LONG(1);
@@ -324,9 +323,10 @@
 					return;
 				}
 			}
-#ifdef HAVE_SPL
+
 			/* if not and the object implements Countable we call its count() method */
-			if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
+			if (zend_lookup_class_ex("Countable", 9, 0, &ce_Countable TSRMLS_CC) != FAILURE) {
+			if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), *ce_Countable TSRMLS_CC)) {
 				zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
 				if (retval) {
 					convert_to_long_ex(&retval);
@@ -335,7 +335,7 @@
 				}
 				return;
 			}
-#endif
+			}
 		}
 		default:
 			RETURN_LONG(1);




--- ext/standard/basic_functions.c.orig	2008-06-09 14:06:40.000000000 +0200
+++ ext/standard/basic_functions.c	2008-06-09 14:08:28.000000000 +0200
@@ -87,6 +87,7 @@
 # include <sys/loadavg.h>
 #endif
 
+#define HARTMUT_0
 #ifdef HARTMUT_0
 #include <getopt.h>
 #endif
@@ -3859,7 +3860,7 @@
 		SetEnvironmentVariable(pe->key, "bugbug");
 #endif




--- ext/standard/dns.h~	2009-05-19 21:39:53.000000000 +0200
+++ ext/standard/dns.h	2009-11-02 20:08:40.000000000 +0100
@@ -37,6 +37,10 @@
 
 #if ((HAVE_RES_NMKQUERY && HAVE_RES_NSEND) || HAVE_DEPRECATED_DNS_FUNCS) && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
 #define HAVE_DNS_FUNCS 1
+#define res_ninit 	__res_ninit
+#define res_nmkquery	__res_nmkquery
+#define res_nsend	__res_nsend
+#define res_nclose	__res_nclose
 #endif
 
 PHP_FUNCTION(gethostbyaddr);




--- ext/standard/php_dns.h.orig	Sun Jun 19 11:57:31 2005
+++ ext/standard/php_dns.h	Sun Jun 19 12:03:37 2005
@@ -25,6 +25,10 @@
 
 #if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
 #define HAVE_DNS_FUNCS 1
+#define res_ninit 	__res_ninit
+#define res_nmkquery	__res_nmkquery
+#define res_nsend	__res_nsend
+#define res_nclose	__res_nclose
 #endif
 
 PHP_FUNCTION(gethostbyaddr);

Lines 1-11 Link Here

(-)lang/php5/files/patch-main_streams_xp_socket.c (-11 lines)
1	--- main/streams/xp_socket.c 2009/09/04 07:59:48 288034
2	+++ main/streams/xp_socket.c 2009/09/23 10:25:54 288604
3	@@ -289,7 +289,7 @@
4	if (sock->socket == -1) {
5	alive = 0;
6	} else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE\|POLLPRI, &tv) > 0) {
7	- if (recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) != SOCK_CONN_ERR && php_socket_errno() != EWOULDBLOCK) {
8	+ if (0 >= recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) {
9	alive = 0;
10	}
11	}




--- php.ini-development~	2009-06-28 19:56:18.000000000 +0200
+++ php.ini-development	2009-11-02 20:14:16.000000000 +0100
@@ -335,6 +335,16 @@
 
 ; Safe Mode
 ; http://php.net/safe-mode
+;
+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
+; the PHP Safe Mode feature not be relied upon for security, since the
+; issues Safe Mode tries to handle cannot properly be handled in PHP
+; (primarily due to PHP's use of external libraries).  While many bugs
+; in Safe Mode has been fixed it's very likely that more issues exist
+; which allows a user to bypass Safe Mode restrictions.
+; For increased security we always recommend to install the Suhosin
+; extension.
+;
 safe_mode = Off
 
 ; By default, Safe Mode does a UID compare check when




--- php.ini-dist.orig	Fri Dec 30 18:19:43 2005
+++ php.ini-dist	Mon Oct 16 08:12:28 2006
@@ -165,6 +165,15 @@
 
 ; Safe Mode
 ;
+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
+; the PHP Safe Mode feature not be relied upon for security, since the
+; issues Safe Mode tries to handle cannot properly be handled in PHP
+; (primarily due to PHP's use of external libraries).  While many bugs
+; in Safe Mode has been fixed it's very likely that more issues exist
+; which allows a user to bypass Safe Mode restrictions.
+; For increased security we always recommend to install the Suhosin
+; extension.
+;
 safe_mode = Off
 
 ; By default, Safe Mode does a UID compare check when




--- php.ini-production~	2009-06-28 19:56:18.000000000 +0200
+++ php.ini-production	2009-11-02 20:14:02.000000000 +0100
@@ -335,6 +335,16 @@
 
 ; Safe Mode
 ; http://php.net/safe-mode
+;
+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
+; the PHP Safe Mode feature not be relied upon for security, since the
+; issues Safe Mode tries to handle cannot properly be handled in PHP
+; (primarily due to PHP's use of external libraries).  While many bugs
+; in Safe Mode has been fixed it's very likely that more issues exist
+; which allows a user to bypass Safe Mode restrictions.
+; For increased security we always recommend to install the Suhosin
+; extension.
+;
 safe_mode = Off
 
 ; By default, Safe Mode does a UID compare check when




--- php.ini-recommended.orig	Fri Dec 30 18:19:43 2005
+++ php.ini-recommended	Mon Oct 16 08:13:05 2006
@@ -223,6 +223,15 @@
 ;
 ; Safe Mode
 ;
+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
+; the PHP Safe Mode feature not be relied upon for security, since the
+; issues Safe Mode tries to handle cannot properly be handled in PHP
+; (primarily due to PHP's use of external libraries).  While many bugs
+; in Safe Mode has been fixed it's very likely that more issues exist
+; which allows a user to bypass Safe Mode restrictions.
+; For increased security we recommend to always install the Suhosin
+; extension.
+;
 safe_mode = Off
 
 ; By default, Safe Mode does a UID compare check when




--- sapi/cgi/config9.m4.orig	2007-10-01 14:40:54.000000000 +0200
+++ sapi/cgi/config9.m4	2009-11-02 20:21:43.000000000 +0100
@@ -8,7 +8,6 @@
 dnl
 dnl CGI setup
 dnl

   AC_MSG_CHECKING(whether to build CGI binary)
   if test "$PHP_CGI" != "no"; then
     AC_MSG_RESULT(yes)
@@ -53,8 +52,9 @@
     PHP_SUBST(SAPI_CGI_PATH)
 
     dnl Set install target and select SAPI
-    INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
-    PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
+    INSTALL_CGI="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
+    PHP_ADD_SOURCES(sapi/cgi, fastcgi.c cgi_main.c,, cgi)
+    PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
 
     case $host_alias in
       *aix*)
@@ -64,17 +64,29 @@
         BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
       ;;
       *)

+    PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
+    PHP_INSTALL_CGI_TARGET="install-cgi"
     PHP_SUBST(BUILD_CGI)
-
-  elif test "$PHP_CLI" != "no"; then
-    AC_MSG_RESULT(no)
+    PHP_SUBST(INSTALL_CGI)
+    PHP_SUBST(PHP_CGI_OBJS)
+    PHP_SUBST(PHP_CGI_TARGET)
+    PHP_SUBST(PHP_INSTALL_CGI_TARGET)
+
-  elif test "$PHP_CLI" != "no"; then
-    AC_MSG_RESULT(no)
+    if test "$PHP_SAPI" = "default" ; then
+      PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
+    fi




bin/php-config
bin/phpize
etc/php.conf
etc/php.ini-development
etc/php.ini-production
include/php/TSRM/TSRM.h
include/php/TSRM/acconfig.h
include/php/TSRM/readdir.h

include/php/TSRM/tsrm_strtok_r.h
include/php/TSRM/tsrm_virtual_cwd.h
include/php/TSRM/tsrm_win32.h
include/php/Zend/FlexLexer.h
include/php/Zend/acconfig.h
include/php/Zend/zend.h
include/php/Zend/zend_API.h
include/php/Zend/zend_alloc.h
include/php/Zend/zend_build.h
include/php/Zend/zend_builtin_functions.h
include/php/Zend/zend_closures.h
include/php/Zend/zend_compile.h
include/php/Zend/zend_config.h
include/php/Zend/zend_config.nw.h

include/php/Zend/zend_execute.h
include/php/Zend/zend_extensions.h
include/php/Zend/zend_fast_cache.h
include/php/Zend/zend_float.h
include/php/Zend/zend_gc.h
include/php/Zend/zend_globals.h
include/php/Zend/zend_globals_macros.h
include/php/Zend/zend_hash.h

include/php/Zend/zend_ini.h
include/php/Zend/zend_ini_parser.h
include/php/Zend/zend_ini_scanner.h
include/php/Zend/zend_ini_scanner_defs.h
include/php/Zend/zend_interfaces.h
include/php/Zend/zend_istdiostream.h
include/php/Zend/zend_iterators.h
include/php/Zend/zend_language_parser.h
include/php/Zend/zend_language_scanner.h
include/php/Zend/zend_language_scanner_defs.h
include/php/Zend/zend_list.h
include/php/Zend/zend_llist.h
include/php/Zend/zend_modules.h

include/php/ext/date/lib/timelib_config.h
include/php/ext/date/lib/timelib_structs.h
include/php/ext/date/php_date.h
include/php/ext/ereg/php_ereg.h
include/php/ext/ereg/php_regex.h
include/php/ext/ereg/regex/cclass.h
include/php/ext/ereg/regex/cname.h
include/php/ext/ereg/regex/regex.h
include/php/ext/ereg/regex/regex2.h
include/php/ext/ereg/regex/utils.h
include/php/ext/libxml/php_libxml.h
include/php/ext/pcre/pcrelib/config.h
include/php/ext/pcre/pcrelib/pcre.h
include/php/ext/pcre/pcrelib/pcre_internal.h
include/php/ext/pcre/pcrelib/pcreposix.h
include/php/ext/pcre/pcrelib/ucp.h
include/php/ext/pcre/php_pcre.h
@exec touch %D/include/php/ext/php_config.h
@unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h
include/php/ext/spl/php_spl.h
include/php/ext/spl/spl_array.h
include/php/ext/spl/spl_directory.h
include/php/ext/spl/spl_dllist.h
include/php/ext/spl/spl_engine.h
include/php/ext/spl/spl_exceptions.h
include/php/ext/spl/spl_fixedarray.h
include/php/ext/spl/spl_functions.h
include/php/ext/spl/spl_heap.h
include/php/ext/spl/spl_iterators.h
include/php/ext/spl/spl_observer.h
include/php/ext/standard/base64.h
include/php/ext/standard/basic_functions.h
include/php/ext/standard/crc32.h
include/php/ext/standard/credits.h
include/php/ext/standard/credits_ext.h
include/php/ext/standard/credits_sapi.h
include/php/ext/standard/crypt_freesec.h
include/php/ext/standard/css.h
include/php/ext/standard/cyr_convert.h
include/php/ext/standard/datetime.h
include/php/ext/standard/dl.h
include/php/ext/standard/dns.h
include/php/ext/standard/exec.h
include/php/ext/standard/file.h
include/php/ext/standard/flock_compat.h

include/php/ext/standard/php_assert.h
include/php/ext/standard/php_browscap.h
include/php/ext/standard/php_crypt.h
include/php/ext/standard/php_crypt_r.h
include/php/ext/standard/php_dir.h
include/php/ext/standard/php_dns.h
include/php/ext/standard/php_ext_syslog.h
include/php/ext/standard/php_filestat.h
include/php/ext/standard/php_fopen_wrappers.h

include/php/ext/standard/php_versioning.h
include/php/ext/standard/proc_open.h
include/php/ext/standard/quot_print.h
include/php/ext/standard/reg.h
include/php/ext/standard/scanf.h
include/php/ext/standard/sha1.h
include/php/ext/standard/streamsfuncs.h
include/php/ext/standard/uniqid.h
include/php/ext/standard/url.h
include/php/ext/standard/url_scanner.h
include/php/ext/standard/url_scanner_ex.h
include/php/ext/standard/winver.h
@unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h
include/php/main/SAPI.h
include/php/main/build-defs.h
include/php/main/config.w32.h
include/php/main/fopen_wrappers.h
include/php/main/logos.h
include/php/main/php.h

include/php/main/php_compat.h
include/php/main/php_config.h
include/php/main/php_content_types.h
include/php/main/php_getopt.h
include/php/main/php_globals.h
include/php/main/php_ini.h
include/php/main/php_logos.h

include/php/main/php_open_temporary_file.h
include/php/main/php_output.h
include/php/main/php_reentrancy.h
include/php/main/php_regex.h
include/php/main/php_scandir.h
include/php/main/php_streams.h
include/php/main/php_syslog.h

include/php/main/spprintf.h
include/php/main/streams/php_stream_context.h
include/php/main/streams/php_stream_filter_api.h
include/php/main/streams/php_stream_glob_wrapper.h
include/php/main/streams/php_stream_mmap.h
include/php/main/streams/php_stream_plain_wrapper.h
include/php/main/streams/php_stream_transport.h
include/php/main/streams/php_stream_userspace.h
include/php/main/streams/php_streams_int.h
%%SUHOSIN%%include/php/main/suhosin_globals.h
%%SUHOSIN%%include/php/main/suhosin_logo.h
%%SUHOSIN%%include/php/main/suhosin_patch.h
include/php/main/win32_internal_function_disabled.h
include/php/main/win95nt.h
include/php/regex/cclass.h
include/php/regex/cname.h
include/php/regex/regex.h
include/php/regex/regex2.h
include/php/regex/regex_extra.h
include/php/regex/utils.h
lib/php/build/Makefile.global
lib/php/build/acinclude.m4
lib/php/build/config.guess

lib/php/build/run-tests.php
lib/php/build/scan_makefile_in.awk
lib/php/build/shtool
@dirrm lib/php/build
@dirrmtry lib/php
@dirrm include/php/main/streams
@dirrm include/php/main
@dirrm include/php/ext/standard
@dirrm include/php/ext/spl
@dirrm include/php/ext/pcre/pcrelib
@dirrm include/php/ext/pcre
@dirrm include/php/ext/libxml
@dirrm include/php/ext/ereg/regex
@dirrm include/php/ext/ereg
@dirrm include/php/ext/date/lib
@dirrm include/php/ext/date
@dirrm include/php/ext/libxml
@dirrm include/php/ext/standard
@dirrmtry include/php/ext
@dirrm include/php/Zend
@dirrm include/php/TSRM
@dirrm include/php/regex
@dirrmtry include/php
%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%%
%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f




WITH_HASH=	yes
WITH_ICONV=	yes
WITH_JSON=	yes
WITH_PCRE=	yes
WITH_PDO=	yes
WITH_PDO_SQLITE=yes
WITH_POSIX=	yes
WITH_SESSION=	yes
WITH_SIMPLEXML=	yes
WITH_SPL=	yes
WITH_SQLITE=	yes
WITH_TOKENIZER=	yes
WITH_XML=	yes

		CTYPE           "ctype functions" on \
		CURL            "CURL support" off \
		DBA             "dba support" off \
		DBASE           "dBase library support" off \
		DOM             "DOM support" on \
		EXIF            "EXIF support" off \
		FILEINFO        "fileinfo support" off \

		LDAP            "OpenLDAP support" off \
		MBSTRING        "multibyte string support" off \
		MCRYPT          "Encryption support" off \
		MHASH           "Crypto-hashing support" off \
		MING            "ming shockwave flash support" off \
		MSSQL           "MS-SQL database support" off \
		MYSQL           "MySQL database support" off \
		MYSQLI          "MySQLi database support" off \
		NCURSES         "ncurses support (CLI only)" off \
		ODBC            "unixODBC support" off \
		OPENSSL         "OpenSSL support" off \
		PCNTL           "pcntl support (CLI only)" off \
		PCRE            "Perl Compatible Regular Expression support" on \
		PDF             "PDFlib support (implies GD)" off \
		PDO             "PHP Data Objects Interface (PDO)" on \
		PDO_SQLITE      "PDO sqlite driver" on \

		SNMP            "SNMP support" off \
		SOAP            "SOAP support" off \
		SOCKETS         "sockets support" off \
		SPL             "Standard PHP Library" on \
		SQLITE          "sqlite support" on \
		SYBASE_CT       "Sybase database support" off \
		SYSVMSG         "System V message support" off \

.include "${OPTIONSFILE}"
.endif

ALL_OPTIONS=	BCMATH BZ2 CALENDAR CTYPE CURL DBA \
		DOM EXIF FILEINFO FILTER FRIBIDI FTP GD GETTEXT \
		GMP HASH ICONV IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \
		MSSQL MYSQL MYSQLI \
		ODBC OPENSSL PCNTL PDF PDO PDO_SQLITE PGSQL POSIX \
		PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \
		SOCKETS SQLITE SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \
		TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \
		YAZ ZIP ZLIB





--- php_bcmath.h~	2008-12-31 12:15:35.000000000 +0100
+++ php_bcmath.h	2009-11-18 17:36:53.371409213 +0100
@@ -21,8 +21,6 @@
 #ifndef PHP_BCMATH_H
 #define PHP_BCMATH_H
 
-#if HAVE_BCMATH
-
 #include "libbcmath/src/bcmath.h"
 
 extern zend_module_entry bcmath_module_entry;
@@ -58,10 +56,4 @@
 
 ZEND_EXTERN_MODULE_GLOBALS(bcmath)
 
-#else
-
-#define phpext_bcmath_ptr NULL
-
-#endif
-
 #endif /* PHP_BCMATH_H */




# New ports collection makefile for:	php5-mhash
# Date created:			7 Jul 2004
# Whom:				Alex Dupre <ale@FreeBSD.org>
#
# $FreeBSD: ports/security/php5-mhash/Makefile,v 1.1 2004/07/19 09:19:03 ale Exp $
#

CATEGORIES=	security

MASTERDIR=	${.CURDIR}/../../lang/php5

PKGNAMESUFFIX=	-mhash

.include "${MASTERDIR}/Makefile"

Return to bug 140678

Lines 1-14 Link Here

(-)databases/php5-dbase/Makefile (-14 lines)
1	# New ports collection makefile for: php5-dbase
2	# Date created: 7 Jul 2004
3	# Whom: Alex Dupre <ale@FreeBSD.org>
4	#
5	# $FreeBSD: ports/databases/php5-dbase/Makefile,v 1.1 2004/07/19 08:49:04 ale Exp $
6	#
7
8	CATEGORIES= databases
9
10	MASTERDIR= ${.CURDIR}/../../lang/php5
11
12	PKGNAMESUFFIX= -dbase
13
14	.include "${MASTERDIR}/Makefile"

Lines 1-50 Link Here

(-)databases/php5-pdo_sqlite/files/patch-sqlite_statement.c (-50 lines)
1	--- sqlite_statement.c.orig 2007-12-31 08:20:10.000000000 +0100
2	+++ sqlite_statement.c 2008-12-07 11:50:35.000000000 +0100
3	@@ -104,6 +104,21 @@
4	pdo_sqlite_error_stmt(stmt);
5	return 0;
6
7	+ case PDO_PARAM_INT:
8	+ case PDO_PARAM_BOOL:
9	+ if (Z_TYPE_P(param->parameter) == IS_NULL) {
10	+ if (sqlite3_bind_null(S->stmt, param->paramno + 1) == SQLITE_OK) {
11	+ return 1;
12	+ }
13	+ } else {
14	+ convert_to_long(param->parameter);
15	+ if (SQLITE_OK == sqlite3_bind_int(S->stmt, param->paramno + 1, Z_LVAL_P(param->parameter))) {
16	+ return 1;
17	+ }
18	+ }
19	+ pdo_sqlite_error_stmt(stmt);
20	+ return 0;
21	+
22	case PDO_PARAM_LOB:
23	if (Z_TYPE_P(param->parameter) == IS_RESOURCE) {
24	php_stream *stm;
25	@@ -117,8 +132,24 @@
26	pdo_raise_impl_error(stmt->dbh, stmt, "HY105", "Expected a stream resource" TSRMLS_CC);
27	return 0;
28	}
29	+ } else if (Z_TYPE_P(param->parameter) == IS_NULL) {
30	+ if (sqlite3_bind_null(S->stmt, param->paramno + 1) == SQLITE_OK) {
31	+ return 1;
32	+ }
33	+ pdo_sqlite_error_stmt(stmt);
34	+ return 0;
35	+ } else {
36	+ convert_to_string(param->parameter);
37	+ }
38	+
39	+ if (SQLITE_OK == sqlite3_bind_blob(S->stmt, param->paramno + 1,
40	+ Z_STRVAL_P(param->parameter),
41	+ Z_STRLEN_P(param->parameter),
42	+ SQLITE_STATIC)) {
43	+ return 1;
44	}
45	- /* fall through */
46	+ pdo_sqlite_error_stmt(stmt);
47	+ return 0;
48
49	case PDO_PARAM_STR:
50	default:

Lines 1-6 Link Here

(-)databases/php5-pgsql/files/patch-pgsql.c (-25 / +18 lines)
1	--- pgsql.c.orig 2007-10-04 01:31:58.000000000 +0200	1	--- pgsql.c.orig 2009-05-19 18:03:36.000000000 +0200
2	+++ pgsql.c 2008-01-29 11:10:15.000000000 +0100	2	+++ pgsql.c 2009-11-18 16:36:41.178716287 +0100
3	@@ -62,6 +62,7 @@	3	@@ -63,6 +63,7 @@
4	#define PGSQL_MAX_LENGTH_OF_LONG 30	4	#define PGSQL_MAX_LENGTH_OF_LONG 30
5	#define PGSQL_MAX_LENGTH_OF_DOUBLE 60	5	#define PGSQL_MAX_LENGTH_OF_DOUBLE 60
6		6
Lines 8-14 Link Here
8	#define PGSQL_RETURN_OID(oid) do { \	8	#define PGSQL_RETURN_OID(oid) do { \
9	if (oid > LONG_MAX) { \	9	if (oid > LONG_MAX) { \
10	smart_str s = {0}; \	10	smart_str s = {0}; \
11	@@ -71,7 +72,9 @@	11	@@ -72,7 +73,9 @@
12	} \	12	} \
13	RETURN_LONG((long)oid); \	13	RETURN_LONG((long)oid); \
14	} while(0)	14	} while(0)
Lines 19-25 Link Here
19		19
20	#if HAVE_PQSETNONBLOCKING	20	#if HAVE_PQSETNONBLOCKING
21	#define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag)	21	#define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag)
22	@@ -272,7 +275,7 @@	22	@@ -728,7 +731,7 @@
23	static int le_link, le_plink, le_result, le_lofp, le_string;	23	static int le_link, le_plink, le_result, le_lofp, le_string;
24		24
25	/* {{{ _php_pgsql_trim_message */	25	/* {{{ _php_pgsql_trim_message */
Lines 28-34 Link Here
28	{	28	{
29	register int i = strlen(message)-1;	29	register int i = strlen(message)-1;
30		30
31	@@ -363,7 +366,7 @@	31	@@ -819,7 +822,7 @@
32	if (PGG(log_notices)) {	32	if (PGG(log_notices)) {
33	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", notice->message);	33	php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", notice->message);
34	}	34	}
Lines 37-43 Link Here
37	}	37	}
38	}	38	}
39	/* }}} */	39	/* }}} */
40	@@ -761,13 +764,14 @@	40	@@ -1217,13 +1220,14 @@
41	*/	41	*/
42	if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)	42	if (!(connect_type & PGSQL_CONNECT_FORCE_NEW)
43	&& zend_hash_find(&EG(regular_list),str.c,str.len+1,(void **) &index_ptr)==SUCCESS) {	43	&& zend_hash_find(&EG(regular_list),str.c,str.len+1,(void **) &index_ptr)==SUCCESS) {
Lines 54-60 Link Here
54	ptr = zend_list_find(link,&type); /* check if the link is still there */	54	ptr = zend_list_find(link,&type); /* check if the link is still there */
55	if (ptr && (type==le_link \|\| type==le_plink)) {	55	if (ptr && (type==le_link \|\| type==le_plink)) {
56	Z_LVAL_P(return_value) = link;	56	Z_LVAL_P(return_value) = link;
57	@@ -1748,12 +1752,15 @@	57	@@ -2166,12 +2170,15 @@
58		58
59		59
60	if (return_oid) {	60	if (return_oid) {
Lines 71-100 Link Here
71	RETURN_LONG((long)oid);	71	RETURN_LONG((long)oid);
72	}	72	}
73	}	73	}
74	@@ -1854,6 +1861,7 @@	74	@@ -2272,6 +2279,7 @@
75		75
76	oid = PQftype(pgsql_result, Z_LVAL_PP(field));	76	oid = PQftype(pgsql_result, field);
77		77
78	+#if UINT_MAX > LONG_MAX	78	+#if UINT_MAX > LONG_MAX
79	if (oid > LONG_MAX) {	79	if (oid > LONG_MAX) {
80	smart_str s = {0};	80	smart_str s = {0};
81	smart_str_append_unsigned(&s, oid);	81	smart_str_append_unsigned(&s, oid);
82	@@ -1863,6 +1871,7 @@	82	@@ -2279,7 +2287,10 @@
		83	Z_STRVAL_P(return_value) = s.c;
		84	Z_STRLEN_P(return_value) = s.len;
83	Z_TYPE_P(return_value) = IS_STRING;	85	Z_TYPE_P(return_value) = IS_STRING;
84	}	86	- } else {
85	else	87	+ }
		88	+ else
86	+#endif	89	+#endif
87	{	90	+ {
88	Z_LVAL_P(return_value) = (long)oid;	91	Z_LVAL_P(return_value) = (long)oid;
89	Z_TYPE_P(return_value) = IS_LONG;	92	Z_TYPE_P(return_value) = IS_LONG;
90	@@ -5741,8 +5750,8 @@	93	}
91	{
92	zval *row;
93	char field_name, element, *data;
94	- size_t num_fields, element_len, data_len;
95	- int pg_numrows, pg_row;
96	+ size_t num_fields, element_len;
97	+ int pg_numrows, pg_row, data_len;
98	uint i;
99	assert(Z_TYPE_P(ret_array) == IS_ARRAY);
100

Lines 1-14 Link Here

(-)devel/php5-ncurses/Makefile (-14 lines)
1	# New ports collection makefile for: php5-ncurses
2	# Date created: 7 Jul 2004
3	# Whom: Alex Dupre <ale@FreeBSD.org>
4	#
5	# $FreeBSD: ports/devel/php5-ncurses/Makefile,v 1.1 2004/07/19 09:03:10 ale Exp $
6	#
7
8	CATEGORIES= devel
9
10	MASTERDIR= ${.CURDIR}/../../lang/php5
11
12	PKGNAMESUFFIX= -ncurses
13
14	.include "${MASTERDIR}/Makefile"

Lines 1-14 Link Here

(-)devel/php5-pcre/Makefile (-14 lines)
1	# New ports collection makefile for: php5-pcre
2	# Date created: 7 Jul 2004
3	# Whom: Alex Dupre <ale@FreeBSD.org>
4	#
5	# $FreeBSD: ports/devel/php5-pcre/Makefile,v 1.6 2009/03/06 10:08:33 ale Exp $
6	#
7
8	CATEGORIES= devel
9
10	MASTERDIR= ${.CURDIR}/../../lang/php5
11
12	PKGNAMESUFFIX= -pcre
13
14	.include "${MASTERDIR}/Makefile"

Lines 1-20 Link Here

(-)devel/php5-readline/files/patch-config.m4 (-8 / +5 lines)
1	--- config.m4.orig 2009-08-04 13:20:49.000000000 +0200	1	--- config.m4.orig 2009-05-14 15:40:51.000000000 +0200
2	+++ config.m4 2009-09-22 11:13:12.000000000 +0200	2	+++ config.m4 2009-11-18 16:45:23.686386117 +0100
3	@@ -5,13 +5,8 @@	3	@@ -5,10 +5,8 @@
4	PHP_ARG_WITH(libedit,for libedit readline replacement,	4	PHP_ARG_WITH(libedit,for libedit readline replacement,
5	[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)])	5	[ --with-libedit[=DIR] Include libedit readline replacement (CLI/CGI only)])
6		6
7	-if test "$PHP_LIBEDIT" = "no"; then	7	-if test "$PHP_LIBEDIT" = "no"; then
8	PHP_ARG_WITH(readline,for readline support,	8	PHP_ARG_WITH(readline,for readline support,
9	[ --with-readline[=DIR] Include readline support (CLI/CGI only)])	9	[ --with-readline[=DIR] Include readline support (CLI/CGI only)])
10	-else
11	- dnl "register" the --with-readline option to preven invalid "unknown configure option" warning
12	- php_with_readline=no
13	-fi	10	-fi
14		11
15	if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then	12	if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then
16	for i in $PHP_READLINE /usr/local /usr; do	13	for i in $PHP_READLINE /usr/local /usr; do
17	@@ -60,6 +55,13 @@	14	@@ -50,6 +48,13 @@
18	-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS	15	-L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
19	])	16	])
20		17
Lines 28-34 Link Here
28	AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])	25	AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
29		26
30	elif test "$PHP_LIBEDIT" != "no"; then	27	elif test "$PHP_LIBEDIT" != "no"; then
31	@@ -97,7 +99,6 @@	28	@@ -87,7 +92,6 @@
32	fi	29	fi
33		30
34	if test "$PHP_READLINE" != "no" \|\| test "$PHP_LIBEDIT" != "no"; then	31	if test "$PHP_READLINE" != "no" \|\| test "$PHP_LIBEDIT" != "no"; then

Lines 1-14 Link Here

(-)devel/php5-spl/Makefile (-14 lines)
1	# New ports collection makefile for: php5-spl
2	# Date created: 7 Feb 2007
3	# Whom: Alex Dupre <ale@FreeBSD.org>
4	#
5	# $FreeBSD: ports/devel/php5-spl/Makefile,v 1.1 2007/02/09 08:31:42 ale Exp $
6	#
7
8	CATEGORIES= devel
9
10	MASTERDIR= ${.CURDIR}/../../lang/php5
11
12	PKGNAMESUFFIX= -spl
13
14	.include "${MASTERDIR}/Makefile"

Lines 1-28 Link Here

(-)devel/php5-spl/files/patch-config.m4 (-28 lines)
1	--- config.m4.orig Mon Dec 4 19:01:53 2006
2	+++ config.m4 Wed Feb 7 12:21:20 2007
3	@@ -4,6 +4,11 @@
4	PHP_ARG_ENABLE(spl, enable SPL suppport,
5	[ --disable-spl Disable Standard PHP Library], yes)
6
7	+if test -z "$PHP_LIBXML_DIR"; then
8	+ PHP_ARG_WITH(libxml-dir, libxml2 install dir,
9	+ [ --with-libxml-dir=DIR SPL: libxml2 install prefix], no, no)
10	+fi
11	+
12	if test "$PHP_SPL" != "no"; then
13	AC_MSG_CHECKING(whether zend_object_value is packed)
14	old_CPPFLAGS=$CPPFLAGS
15	@@ -25,8 +30,12 @@
16	])
17	CPPFLAGS=$old_CPPFLAGS
18	AC_DEFINE_UNQUOTED(HAVE_PACKED_OBJECT_VALUE, $ac_result, [Whether struct _zend_object_value is packed])
19	+ PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
20	AC_DEFINE(HAVE_SPL, 1, [Whether you want SPL (Standard PHP Library) support])
21	- PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, no)
22	+ PHP_NEW_EXTENSION(spl, php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c, yes)
23	PHP_INSTALL_HEADERS([ext/spl], [php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_sxe.h])
24	PHP_ADD_EXTENSION_DEP(spl, pcre, true)
25	+ ], [
26	+ AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
27	+ ])
28	fi

Lines 1-14 Link Here

(-)graphics/php5-ming/Makefile (-14 lines)
1	# New ports collection makefile for: php5-ming
2	# Date created: 7 Jul 2004
3	# Whom: Alex Dupre <ale@FreeBSD.org>
4	#
5	# $FreeBSD: ports/graphics/php5-ming/Makefile,v 1.1 2004/07/19 09:11:12 ale Exp $
6	#
7
8	CATEGORIES= graphics
9
10	MASTERDIR= ${.CURDIR}/../../lang/php5
11
12	PKGNAMESUFFIX= -ming
13
14	.include "${MASTERDIR}/Makefile"

Lines 6-13 Link Here

(-)lang/php5/Makefile (-7 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= php5	8	PORTNAME= php5
9	PORTVERSION= 5.2.11	9	PORTVERSION= 5.3.0
10	PORTREVISION?= 1	10	#PORTREVISION?= 1
11	CATEGORIES?= lang devel www	11	CATEGORIES?= lang devel www
12	MASTER_SITES= ${MASTER_SITE_PHP}	12	MASTER_SITES= ${MASTER_SITE_PHP}
13	MASTER_SITE_SUBDIR= distributions	13	MASTER_SITE_SUBDIR= distributions
Lines 47-53 Link Here
47	FASTCGI "Enable fastcgi support (CGI only)" on \	47	FASTCGI "Enable fastcgi support (CGI only)" on \
48	PATHINFO "Enable path-info-check support (CGI only)" on	48	PATHINFO "Enable path-info-check support (CGI only)" on
49		49
50	CONFLICTS= php4-4*	50	CONFLICTS= php4-4*
		51	#php5-pcre-* php5-spl-* php5-mhash-*
51		52
52	MAN1= php-config.1 phpize.1	53	MAN1= php-config.1 phpize.1
53		54
Lines 56-62 Link Here
56	PATCH_DIST_STRIP= -p1	57	PATCH_DIST_STRIP= -p1
57		58
58	.if !defined(WITHOUT_SUHOSIN)	59	.if !defined(WITHOUT_SUHOSIN)
59	PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin	60	PATCHFILES+= suhosin-patch-${PORTVERSION}-0.9.8.patch.gz:suhosin
60	PATCH_SITES+= http://download.suhosin.org/:suhosin	61	PATCH_SITES+= http://download.suhosin.org/:suhosin
61	PLIST_SUB+= SUHOSIN=""	62	PLIST_SUB+= SUHOSIN=""
62	.else	63	.else
Lines 65-71 Link Here
65		66
66	.if defined(WITH_MAILHEAD)	67	.if defined(WITH_MAILHEAD)
67	#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail	68	#PATCHFILES+= php-${PORTVERSION}-mail-header.patch:mail
68	PATCHFILES+= php-5.2.10-mail-header.patch:mail	69	PATCHFILES+= php-5.3.0-mail-header.patch:mail
69	PATCH_SITES+= http://choon.net/opensource/php/:mail	70	PATCH_SITES+= http://choon.net/opensource/php/:mail
70	.endif	71	.endif
71		72
Lines 163-170 Link Here
163	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf	164	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
164		165
165	post-install:	166	post-install:
166	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc	167	@${INSTALL_DATA} ${WRKSRC}/php.ini-production ${PREFIX}/etc
167	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc	168	@${INSTALL_DATA} ${WRKSRC}/php.ini-development ${PREFIX}/etc
168	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc	169	@${INSTALL_DATA} ${WRKDIR}/php.conf ${PREFIX}/etc
169	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h	170	@${TOUCH} ${PREFIX}/include/php/ext/php_config.h
170	.if defined(WITH_APACHE)	171	.if defined(WITH_APACHE)

Lines 56-72 Link Here

(-)lang/php5/Makefile.ext (-48 lines)
56	PHP_HEADER_DIRS= libcdb libflatfile libinifile	56	PHP_HEADER_DIRS= libcdb libflatfile libinifile
57	.endif	57	.endif
58		58
59	.if ${PHP_MODNAME} == "dbase"
60	CONFIGURE_ARGS+=--enable-dbase
61	.endif
62
63	.if ${PHP_MODNAME} == "dom"	59	.if ${PHP_MODNAME} == "dom"
64	CONFIGURE_ARGS+=--enable-dom \	60	CONFIGURE_ARGS+=--enable-dom \
65	--with-libxml-dir=${LOCALBASE}	61	--with-libxml-dir=${LOCALBASE}
66		62
67	USE_GNOME= libxml2	63	USE_GNOME= libxml2
68		64
69	USE_PHP= spl
70	USE_PHP_BUILD= yes	65	USE_PHP_BUILD= yes
71	.endif	66	.endif
72		67
Lines 78-84 Link Here
78	CONFIGURE_ARGS+=--enable-filter \	73	CONFIGURE_ARGS+=--enable-filter \
79	--with-pcre-dir=${LOCALBASE}	74	--with-pcre-dir=${LOCALBASE}
80		75
81	USE_PHP= pcre
82	USE_PHP_BUILD= yes	76	USE_PHP_BUILD= yes
83	.endif	77	.endif
84		78
Lines 191-202 Link Here
191	CONFIGURE_ARGS+=--with-mhash=${LOCALBASE}	185	CONFIGURE_ARGS+=--with-mhash=${LOCALBASE}
192	.endif	186	.endif
193		187
194	.if ${PHP_MODNAME} == "ming"
195	LIB_DEPENDS+= ming.4:${PORTSDIR}/graphics/ming
196
197	CONFIGURE_ARGS+=--with-ming=${LOCALBASE}
198	.endif
199
200	.if ${PHP_MODNAME} == "mssql"	188	.if ${PHP_MODNAME} == "mssql"
201	LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib	189	LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib
202		190
Lines 216-229 Link Here
216	USE_MYSQL= yes	204	USE_MYSQL= yes
217	BROKEN_WITH_MYSQL= 323 40	205	BROKEN_WITH_MYSQL= 323 40
218		206
219	USE_PHP= spl
220	USE_PHP_BUILD= yes	207	USE_PHP_BUILD= yes
221	.endif	208	.endif
222		209
223	.if ${PHP_MODNAME} == "ncurses"
224	CONFIGURE_ARGS+=--with-ncurses=/usr
225	.endif
226
227	.if ${PHP_MODNAME} == "oci8"	210	.if ${PHP_MODNAME} == "oci8"
228	BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client	211	BUILD_DEPENDS+= ${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
229		212
Lines 315-330 Link Here
315	.endif	298	.endif
316		299
317	.if ${PHP_MODNAME} == "pdo_sqlite"	300	.if ${PHP_MODNAME} == "pdo_sqlite"
318	. if defined(WITH_SQLITE_PORT)
319	USE_SQLITE= yes	301	USE_SQLITE= yes
320	CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}	302	CONFIGURE_ARGS+=--with-pdo-sqlite=${LOCALBASE}
321	. else
322	CONFIGURE_ARGS+=--with-pdo-sqlite
323	. endif
324		303
325	USE_PHP= pdo	304	USE_PHP= pdo
326	USE_PHP_BUILD= yes	305	USE_PHP_BUILD= yes
327	PHP_HEADER_DIRS=sqlite/src
328	.endif	306	.endif
329		307
330		308
Lines 394-409 Link Here
394	USE_PHP_BUILD= yes	372	USE_PHP_BUILD= yes
395	.endif	373	.endif
396		374
397	.if ${PHP_MODNAME} == "spl"
398	CONFIGURE_ARGS+=--enable-spl \
399	--with-libxml-dir=${LOCALBASE}
400
401	USE_GNOME= libxml2
402
403	USE_PHP= pcre simplexml
404	USE_PHP_BUILD= yes
405	.endif
406
407	.if ${PHP_MODNAME} == "sockets"	375	.if ${PHP_MODNAME} == "sockets"
408	CONFIGURE_ARGS+=--enable-sockets	376	CONFIGURE_ARGS+=--enable-sockets
409	.endif	377	.endif
Lines 415-421 Link Here
415	USE_PHP_BUILD= yes	383	USE_PHP_BUILD= yes
416	PHP_HEADER_DIRS=libsqlite/src	384	PHP_HEADER_DIRS=libsqlite/src
417		385
418	USE_PHP= spl
419	USE_PHP_BUILD= yes	386	USE_PHP_BUILD= yes
420		387
421	OPTIONS= UTF8 "Enable UTF-8 support" off	388	OPTIONS= UTF8 "Enable UTF-8 support" off
Lines 578-598 Link Here
578	/usr/bin/ar rcs liboci8.a *.o	545	/usr/bin/ar rcs liboci8.a *.o
579	.endif	546	.endif
580		547
581	.if ${PHP_MODNAME} == "pcre"
582	. if defined(WITH_BUNDLED_PCRE)
583	CONFIGURE_ARGS+=--with-pcre-regex=yes
584
585	PHP_HEADER_DIRS=pcrelib
586	. else
587	LIB_DEPENDS+= pcre.0:${PORTSDIR}/devel/pcre
588
589	CONFIGURE_ARGS+=--with-pcre-regex=${LOCALBASE}
590	. endif
591
592	post-extract:
593	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
594	.endif
595
596	.if ${PHP_MODNAME} == "pdo_dblib"	548	.if ${PHP_MODNAME} == "pdo_dblib"
597	.if defined(WITH_MSSQL)	549	.if defined(WITH_MSSQL)
598	LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib	550	LIB_DEPENDS+= sybdb.5:${PORTSDIR}/databases/freetds-msdblib

Lines 1-6 Link Here

(-)lang/php5/files/patch-configure.in (-15 / +15 lines)
1	--- configure.in.orig 2008-12-05 07:58:47.000000000 +0100	1	--- configure.in.orig 2009-11-02 19:51:47.000000000 +0100
2	+++ configure.in 2008-12-05 08:02:26.000000000 +0100	2	+++ configure.in 2009-11-02 19:56:29.000000000 +0100
3	@@ -270,7 +270,6 @@	3	@@ -320,7 +320,6 @@
4	dnl .	4	dnl .
5	dnl -------------------------------------------------------------------------	5	dnl -------------------------------------------------------------------------
6		6
Lines 8-14 Link Here
8	PHP_HELP_SEPARATOR([SAPI modules:])	8	PHP_HELP_SEPARATOR([SAPI modules:])
9	PHP_SHLIB_SUFFIX_NAMES	9	PHP_SHLIB_SUFFIX_NAMES
10	PHP_SAPI=default	10	PHP_SAPI=default
11	@@ -295,7 +294,6 @@	11	@@ -345,7 +344,6 @@
12		12
13	if test "$enable_maintainer_zts" = "yes"; then	13	if test "$enable_maintainer_zts" = "yes"; then
14	PTHREADS_ASSIGN_VARS	14	PTHREADS_ASSIGN_VARS
Lines 16-22 Link Here
16	fi	16	fi
17		17
18	divert(3)	18	divert(3)
19	@@ -1136,7 +1134,7 @@	19	@@ -1188,7 +1186,7 @@
20	EXPANDED_DATADIR=$datadir	20	EXPANDED_DATADIR=$datadir
21	EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`	21	EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
22	EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`	22	EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
Lines 25-38 Link Here
25		25
26	exec_prefix=$old_exec_prefix	26	exec_prefix=$old_exec_prefix
27	libdir=$old_libdir	27	libdir=$old_libdir
28	@@ -1344,22 +1342,19 @@	28	@@ -1396,22 +1394,19 @@
29	INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"	29	pharcmd_install=
30	CXXFLAGS="$CXXFLAGS $standard_libtool_flag"	30	fi;
31		31
32	-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET)"	32	-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) $pharcmd"
33	-install_targets="$install_modules install-build install-headers install-programs $install_pear"	33	-install_targets="$install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
34	+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)"	34	+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET) $pharcmd"
35	+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear"	35	+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear $pharcmd_install"
36		36
37	case $PHP_SAPI in	37	case $PHP_SAPI in
38	- cli)	38	- cli)
Lines 48-55 Link Here
48	PHP_SUBST(all_targets)	48	PHP_SUBST(all_targets)
49	PHP_SUBST(install_targets)	49	PHP_SUBST(install_targets)
50		50
51	-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])	51	-PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/])
52	+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/ regex/])	52	+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/])
53		53
54	PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)	54	PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
55		55

Lines 1-33 Link Here

(-)lang/php5/files/patch-ext_standard_array.c (-13 / +22 lines)
1	--- ext/standard/array.c.orig Mon Feb 12 20:20:48 2007	1	--- ext/standard/array.c.orig 2009-05-15 19:03:03.000000000 +0200
2	+++ ext/standard/array.c Mon Feb 12 20:22:14 2007	2	+++ ext/standard/array.c 2009-11-02 20:04:20.000000000 +0100
3	@@ -295,6 +295,7 @@	3	@@ -300,6 +300,7 @@
4	PHP_FUNCTION(count)	4	PHP_FUNCTION(count)
5	{	5	{
6	zval *array;	6	zval *array;
7	+ zend_class_entry **ce_Countable;	7	+ zend_class_entry **ce_Countable;
8	long mode = COUNT_NORMAL;	8	long mode = COUNT_NORMAL;
9		9
10	if (zend_parse_parameters (ZEND_NUM_ARGS() TSRMLS_CC, "z\|l", &array, &mode) == FAILURE)	10	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z\|l", &array, &mode) == FAILURE) {
11	@@ -308,11 +309,11 @@	11	@@ -314,9 +315,7 @@
12	RETURN_LONG (php_count_recursive (array, mode TSRMLS_CC));	12	RETURN_LONG (php_count_recursive (array, mode TSRMLS_CC));
13	break;	13	break;
14	case IS_OBJECT: {	14	case IS_OBJECT: {
15	-#ifdef HAVE_SPL	15	-#ifdef HAVE_SPL
16	/* it the object implements Countable we call its count() method */
17	zval *retval;	16	zval *retval;
18		17	-#endif
		18	/* first, we check if the handler is defined */
		19	if (Z_OBJ_HT_P(array)->count_elements) {
		20	RETVAL_LONG(1);
		21	@@ -324,9 +323,10 @@
		22	return;
		23	}
		24	}
		25	-#ifdef HAVE_SPL
		26	+
		27	/* if not and the object implements Countable we call its count() method */
19	- if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {	28	- if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), spl_ce_Countable TSRMLS_CC)) {
20	+ if (zend_lookup_class_ex("Countable", 9, 0, &ce_Countable TSRMLS_CC) != FAILURE) {	29	+ if (zend_lookup_class_ex("Countable", 9, 0, &ce_Countable TSRMLS_CC) != FAILURE) {
21	+ if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), *ce_Countable TSRMLS_CC)) {	30	+ if (Z_OBJ_HT_P(array)->get_class_entry && instanceof_function(Z_OBJCE_P(array), *ce_Countable TSRMLS_CC)) {
22	zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);	31	zend_call_method_with_0_params(&array, NULL, NULL, "count", &retval);
23	if (retval) {	32	if (retval) {
24	convert_to_long(retval);	33	convert_to_long_ex(&retval);
25	@@ -321,7 +322,7 @@	34	@@ -335,7 +335,7 @@
26	}	35	}
27	return;	36	return;
28	}	37	}
29	-#endif	38	-#endif
30	+ }	39	+ }
31	/* if not we return the number of properties (not taking visibility into account) */	40	}
32	if (Z_OBJ_HT_P(array)->count_elements) {	41	default:
33	RETVAL_LONG(1);	42	RETURN_LONG(1);

Lines 1-13 Link Here

(-)lang/php5/files/patch-ext_standard_basic_functions.c (-8 lines)
1	--- ext/standard/basic_functions.c.orig 2008-06-09 14:06:40.000000000 +0200	1	--- ext/standard/basic_functions.c.orig 2008-06-09 14:06:40.000000000 +0200
2	+++ ext/standard/basic_functions.c 2008-06-09 14:08:28.000000000 +0200	2	+++ ext/standard/basic_functions.c 2008-06-09 14:08:28.000000000 +0200
3	@@ -87,6 +87,7 @@
4	# include <sys/loadavg.h>
5	#endif
6
7	+#define HARTMUT_0
8	#ifdef HARTMUT_0
9	#include <getopt.h>
10	#endif
11	@@ -3859,7 +3860,7 @@	3	@@ -3859,7 +3860,7 @@
12	SetEnvironmentVariable(pe->key, "bugbug");	4	SetEnvironmentVariable(pe->key, "bugbug");
13	#endif	5	#endif

Line 0 Link Here

(-)lang/php5/files/patch-ext_standard_dns.h (+13 lines)
	1	--- ext/standard/dns.h~ 2009-05-19 21:39:53.000000000 +0200
	2	+++ ext/standard/dns.h 2009-11-02 20:08:40.000000000 +0100
	3	@@ -37,6 +37,10 @@
	4
	5	#if ((HAVE_RES_NMKQUERY && HAVE_RES_NSEND) \|\| HAVE_DEPRECATED_DNS_FUNCS) && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
	6	#define HAVE_DNS_FUNCS 1
	7	+#define res_ninit __res_ninit
	8	+#define res_nmkquery __res_nmkquery
	9	+#define res_nsend __res_nsend
	10	+#define res_nclose __res_nclose
	11	#endif
	12
	13	PHP_FUNCTION(gethostbyaddr);

Lines 1-13 Link Here

(-)lang/php5/files/patch-ext_standard_php_dns.h (-13 lines)
1	--- ext/standard/php_dns.h.orig Sun Jun 19 11:57:31 2005
2	+++ ext/standard/php_dns.h Sun Jun 19 12:03:37 2005
3	@@ -25,6 +25,10 @@
4
5	#if HAVE_RES_NMKQUERY && HAVE_RES_NSEND && HAVE_DN_EXPAND && HAVE_DN_SKIPNAME
6	#define HAVE_DNS_FUNCS 1
7	+#define res_ninit __res_ninit
8	+#define res_nmkquery __res_nmkquery
9	+#define res_nsend __res_nsend
10	+#define res_nclose __res_nclose
11	#endif
12
13	PHP_FUNCTION(gethostbyaddr);

Line 0 Link Here

(-)lang/php5/files/patch-php.ini-development (+19 lines)
	1	--- php.ini-development~ 2009-06-28 19:56:18.000000000 +0200
	2	+++ php.ini-development 2009-11-02 20:14:16.000000000 +0100
	3	@@ -335,6 +335,16 @@
	4
	5	; Safe Mode
	6	; http://php.net/safe-mode
	7	+;
	8	+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
	9	+; the PHP Safe Mode feature not be relied upon for security, since the
	10	+; issues Safe Mode tries to handle cannot properly be handled in PHP
	11	+; (primarily due to PHP's use of external libraries). While many bugs
	12	+; in Safe Mode has been fixed it's very likely that more issues exist
	13	+; which allows a user to bypass Safe Mode restrictions.
	14	+; For increased security we always recommend to install the Suhosin
	15	+; extension.
	16	+;
	17	safe_mode = Off
	18
	19	; By default, Safe Mode does a UID compare check when

Lines 1-18 Link Here

(-)lang/php5/files/patch-php.ini-dist (-18 lines)
1	--- php.ini-dist.orig Fri Dec 30 18:19:43 2005
2	+++ php.ini-dist Mon Oct 16 08:12:28 2006
3	@@ -165,6 +165,15 @@
4
5	; Safe Mode
6	;
7	+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
8	+; the PHP Safe Mode feature not be relied upon for security, since the
9	+; issues Safe Mode tries to handle cannot properly be handled in PHP
10	+; (primarily due to PHP's use of external libraries). While many bugs
11	+; in Safe Mode has been fixed it's very likely that more issues exist
12	+; which allows a user to bypass Safe Mode restrictions.
13	+; For increased security we always recommend to install the Suhosin
14	+; extension.
15	+;
16	safe_mode = Off
17
18	; By default, Safe Mode does a UID compare check when

Line 0 Link Here

(-)lang/php5/files/patch-php.ini-production (+19 lines)
	1	--- php.ini-production~ 2009-06-28 19:56:18.000000000 +0200
	2	+++ php.ini-production 2009-11-02 20:14:02.000000000 +0100
	3	@@ -335,6 +335,16 @@
	4
	5	; Safe Mode
	6	; http://php.net/safe-mode
	7	+;
	8	+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
	9	+; the PHP Safe Mode feature not be relied upon for security, since the
	10	+; issues Safe Mode tries to handle cannot properly be handled in PHP
	11	+; (primarily due to PHP's use of external libraries). While many bugs
	12	+; in Safe Mode has been fixed it's very likely that more issues exist
	13	+; which allows a user to bypass Safe Mode restrictions.
	14	+; For increased security we always recommend to install the Suhosin
	15	+; extension.
	16	+;
	17	safe_mode = Off
	18
	19	; By default, Safe Mode does a UID compare check when

Lines 1-18 Link Here

(-)lang/php5/files/patch-php.ini-recommended (-18 lines)
1	--- php.ini-recommended.orig Fri Dec 30 18:19:43 2005
2	+++ php.ini-recommended Mon Oct 16 08:13:05 2006
3	@@ -223,6 +223,15 @@
4	;
5	; Safe Mode
6	;
7	+; SECURITY NOTE: The FreeBSD Security Officer strongly recommend that
8	+; the PHP Safe Mode feature not be relied upon for security, since the
9	+; issues Safe Mode tries to handle cannot properly be handled in PHP
10	+; (primarily due to PHP's use of external libraries). While many bugs
11	+; in Safe Mode has been fixed it's very likely that more issues exist
12	+; which allows a user to bypass Safe Mode restrictions.
13	+; For increased security we recommend to always install the Suhosin
14	+; extension.
15	+;
16	safe_mode = Off
17
18	; By default, Safe Mode does a UID compare check when

Lines 1-6 Link Here

(-)lang/php5/files/patch-sapi_cgi_config9.m4 (-11 / +12 lines)
1	--- sapi/cgi/config9.m4.orig Thu Jul 12 01:20:36 2007	1	--- sapi/cgi/config9.m4.orig 2007-10-01 14:40:54.000000000 +0200
2	+++ sapi/cgi/config9.m4 Wed Sep 5 07:55:06 2007	2	+++ sapi/cgi/config9.m4 2009-11-02 20:21:43.000000000 +0100
3	@@ -25,7 +25,6 @@	3	@@ -8,7 +8,6 @@
4	dnl	4	dnl
5	dnl CGI setup	5	dnl CGI setup
6	dnl	6	dnl
Lines 8-26 Link Here
8	AC_MSG_CHECKING(whether to build CGI binary)	8	AC_MSG_CHECKING(whether to build CGI binary)
9	if test "$PHP_CGI" != "no"; then	9	if test "$PHP_CGI" != "no"; then
10	AC_MSG_RESULT(yes)	10	AC_MSG_RESULT(yes)
11	@@ -85,8 +84,9 @@	11	@@ -53,8 +52,9 @@
12	AC_MSG_RESULT($PHP_PATH_INFO_CHECK)	12	PHP_SUBST(SAPI_CGI_PATH)
13		13
14	dnl Set install target and select SAPI	14	dnl Set install target and select SAPI
15	- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"	15	- INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
16	- PHP_SELECT_SAPI(cgi, program, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)')	16	- PHP_SELECT_SAPI(cgi, program, cgi_main.c fastcgi.c,, '$(SAPI_CGI_PATH)')
17	+ INSTALL_CGI="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"	17	+ INSTALL_CGI="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
18	+ PHP_ADD_SOURCES(sapi/cgi, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)	18	+ PHP_ADD_SOURCES(sapi/cgi, fastcgi.c cgi_main.c,, cgi)
19	+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)	19	+ PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
20		20
21	case $host_alias in	21	case $host_alias in
22	aix)	22	aix)
23	@@ -96,17 +96,29 @@	23	@@ -64,17 +64,29 @@
24	BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"	24	BUILD_CGI="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CGI_PATH)"
25	;;	25	;;
26	*)	26	*)
Lines 32-44 Link Here
32	+ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"	32	+ PHP_CGI_TARGET="\$(SAPI_CGI_PATH)"
33	+ PHP_INSTALL_CGI_TARGET="install-cgi"	33	+ PHP_INSTALL_CGI_TARGET="install-cgi"
34	PHP_SUBST(BUILD_CGI)	34	PHP_SUBST(BUILD_CGI)
		35	-
		36	- elif test "$PHP_CLI" != "no"; then
		37	- AC_MSG_RESULT(no)
35	+ PHP_SUBST(INSTALL_CGI)	38	+ PHP_SUBST(INSTALL_CGI)
36	+ PHP_SUBST(PHP_CGI_OBJS)	39	+ PHP_SUBST(PHP_CGI_OBJS)
37	+ PHP_SUBST(PHP_CGI_TARGET)	40	+ PHP_SUBST(PHP_CGI_TARGET)
38	+ PHP_SUBST(PHP_INSTALL_CGI_TARGET)	41	+ PHP_SUBST(PHP_INSTALL_CGI_TARGET)
39		42	+
40	- elif test "$PHP_CLI" != "no"; then
41	- AC_MSG_RESULT(no)
42	+ if test "$PHP_SAPI" = "default" ; then	43	+ if test "$PHP_SAPI" = "default" ; then
43	+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)	44	+ PHP_BUILD_PROGRAM($SAPI_CGI_PATH)
44	+ fi	45	+ fi

Lines 3-10 Link Here

(-)lang/php5/pkg-plist (-29 / +60 lines)
3	bin/php-config	3	bin/php-config
4	bin/phpize	4	bin/phpize
5	etc/php.conf	5	etc/php.conf
6	etc/php.ini-dist	6	etc/php.ini-development
7	etc/php.ini-recommended	7	etc/php.ini-production
8	include/php/TSRM/TSRM.h	8	include/php/TSRM/TSRM.h
9	include/php/TSRM/acconfig.h	9	include/php/TSRM/acconfig.h
10	include/php/TSRM/readdir.h	10	include/php/TSRM/readdir.h
Lines 15-26 Link Here
15	include/php/TSRM/tsrm_strtok_r.h	15	include/php/TSRM/tsrm_strtok_r.h
16	include/php/TSRM/tsrm_virtual_cwd.h	16	include/php/TSRM/tsrm_virtual_cwd.h
17	include/php/TSRM/tsrm_win32.h	17	include/php/TSRM/tsrm_win32.h
18	include/php/Zend/FlexLexer.h
19	include/php/Zend/acconfig.h	18	include/php/Zend/acconfig.h
20	include/php/Zend/zend.h	19	include/php/Zend/zend.h
21	include/php/Zend/zend_API.h	20	include/php/Zend/zend_API.h
22	include/php/Zend/zend_alloc.h	21	include/php/Zend/zend_alloc.h
		22	include/php/Zend/zend_build.h
23	include/php/Zend/zend_builtin_functions.h	23	include/php/Zend/zend_builtin_functions.h
		24	include/php/Zend/zend_closures.h
24	include/php/Zend/zend_compile.h	25	include/php/Zend/zend_compile.h
25	include/php/Zend/zend_config.h	26	include/php/Zend/zend_config.h
26	include/php/Zend/zend_config.nw.h	27	include/php/Zend/zend_config.nw.h
Lines 32-37 Link Here
32	include/php/Zend/zend_execute.h	33	include/php/Zend/zend_execute.h
33	include/php/Zend/zend_extensions.h	34	include/php/Zend/zend_extensions.h
34	include/php/Zend/zend_fast_cache.h	35	include/php/Zend/zend_fast_cache.h
		36	include/php/Zend/zend_float.h
		37	include/php/Zend/zend_gc.h
35	include/php/Zend/zend_globals.h	38	include/php/Zend/zend_globals.h
36	include/php/Zend/zend_globals_macros.h	39	include/php/Zend/zend_globals_macros.h
37	include/php/Zend/zend_hash.h	40	include/php/Zend/zend_hash.h
Lines 40-50 Link Here
40	include/php/Zend/zend_ini.h	43	include/php/Zend/zend_ini.h
41	include/php/Zend/zend_ini_parser.h	44	include/php/Zend/zend_ini_parser.h
42	include/php/Zend/zend_ini_scanner.h	45	include/php/Zend/zend_ini_scanner.h
		46	include/php/Zend/zend_ini_scanner_defs.h
43	include/php/Zend/zend_interfaces.h	47	include/php/Zend/zend_interfaces.h
44	include/php/Zend/zend_istdiostream.h	48	include/php/Zend/zend_istdiostream.h
45	include/php/Zend/zend_iterators.h	49	include/php/Zend/zend_iterators.h
46	include/php/Zend/zend_language_parser.h	50	include/php/Zend/zend_language_parser.h
47	include/php/Zend/zend_language_scanner.h	51	include/php/Zend/zend_language_scanner.h
		52	include/php/Zend/zend_language_scanner_defs.h
48	include/php/Zend/zend_list.h	53	include/php/Zend/zend_list.h
49	include/php/Zend/zend_llist.h	54	include/php/Zend/zend_llist.h
50	include/php/Zend/zend_modules.h	55	include/php/Zend/zend_modules.h
Lines 71-87 Link Here
71	include/php/ext/date/lib/timelib_config.h	76	include/php/ext/date/lib/timelib_config.h
72	include/php/ext/date/lib/timelib_structs.h	77	include/php/ext/date/lib/timelib_structs.h
73	include/php/ext/date/php_date.h	78	include/php/ext/date/php_date.h
		79	include/php/ext/ereg/php_ereg.h
		80	include/php/ext/ereg/php_regex.h
		81	include/php/ext/ereg/regex/cclass.h
		82	include/php/ext/ereg/regex/cname.h
		83	include/php/ext/ereg/regex/regex.h
		84	include/php/ext/ereg/regex/regex2.h
		85	include/php/ext/ereg/regex/utils.h
74	include/php/ext/libxml/php_libxml.h	86	include/php/ext/libxml/php_libxml.h
		87	include/php/ext/pcre/pcrelib/config.h
		88	include/php/ext/pcre/pcrelib/pcre.h
		89	include/php/ext/pcre/pcrelib/pcre_internal.h
		90	include/php/ext/pcre/pcrelib/pcreposix.h
		91	include/php/ext/pcre/pcrelib/ucp.h
		92	include/php/ext/pcre/php_pcre.h
		93	@exec touch %D/include/php/ext/php_config.h
		94	@unexec [ -s %D/include/php/ext/php_config.h ] \|\| rm %D/include/php/ext/php_config.h
		95	include/php/ext/spl/php_spl.h
		96	include/php/ext/spl/spl_array.h
		97	include/php/ext/spl/spl_directory.h
		98	include/php/ext/spl/spl_dllist.h
		99	include/php/ext/spl/spl_engine.h
		100	include/php/ext/spl/spl_exceptions.h
		101	include/php/ext/spl/spl_fixedarray.h
		102	include/php/ext/spl/spl_functions.h
		103	include/php/ext/spl/spl_heap.h
		104	include/php/ext/spl/spl_iterators.h
		105	include/php/ext/spl/spl_observer.h
75	include/php/ext/standard/base64.h	106	include/php/ext/standard/base64.h
76	include/php/ext/standard/basic_functions.h	107	include/php/ext/standard/basic_functions.h
77	include/php/ext/standard/crc32.h	108	include/php/ext/standard/crc32.h
78	include/php/ext/standard/credits.h	109	include/php/ext/standard/credits.h
79	include/php/ext/standard/credits_ext.h	110	include/php/ext/standard/credits_ext.h
80	include/php/ext/standard/credits_sapi.h	111	include/php/ext/standard/credits_sapi.h
		112	include/php/ext/standard/crypt_freesec.h
81	include/php/ext/standard/css.h	113	include/php/ext/standard/css.h
82	include/php/ext/standard/cyr_convert.h	114	include/php/ext/standard/cyr_convert.h
83	include/php/ext/standard/datetime.h	115	include/php/ext/standard/datetime.h
84	include/php/ext/standard/dl.h	116	include/php/ext/standard/dl.h
		117	include/php/ext/standard/dns.h
85	include/php/ext/standard/exec.h	118	include/php/ext/standard/exec.h
86	include/php/ext/standard/file.h	119	include/php/ext/standard/file.h
87	include/php/ext/standard/flock_compat.h	120	include/php/ext/standard/flock_compat.h
Lines 97-104 Link Here
97	include/php/ext/standard/php_assert.h	130	include/php/ext/standard/php_assert.h
98	include/php/ext/standard/php_browscap.h	131	include/php/ext/standard/php_browscap.h
99	include/php/ext/standard/php_crypt.h	132	include/php/ext/standard/php_crypt.h
		133	include/php/ext/standard/php_crypt_r.h
100	include/php/ext/standard/php_dir.h	134	include/php/ext/standard/php_dir.h
101	include/php/ext/standard/php_dns.h
102	include/php/ext/standard/php_ext_syslog.h	135	include/php/ext/standard/php_ext_syslog.h
103	include/php/ext/standard/php_filestat.h	136	include/php/ext/standard/php_filestat.h
104	include/php/ext/standard/php_fopen_wrappers.h	137	include/php/ext/standard/php_fopen_wrappers.h
Lines 123-140 Link Here
123	include/php/ext/standard/php_versioning.h	156	include/php/ext/standard/php_versioning.h
124	include/php/ext/standard/proc_open.h	157	include/php/ext/standard/proc_open.h
125	include/php/ext/standard/quot_print.h	158	include/php/ext/standard/quot_print.h
126	include/php/ext/standard/reg.h
127	include/php/ext/standard/scanf.h	159	include/php/ext/standard/scanf.h
128	include/php/ext/standard/sha1.h	160	include/php/ext/standard/sha1.h
129	include/php/ext/standard/streamsfuncs.h	161	include/php/ext/standard/streamsfuncs.h
130	include/php/ext/standard/uniqid.h	162	include/php/ext/standard/uniqid.h
131	include/php/ext/standard/url.h	163	include/php/ext/standard/url.h
		164	include/php/ext/standard/url_scanner.h
132	include/php/ext/standard/url_scanner_ex.h	165	include/php/ext/standard/url_scanner_ex.h
133	@exec touch %D/include/php/ext/php_config.h	166	include/php/ext/standard/winver.h
134	@unexec [ -s %D/include/php/ext/php_config.h ] \|\| rm %D/include/php/ext/php_config.h
135	include/php/main/SAPI.h	167	include/php/main/SAPI.h
136	include/php/main/build-defs.h	168	include/php/main/build-defs.h
137	include/php/main/config.w32.h
138	include/php/main/fopen_wrappers.h	169	include/php/main/fopen_wrappers.h
139	include/php/main/logos.h	170	include/php/main/logos.h
140	include/php/main/php.h	171	include/php/main/php.h
Lines 142-147 Link Here
142	include/php/main/php_compat.h	173	include/php/main/php_compat.h
143	include/php/main/php_config.h	174	include/php/main/php_config.h
144	include/php/main/php_content_types.h	175	include/php/main/php_content_types.h
		176	include/php/main/php_getopt.h
145	include/php/main/php_globals.h	177	include/php/main/php_globals.h
146	include/php/main/php_ini.h	178	include/php/main/php_ini.h
147	include/php/main/php_logos.h	179	include/php/main/php_logos.h
Lines 151-157 Link Here
151	include/php/main/php_open_temporary_file.h	183	include/php/main/php_open_temporary_file.h
152	include/php/main/php_output.h	184	include/php/main/php_output.h
153	include/php/main/php_reentrancy.h	185	include/php/main/php_reentrancy.h
154	include/php/main/php_regex.h
155	include/php/main/php_scandir.h	186	include/php/main/php_scandir.h
156	include/php/main/php_streams.h	187	include/php/main/php_streams.h
157	include/php/main/php_syslog.h	188	include/php/main/php_syslog.h
Lines 164-184 Link Here
164	include/php/main/spprintf.h	195	include/php/main/spprintf.h
165	include/php/main/streams/php_stream_context.h	196	include/php/main/streams/php_stream_context.h
166	include/php/main/streams/php_stream_filter_api.h	197	include/php/main/streams/php_stream_filter_api.h
		198	include/php/main/streams/php_stream_glob_wrapper.h
167	include/php/main/streams/php_stream_mmap.h	199	include/php/main/streams/php_stream_mmap.h
168	include/php/main/streams/php_streams_int.h	200	include/php/main/streams/php_stream_plain_wrapper.h
169	include/php/main/streams/php_stream_transport.h	201	include/php/main/streams/php_stream_transport.h
170	include/php/main/streams/php_stream_userspace.h	202	include/php/main/streams/php_stream_userspace.h
171	include/php/main/streams/php_stream_plain_wrapper.h	203	include/php/main/streams/php_streams_int.h
172	%%SUHOSIN%%include/php/main/suhosin_globals.h	204	%%SUHOSIN%%include/php/main/suhosin_globals.h
173	%%SUHOSIN%%include/php/main/suhosin_logo.h	205	%%SUHOSIN%%include/php/main/suhosin_logo.h
174	%%SUHOSIN%%include/php/main/suhosin_patch.h	206	%%SUHOSIN%%include/php/main/suhosin_patch.h
		207	include/php/main/win32_internal_function_disabled.h
175	include/php/main/win95nt.h	208	include/php/main/win95nt.h
176	include/php/regex/cclass.h
177	include/php/regex/cname.h
178	include/php/regex/regex.h
179	include/php/regex/regex2.h
180	include/php/regex/regex_extra.h
181	include/php/regex/utils.h
182	lib/php/build/Makefile.global	209	lib/php/build/Makefile.global
183	lib/php/build/acinclude.m4	210	lib/php/build/acinclude.m4
184	lib/php/build/config.guess	211	lib/php/build/config.guess
Lines 190-208 Link Here
190	lib/php/build/run-tests.php	217	lib/php/build/run-tests.php
191	lib/php/build/scan_makefile_in.awk	218	lib/php/build/scan_makefile_in.awk
192	lib/php/build/shtool	219	lib/php/build/shtool
193	%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%%	220	@dirrm lib/php/build
194	%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f	221	@dirrmtry lib/php
195	%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f	222	@dirrm include/php/main/streams
196	@dirrm include/php/TSRM	223	@dirrm include/php/main
197	@dirrm include/php/Zend	224	@dirrm include/php/ext/standard
		225	@dirrm include/php/ext/spl
		226	@dirrm include/php/ext/pcre/pcrelib
		227	@dirrm include/php/ext/pcre
		228	@dirrm include/php/ext/libxml
		229	@dirrm include/php/ext/ereg/regex
		230	@dirrm include/php/ext/ereg
198	@dirrm include/php/ext/date/lib	231	@dirrm include/php/ext/date/lib
199	@dirrm include/php/ext/date	232	@dirrm include/php/ext/date
200	@dirrm include/php/ext/libxml
201	@dirrm include/php/ext/standard
202	@dirrmtry include/php/ext	233	@dirrmtry include/php/ext
203	@dirrm include/php/main/streams	234	@dirrm include/php/Zend
204	@dirrm include/php/main	235	@dirrm include/php/TSRM
205	@dirrm include/php/regex
206	@dirrmtry include/php	236	@dirrmtry include/php
207	@dirrm lib/php/build	237	%%APACHE%%%%APACHEMODDIR%%/%%AP_MODULE%%
208	@dirrmtry lib/php	238	%%APACHE%%@exec %D/sbin/apxs -e -a -n %%AP_NAME%% %f
		239	%%APACHE%%@unexec %D/sbin/apxs -e -A -n %%AP_NAME%% %f

Lines 28-40 Link Here

(-)lang/php5-extensions/Makefile (-12 / +4 lines)
28	WITH_HASH= yes	28	WITH_HASH= yes
29	WITH_ICONV= yes	29	WITH_ICONV= yes
30	WITH_JSON= yes	30	WITH_JSON= yes
31	WITH_PCRE= yes
32	WITH_PDO= yes	31	WITH_PDO= yes
33	WITH_PDO_SQLITE=yes	32	WITH_PDO_SQLITE=yes
34	WITH_POSIX= yes	33	WITH_POSIX= yes
35	WITH_SESSION= yes	34	WITH_SESSION= yes
36	WITH_SIMPLEXML= yes	35	WITH_SIMPLEXML= yes
37	WITH_SPL= yes
38	WITH_SQLITE= yes	36	WITH_SQLITE= yes
39	WITH_TOKENIZER= yes	37	WITH_TOKENIZER= yes
40	WITH_XML= yes	38	WITH_XML= yes
Lines 47-53 Link Here
47	CTYPE "ctype functions" on \	45	CTYPE "ctype functions" on \
48	CURL "CURL support" off \	46	CURL "CURL support" off \
49	DBA "dba support" off \	47	DBA "dba support" off \
50	DBASE "dBase library support" off \
51	DOM "DOM support" on \	48	DOM "DOM support" on \
52	EXIF "EXIF support" off \	49	EXIF "EXIF support" off \
53	FILEINFO "fileinfo support" off \	50	FILEINFO "fileinfo support" off \
Lines 65-80 Link Here
65	LDAP "OpenLDAP support" off \	62	LDAP "OpenLDAP support" off \
66	MBSTRING "multibyte string support" off \	63	MBSTRING "multibyte string support" off \
67	MCRYPT "Encryption support" off \	64	MCRYPT "Encryption support" off \
68	MHASH "Crypto-hashing support" off \
69	MING "ming shockwave flash support" off \
70	MSSQL "MS-SQL database support" off \	65	MSSQL "MS-SQL database support" off \
71	MYSQL "MySQL database support" off \	66	MYSQL "MySQL database support" off \
72	MYSQLI "MySQLi database support" off \	67	MYSQLI "MySQLi database support" off \
73	NCURSES "ncurses support (CLI only)" off \
74	ODBC "unixODBC support" off \	68	ODBC "unixODBC support" off \
75	OPENSSL "OpenSSL support" off \	69	OPENSSL "OpenSSL support" off \
76	PCNTL "pcntl support (CLI only)" off \	70	PCNTL "pcntl support (CLI only)" off \
77	PCRE "Perl Compatible Regular Expression support" on \
78	PDF "PDFlib support (implies GD)" off \	71	PDF "PDFlib support (implies GD)" off \
79	PDO "PHP Data Objects Interface (PDO)" on \	72	PDO "PHP Data Objects Interface (PDO)" on \
80	PDO_SQLITE "PDO sqlite driver" on \	73	PDO_SQLITE "PDO sqlite driver" on \
Lines 89-95 Link Here
89	SNMP "SNMP support" off \	82	SNMP "SNMP support" off \
90	SOAP "SOAP support" off \	83	SOAP "SOAP support" off \
91	SOCKETS "sockets support" off \	84	SOCKETS "sockets support" off \
92	SPL "Standard PHP Library" on \
93	SQLITE "sqlite support" on \	85	SQLITE "sqlite support" on \
94	SYBASE_CT "Sybase database support" off \	86	SYBASE_CT "Sybase database support" off \
95	SYSVMSG "System V message support" off \	87	SYSVMSG "System V message support" off \
Lines 115-127 Link Here
115	.include "${OPTIONSFILE}"	107	.include "${OPTIONSFILE}"
116	.endif	108	.endif
117		109
118	ALL_OPTIONS= BCMATH BZ2 CALENDAR CTYPE CURL DBA DBASE \	110	ALL_OPTIONS= BCMATH BZ2 CALENDAR CTYPE CURL DBA \
119	DOM EXIF FILEINFO FILTER FRIBIDI FTP GD GETTEXT \	111	DOM EXIF FILEINFO FILTER FRIBIDI FTP GD GETTEXT \
120	GMP HASH ICONV IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \	112	GMP HASH ICONV IMAP INTERBASE JSON LDAP MBSTRING MCRYPT \
121	MHASH MING MSSQL MYSQL MYSQLI NCURSES \	113	MSSQL MYSQL MYSQLI \
122	ODBC OPENSSL PCNTL PCRE PDF PDO PDO_SQLITE PGSQL POSIX \	114	ODBC OPENSSL PCNTL PDF PDO PDO_SQLITE PGSQL POSIX \
123	PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \	115	PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \
124	SOCKETS SPL SQLITE SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \	116	SOCKETS SQLITE SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \
125	TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \	117	TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \
126	YAZ ZIP ZLIB	118	YAZ ZIP ZLIB
127		119

Line 0 Link Here

(-)math/php5-bcmath/files/patch-php_bcmath_h (+22 lines)
	1	--- php_bcmath.h~ 2008-12-31 12:15:35.000000000 +0100
	2	+++ php_bcmath.h 2009-11-18 17:36:53.371409213 +0100
	3	@@ -21,8 +21,6 @@
	4	#ifndef PHP_BCMATH_H
	5	#define PHP_BCMATH_H
	6
	7	-#if HAVE_BCMATH
	8	-
	9	#include "libbcmath/src/bcmath.h"
	10
	11	extern zend_module_entry bcmath_module_entry;
	12	@@ -58,10 +56,4 @@
	13
	14	ZEND_EXTERN_MODULE_GLOBALS(bcmath)
	15
	16	-#else
	17	-
	18	-#define phpext_bcmath_ptr NULL
	19	-
	20	-#endif
	21	-
	22	#endif /* PHP_BCMATH_H */

Lines 1-14 Link Here

(-)security/php5-mhash/Makefile (-14 lines)
1	# New ports collection makefile for: php5-mhash
2	# Date created: 7 Jul 2004
3	# Whom: Alex Dupre <ale@FreeBSD.org>
4	#
5	# $FreeBSD: ports/security/php5-mhash/Makefile,v 1.1 2004/07/19 09:19:03 ale Exp $
6	#
7
8	CATEGORIES= security
9
10	MASTERDIR= ${.CURDIR}/../../lang/php5
11
12	PKGNAMESUFFIX= -mhash
13
14	.include "${MASTERDIR}/Makefile"