ports/140678: Update port lang/php5 to upstream version 5.3.0

Morton Jonuschat mjonuschat at gmail.com
Wed Nov 18 18:10:05 UTC 2009 

>Number:         140678
>Category:       ports
>Synopsis:       Update port lang/php5 to upstream version 5.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 18 18:10:04 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Morton Jonuschat
>Release:        8.0-PRERELEASE
>Organization:
>Environment:
FreeBSD localhorst.local 8.0-PRERELEASE FreeBSD 8.0-PRERELEASE #0: Tue Nov 17 07:52:33 CET 2009     root at localhorst.local:/usr/obj/usr/src/sys/HOMESERVER  amd64
>Description:
Attached patches update lang/php5 and associated extensions to upstream version 5.3.0

6 new entries in MOVED
 * pcre and spl extensions are required by core since 5.3.0 and are always included
 * mhash has been deprecated, an API compatible replacement ist php5-has
 * dbase, ncurses and ming have been deprecated upstream

port/directory devel/php5-spl needs to be removed
port/directory devel/php5-pcre needs to be removed
port/directory security/php5-mhash needs to be removed
port/directory databases/php5-dbase needs to be removed
port/directory devel/php5-ncurses needs to be removed
port/directory graphics/php5-ming needs to be removed

Suhosin and Mailhead patch have been updated to 5.3.0 comaptible versions

Patch files for extension php5-readline have been made 5.3.0 compatible 
Patch files for extension php5-pgsql have been made 5.3.0 compatible
Patch files for extension php5-pdo_sqlite have been made 5.3.0 compatible

Extension php5-bcmath has been patched to compile as phpized module
  PHP Bug report: http://bugs.php.net/bug.php?id=49289

Meta package php5-extensions has been patched to reflect changed availability of extension modules


>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -urN FreeBSD/ports/MOVED PHP-5.3.0/ports/MOVED
--- MOVED	2009-11-11 09:57:58.000000000 +0100
+++ MOVED	2009-11-18 11:32:38.148046748 +0100
@@ -4197,3 +4197,10 @@
 emulators/fceu|emulators/fceux|2009-11-04|Repocopied to new location
 net/p5-Net-EPP-Frame|net/p5-Net-EPP|2009-11-11|Please use net/p5-Net-EPP
 net/p5-Net-EPP-Client|net/p5-Net-EPP|2009-11-11|Please use net/p5-Net-EPP
+devel/php5-pcre|lang/php5|2009-11-17|Required core module as of PHP 5.3.0
+devel/php5-spl|lang/php5|2009-11-17|Required core module as of PHP 5.3.0
+security/php5-mhash|security/php5-hash|2009-11-17|Replaced by php5-hash as of PHP 5.3.0
+databases/php5-dbase||2009-11-17|Has expired: the extension was removed from PHP 5.3.0
+graphics/php5-ming||2009-11-17|Has expired: the extension was removed from PHP 5.3.0
+devel/php5-ncurses||2009-11-17|Has expired: the extension was removed from PHP 5.3.0
+
diff -urN FreeBSD/ports/databases/php5-dbase/Makefile PHP-5.3.0/ports/databases/php5-dbase/Makefile
--- databases/php5-dbase/Makefile	2004-07-19 10:49:04.000000000 +0200
+++ databases/php5-dbase/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-# New ports collection makefile for:	php5-dbase
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale at 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"
diff -urN FreeBSD/ports/databases/php5-pdo_sqlite/files/patch-sqlite_statement.c PHP-5.3.0/ports/databases/php5-pdo_sqlite/files/patch-sqlite_statement.c
--- databases/php5-pdo_sqlite/files/patch-sqlite_statement.c	2008-12-07 12:54:35.000000000 +0100
+++ databases/php5-pdo_sqlite/files/patch-sqlite_statement.c	2009-11-18 08:50:30.771116161 +0100
@@ -1,50 +0,0 @@
---- 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:
diff -urN FreeBSD/ports/databases/php5-pgsql/files/patch-pgsql.c PHP-5.3.0/ports/databases/php5-pgsql/files/patch-pgsql.c
--- databases/php5-pgsql/files/patch-pgsql.c	2008-01-29 11:14:37.000000000 +0100
+++ databases/php5-pgsql/files/patch-pgsql.c	2009-11-18 16:38:19.676294611 +0100
@@ -1,6 +1,6 @@
---- pgsql.c.orig	2007-10-04 01:31:58.000000000 +0200
-+++ pgsql.c	2008-01-29 11:10:15.000000000 +0100
-@@ -62,6 +62,7 @@
+--- 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
  
@@ -8,7 +8,7 @@
  #define PGSQL_RETURN_OID(oid) do { \
  	if (oid > LONG_MAX) { \
  		smart_str s = {0}; \
-@@ -71,7 +72,9 @@
+@@ -72,7 +73,9 @@
  	} \
  	RETURN_LONG((long)oid); \
  } while(0)
@@ -19,7 +19,7 @@
  
  #if HAVE_PQSETNONBLOCKING
  #define PQ_SETNONBLOCKING(pg_link, flag) PQsetnonblocking(pg_link, flag)
-@@ -272,7 +275,7 @@
+@@ -728,7 +731,7 @@
  static int le_link, le_plink, le_result, le_lofp, le_string;
  
  /* {{{ _php_pgsql_trim_message */
@@ -28,7 +28,7 @@
  {
  	register int i = strlen(message)-1;
  
-@@ -363,7 +366,7 @@
+@@ -819,7 +822,7 @@
  		if (PGG(log_notices)) {
  			php_error_docref(NULL TSRMLS_CC, E_NOTICE, "%s", notice->message);
  		}
@@ -37,7 +37,7 @@
  	}
  }
  /* }}} */
-@@ -761,13 +764,14 @@
+@@ -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) {
@@ -54,7 +54,7 @@
  			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;
-@@ -1748,12 +1752,15 @@
+@@ -2166,12 +2170,15 @@
  
  
  	if (return_oid) {
@@ -71,30 +71,23 @@
  			RETURN_LONG((long)oid);
  		}
  	}
-@@ -1854,6 +1861,7 @@
+@@ -2272,6 +2279,7 @@
  			
- 			oid = PQftype(pgsql_result, Z_LVAL_PP(field));
+ 			oid = PQftype(pgsql_result, field);
  
 +#if UINT_MAX > LONG_MAX
  			if (oid > LONG_MAX) {
  				smart_str s = {0};
  				smart_str_append_unsigned(&s, oid);
-@@ -1863,6 +1871,7 @@
+@@ -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 {
++			}
++			else
 +#endif
- 			{
++			{
  				Z_LVAL_P(return_value) = (long)oid;
  				Z_TYPE_P(return_value) = IS_LONG;
-@@ -5741,8 +5750,8 @@
- {
- 	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);
- 
+ 			}
diff -urN FreeBSD/ports/devel/php5-ncurses/Makefile PHP-5.3.0/ports/devel/php5-ncurses/Makefile
--- devel/php5-ncurses/Makefile	2004-07-19 11:03:10.000000000 +0200
+++ devel/php5-ncurses/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-# New ports collection makefile for:	php5-ncurses
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale at 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"
diff -urN FreeBSD/ports/devel/php5-pcre/Makefile PHP-5.3.0/ports/devel/php5-pcre/Makefile
--- devel/php5-pcre/Makefile	2009-03-06 11:08:33.000000000 +0100
+++ devel/php5-pcre/Makefile	2009-11-18 08:50:30.854381492 +0100
@@ -1,14 +0,0 @@
-# New ports collection makefile for:	php5-pcre
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale at 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"
diff -urN FreeBSD/ports/devel/php5-pcre/files/patch-php_pcre.c PHP-5.3.0/ports/devel/php5-pcre/files/patch-php_pcre.c
--- devel/php5-pcre/files/patch-php_pcre.c	2009-03-06 11:08:33.000000000 +0100
+++ devel/php5-pcre/files/patch-php_pcre.c	2009-11-18 08:50:30.869930116 +0100
@@ -1,13 +0,0 @@
---- php_pcre.c.orig	2009-03-06 10:58:43.000000000 +0100
-+++ php_pcre.c	2009-03-06 10:58:56.000000000 +0100
-@@ -18,6 +18,10 @@
- 
- /* $Id: php_pcre.c,v 1.168.2.9.2.30 2009/01/13 19:23:31 andrei Exp $ */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
- #include "php_ini.h"
- #include "php_globals.h"
diff -urN FreeBSD/ports/devel/php5-readline/files/patch-config.m4 PHP-5.3.0/ports/devel/php5-readline/files/patch-config.m4
--- devel/php5-readline/files/patch-config.m4	2009-09-22 12:36:31.000000000 +0200
+++ devel/php5-readline/files/patch-config.m4	2009-11-18 16:45:50.575777646 +0100
@@ -1,20 +1,17 @@
---- config.m4.orig	2009-08-04 13:20:49.000000000 +0200
-+++ config.m4	2009-09-22 11:13:12.000000000 +0200
-@@ -5,13 +5,8 @@
+--- 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
-@@ -60,6 +55,13 @@
+@@ -50,6 +48,13 @@
      -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS
    ])
  
@@ -28,7 +25,7 @@
    AC_DEFINE(HAVE_LIBREADLINE, 1, [ ])
  
  elif test "$PHP_LIBEDIT" != "no"; then
-@@ -97,7 +99,6 @@
+@@ -87,7 +92,6 @@
  fi
  
  if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then
diff -urN FreeBSD/ports/devel/php5-spl/Makefile PHP-5.3.0/ports/devel/php5-spl/Makefile
--- devel/php5-spl/Makefile	2007-02-09 09:31:42.000000000 +0100
+++ devel/php5-spl/Makefile	2009-11-18 08:50:30.873000897 +0100
@@ -1,14 +0,0 @@
-# New ports collection makefile for:	php5-spl
-# Date created:			7 Feb 2007
-# Whom:				Alex Dupre <ale at 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"
diff -urN FreeBSD/ports/devel/php5-spl/files/patch-config.m4 PHP-5.3.0/ports/devel/php5-spl/files/patch-config.m4
--- devel/php5-spl/files/patch-config.m4	2007-02-09 09:31:42.000000000 +0100
+++ devel/php5-spl/files/patch-config.m4	2009-11-18 08:50:30.875052834 +0100
@@ -1,28 +0,0 @@
---- 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
diff -urN FreeBSD/ports/graphics/php5-ming/Makefile PHP-5.3.0/ports/graphics/php5-ming/Makefile
--- graphics/php5-ming/Makefile	2004-07-19 11:11:12.000000000 +0200
+++ graphics/php5-ming/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-# New ports collection makefile for:	php5-ming
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale at 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"
diff -urN FreeBSD/ports/lang/php5/Makefile PHP-5.3.0/ports/lang/php5/Makefile
--- lang/php5/Makefile	2009-10-12 15:14:26.000000000 +0200
+++ lang/php5/Makefile	2009-11-18 08:50:30.944713084 +0100
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.2.11
-PORTREVISION?=	1
+PORTVERSION=	5.3.0
+#PORTREVISION?=	1
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP}
 MASTER_SITE_SUBDIR=	distributions
@@ -47,7 +47,8 @@
 		FASTCGI "Enable fastcgi support (CGI only)" on \
 		PATHINFO "Enable path-info-check support (CGI only)" on
 
-CONFLICTS=	php4-4*
+CONFLICTS=	php4-4* 
+#php5-pcre-* php5-spl-* php5-mhash-*
 
 MAN1=		php-config.1 phpize.1
 
@@ -56,7 +57,7 @@
 PATCH_DIST_STRIP=	-p1
 
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.7.patch.gz:suhosin
+PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.8.patch.gz:suhosin
 PATCH_SITES+=	http://download.suhosin.org/:suhosin
 PLIST_SUB+=	SUHOSIN=""
 .else
@@ -65,7 +66,7 @@
 
 .if defined(WITH_MAILHEAD)
 #PATCHFILES+=	php-${PORTVERSION}-mail-header.patch:mail
-PATCHFILES+=	php-5.2.10-mail-header.patch:mail
+PATCHFILES+=	php-5.3.0-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
@@ -163,8 +164,8 @@
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
 
 post-install:
-	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
-	@${INSTALL_DATA} ${WRKSRC}/php.ini-recommended ${PREFIX}/etc
+	@${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)
diff -urN FreeBSD/ports/lang/php5/Makefile.ext PHP-5.3.0/ports/lang/php5/Makefile.ext
--- lang/php5/Makefile.ext	2009-08-02 21:34:30.000000000 +0200
+++ lang/php5/Makefile.ext	2009-11-18 11:41:32.491500176 +0100
@@ -56,17 +56,12 @@
 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
 
@@ -78,7 +73,6 @@
 CONFIGURE_ARGS+=--enable-filter \
 		--with-pcre-dir=${LOCALBASE}
 
-USE_PHP=	pcre
 USE_PHP_BUILD=	yes
 .endif
 
@@ -191,12 +185,6 @@
 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
 
@@ -216,14 +204,9 @@
 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
 
@@ -315,16 +298,11 @@
 .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
 
 
@@ -394,16 +372,6 @@
 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
@@ -415,7 +383,6 @@
 USE_PHP_BUILD=	yes
 PHP_HEADER_DIRS=libsqlite/src
 
-USE_PHP=	spl
 USE_PHP_BUILD=	yes
 
 OPTIONS=	UTF8 "Enable UTF-8 support" off
@@ -578,21 +545,6 @@
 	/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
diff -urN FreeBSD/ports/lang/php5/distinfo PHP-5.3.0/ports/lang/php5/distinfo
--- lang/php5/distinfo	2009-09-22 12:36:31.000000000 +0200
+++ lang/php5/distinfo	2009-11-18 08:50:30.948753821 +0100
@@ -1,9 +1,10 @@
-MD5 (php-5.2.11.tar.bz2) = 286bf34630f5643c25ebcedfec5e0a09
-SHA256 (php-5.2.11.tar.bz2) = 9bcd14ceda2b4bd7abcc7eb59bd74bae490d9335e4207580de783b48aa7e8f23
-SIZE (php-5.2.11.tar.bz2) = 9030787
-MD5 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 8f9de4d97fae6eba163cf3699509a260
-SHA256 (suhosin-patch-5.2.11-0.9.7.patch.gz) = 392f10c9b7d9c47f30e989fb7775cc46d36153b933bf7ac9ccd8826b2954584b
-SIZE (suhosin-patch-5.2.11-0.9.7.patch.gz) = 23050
-MD5 (php-5.2.10-mail-header.patch) = 7f73682e78d32e22989c3fb3678d668b
-SHA256 (php-5.2.10-mail-header.patch) = a61d50540f4aae32390118453845c380fe935b6d1e46cef6819c8561946e942f
-SIZE (php-5.2.10-mail-header.patch) = 3383
+MD5 (php-5.3.0.tar.bz2) = 846760cd655c98dfd86d6d97c3d964b0
+SHA256 (php-5.3.0.tar.bz2) = 83c9d86f830f8b188c70d3554d07b7416af90fd9e06d84340ffda58c09e58357
+SIZE (php-5.3.0.tar.bz2) = 10097840
+MD5 (suhosin-patch-5.3.0-0.9.8.patch.gz) = a23a3d54e177ac0ad30f78d928ba8177
+SHA256 (suhosin-patch-5.3.0-0.9.8.patch.gz) = 1825c80b77a69044efa855453c1844619827c8398c82280c6060840b238d5a5b
+SIZE (suhosin-patch-5.3.0-0.9.8.patch.gz) = 38026
+MD5 (php-5.3.0-mail-header.patch) = c205f2b93eb180dc7c256ebde9313c2c
+SHA256 (php-5.3.0-mail-header.patch) = 6c748284efa0a129538e0520f52cb1e72eae885cbf5f658e4112b64a3cf63f41
+SIZE (php-5.3.0-mail-header.patch) = 3350
+
diff -urN FreeBSD/ports/lang/php5/files/patch-Zend::zend.h PHP-5.3.0/ports/lang/php5/files/patch-Zend::zend.h
--- lang/php5/files/patch-Zend::zend.h	2005-12-09 20:41:39.000000000 +0100
+++ lang/php5/files/patch-Zend::zend.h	2009-11-18 08:50:30.963295334 +0100
@@ -1,11 +1,11 @@
---- Zend/zend.h.orig	Tue Nov 15 14:35:22 2005
-+++ Zend/zend.h	Fri Nov 25 09:31:48 2005
-@@ -178,7 +178,7 @@
+--- Zend/zend.h.orig	2009-11-02 19:45:53.000000000 +0100
++++ Zend/zend.h	2009-11-02 19:49:11.000000000 +0100
+@@ -198,7 +198,7 @@
  #endif
- 
+ #define restrict __restrict__
  
 -#if (HAVE_ALLOCA || (defined (__GNUC__) && __GNUC__ >= 2)) && !(defined(ZTS) && defined(ZEND_WIN32)) && !(defined(ZTS) && defined(NETWARE)) && !(defined(ZTS) && defined(HPUX)) && !defined(DARWIN)
 +#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__))
- # define do_alloca(p) alloca(p)
- # define free_alloca(p)
- #else
+ # define ZEND_ALLOCA_MAX_SIZE (32 * 1024)
+ # define ALLOCA_FLAG(name) \
+ 	zend_bool name;
diff -urN FreeBSD/ports/lang/php5/files/patch-configure.in PHP-5.3.0/ports/lang/php5/files/patch-configure.in
--- lang/php5/files/patch-configure.in	2008-12-07 12:54:35.000000000 +0100
+++ lang/php5/files/patch-configure.in	2009-11-18 08:50:30.965325201 +0100
@@ -1,6 +1,6 @@
---- configure.in.orig	2008-12-05 07:58:47.000000000 +0100
-+++ configure.in	2008-12-05 08:02:26.000000000 +0100
-@@ -270,7 +270,6 @@
+--- 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 -------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_SAPI=default
-@@ -295,7 +294,6 @@
+@@ -345,7 +344,6 @@
  
  if test "$enable_maintainer_zts" = "yes"; then
    PTHREADS_ASSIGN_VARS
@@ -16,7 +16,7 @@
  fi
  
  divert(3)
-@@ -1136,7 +1134,7 @@
+@@ -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"`
@@ -25,14 +25,14 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1344,22 +1342,19 @@
- INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
- CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
- 
--all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET)"
--install_targets="$install_modules install-build install-headers install-programs $install_pear"
-+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)"
-+install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear"
+@@ -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)
@@ -48,8 +48,8 @@
  PHP_SUBST(all_targets)
  PHP_SUBST(install_targets)
  
--PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])
-+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/ regex/])
+-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)
  
diff -urN FreeBSD/ports/lang/php5/files/patch-ext_standard_array.c PHP-5.3.0/ports/lang/php5/files/patch-ext_standard_array.c
--- lang/php5/files/patch-ext_standard_array.c	2007-02-12 20:34:58.000000000 +0100
+++ lang/php5/files/patch-ext_standard_array.c	2009-11-18 08:50:30.967366243 +0100
@@ -1,33 +1,42 @@
---- ext/standard/array.c.orig	Mon Feb 12 20:20:48 2007
-+++ ext/standard/array.c	Mon Feb 12 20:22:14 2007
-@@ -295,6 +295,7 @@
+--- 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)
-@@ -308,11 +309,11 @@
+ 
+ 	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(retval);
-@@ -321,7 +322,7 @@
+ 					convert_to_long_ex(&retval);
+@@ -335,7 +335,7 @@
  				}
  				return;
  			}
 -#endif
 +			}
- 			/* if not we return the number of properties (not taking visibility into account) */
- 			if (Z_OBJ_HT_P(array)->count_elements) {
- 				RETVAL_LONG(1);
+ 		}
+ 		default:
+ 			RETURN_LONG(1);
diff -urN FreeBSD/ports/lang/php5/files/patch-ext_standard_basic_functions.c PHP-5.3.0/ports/lang/php5/files/patch-ext_standard_basic_functions.c
--- lang/php5/files/patch-ext_standard_basic_functions.c	2008-06-09 14:11:33.000000000 +0200
+++ lang/php5/files/patch-ext_standard_basic_functions.c	2009-11-18 08:50:30.968365532 +0100
@@ -1,13 +1,5 @@
 --- 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
diff -urN FreeBSD/ports/lang/php5/files/patch-ext_standard_dns.h PHP-5.3.0/ports/lang/php5/files/patch-ext_standard_dns.h
--- lang/php5/files/patch-ext_standard_dns.h	1970-01-01 01:00:00.000000000 +0100
+++ lang/php5/files/patch-ext_standard_dns.h	2009-11-18 08:50:30.970386180 +0100
@@ -0,0 +1,13 @@
+--- 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);
diff -urN FreeBSD/ports/lang/php5/files/patch-ext_standard_php_dns.h PHP-5.3.0/ports/lang/php5/files/patch-ext_standard_php_dns.h
--- lang/php5/files/patch-ext_standard_php_dns.h	2009-09-22 12:36:31.000000000 +0200
+++ lang/php5/files/patch-ext_standard_php_dns.h	2009-11-18 08:50:30.971399158 +0100
@@ -1,13 +0,0 @@
---- 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);
diff -urN FreeBSD/ports/lang/php5/files/patch-main_streams_xp_socket.c PHP-5.3.0/ports/lang/php5/files/patch-main_streams_xp_socket.c
--- lang/php5/files/patch-main_streams_xp_socket.c	2009-10-12 15:14:26.000000000 +0200
+++ lang/php5/files/patch-main_streams_xp_socket.c	2009-11-18 08:50:30.972406548 +0100
@@ -1,11 +0,0 @@
---- main/streams/xp_socket.c	2009/09/04 07:59:48	288034
-+++ main/streams/xp_socket.c	2009/09/23 10:25:54	288604
-@@ -289,7 +289,7 @@
- 				if (sock->socket == -1) {
- 					alive = 0;
- 				} else if (php_pollfd_for(sock->socket, PHP_POLLREADABLE|POLLPRI, &tv) > 0) {
--					if (recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) != SOCK_CONN_ERR && php_socket_errno() != EWOULDBLOCK) {
-+					if (0 >= recv(sock->socket, &buf, sizeof(buf), MSG_PEEK) && php_socket_errno() != EWOULDBLOCK) {
- 						alive = 0;
- 					}
- 				}
diff -urN FreeBSD/ports/lang/php5/files/patch-php.ini-development PHP-5.3.0/ports/lang/php5/files/patch-php.ini-development
--- lang/php5/files/patch-php.ini-development	1970-01-01 01:00:00.000000000 +0100
+++ lang/php5/files/patch-php.ini-development	2009-11-18 08:50:30.974426637 +0100
@@ -0,0 +1,19 @@
+--- 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
diff -urN FreeBSD/ports/lang/php5/files/patch-php.ini-dist PHP-5.3.0/ports/lang/php5/files/patch-php.ini-dist
--- lang/php5/files/patch-php.ini-dist	2006-10-16 11:30:58.000000000 +0200
+++ lang/php5/files/patch-php.ini-dist	2009-11-18 08:50:30.975427882 +0100
@@ -1,18 +0,0 @@
---- 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
diff -urN FreeBSD/ports/lang/php5/files/patch-php.ini-production PHP-5.3.0/ports/lang/php5/files/patch-php.ini-production
--- lang/php5/files/patch-php.ini-production	1970-01-01 01:00:00.000000000 +0100
+++ lang/php5/files/patch-php.ini-production	2009-11-18 08:50:30.977447133 +0100
@@ -0,0 +1,19 @@
+--- 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
diff -urN FreeBSD/ports/lang/php5/files/patch-php.ini-recommended PHP-5.3.0/ports/lang/php5/files/patch-php.ini-recommended
--- lang/php5/files/patch-php.ini-recommended	2006-10-16 11:30:58.000000000 +0200
+++ lang/php5/files/patch-php.ini-recommended	2009-11-18 08:50:30.978458714 +0100
@@ -1,18 +0,0 @@
---- 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
diff -urN FreeBSD/ports/lang/php5/files/patch-sapi_cgi_config9.m4 PHP-5.3.0/ports/lang/php5/files/patch-sapi_cgi_config9.m4
--- lang/php5/files/patch-sapi_cgi_config9.m4	2007-09-14 08:29:31.000000000 +0200
+++ lang/php5/files/patch-sapi_cgi_config9.m4	2009-11-18 08:50:30.980488301 +0100
@@ -1,6 +1,6 @@
---- sapi/cgi/config9.m4.orig	Thu Jul 12 01:20:36 2007
-+++ sapi/cgi/config9.m4	Wed Sep  5 07:55:06 2007
-@@ -25,7 +25,6 @@
+--- 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
@@ -8,19 +8,19 @@
    AC_MSG_CHECKING(whether to build CGI binary)
    if test "$PHP_CGI" != "no"; then
      AC_MSG_RESULT(yes)
-@@ -85,8 +84,9 @@
-     AC_MSG_RESULT($PHP_PATH_INFO_CHECK)
+@@ -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, $PHP_FCGI_FILES cgi_main.c getopt.c,, '$(SAPI_CGI_PATH)')
+-    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, $PHP_FCGI_FILES cgi_main.c getopt.c,, cgi)
++    PHP_ADD_SOURCES(sapi/cgi, fastcgi.c cgi_main.c,, cgi)
 +    PHP_ADD_SOURCES(/main, internal_functions.c,,cgi)
  
      case $host_alias in
        *aix*)
-@@ -96,17 +96,29 @@
+@@ -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)"
        ;;
        *)
@@ -32,13 +32,14 @@
 +    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
diff -urN FreeBSD/ports/lang/php5/pkg-plist PHP-5.3.0/ports/lang/php5/pkg-plist
--- lang/php5/pkg-plist	2009-09-22 12:36:31.000000000 +0200
+++ lang/php5/pkg-plist	2009-11-18 08:50:30.982508670 +0100
@@ -3,8 +3,8 @@
 bin/php-config
 bin/phpize
 etc/php.conf
-etc/php.ini-dist
-etc/php.ini-recommended
+etc/php.ini-development
+etc/php.ini-production
 include/php/TSRM/TSRM.h
 include/php/TSRM/acconfig.h
 include/php/TSRM/readdir.h
@@ -15,12 +15,13 @@
 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
@@ -32,6 +33,8 @@
 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
@@ -40,11 +43,13 @@
 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
@@ -71,17 +76,45 @@
 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
+ at exec touch %D/include/php/ext/php_config.h
+ at 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
@@ -97,8 +130,8 @@
 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
@@ -123,18 +156,16 @@
 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
- at exec touch %D/include/php/ext/php_config.h
- at unexec [ -s %D/include/php/ext/php_config.h ] || rm %D/include/php/ext/php_config.h
+include/php/ext/standard/winver.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
@@ -142,6 +173,7 @@
 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
@@ -151,7 +183,6 @@
 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
@@ -164,21 +195,17 @@
 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_streams_int.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_stream_plain_wrapper.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
@@ -190,19 +217,23 @@
 lib/php/build/run-tests.php
 lib/php/build/scan_makefile_in.awk
 lib/php/build/shtool
-%%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
- at dirrm include/php/TSRM
- at dirrm include/php/Zend
+ at dirrm lib/php/build
+ at dirrmtry lib/php
+ at dirrm include/php/main/streams
+ at dirrm include/php/main
+ at dirrm include/php/ext/standard
+ at dirrm include/php/ext/spl
+ at dirrm include/php/ext/pcre/pcrelib
+ at dirrm include/php/ext/pcre
+ at dirrm include/php/ext/libxml
+ at dirrm include/php/ext/ereg/regex
+ at dirrm include/php/ext/ereg
 @dirrm include/php/ext/date/lib
 @dirrm include/php/ext/date
- at dirrm include/php/ext/libxml
- at dirrm include/php/ext/standard
 @dirrmtry include/php/ext
- at dirrm include/php/main/streams
- at dirrm include/php/main
- at dirrm include/php/regex
+ at dirrm include/php/Zend
+ at dirrm include/php/TSRM
 @dirrmtry include/php
- at dirrm lib/php/build
- at dirrmtry lib/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
diff -urN FreeBSD/ports/lang/php5-extensions/Makefile PHP-5.3.0/ports/lang/php5-extensions/Makefile
--- lang/php5-extensions/Makefile	2009-03-06 11:08:33.000000000 +0100
+++ lang/php5-extensions/Makefile	2009-11-18 11:40:36.134540562 +0100
@@ -28,13 +28,11 @@
 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
@@ -47,7 +45,6 @@
 		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 \
@@ -65,16 +62,12 @@
 		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 \
@@ -89,7 +82,6 @@
 		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 \
@@ -115,13 +107,13 @@
 .include "${OPTIONSFILE}"
 .endif
 
-ALL_OPTIONS=	BCMATH BZ2 CALENDAR CTYPE CURL DBA DBASE \
+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 \
-		MHASH MING MSSQL MYSQL MYSQLI NCURSES \
-		ODBC OPENSSL PCNTL PCRE PDF PDO PDO_SQLITE PGSQL POSIX \
+		MSSQL MYSQL MYSQLI \
+		ODBC OPENSSL PCNTL PDF PDO PDO_SQLITE PGSQL POSIX \
 		PSPELL READLINE RECODE SESSION SHMOP SIMPLEXML SNMP SOAP \
-		SOCKETS SPL SQLITE SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \
+		SOCKETS SQLITE SYBASE_CT SYSVMSG SYSVSEM SYSVSHM \
 		TIDY TOKENIZER WDDX XML XMLREADER XMLRPC XMLWRITER XSL \
 		YAZ ZIP ZLIB
 
diff -urN FreeBSD/ports/math/php5-bcmath/files/patch-php_bcmath_h PHP-5.3.0/ports/math/php5-bcmath/files/patch-php_bcmath_h
--- math/php5-bcmath/files/patch-php_bcmath_h	1970-01-01 01:00:00.000000000 +0100
+++ math/php5-bcmath/files/patch-php_bcmath_h	2009-11-18 17:37:06.000000000 +0100
@@ -0,0 +1,22 @@
+--- 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 */
diff -urN FreeBSD/ports/security/php5-mhash/Makefile PHP-5.3.0/ports/security/php5-mhash/Makefile
--- security/php5-mhash/Makefile	2004-07-19 11:19:03.000000000 +0200
+++ security/php5-mhash/Makefile	1970-01-01 01:00:00.000000000 +0100
@@ -1,14 +0,0 @@
-# New ports collection makefile for:	php5-mhash
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale at 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"


>Release-Note:
>Audit-Trail:
>Unformatted:

More information about the freebsd-ports-bugs mailing list