Update to 5.2.1 release.

5 files changed, 106 insertions, 26 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index f8fe55613248..e9d98ee984dc 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.2.0
+PORTVERSION=	5.2.1
 PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S,$,:release,} \
@@ -27,14 +27,12 @@ USE_AUTOTOOLS=	autoconf:259
 USE_GETOPT_LONG=yes
 
 CONFIGURE_ARGS=	--enable-versioning \
-		--enable-memory-limit \
 		--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
 		--enable-reflection \
-		--enable-spl \
 		--program-prefix=""
 
 USE_GNOME=	libxml2
@@ -69,7 +67,7 @@ PLIST_SUB+=	SUHOSIN="@comment "
 .endif
 
 .if defined(WITH_MAILHEAD)
-PATCHFILES+=	php-${PORTVERSION}-mail-header.patch:mail
+PATCHFILES+=	php-5.2.0-mail-header.patch:mail
 PATCH_SITES+=	http://choon.net/opensource/php/:mail
 .endif
 
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 77fe93b9c567..c346bfcc65f7 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -237,8 +237,79 @@ CONFIGURE_ARGS+=--with-pcre-regex=yes
 PHP_HEADER_DIRS=pcrelib
 .endif
 
+.if ${PHP_MODNAME} == "pdo"
+CONFIGURE_ARGS+=--enable-pdo
+.endif
+
+.if ${PHP_MODNAME} == "pdo_dblib"
+CONFIGURE_ARGS+=--with-pdo-dblib=${LOCALBASE}
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+
+OPTIONS=	MSSQL	"Enable Microsoft SQL Server support" off
+.endif
+
+.if ${PHP_MODNAME} == "pdo_firebird"
+LIB_DEPENDS+=	gds.1:${PORTSDIR}/databases/firebird-client
+
+CONFIGURE_ARGS+=--with-pdo-firebird=${LOCALBASE}
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+
+USE_GCC=	3.4+
+.endif
+
+.if ${PHP_MODNAME} == "pdo_mysql"
+CONFIGURE_ARGS+=--with-pdo-mysql=${LOCALBASE}
+
+USE_MYSQL=	yes
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+.endif
+
+.if ${PHP_MODNAME} == "pdo_oci"
+BUILD_DEPENDS+=	${LOCALBASE}/oracle8-client/lib/libclntsh.a:${PORTSDIR}/databases/oracle8-client
+
+RUN_DEPENDS+=	${BUILD_DEPENDS}
+
+CONFIGURE_ARGS+=--with-pdo-oci=${LOCALBASE}/oracle8-client
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+.endif
+
+.if ${PHP_MODNAME} == "pdo_odbc"
+LIB_DEPENDS+=	odbc.1:${PORTSDIR}/databases/unixODBC
+
+CONFIGURE_ARGS+=--with-pdo-odbc=unixODBC,${LOCALBASE}
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+.endif
+
+.if ${PHP_MODNAME} == "pdo_pgsql"
+USE_PGSQL=	yes
+
+CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+.endif
+
+.if ${PHP_MODNAME} == "pdo_sqlite"
+CONFIGURE_ARGS+=--with-pdo-sqlite
+
+USE_PHP=	pdo
+USE_PHP_BUILD=	yes
+PHP_HEADER_DIRS=sqlite/src
+.endif
+
+
 .if ${PHP_MODNAME} == "pgsql"
-USE_PGSQL=	YES
+USE_PGSQL=	yes
 
 CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
 .endif
@@ -300,6 +371,16 @@ USE_PHP=	session
 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
@@ -409,7 +490,10 @@ CONFIGURE_ARGS+=--with-zlib=/usr
 CONFIGURE_ARGS+=--without-cdb
 .	endif
 .	if defined(WITH_DB4)
-WITH_DB4_VER?=	43
+WITH_DB4_VER?=	44
+.		if ${WITH_DB4_VER} == 43
+LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
+.		else
 .		if ${WITH_DB4_VER} == 42
 LIB_DEPENDS+=	db-4.2.2:${PORTSDIR}/databases/db42
 .		else
@@ -419,7 +503,8 @@ LIB_DEPENDS+=	db41.1:${PORTSDIR}/databases/db41
 .		if ${WITH_DB4_VER} == 4
 LIB_DEPENDS+=	db4.0:${PORTSDIR}/databases/db4
 .		else
-LIB_DEPENDS+=	db-4.3.0:${PORTSDIR}/databases/db43
+LIB_DEPENDS+=	db-4.4.0:${PORTSDIR}/databases/db44
+.		endif
 .		endif
 .		endif
 .		endif
@@ -473,7 +558,7 @@ post-extract:
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
-.if ${PHP_MODNAME} == "oci8"
+.if ${PHP_MODNAME} == "oci8" || ${PHP_MODNAME} == "pdo_oci"
 . if ${OSVERSION} < 500000
 BROKEN=	Doesn't work on FreeBSD 4.x
 . endif
@@ -486,6 +571,14 @@ pre-configure:
 	/usr/bin/ar rcs liboci8.a *.o
 .endif
 
+.if ${PHP_MODNAME} == "pdo_dblib"
+.if defined(WITH_MSSQL)
+LIB_DEPENDS+=	sybdb.5:${PORTSDIR}/databases/freetds-msdblib
+.else
+LIB_DEPENDS+=	ct.3:${PORTSDIR}/databases/freetds
+.endif
+.endif
+
 .if ${PHP_MODNAME} == "snmp"
 .	if defined(WITH_SNMP4) || exists(${LOCALBASE}/lib/libsnmp.so.4)
 LIB_DEPENDS+=   snmp.4:${PORTSDIR}/net-mgmt/net-snmp4
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 5570311ee32f..a1a021e9c914 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-5.2.0.tar.bz2) = e6029fafcee029edcfa2ceed7a005333
-SHA256 (php-5.2.0.tar.bz2) = e105b6aad55589aecf20ae70ab7aa81eb202296fc52531f62e546af23077cca1
-SIZE (php-5.2.0.tar.bz2) = 6789838
-MD5 (suhosin-patch-5.2.0-0.9.6.2.patch.gz) = 621ec57f10345cc58b29b189d89aecce
-SHA256 (suhosin-patch-5.2.0-0.9.6.2.patch.gz) = a67ee0d4c69b01784aba23a74d12fb1182bdca2f85ed2f12325a302ebbe319e9
-SIZE (suhosin-patch-5.2.0-0.9.6.2.patch.gz) = 23115
+MD5 (php-5.2.1.tar.bz2) = 261218e3569a777dbd87c16a15f05c8d
+SHA256 (php-5.2.1.tar.bz2) = 4b60fa70969644d193d58dd7cb9f2765e304c6368e98b1551e92e8d4e14d35ed
+SIZE (php-5.2.1.tar.bz2) = 7163383
+MD5 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 98cae8ee994df74e3ea1b25c955310e8
+SHA256 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 78802a71c35ed2bed2e0e32cb8443f682451989ebe1ed5d5b384b7bb85b90c1b
+SIZE (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 22679
 MD5 (php-5.2.0-mail-header.patch) = 36f876b692a9a407874c39b71c39ac83
 SHA256 (php-5.2.0-mail-header.patch) = 9955ec5fc79d2444ba507f4524acb1957bc65419be95b13e363a922a2021418a
 SIZE (php-5.2.0-mail-header.patch) = 3420
diff --git a/lang/php5/files/patch-configure.in b/lang/php5/files/patch-configure.in
index cb22e3f33844..7e735cdeb2a7 100644
--- a/lang/php5/files/patch-configure.in
+++ b/lang/php5/files/patch-configure.in
@@ -53,7 +53,7 @@
  PHP_SUBST(install_targets)
  
 -PHP_INSTALL_HEADERS([Zend/ TSRM/ include/ main/ main/streams/ regex/])
-+PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/ regex/ ext/spl/])
++PHP_INSTALL_HEADERS([Zend/ TSRM/ main/ main/streams/ regex/])
  
  PHP_ADD_SOURCES(TSRM, TSRM.c tsrm_strtok_r.c tsrm_virtual_cwd.c)
  
diff --git a/lang/php5/pkg-plist b/lang/php5/pkg-plist
index 7a29879ebe4d..17c9fdaaf18f 100644
--- a/lang/php5/pkg-plist
+++ b/lang/php5/pkg-plist
@@ -47,7 +47,6 @@ include/php/Zend/zend_language_parser.h
 include/php/Zend/zend_language_scanner.h
 include/php/Zend/zend_list.h
 include/php/Zend/zend_llist.h
-include/php/Zend/zend_mm.h
 include/php/Zend/zend_modules.h
 include/php/Zend/zend_multibyte.h
 include/php/Zend/zend_multiply.h
@@ -73,15 +72,6 @@ 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/libxml/php_libxml.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_engine.h
-include/php/ext/spl/spl_exceptions.h
-include/php/ext/spl/spl_functions.h
-include/php/ext/spl/spl_iterators.h
-include/php/ext/spl/spl_observer.h
-include/php/ext/spl/spl_sxe.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
@@ -209,7 +199,6 @@ lib/php/build/shtool
 @dirrm include/php/ext/date/lib
 @dirrm include/php/ext/date
 @dirrm include/php/ext/libxml
-@dirrm include/php/ext/spl
 @dirrm include/php/ext/standard
 @dirrmtry include/php/ext
 @dirrm include/php/main/streams