- update to php 5.2.1 and suhosin 0.9.2.6

- remove the pear subpackage as it is now replaced with www/pear - the filepro extension is no longer available tested by a couple of people
2007-03-22 22:43:20 +00:00 · 2007-03-22 22:43:20 +00:00 · 33e91cd4a1
commit 33e91cd4a1
parent 86c11e7840
23 changed files with 386 additions and 595 deletions
--- a/www/php5/Makefile.inc
+++ b/www/php5/Makefile.inc
@ -1,12 +1,11 @@
-# $OpenBSD: Makefile.inc,v 1.13 2006/10/24 09:30:25 wilfried Exp $
+# $OpenBSD: Makefile.inc,v 1.14 2007/03/22 22:43:20 robert Exp $

 # This port currently only works with archs supporting dynamic loading
 # and has Apache that supports DSO's.
 NOT_FOR_ARCHS=		${NO_SHARED_ARCHS}

-V=			5.1.6
-PEAR_V= 		20060428
-SUHOSIN_V=		0.9.5
+V=			5.2.1
+SUHOSIN_V=		0.9.6.2
 DISTNAME?=		php-${V}
 CATEGORIES=		www lang

@ -36,7 +35,6 @@ APACHE_MODULE_DIR=	${LOCALBASE}/${APACHE_MODULE_SUBDIR}

 # where the PEAR and extension modules are (inside the chroot)
 CHROOT_DIR?=		/var/www
-PEAR_DIR?=		${CHROOT_DIR}/pear
 MODULES_SUBDIR=		lib/php/modules
 MODULES_DIR=		${CHROOT_DIR}/${MODULES_SUBDIR}

@ -47,7 +45,7 @@ PHP_LDFLAGS=		-lstdc++ -lm
 CONFIGURE_STYLE=	autoconf
 AUTOCONF_VERSION=	2.52
 CONFIGURE_ENV=          CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
-                        LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS}" \
+                        LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS} -pthread" \
 			EXTENSION_DIR=${MODULES_DIR}
 MAKE_ENV=               ${CONFIGURE_ENV}

--- a/www/php5/core/Makefile
+++ b/www/php5/core/Makefile
@ -1,13 +1,8 @@
-# $OpenBSD: Makefile,v 1.19 2006/11/25 11:09:04 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2007/03/22 22:43:20 robert Exp $

-MULTI_PACKAGES=	-main -pear
-
-COMMENT-main=	"server-side HTML-embedded scripting language"
-COMMENT-pear=	"base classes for common PHP tasks"
-PKGNAME-main=	php5-core-${V}p0
-FULLPKGNAME-pear= php5-pear-${V}p0
-DISTFILES=	php-${V}.tar.gz \
-		pear-${PEAR_V}.tar.gz:0
+COMMENT=	"server-side HTML-embedded scripting language"
+PKGNAME=	php5-core-${V}
+DISTFILES=	php-${V}.tar.gz

 CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \
 		--without-mysql \
@ -17,7 +12,6 @@ CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \
 		--with-iconv=${LOCALBASE} \
 		--with-gettext=${LOCALBASE} \
 		--enable-dio \
-		--with-pear=${PEAR_DIR} \
 		--enable-bcmath \
 		--enable-session \
 		--enable-trans-sid \
@ -31,7 +25,8 @@ CONFIGURE_ARGS+=--with-apxs=/usr/sbin/apxs \
 		--enable-sysvshm \
 		--enable-yp \
 		--enable-exif \
-		--without-sqlite
+		--without-sqlite \
+		--with-pear=${LOCALBASE}/share/php5
 		
 MODULES=	devel/gettext

@ -46,44 +41,22 @@ PHPXS_SUBST+= -e 's,${i},${${i}},'
 WANTLIB=	c crypto m ssl stdc++ z pthread
 LIB_DEPENDS=	xml2.>=8::textproc/libxml

-PREFIX-pear=		${CHROOT_DIR}
-RUN_DEPENDS-pear=	:php5-core-${V}:www/php5/core
-WANTLIB-pear=
-LIB_DEPENDS-pear=
-
-
 pre-fake:
 	${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}
 INSTALL_TARGET= install-headers install-build install-programs
 FAKE_FLAGS=	INSTALL_ROOT=${DESTDIR}

 pre-configure:
-	@cd ${WRKDIR}/pear && ${PATCH} -p0 --quiet < patch-OpenBSD 
 	@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
-		${WRKDIR}/pear/PEAR/Config.php ${WRKSRC}/scripts/phpize.in \
+		${WRKSRC}/scripts/phpize.in \
 		${WRKSRC}/scripts/php-config.in

 post-install:
 	${INSTALL_DATA} ${WRKBUILD}/.libs/libphp5.so \
 		${PREFIX}/${APACHE_MODULE_SUBDIR}
-	${INSTALL_DATA_DIR} ${WRKINST}/${CHROOT_DIR}/pear/lib
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php5
 	${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin
 	
-	@cd ${WRKDIR}/pear && ${PREFIX}/bin/php \
-		-n -dshort_open_tag=0 -dsafe_mode=0 -derror_reporting=E_ALL \
-		-ddetect_unicode=0 install-pear.php -b ${PREFIX}/bin \
-		-c ${WRKINST} -d ${WRKINST}${CHROOT_DIR}/pear *.tar 
-
-	@cp ${WRKDIR}/pear/PEAR/Config.php \
-		${WRKINST}${CHROOT_DIR}/pear/lib/PEAR/Config.php
-	@perl -pi -e "s,${WRKINST},,g" ${PREFIX}/bin/pear \
-				${PREFIX}/bin/peardev \
-				${PREFIX}/bin/pecl \
-				${WRKINST}${PEAR_DIR}/lib/pearcmd.php \
-				${WRKINST}${PEAR_DIR}/lib/peclcmd.php \
-				${WRKINST}${PEAR_DIR}/lib/PEAR/Command/Package.php
-
 .for i in dist recommended
 	@sed -e 's,MODULES_DIR,${MODULES_DIR},' \
 	     -e 's,OPENBSD_INCLUDE_PATH,/pear/lib:${CHROOT_DIR}/pear/lib,' \
--- a/www/php5/core/patches/patch-scripts_php_config_in
+++ b/www/php5/core/patches/patch-scripts_php_config_in
@ -1,15 +1,16 @@
-$OpenBSD: patch-scripts_php_config_in,v 1.2 2006/05/10 13:48:01 wilfried Exp $
--- scripts/php-config.in.orig	Fri Apr 28 00:49:53 2006
-+++ scripts/php-config.in	Fri Apr 28 01:03:19 2006
-@@ -1,9 +1,9 @@
+$OpenBSD: patch-scripts_php_config_in,v 1.3 2007/03/22 22:43:20 robert Exp $
+--- scripts/php-config.in.orig	Thu Jul 27 10:53:16 2006
+++ scripts/php-config.in	Wed Feb 21 23:27:24 2007
+@@ -1,10 +1,10 @@
 #! /bin/sh
 
 -prefix="@prefix@"
 +prefix=OPENBSD_PEAR_ROOT
 exec_prefix="@exec_prefix@"
 version="@PHP_VERSION@"
+ version_id="@PHP_VERSION_ID@"
 -includedir="@includedir@/php"
 +includedir="@PEAR_INSTALLDIR@/include"
- includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext"
+ includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib"
 ldflags="@PHP_LDFLAGS@"
 libs="@EXTRA_LIBS@"
--- a/www/php5/core/patches/patch-scripts_phpize_in
+++ b/www/php5/core/patches/patch-scripts_phpize_in
@ -1,4 +1,4 @@
-$OpenBSD: patch-scripts_phpize_in,v 1.5 2006/05/09 14:15:40 robert Exp $
+$OpenBSD: patch-scripts_phpize_in,v 1.6 2007/03/22 22:43:20 robert Exp $
 --- scripts/phpize.in.orig	Thu Sep  1 15:59:03 2005
 +++ scripts/phpize.in	Sat Nov 26 13:07:08 2005
@@ -1,10 +1,10 @@
@ -6,7 +6,7 @@ $OpenBSD: patch-scripts_phpize_in,v 1.5 2006/05/09 14:15:40 robert Exp $
 
 # Variable declaration
 -prefix='@prefix@'
-+prefix=OPENBSD_PEAR_ROOT
+prefix=@PEAR_INSTALLDIR@
 exec_prefix="`eval echo @exec_prefix@`"
 -phpdir="`eval echo @libdir@`/build"
 -includedir="`eval echo @includedir@`/php"
--- a/www/php5/core/pkg/DESCR-main
+++ b/www/php5/core/pkg/DESCR-main
--- a/www/php5/core/pkg/DESCR-pear
+++ b/www/php5/core/pkg/DESCR-pear
@ -1,6 +0,0 @@
-PEAR (PHP Extensions and Add-on Repository) is a code repository
-for PHP extensions and PHP library code inspired by TeX's CTAN and
-Perl's CPAN.
-
-While it is currently distributed with PHP, it is being dissociated,
-and future versions will be upgradable independently of PHP5.
--- a/www/php5/core/pkg/MESSAGE-main
+++ b/www/php5/core/pkg/MESSAGE-main
--- a/www/php5/core/pkg/PFRAG.shared
+++ b/www/php5/core/pkg/PFRAG.shared
@ -0,0 +1,2 @@
+@comment $OpenBSD: PFRAG.shared,v 1.3 2007/03/22 22:43:20 robert Exp $
+lib/php/libphp5.so
--- a/www/php5/core/pkg/PFRAG.shared-main
+++ b/www/php5/core/pkg/PFRAG.shared-main
@ -1,2 +0,0 @@
-@comment $OpenBSD: PFRAG.shared-main,v 1.1 2006/11/25 11:09:43 espie Exp $
-lib/php/libphp5.so
--- a/www/php5/core/pkg/PLIST
+++ b/www/php5/core/pkg/PLIST
@ -0,0 +1,273 @@
+@comment $OpenBSD: PLIST,v 1.11 2007/03/22 22:43:20 robert Exp $
+@conflict php4-core-*
+@pkgpath www/php5/core
+@pkgpath www/php5/core,hardened
+%%SHARED%%
+bin/php
+bin/php-config
+bin/phpize
+lib/php/
+@man man/man1/php-config.1
+@man man/man1/php.1
+@man man/man1/phpize.1
+sbin/phpxs
+share/examples/php5/
+share/examples/php5/php.ini-dist
+share/examples/php5/php.ini-recommended
+@unexec rm -f /usr/lib/apache/modules/libphp5.so
+share/php5/
+share/php5/build/
+share/php5/build/Makefile.global
+share/php5/build/acinclude.m4
+share/php5/build/config.guess
+share/php5/build/config.sub
+share/php5/build/libtool.m4
+share/php5/build/ltmain.sh
+share/php5/build/mkdep.awk
+share/php5/build/phpize.m4
+share/php5/build/run-tests.php
+share/php5/build/scan_makefile_in.awk
+share/php5/build/shtool
+share/php5/include/
+share/php5/include/TSRM/
+share/php5/include/TSRM/TSRM.h
+share/php5/include/TSRM/acconfig.h
+share/php5/include/TSRM/readdir.h
+share/php5/include/TSRM/tsrm_config.h
+share/php5/include/TSRM/tsrm_config.w32.h
+share/php5/include/TSRM/tsrm_config_common.h
+share/php5/include/TSRM/tsrm_nw.h
+share/php5/include/TSRM/tsrm_strtok_r.h
+share/php5/include/TSRM/tsrm_virtual_cwd.h
+share/php5/include/TSRM/tsrm_win32.h
+share/php5/include/Zend/
+share/php5/include/Zend/FlexLexer.h
+share/php5/include/Zend/acconfig.h
+share/php5/include/Zend/zend.h
+share/php5/include/Zend/zend_API.h
+share/php5/include/Zend/zend_alloc.h
+share/php5/include/Zend/zend_builtin_functions.h
+share/php5/include/Zend/zend_compile.h
+share/php5/include/Zend/zend_config.h
+share/php5/include/Zend/zend_config.nw.h
+share/php5/include/Zend/zend_config.w32.h
+share/php5/include/Zend/zend_constants.h
+share/php5/include/Zend/zend_dynamic_array.h
+share/php5/include/Zend/zend_errors.h
+share/php5/include/Zend/zend_exceptions.h
+share/php5/include/Zend/zend_execute.h
+share/php5/include/Zend/zend_extensions.h
+share/php5/include/Zend/zend_fast_cache.h
+share/php5/include/Zend/zend_globals.h
+share/php5/include/Zend/zend_globals_macros.h
+share/php5/include/Zend/zend_hash.h
+share/php5/include/Zend/zend_highlight.h
+share/php5/include/Zend/zend_indent.h
+share/php5/include/Zend/zend_ini.h
+share/php5/include/Zend/zend_ini_parser.h
+share/php5/include/Zend/zend_ini_scanner.h
+share/php5/include/Zend/zend_interfaces.h
+share/php5/include/Zend/zend_istdiostream.h
+share/php5/include/Zend/zend_iterators.h
+share/php5/include/Zend/zend_language_parser.h
+share/php5/include/Zend/zend_language_scanner.h
+share/php5/include/Zend/zend_list.h
+share/php5/include/Zend/zend_llist.h
+share/php5/include/Zend/zend_modules.h
+share/php5/include/Zend/zend_multibyte.h
+share/php5/include/Zend/zend_multiply.h
+share/php5/include/Zend/zend_object_handlers.h
+share/php5/include/Zend/zend_objects.h
+share/php5/include/Zend/zend_objects_API.h
+share/php5/include/Zend/zend_operators.h
+share/php5/include/Zend/zend_ptr_stack.h
+share/php5/include/Zend/zend_qsort.h
+share/php5/include/Zend/zend_stack.h
+share/php5/include/Zend/zend_static_allocator.h
+share/php5/include/Zend/zend_stream.h
+share/php5/include/Zend/zend_strtod.h
+share/php5/include/Zend/zend_ts_hash.h
+share/php5/include/Zend/zend_types.h
+share/php5/include/Zend/zend_variables.h
+share/php5/include/Zend/zend_vm.h
+share/php5/include/Zend/zend_vm_def.h
+share/php5/include/Zend/zend_vm_execute.h
+share/php5/include/Zend/zend_vm_opcodes.h
+share/php5/include/ext/
+share/php5/include/ext/date/
+share/php5/include/ext/date/lib/
+share/php5/include/ext/date/lib/timelib.h
+share/php5/include/ext/date/lib/timelib_config.h
+share/php5/include/ext/date/lib/timelib_structs.h
+share/php5/include/ext/date/php_date.h
+share/php5/include/ext/dom/
+share/php5/include/ext/dom/xml_common.h
+share/php5/include/ext/filter/
+share/php5/include/ext/filter/php_filter.h
+share/php5/include/ext/hash/
+share/php5/include/ext/hash/php_hash.h
+share/php5/include/ext/hash/php_hash_adler32.h
+share/php5/include/ext/hash/php_hash_crc32.h
+share/php5/include/ext/hash/php_hash_gost.h
+share/php5/include/ext/hash/php_hash_haval.h
+share/php5/include/ext/hash/php_hash_md.h
+share/php5/include/ext/hash/php_hash_ripemd.h
+share/php5/include/ext/hash/php_hash_sha.h
+share/php5/include/ext/hash/php_hash_snefru.h
+share/php5/include/ext/hash/php_hash_tiger.h
+share/php5/include/ext/hash/php_hash_types.h
+share/php5/include/ext/hash/php_hash_whirlpool.h
+share/php5/include/ext/iconv/
+share/php5/include/ext/iconv/php_have_bsd_iconv.h
+share/php5/include/ext/iconv/php_have_glibc_iconv.h
+share/php5/include/ext/iconv/php_have_iconv.h
+share/php5/include/ext/iconv/php_have_libiconv.h
+share/php5/include/ext/iconv/php_iconv.h
+share/php5/include/ext/iconv/php_iconv_supports_errno.h
+share/php5/include/ext/iconv/php_php_iconv_h_path.h
+share/php5/include/ext/iconv/php_php_iconv_impl.h
+share/php5/include/ext/libxml/
+share/php5/include/ext/libxml/php_libxml.h
+share/php5/include/ext/pcre/
+share/php5/include/ext/pcre/pcrelib/
+share/php5/include/ext/pcre/pcrelib/pcre.h
+share/php5/include/ext/pcre/pcrelib/pcre_internal.h
+share/php5/include/ext/pcre/pcrelib/pcre_scanner.h
+share/php5/include/ext/pcre/pcrelib/pcre_stringpiece.h
+share/php5/include/ext/pcre/pcrelib/pcrecpp.h
+share/php5/include/ext/pcre/pcrelib/pcrecpparg.h
+share/php5/include/ext/pcre/pcrelib/pcreposix.h
+share/php5/include/ext/pcre/pcrelib/ucp.h
+share/php5/include/ext/pcre/pcrelib/ucpinternal.h
+share/php5/include/ext/pcre/php_pcre.h
+share/php5/include/ext/pdo/
+share/php5/include/ext/pdo/php_pdo.h
+share/php5/include/ext/pdo/php_pdo_driver.h
+share/php5/include/ext/session/
+share/php5/include/ext/session/mod_files.h
+share/php5/include/ext/session/mod_user.h
+share/php5/include/ext/session/php_session.h
+share/php5/include/ext/spl/
+share/php5/include/ext/spl/php_spl.h
+share/php5/include/ext/spl/spl_array.h
+share/php5/include/ext/spl/spl_directory.h
+share/php5/include/ext/spl/spl_engine.h
+share/php5/include/ext/spl/spl_exceptions.h
+share/php5/include/ext/spl/spl_functions.h
+share/php5/include/ext/spl/spl_iterators.h
+share/php5/include/ext/spl/spl_observer.h
+share/php5/include/ext/spl/spl_sxe.h
+share/php5/include/ext/standard/
+share/php5/include/ext/standard/base64.h
+share/php5/include/ext/standard/basic_functions.h
+share/php5/include/ext/standard/crc32.h
+share/php5/include/ext/standard/credits.h
+share/php5/include/ext/standard/credits_ext.h
+share/php5/include/ext/standard/credits_sapi.h
+share/php5/include/ext/standard/css.h
+share/php5/include/ext/standard/cyr_convert.h
+share/php5/include/ext/standard/datetime.h
+share/php5/include/ext/standard/dl.h
+share/php5/include/ext/standard/dns.h
+share/php5/include/ext/standard/exec.h
+share/php5/include/ext/standard/file.h
+share/php5/include/ext/standard/flock_compat.h
+share/php5/include/ext/standard/fsock.h
+share/php5/include/ext/standard/head.h
+share/php5/include/ext/standard/html.h
+share/php5/include/ext/standard/info.h
+share/php5/include/ext/standard/md5.h
+share/php5/include/ext/standard/microtime.h
+share/php5/include/ext/standard/pack.h
+share/php5/include/ext/standard/pageinfo.h
+share/php5/include/ext/standard/php_array.h
+share/php5/include/ext/standard/php_assert.h
+share/php5/include/ext/standard/php_browscap.h
+share/php5/include/ext/standard/php_crypt.h
+share/php5/include/ext/standard/php_dir.h
+share/php5/include/ext/standard/php_ext_syslog.h
+share/php5/include/ext/standard/php_filestat.h
+share/php5/include/ext/standard/php_fopen_wrappers.h
+share/php5/include/ext/standard/php_ftok.h
+share/php5/include/ext/standard/php_http.h
+share/php5/include/ext/standard/php_image.h
+share/php5/include/ext/standard/php_incomplete_class.h
+share/php5/include/ext/standard/php_iptc.h
+share/php5/include/ext/standard/php_lcg.h
+share/php5/include/ext/standard/php_link.h
+share/php5/include/ext/standard/php_mail.h
+share/php5/include/ext/standard/php_math.h
+share/php5/include/ext/standard/php_metaphone.h
+share/php5/include/ext/standard/php_rand.h
+share/php5/include/ext/standard/php_smart_str.h
+share/php5/include/ext/standard/php_smart_str_public.h
+share/php5/include/ext/standard/php_standard.h
+share/php5/include/ext/standard/php_string.h
+share/php5/include/ext/standard/php_type.h
+share/php5/include/ext/standard/php_uuencode.h
+share/php5/include/ext/standard/php_var.h
+share/php5/include/ext/standard/php_versioning.h
+share/php5/include/ext/standard/proc_open.h
+share/php5/include/ext/standard/quot_print.h
+share/php5/include/ext/standard/reg.h
+share/php5/include/ext/standard/scanf.h
+share/php5/include/ext/standard/sha1.h
+share/php5/include/ext/standard/streamsfuncs.h
+share/php5/include/ext/standard/uniqid.h
+share/php5/include/ext/standard/url.h
+share/php5/include/ext/standard/url_scanner.h
+share/php5/include/ext/standard/url_scanner_ex.h
+share/php5/include/ext/xml/
+share/php5/include/ext/xml/expat_compat.h
+share/php5/include/ext/xml/php_xml.h
+share/php5/include/include/
+share/php5/include/main/
+share/php5/include/main/SAPI.h
+share/php5/include/main/build-defs.h
+share/php5/include/main/config.w32.h
+share/php5/include/main/fopen_wrappers.h
+share/php5/include/main/logos.h
+share/php5/include/main/php.h
+share/php5/include/main/php3_compat.h
+share/php5/include/main/php_compat.h
+share/php5/include/main/php_config.h
+share/php5/include/main/php_content_types.h
+share/php5/include/main/php_globals.h
+share/php5/include/main/php_ini.h
+share/php5/include/main/php_logos.h
+share/php5/include/main/php_main.h
+share/php5/include/main/php_memory_streams.h
+share/php5/include/main/php_network.h
+share/php5/include/main/php_open_temporary_file.h
+share/php5/include/main/php_output.h
+share/php5/include/main/php_reentrancy.h
+share/php5/include/main/php_regex.h
+share/php5/include/main/php_scandir.h
+share/php5/include/main/php_streams.h
+share/php5/include/main/php_syslog.h
+share/php5/include/main/php_ticks.h
+share/php5/include/main/php_variables.h
+share/php5/include/main/php_version.h
+share/php5/include/main/rfc1867.h
+share/php5/include/main/safe_mode.h
+share/php5/include/main/snprintf.h
+share/php5/include/main/spprintf.h
+share/php5/include/main/streams/
+share/php5/include/main/streams/php_stream_context.h
+share/php5/include/main/streams/php_stream_filter_api.h
+share/php5/include/main/streams/php_stream_mmap.h
+share/php5/include/main/streams/php_stream_plain_wrapper.h
+share/php5/include/main/streams/php_stream_transport.h
+share/php5/include/main/streams/php_stream_userspace.h
+share/php5/include/main/streams/php_streams_int.h
+share/php5/include/main/suhosin_globals.h
+share/php5/include/main/suhosin_logo.h
+share/php5/include/main/suhosin_patch.h
+share/php5/include/main/win95nt.h
+share/php5/include/regex/
+share/php5/include/regex/cclass.h
+share/php5/include/regex/cname.h
+share/php5/include/regex/regex.h
+share/php5/include/regex/regex2.h
+share/php5/include/regex/regex_extra.h
+share/php5/include/regex/utils.h
--- a/www/php5/core/pkg/PLIST-main
+++ b/www/php5/core/pkg/PLIST-main
@ -1,20 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/25 11:09:43 espie Exp $
-@conflict php4-core-*
-@pkgpath www/php5/core
-@pkgpath www/php5/core,hardened
-%%SHARED%%
-bin/pear
-bin/peardev
-bin/pecl
-bin/php
-bin/php-config
-bin/phpize
-lib/php/
-@man man/man1/php-config.1
-@man man/man1/php.1
-@man man/man1/phpize.1
-sbin/phpxs
-share/examples/php5/
-share/examples/php5/php.ini-dist
-share/examples/php5/php.ini-recommended
-@unexec rm -f /usr/lib/apache/modules/libphp5.so
--- a/www/php5/core/pkg/PLIST-pear
+++ b/www/php5/core/pkg/PLIST-pear
@ -1,402 +0,0 @@
-@comment $OpenBSD: PLIST-pear,v 1.10 2006/11/25 11:09:04 espie Exp $
-@conflict php4-pear-*
-@group daemon
-pear/
-pear/build/
-pear/build/Makefile.global
-pear/build/acinclude.m4
-pear/build/config.guess
-pear/build/config.sub
-pear/build/libtool.m4
-pear/build/ltmain.sh
-pear/build/mkdep.awk
-pear/build/phpize.m4
-pear/build/run-tests.php
-pear/build/scan_makefile_in.awk
-pear/build/shtool
-pear/data/
-pear/data/PEAR/
-pear/data/PEAR/package.dtd
-pear/data/PEAR/template.spec
-pear/doc/
-pear/doc/Archive_Tar/
-pear/doc/Archive_Tar/docs/
-pear/doc/Archive_Tar/docs/Archive_Tar.txt
-pear/include/
-pear/include/TSRM/
-pear/include/TSRM/TSRM.h
-pear/include/TSRM/acconfig.h
-pear/include/TSRM/readdir.h
-pear/include/TSRM/tsrm_config.h
-pear/include/TSRM/tsrm_config.w32.h
-pear/include/TSRM/tsrm_config_common.h
-pear/include/TSRM/tsrm_nw.h
-pear/include/TSRM/tsrm_strtok_r.h
-pear/include/TSRM/tsrm_virtual_cwd.h
-pear/include/TSRM/tsrm_win32.h
-pear/include/Zend/
-pear/include/Zend/FlexLexer.h
-pear/include/Zend/acconfig.h
-pear/include/Zend/zend.h
-pear/include/Zend/zend_API.h
-pear/include/Zend/zend_alloc.h
-pear/include/Zend/zend_builtin_functions.h
-pear/include/Zend/zend_compile.h
-pear/include/Zend/zend_config.h
-pear/include/Zend/zend_config.nw.h
-pear/include/Zend/zend_config.w32.h
-pear/include/Zend/zend_constants.h
-pear/include/Zend/zend_dynamic_array.h
-pear/include/Zend/zend_errors.h
-pear/include/Zend/zend_exceptions.h
-pear/include/Zend/zend_execute.h
-pear/include/Zend/zend_extensions.h
-pear/include/Zend/zend_fast_cache.h
-pear/include/Zend/zend_globals.h
-pear/include/Zend/zend_globals_macros.h
-pear/include/Zend/zend_hash.h
-pear/include/Zend/zend_highlight.h
-pear/include/Zend/zend_indent.h
-pear/include/Zend/zend_ini.h
-pear/include/Zend/zend_ini_parser.h
-pear/include/Zend/zend_ini_scanner.h
-pear/include/Zend/zend_interfaces.h
-pear/include/Zend/zend_istdiostream.h
-pear/include/Zend/zend_iterators.h
-pear/include/Zend/zend_language_parser.h
-pear/include/Zend/zend_language_scanner.h
-pear/include/Zend/zend_list.h
-pear/include/Zend/zend_llist.h
-pear/include/Zend/zend_mm.h
-pear/include/Zend/zend_modules.h
-pear/include/Zend/zend_multibyte.h
-pear/include/Zend/zend_multiply.h
-pear/include/Zend/zend_object_handlers.h
-pear/include/Zend/zend_objects.h
-pear/include/Zend/zend_objects_API.h
-pear/include/Zend/zend_operators.h
-pear/include/Zend/zend_ptr_stack.h
-pear/include/Zend/zend_qsort.h
-pear/include/Zend/zend_stack.h
-pear/include/Zend/zend_static_allocator.h
-pear/include/Zend/zend_stream.h
-pear/include/Zend/zend_strtod.h
-pear/include/Zend/zend_ts_hash.h
-pear/include/Zend/zend_types.h
-pear/include/Zend/zend_variables.h
-pear/include/Zend/zend_vm.h
-pear/include/Zend/zend_vm_def.h
-pear/include/Zend/zend_vm_execute.h
-pear/include/Zend/zend_vm_opcodes.h
-pear/include/ext/
-pear/include/ext/date/
-pear/include/ext/date/lib/
-pear/include/ext/date/lib/timelib.h
-pear/include/ext/date/lib/timelib_config.h
-pear/include/ext/date/lib/timelib_structs.h
-pear/include/ext/date/php_date.h
-pear/include/ext/dom/
-pear/include/ext/dom/xml_common.h
-pear/include/ext/hash/
-pear/include/ext/hash/php_hash.h
-pear/include/ext/hash/php_hash_adler32.h
-pear/include/ext/hash/php_hash_crc32.h
-pear/include/ext/hash/php_hash_gost.h
-pear/include/ext/hash/php_hash_haval.h
-pear/include/ext/hash/php_hash_md.h
-pear/include/ext/hash/php_hash_ripemd.h
-pear/include/ext/hash/php_hash_sha.h
-pear/include/ext/hash/php_hash_snefru.h
-pear/include/ext/hash/php_hash_tiger.h
-pear/include/ext/hash/php_hash_types.h
-pear/include/ext/hash/php_hash_whirlpool.h
-pear/include/ext/iconv/
-pear/include/ext/iconv/php_have_bsd_iconv.h
-pear/include/ext/iconv/php_have_glibc_iconv.h
-pear/include/ext/iconv/php_have_iconv.h
-pear/include/ext/iconv/php_have_libiconv.h
-pear/include/ext/iconv/php_iconv.h
-pear/include/ext/iconv/php_iconv_supports_errno.h
-pear/include/ext/iconv/php_php_iconv_h_path.h
-pear/include/ext/iconv/php_php_iconv_impl.h
-pear/include/ext/libxml/
-pear/include/ext/libxml/php_libxml.h
-pear/include/ext/pcre/
-pear/include/ext/pcre/pcrelib/
-pear/include/ext/pcre/pcrelib/internal.h
-pear/include/ext/pcre/pcrelib/pcre.h
-pear/include/ext/pcre/pcrelib/pcre_internal.h
-pear/include/ext/pcre/pcrelib/pcre_scanner.h
-pear/include/ext/pcre/pcrelib/pcre_stringpiece.h
-pear/include/ext/pcre/pcrelib/pcrecpp.h
-pear/include/ext/pcre/pcrelib/pcrecpparg.h
-pear/include/ext/pcre/pcrelib/pcreposix.h
-pear/include/ext/pcre/pcrelib/ucp.h
-pear/include/ext/pcre/pcrelib/ucpinternal.h
-pear/include/ext/pcre/php_pcre.h
-pear/include/ext/pdo/
-pear/include/ext/pdo/php_pdo.h
-pear/include/ext/pdo/php_pdo_driver.h
-pear/include/ext/session/
-pear/include/ext/session/mod_files.h
-pear/include/ext/session/mod_user.h
-pear/include/ext/session/php_session.h
-pear/include/ext/standard/
-pear/include/ext/standard/base64.h
-pear/include/ext/standard/basic_functions.h
-pear/include/ext/standard/crc32.h
-pear/include/ext/standard/credits.h
-pear/include/ext/standard/credits_ext.h
-pear/include/ext/standard/credits_sapi.h
-pear/include/ext/standard/css.h
-pear/include/ext/standard/cyr_convert.h
-pear/include/ext/standard/datetime.h
-pear/include/ext/standard/dl.h
-pear/include/ext/standard/dns.h
-pear/include/ext/standard/exec.h
-pear/include/ext/standard/file.h
-pear/include/ext/standard/flock_compat.h
-pear/include/ext/standard/fsock.h
-pear/include/ext/standard/head.h
-pear/include/ext/standard/html.h
-pear/include/ext/standard/info.h
-pear/include/ext/standard/md5.h
-pear/include/ext/standard/microtime.h
-pear/include/ext/standard/pack.h
-pear/include/ext/standard/pageinfo.h
-pear/include/ext/standard/php_array.h
-pear/include/ext/standard/php_assert.h
-pear/include/ext/standard/php_browscap.h
-pear/include/ext/standard/php_crypt.h
-pear/include/ext/standard/php_dir.h
-pear/include/ext/standard/php_ext_syslog.h
-pear/include/ext/standard/php_filestat.h
-pear/include/ext/standard/php_fopen_wrappers.h
-pear/include/ext/standard/php_ftok.h
-pear/include/ext/standard/php_http.h
-pear/include/ext/standard/php_image.h
-pear/include/ext/standard/php_incomplete_class.h
-pear/include/ext/standard/php_iptc.h
-pear/include/ext/standard/php_lcg.h
-pear/include/ext/standard/php_link.h
-pear/include/ext/standard/php_mail.h
-pear/include/ext/standard/php_math.h
-pear/include/ext/standard/php_metaphone.h
-pear/include/ext/standard/php_rand.h
-pear/include/ext/standard/php_smart_str.h
-pear/include/ext/standard/php_smart_str_public.h
-pear/include/ext/standard/php_standard.h
-pear/include/ext/standard/php_string.h
-pear/include/ext/standard/php_type.h
-pear/include/ext/standard/php_uuencode.h
-pear/include/ext/standard/php_var.h
-pear/include/ext/standard/php_versioning.h
-pear/include/ext/standard/proc_open.h
-pear/include/ext/standard/quot_print.h
-pear/include/ext/standard/reg.h
-pear/include/ext/standard/scanf.h
-pear/include/ext/standard/sha1.h
-pear/include/ext/standard/streamsfuncs.h
-pear/include/ext/standard/uniqid.h
-pear/include/ext/standard/url.h
-pear/include/ext/standard/url_scanner.h
-pear/include/ext/standard/url_scanner_ex.h
-pear/include/ext/xml/
-pear/include/ext/xml/expat_compat.h
-pear/include/ext/xml/php_xml.h
-pear/include/include/
-pear/include/main/
-pear/include/main/SAPI.h
-pear/include/main/build-defs.h
-pear/include/main/config.w32.h
-pear/include/main/fopen_wrappers.h
-pear/include/main/logos.h
-pear/include/main/php.h
-pear/include/main/php3_compat.h
-pear/include/main/php_compat.h
-pear/include/main/php_config.h
-pear/include/main/php_content_types.h
-pear/include/main/php_globals.h
-pear/include/main/php_ini.h
-pear/include/main/php_logos.h
-pear/include/main/php_main.h
-pear/include/main/php_memory_streams.h
-pear/include/main/php_network.h
-pear/include/main/php_open_temporary_file.h
-pear/include/main/php_output.h
-pear/include/main/php_reentrancy.h
-pear/include/main/php_regex.h
-pear/include/main/php_scandir.h
-pear/include/main/php_streams.h
-pear/include/main/php_syslog.h
-pear/include/main/php_ticks.h
-pear/include/main/php_variables.h
-pear/include/main/php_version.h
-pear/include/main/rfc1867.h
-pear/include/main/safe_mode.h
-pear/include/main/snprintf.h
-pear/include/main/spprintf.h
-pear/include/main/streams/
-pear/include/main/streams/php_stream_context.h
-pear/include/main/streams/php_stream_filter_api.h
-pear/include/main/streams/php_stream_mmap.h
-pear/include/main/streams/php_stream_plain_wrapper.h
-pear/include/main/streams/php_stream_transport.h
-pear/include/main/streams/php_stream_userspace.h
-pear/include/main/streams/php_streams_int.h
-pear/include/main/suhosin_globals.h
-pear/include/main/suhosin_logo.h
-pear/include/main/suhosin_patch.h
-pear/include/main/win95nt.h
-pear/include/regex/
-pear/include/regex/cclass.h
-pear/include/regex/cname.h
-pear/include/regex/regex.h
-pear/include/regex/regex2.h
-pear/include/regex/regex_extra.h
-pear/include/regex/utils.h
-pear/lib/
-pear/lib/.channels/
-pear/lib/.channels/.alias/
-pear/lib/.channels/.alias/pear.txt
-pear/lib/.channels/.alias/pecl.txt
-pear/lib/.channels/__uri.reg
-pear/lib/.channels/pear.php.net.reg
-pear/lib/.channels/pecl.php.net.reg
-pear/lib/.depdb
-pear/lib/.depdblock
-pear/lib/.registry/
-pear/lib/.registry/.channel.__uri/
-pear/lib/.registry/.channel.pecl.php.net/
-pear/lib/.registry/archive_tar.reg
-pear/lib/.registry/console_getopt.reg
-pear/lib/.registry/pear.reg
-pear/lib/.registry/xml_rpc.reg
-pear/lib/Archive/
-pear/lib/Archive/Tar.php
-pear/lib/Console/
-pear/lib/Console/Getopt.php
-pear/lib/OS/
-pear/lib/OS/Guess.php
-pear/lib/PEAR/
-pear/lib/PEAR.php
-pear/lib/PEAR/Autoloader.php
-pear/lib/PEAR/Builder.php
-pear/lib/PEAR/ChannelFile/
-pear/lib/PEAR/ChannelFile.php
-pear/lib/PEAR/ChannelFile/Parser.php
-pear/lib/PEAR/Command/
-pear/lib/PEAR/Command.php
-pear/lib/PEAR/Command/Auth.php
-pear/lib/PEAR/Command/Auth.xml
-pear/lib/PEAR/Command/Build.php
-pear/lib/PEAR/Command/Build.xml
-pear/lib/PEAR/Command/Channels.php
-pear/lib/PEAR/Command/Channels.xml
-pear/lib/PEAR/Command/Common.php
-pear/lib/PEAR/Command/Config.php
-pear/lib/PEAR/Command/Config.xml
-pear/lib/PEAR/Command/Install.php
-pear/lib/PEAR/Command/Install.xml
-pear/lib/PEAR/Command/Mirror.php
-pear/lib/PEAR/Command/Mirror.xml
-pear/lib/PEAR/Command/Package.php
-pear/lib/PEAR/Command/Package.xml
-pear/lib/PEAR/Command/Pickle.php
-pear/lib/PEAR/Command/Pickle.xml
-pear/lib/PEAR/Command/Registry.php
-pear/lib/PEAR/Command/Registry.xml
-pear/lib/PEAR/Command/Remote.php
-pear/lib/PEAR/Command/Remote.xml
-pear/lib/PEAR/Command/Test.php
-pear/lib/PEAR/Command/Test.xml
-pear/lib/PEAR/Common.php
-pear/lib/PEAR/Config.php
-pear/lib/PEAR/Dependency.php
-pear/lib/PEAR/Dependency2.php
-pear/lib/PEAR/DependencyDB.php
-pear/lib/PEAR/Downloader/
-pear/lib/PEAR/Downloader.php
-pear/lib/PEAR/Downloader/Package.php
-pear/lib/PEAR/ErrorStack.php
-pear/lib/PEAR/Exception.php
-pear/lib/PEAR/Frontend/
-pear/lib/PEAR/Frontend.php
-pear/lib/PEAR/Frontend/CLI.php
-pear/lib/PEAR/Installer/
-pear/lib/PEAR/Installer.php
-pear/lib/PEAR/Installer/Role/
-pear/lib/PEAR/Installer/Role.php
-pear/lib/PEAR/Installer/Role/Common.php
-pear/lib/PEAR/Installer/Role/Data.php
-pear/lib/PEAR/Installer/Role/Data.xml
-pear/lib/PEAR/Installer/Role/Doc.php
-pear/lib/PEAR/Installer/Role/Doc.xml
-pear/lib/PEAR/Installer/Role/Ext.php
-pear/lib/PEAR/Installer/Role/Ext.xml
-pear/lib/PEAR/Installer/Role/Php.php
-pear/lib/PEAR/Installer/Role/Php.xml
-pear/lib/PEAR/Installer/Role/Script.php
-pear/lib/PEAR/Installer/Role/Script.xml
-pear/lib/PEAR/Installer/Role/Src.php
-pear/lib/PEAR/Installer/Role/Src.xml
-pear/lib/PEAR/Installer/Role/Test.php
-pear/lib/PEAR/Installer/Role/Test.xml
-pear/lib/PEAR/PackageFile/
-pear/lib/PEAR/PackageFile.php
-pear/lib/PEAR/PackageFile/Generator/
-pear/lib/PEAR/PackageFile/Generator/v1.php
-pear/lib/PEAR/PackageFile/Generator/v2.php
-pear/lib/PEAR/PackageFile/Parser/
-pear/lib/PEAR/PackageFile/Parser/v1.php
-pear/lib/PEAR/PackageFile/Parser/v2.php
-pear/lib/PEAR/PackageFile/v1.php
-pear/lib/PEAR/PackageFile/v2/
-pear/lib/PEAR/PackageFile/v2.php
-pear/lib/PEAR/PackageFile/v2/Validator.php
-pear/lib/PEAR/PackageFile/v2/rw.php
-pear/lib/PEAR/Packager.php
-pear/lib/PEAR/REST/
-pear/lib/PEAR/REST.php
-pear/lib/PEAR/REST/10.php
-pear/lib/PEAR/REST/11.php
-pear/lib/PEAR/Registry.php
-pear/lib/PEAR/Remote.php
-pear/lib/PEAR/RunTest.php
-pear/lib/PEAR/Task/
-pear/lib/PEAR/Task/Common.php
-pear/lib/PEAR/Task/Postinstallscript/
-pear/lib/PEAR/Task/Postinstallscript.php
-pear/lib/PEAR/Task/Postinstallscript/rw.php
-pear/lib/PEAR/Task/Replace/
-pear/lib/PEAR/Task/Replace.php
-pear/lib/PEAR/Task/Replace/rw.php
-pear/lib/PEAR/Task/Unixeol/
-pear/lib/PEAR/Task/Unixeol.php
-pear/lib/PEAR/Task/Unixeol/rw.php
-pear/lib/PEAR/Task/Windowseol/
-pear/lib/PEAR/Task/Windowseol.php
-pear/lib/PEAR/Task/Windowseol/rw.php
-pear/lib/PEAR/Validate.php
-pear/lib/PEAR/Validator/
-pear/lib/PEAR/Validator/PECL.php
-pear/lib/PEAR/XMLParser.php
-pear/lib/System.php
-pear/lib/XML/
-pear/lib/XML/RPC/
-pear/lib/XML/RPC.php
-pear/lib/XML/RPC/Dump.php
-pear/lib/XML/RPC/Server.php
-pear/lib/pearcmd.php
-pear/lib/peclcmd.php
-pear/tests/
-pear/tests/XML_RPC/
-pear/tests/XML_RPC/tests/
-pear/tests/XML_RPC/tests/allgot.inc
-pear/tests/XML_RPC/tests/empty-value-struct.php
-pear/tests/XML_RPC/tests/empty-value.php
-pear/tests/XML_RPC/tests/extra-lines.php
-pear/tests/XML_RPC/tests/protoport.php
-pear/tests/XML_RPC/tests/test_Dump.php
-pear/tests/XML_RPC/tests/types.php
-@group
--- a/www/php5/core/pkg/UNMESSAGE-main
+++ b/www/php5/core/pkg/UNMESSAGE-main
--- a/www/php5/distinfo
+++ b/www/php5/distinfo
@ -1,12 +1,10 @@
-MD5 (pear-20060428.tar.gz) = 28ab6f44a90cbcb5dd9ed0aef32d2fa9
-MD5 (php-5.1.6.tar.gz) = 04d6166552289eaeff771f5ec953b065
-MD5 (suhosin-patch-5.1.6-0.9.5.patch.gz) = a34ef9819a1681ed03e61d1423c5b9e1
-RMD160 (pear-20060428.tar.gz) = 34bac3122dfc8218efdce0ea7df046da031e72e7
-RMD160 (php-5.1.6.tar.gz) = 89aeed0b88368f4e93bd7bdacdd94ce47eebe115
-RMD160 (suhosin-patch-5.1.6-0.9.5.patch.gz) = 38420c6cb6f381cd763a9463e3c35706a7518f09
-SHA1 (pear-20060428.tar.gz) = 09713b3052904c1c45acba015dc067ddad0136cb
-SHA1 (php-5.1.6.tar.gz) = e6f9df1db989e694dac6e1e190c5022f75c6a9cc
-SHA1 (suhosin-patch-5.1.6-0.9.5.patch.gz) = 7863e0b2cfb433ba4f82c5ad4aa27d73a47e920d
-SIZE (pear-20060428.tar.gz) = 619353
-SIZE (php-5.1.6.tar.gz) = 8187896
-SIZE (suhosin-patch-5.1.6-0.9.5.patch.gz) = 23141
+MD5 (php-5.2.1.tar.gz) = 604eaee2b834bb037d2c83e53e300d3f
+MD5 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 98cae8ee994df74e3ea1b25c955310e8
+RMD160 (php-5.2.1.tar.gz) = cca8b966106ea87b2abf27e10091ecb447bb4ecf
+RMD160 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 6bab11d96224725b6c45f2de1bfdc69b992302eb
+SHA1 (php-5.2.1.tar.gz) = 221ef0402d8fa49464c648d95debc7d21a3f16d9
+SHA1 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = dbb007554f2cc4544d60bd80a23a6af305744fbd
+SHA256 (php-5.2.1.tar.gz) = 4dc753a9bc63a161fd4dd027c9ff37e77124bd681db28ea5463895b29442d66d
+SHA256 (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 78802a71c35ed2bed2e0e32cb8443f682451989ebe1ed5d5b384b7bb85b90c1b
+SIZE (php-5.2.1.tar.gz) = 9010594
+SIZE (suhosin-patch-5.2.1-0.9.6.2.patch.gz) = 22679
--- a/www/php5/extensions/Makefile
+++ b/www/php5/extensions/Makefile
@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.32 2007/02/09 13:48:20 bernd Exp $
+# $OpenBSD: Makefile,v 1.33 2007/03/22 22:43:20 robert Exp $

-FULLPKGNAME-main=		php5-extensions-${V}p0
+FULLPKGNAME-main=	php5-extensions-${V}
 COMMENT-main=		"informational package about PHP5 extensions"

 MULTI_PACKAGES=	-main
@ -48,7 +48,7 @@ COMMENT-curl=		"curl URL library extensions for php5"
 CONFIGURE_ARGS+=	--with-curl=shared,${LOCALBASE}
 LIB_DEPENDS-curl=	curl.>=2::net/curl
 WANTLIB-curl=		${WANTLIB} crypto ssl z
-FULLPKGNAME-curl=	php5-curl-${V}p2
+FULLPKGNAME-curl=	php5-curl-${V}
 .endif

 # dba
@ -73,17 +73,6 @@ CONFIGURE_ARGS+=	--enable-dbase=shared
 LIB_DEPENDS-dbase=
 .endif

-# filepro
-PSEUDO_FLAVORS+=	no_filepro
-.if ${FLAVOR:L:Mno_filepro}
-CONFIGURE_ARGS+=	--disable-filepro
-.else
-MULTI_PACKAGES+=	-filepro
-COMMENT-filepro=	"filepro database access extensions for php5"
-CONFIGURE_ARGS+=	--enable-filepro=shared
-LIB_DEPENDS-filepro=
-.endif
-
 # gd
 PSEUDO_FLAVORS+=	no_gd
 .if ${FLAVOR:L:Mno_gd}
@ -101,11 +90,11 @@ CONFIGURE_ARGS+=	--with-gd=shared ${GRAPHIC_CONFIG} \

 . if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+=	--without-xpm-dir --without-freetype-dir
-FULLPKGNAME-gd=		php5-gd-${V}-no_x11p2
+FULLPKGNAME-gd=		php5-gd-${V}-no_x11
 . else
 USE_X11=		yes
 CONFIGURE_ARGS+=	--with-xpm-dir=${X11BASE}
-FULLPKGNAME-gd=		php5-gd-${V}p1
+FULLPKGNAME-gd=		php5-gd-${V}
 WANTLIB-gd+=		X11 Xpm freetype
 . endif
 .endif
@ -290,7 +279,7 @@ MULTI_PACKAGES+=	-sybase_ct
 COMMENT-sybase_ct=	"sybase database access extensions for php5"
 CONFIGURE_ARGS+=        --with-sybase-ct=shared,${LOCALBASE}
 LIB_DEPENDS-sybase_ct=	ct::databases/freetds
-FULLPKGNAME-sybase_ct=	php5-sybase_ct-${V}p2
+FULLPKGNAME-sybase_ct=	php5-sybase_ct-${V}
 .endif

 # xml-rpc
@ -318,7 +307,7 @@ WANTLIB-xsl=		${WANTLIB} iconv xml2 z
 .endif

 .for i in ${MULTI_PACKAGES}
-FULLPKGNAME${i} ?=	php5${i}-${V}p1
+FULLPKGNAME${i} ?=	php5${i}-${V}
 RUN_DEPENDS${i}=	:php5-core-${V}:www/php5/core
 MODULE_NAME${i}=	${i:S/-//g}
 .endfor
--- a/www/php5/extensions/patches/patch-ext_curl_interface_c
+++ b/www/php5/extensions/patches/patch-ext_curl_interface_c
@ -1,20 +0,0 @@
-$OpenBSD: patch-ext_curl_interface_c,v 1.1 2006/11/12 13:40:20 robert Exp $
--- ext/curl/interface.c.orig	Sun Nov 12 14:23:01 2006
-+++ ext/curl/interface.c	Sun Nov 12 14:23:25 2006
-@@ -271,7 +271,7 @@ PHP_MINIT_FUNCTION(curl)
- 	REGISTER_CURL_CONSTANT(CURLOPT_FTPAPPEND);
- 	REGISTER_CURL_CONSTANT(CURLOPT_NETRC);
- 	REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
-	REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
-+	REGISTER_CURL_CONSTANT(CURLOPT_TRANSFERTEXT);
- 	REGISTER_CURL_CONSTANT(CURLOPT_PUT);
- #if CURLOPT_MUTE != 0
- 	REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
-@@ -311,7 +311,6 @@ PHP_MINIT_FUNCTION(curl)
- 	REGISTER_CURL_CONSTANT(CURLOPT_FILETIME);
- 	REGISTER_CURL_CONSTANT(CURLOPT_WRITEFUNCTION);
- 	REGISTER_CURL_CONSTANT(CURLOPT_READFUNCTION);
-	REGISTER_CURL_CONSTANT(CURLOPT_PASSWDFUNCTION);
- 	REGISTER_CURL_CONSTANT(CURLOPT_HEADERFUNCTION);
- 	REGISTER_CURL_CONSTANT(CURLOPT_MAXREDIRS);
- 	REGISTER_CURL_CONSTANT(CURLOPT_MAXCONNECTS);
--- a/www/php5/extensions/pkg/DESCR-filepro
+++ b/www/php5/extensions/pkg/DESCR-filepro
@ -1,5 +0,0 @@
-These functions allow read-only access to data stored in filePro
-databases.
-
-filePro is a registered trademark of fP Technologies, Inc. You can
-find more information about filePro at http://www.fptech.com/
--- a/www/php5/extensions/pkg/PLIST-filepro
+++ b/www/php5/extensions/pkg/PLIST-filepro
@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-filepro,v 1.3 2006/10/21 11:44:10 robert Exp $
-@conflict php4-filepro-*
-@pkgpath www/php5/extensions,-filepro,hardened
-lib/php/modules/filepro.so
--- a/www/php5/patches/patch-ext_posix_posix_c
+++ b/www/php5/patches/patch-ext_posix_posix_c
@ -0,0 +1,21 @@
+$OpenBSD: patch-ext_posix_posix_c,v 1.1 2007/03/22 22:43:20 robert Exp $
+--- ext/posix/posix.c.orig	Tue Mar 20 00:38:18 2007
+++ ext/posix/posix.c	Tue Mar 20 00:39:48 2007
+@@ -884,7 +884,7 @@
+ 	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &gid) == FAILURE) {
+ 		RETURN_FALSE;
+ 	}
+-#ifdef HAVE_GETGRGID_R
+#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
+ 	
+ 	grbuflen = sysconf(_SC_GETGR_R_SIZE_MAX);
+ 	grbuf = emalloc(grbuflen);
+@@ -909,7 +909,7 @@
+ 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "unable to convert posix group struct to array");
+ 		RETVAL_FALSE;
+ 	}
+-#ifdef HAVE_GETGRGID_R
+#if defined(ZTS) && defined(HAVE_GETGRGID_R) && defined(_SC_GETGR_R_SIZE_MAX)
+ 	efree(grbuf);
+ #endif
+ }
--- a/www/php5/patches/patch-php_ini-dist
+++ b/www/php5/patches/patch-php_ini-dist
@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-dist,v 1.6 2006/05/09 14:15:40 robert Exp $
--- php.ini-dist.orig	Tue Nov 15 00:14:23 2005
-+++ php.ini-dist	Sat Nov 26 13:18:08 2005
-@@ -441,10 +441,7 @@
+$OpenBSD: patch-php_ini-dist,v 1.7 2007/03/22 22:43:20 robert Exp $
+--- php.ini-dist.orig	Thu Dec 21 14:05:27 2006
+++ php.ini-dist	Wed Feb 21 23:30:37 2007
+@@ -455,10 +455,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; UNIX: "/path1:/path2"
@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2006/05/09 14:15:40 robert Exp $
 
 ; The root of the PHP pages, used only if nonempty.
 ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -458,7 +455,7 @@
+@@ -472,7 +469,7 @@
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
@ -22,16 +22,16 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2006/05/09 14:15:40 robert Exp $
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -519,7 +516,7 @@
+@@ -533,7 +530,7 @@
 ;;;;;;;;;;;;;;;;;;
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 -allow_url_fopen = On
 +allow_url_fopen = Off
 
- ; Define the anonymous ftp password (your email address)
- ;from="john@doe.com"
-@@ -537,70 +534,6 @@
+ ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
+ allow_url_include = Off
+@@ -554,81 +551,6 @@
 ; fgets() and file() will work regardless of the source of the file.
 ; auto_detect_line_endings = Off
 
@ -64,45 +64,56 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2006/05/09 14:15:40 robert Exp $
 -; extension folders as well as the separate PECL DLL download (PHP 5).
 -; Be sure to appropriately set the extension_dir directive.
 -
-;extension=php_mbstring.dll
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_dba.dll
 -;extension=php_dbase.dll
 -;extension=php_exif.dll
 -;extension=php_fdf.dll
-;extension=php_filepro.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
+-;extension=php_gmp.dll
 -;extension=php_ifx.dll
 -;extension=php_imap.dll
 -;extension=php_interbase.dll
 -;extension=php_ldap.dll
+-;extension=php_mbstring.dll
 -;extension=php_mcrypt.dll
 -;extension=php_mhash.dll
 -;extension=php_mime_magic.dll
 -;extension=php_ming.dll
-;extension=php_mssql.dll
 -;extension=php_msql.dll
+-;extension=php_mssql.dll
 -;extension=php_mysql.dll
+-;extension=php_mysqli.dll
 -;extension=php_oci8.dll
 -;extension=php_openssl.dll
-;extension=php_oracle.dll
+-;extension=php_pdo.dll
+-;extension=php_pdo_firebird.dll
+-;extension=php_pdo_mssql.dll
+-;extension=php_pdo_mysql.dll
+-;extension=php_pdo_oci.dll
+-;extension=php_pdo_oci8.dll
+-;extension=php_pdo_odbc.dll
+-;extension=php_pdo_pgsql.dll
+-;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
+-;extension=php_pspell.dll
 -;extension=php_shmop.dll
 -;extension=php_snmp.dll
+-;extension=php_soap.dll
 -;extension=php_sockets.dll
 -;extension=php_sqlite.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
-
+-;extension=php_zip.dll
 -
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
 ;;;;;;;;;;;;;;;;;;;
-@@ -616,13 +549,6 @@
+@@ -670,13 +592,6 @@
 define_syslog_variables  = Off
 
 [mail function]
@ -116,7 +127,7 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2006/05/09 14:15:40 robert Exp $
 ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
 ;sendmail_path =
 
-@@ -1173,6 +1099,53 @@
+@@ -1252,6 +1167,53 @@
 ; instead of original one.
 soap.wsdl_cache_ttl=86400
 
--- a/www/php5/patches/patch-php_ini-recommended
+++ b/www/php5/patches/patch-php_ini-recommended
@ -1,7 +1,7 @@
-$OpenBSD: patch-php_ini-recommended,v 1.6 2006/05/09 14:15:40 robert Exp $
--- php.ini-recommended.orig	Tue Nov 15 00:14:23 2005
-+++ php.ini-recommended	Sat Nov 26 13:19:47 2005
-@@ -499,10 +499,7 @@
+$OpenBSD: patch-php_ini-recommended,v 1.7 2007/03/22 22:43:20 robert Exp $
+--- php.ini-recommended.orig	Thu Dec 21 14:05:27 2006
+++ php.ini-recommended	Wed Feb 21 23:33:04 2007
+@@ -500,10 +500,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;
 
 ; UNIX: "/path1:/path2"
@ -13,7 +13,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2006/05/09 14:15:40 robert Exp $
 
 ; The root of the PHP pages, used only if nonempty.
 ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -516,7 +513,7 @@
+@@ -517,7 +514,7 @@
 user_dir =
 
 ; Directory in which the loadable extensions (modules) reside.
@ -22,16 +22,16 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2006/05/09 14:15:40 robert Exp $
 
 ; Whether or not to enable the dl() function.  The dl() function does NOT work
 ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
-@@ -577,7 +574,7 @@
+@@ -578,7 +575,7 @@
 ;;;;;;;;;;;;;;;;;;
 
 ; Whether to allow the treatment of URLs (like http:// or ftp://) as files.
 -allow_url_fopen = On
 +allow_url_fopen = Off
 
- ; Define the anonymous ftp password (your email address)
- ;from="john@doe.com"
-@@ -595,70 +592,6 @@
+ ; Whether to allow include/require to open URLs (like http:// or ftp://) as files.
+ allow_url_include = Off
+@@ -599,81 +596,6 @@
 ; fgets() and file() will work regardless of the source of the file.
 ; auto_detect_line_endings = Off
 
@ -64,45 +64,56 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2006/05/09 14:15:40 robert Exp $
 -; extension folders as well as the separate PECL DLL download (PHP 5).
 -; Be sure to appropriately set the extension_dir directive.
 -
-;extension=php_mbstring.dll
 -;extension=php_bz2.dll
 -;extension=php_curl.dll
 -;extension=php_dba.dll
 -;extension=php_dbase.dll
 -;extension=php_exif.dll
 -;extension=php_fdf.dll
-;extension=php_filepro.dll
 -;extension=php_gd2.dll
 -;extension=php_gettext.dll
+-;extension=php_gmp.dll
 -;extension=php_ifx.dll
 -;extension=php_imap.dll
 -;extension=php_interbase.dll
 -;extension=php_ldap.dll
+-;extension=php_mbstring.dll
 -;extension=php_mcrypt.dll
 -;extension=php_mhash.dll
 -;extension=php_mime_magic.dll
 -;extension=php_ming.dll
-;extension=php_mssql.dll
 -;extension=php_msql.dll
+-;extension=php_mssql.dll
 -;extension=php_mysql.dll
+-;extension=php_mysqli.dll
 -;extension=php_oci8.dll
 -;extension=php_openssl.dll
-;extension=php_oracle.dll
+-;extension=php_pdo.dll
+-;extension=php_pdo_firebird.dll
+-;extension=php_pdo_mssql.dll
+-;extension=php_pdo_mysql.dll
+-;extension=php_pdo_oci.dll
+-;extension=php_pdo_oci8.dll
+-;extension=php_pdo_odbc.dll
+-;extension=php_pdo_pgsql.dll
+-;extension=php_pdo_sqlite.dll
 -;extension=php_pgsql.dll
+-;extension=php_pspell.dll
 -;extension=php_shmop.dll
 -;extension=php_snmp.dll
+-;extension=php_soap.dll
 -;extension=php_sockets.dll
 -;extension=php_sqlite.dll
 -;extension=php_sybase_ct.dll
 -;extension=php_tidy.dll
 -;extension=php_xmlrpc.dll
 -;extension=php_xsl.dll
-
+-;extension=php_zip.dll
 -
 ;;;;;;;;;;;;;;;;;;;
 ; Module Settings ;
 ;;;;;;;;;;;;;;;;;;;
-@@ -674,13 +607,6 @@
+@@ -715,13 +637,6 @@
 define_syslog_variables  = Off
 
 [mail function]
@ -116,7 +127,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.6 2006/05/09 14:15:40 robert Exp $
 ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
 ;sendmail_path =
 
-@@ -1231,6 +1157,53 @@
+@@ -1300,6 +1215,53 @@
 ; instead of original one.
 soap.wsdl_cache_ttl=86400
 
--- a/www/php5/pear/Makefile.pear
+++ b/www/php5/pear/Makefile.pear
@ -1,9 +0,0 @@
-# $OpenBSD: Makefile.pear,v 1.1.1.1 2004/10/02 11:32:38 robert Exp $
-# Default Makefile to install a PHP PEAR module
-
-default:
-
-install:
-	cp ${WRKDIR}/package.xml ${.CURDIR}
-	mkdir -p ${PREFIX}/lib/php
-	${LOCALBASE}/bin/pear install -R ${WRKINST} -n ${.CURDIR}/package.xml
--- a/www/php5/pear/pear.port.mk
+++ b/www/php5/pear/pear.port.mk
@ -1,18 +0,0 @@
-# $OpenBSD: pear.port.mk,v 1.3 2006/05/09 14:15:40 robert Exp $
-# PHP PEAR module
-
-RUN_DEPENDS+=	:php5-pear-*:www/php5/core,-pear
-BUILD_DEPENDS+=	${RUN_DEPENDS}
-
-NO_BUILD=	Yes
-.if !target(do-regress)
-NO_REGRESS=	Yes
-.endif
-
-MAKE_FILE=	${PORTSDIR}/www/php5/pear/Makefile.pear
-FAKE_FLAGS+=	WRKINST=${WRKINST} WRKDIR=${WRKDIR}
-
-PREFIX=		/var/www
-
-PEAR_LIBDIR=	${PREFIX}/pear/lib
-PEAR_PHPBIN=	${LOCALBASE}/bin/php