it's a sunny day....and the right time to kill php4.

it has been unlinked from the builds for some monthts now, and everybody should've upgraded to php5 a long time ago. from brad@, ok robert@
2008-05-27 07:07:28 +00:00 · 2008-05-27 07:07:28 +00:00 · 0476a79436
commit 0476a79436
parent 121aa6c4c7
86 changed files with 0 additions and 2077 deletions
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@ -1,7 +0,0 @@
-# $OpenBSD: Makefile,v 1.72 2003/05/23 20:08:20 avsm Exp $
-
-SUBDIR += core
-SUBDIR += extensions
-SUBDIR += extensions,no_x11
-
-.include <bsd.port.subdir.mk>
--- a/www/php4/Makefile.inc
+++ b/www/php4/Makefile.inc
@ -1,71 +0,0 @@
-# $OpenBSD: Makefile.inc,v 1.34 2008/01/28 15:40:35 robert Exp $
-
-# !!! Support for PHP 4 has been discontinued since 2007-12-31,
-# !!! and no more security fixes are going to be released after 2008-08-08.
-# !!! Consider upgrading to php5!
-
-# This port currently only works with archs supporting dynamic loading
-# and has Apache that supports DSO's.
-NOT_FOR_ARCHS=	${NO_SHARED_ARCHS}
-
-V=		4.4.1
-DISTNAME=	php-${V}
-CATEGORIES=	www lang
-
-MAINTAINER=	Robert Nagy <robert@openbsd.org>
-HOMEPAGE=	http://www.php.net/
-
-MASTER_SITES=	http://us2.php.net/distributions/ \
-		http://se.php.net/distributions/ \
-		http://no.php.net/distributions/ \
-		http://uk.php.net/distributions/
-
-# UPGRADERS: please read BOTH the PHP and Zend licenses
-# and make sure they are safe before an upgrade
-
-PERMIT_PACKAGE_CDROM=   Yes
-PERMIT_PACKAGE_FTP=     Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=   Yes
-
-PHP_CONFIG_PATH=	/var/www/conf
-PHP_CONFIG_FILE=	${PHP_CONFIG_PATH}/php.ini
-
-# where the main php4 module is stored (outside the chroot)
-APACHE_MODULE_SUBDIR=	lib/php
-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}
-
-.if ${USE_GCC3:L:Myes}
-PHP_LDFLAGS=		-lstdc++ -lm
-.endif
-
-CONFIGURE_STYLE=	autoconf
-AUTOCONF_VERSION=	2.52
-CONFIGURE_ENV=          CFLAGS="${CFLAGS} -I${LOCALBASE}/include -pthread" \
-                        LDFLAGS="-L${LOCALBASE}/lib ${PHP_LDFLAGS}" \
-			EXTENSION_DIR=${MODULES_DIR}
-MAKE_ENV=               ${CONFIGURE_ENV}
-
-CONFIGURE_ARGS+=	--enable-shared \
-			--disable-static \
-			--disable-rpath \
-			--with-config-file-path=${PHP_CONFIG_PATH} \
-			--enable-inline-optimization \
-			--with-pic
-
-# default included extensions
-CONFIGURE_ARGS+= 	--with-openssl \
-			--with-zlib
-
-REGRESS_TARGET=		test
-REGRESS_FLAGS=		NO_INTERACTION=1
-
-CHECKSUM_FILE=		${.CURDIR}/../distinfo
-PATCH_LIST=		${.CURDIR}/../patches/patch-* \
-			patch-*
--- a/www/php4/core/Makefile
+++ b/www/php4/core/Makefile
@ -1,79 +0,0 @@
-# $OpenBSD: Makefile,v 1.38 2008/01/04 17:48:38 espie Exp $
-
-MULTI_PACKAGES=	-main -pear
-
-COMMENT-main=	server-side HTML-embedded scripting language
-COMMENT-pear=	base classes for common PHP tasks
-PKGNAME-main=	php4-core-${V}p3
-FULLPKGNAME-pear= php4-pear-${V}p2
-
-CONFIGURE_ARGS+= --with-apxs=/usr/sbin/apxs \
-		--without-mysql \
-		--enable-xml \
-		--enable-wddx \
-		--enable-cli \
-		--with-iconv=${LOCALBASE} \
-		--with-gettext=${LOCALBASE} \
-		--enable-dio \
-		--with-pear=${PEAR_DIR} \
-		--enable-bcmath \
-		--enable-session \
-		--enable-trans-sid \
-		--enable-calendar \
-		--enable-ctype \
-		--enable-ftp \
-		--with-pcre-regex \
-		--with-posix \
-		--enable-sockets \
-		--enable-sysvsem \
-		--enable-sysvshm \
-		--enable-yp \
-		--enable-exif
-
-# some variables to substitute
-SUBST_VARS=	PHP_CONFIG_FILE
-PHP_VERSION=	${V}
-
-.for i in TRUEPREFIX PHP_CONFIG_FILE MODULES_DIR PHP_VERSION APACHE_MODULE_DIR
-PHPXS_SUBST+= -e 's,${i},${${i}},'
-.endfor
-
-WANTLIB-main=	c crypto des m ssl stdc++ z pthread
-MODULES=	devel/gettext
-
-.if ${MACHINE_ARCH} == "i386"
-LIB_DEPENDS-main=${LIB_DEPENDS} recode::converters/recode
-CONFIGURE_ARGS+= --with-recode=${LOCALBASE}
-.endif
-
-PREFIX-pear=		${CHROOT_DIR}
-RUN_DEPENDS-pear=	:php4-core-${V}:www/php4/core
-LIB_DEPENDS-pear=
-
-pre-fake:
-	${INSTALL_DATA_DIR} ${PREFIX}/${APACHE_MODULE_SUBDIR}
-
-INSTALL_TARGET= install-pear install-headers install-build install-programs
-DESTDIRNAME=	INSTALL_ROOT
-
-pre-configure:
-	@perl -p -i.orig -e "s,OPENBSD_PEAR_ROOT,'${CHROOT_DIR}/pear',g" \
-	    ${WRKSRC}/pear/PEAR/Config.php ${WRKSRC}/scripts/phpize.in \
-	    ${WRKSRC}/scripts/php-config.in
-
-post-install:
-	${INSTALL_DATA} ${WRKBUILD}/.libs/libphp4.so ${PREFIX}/${APACHE_MODULE_SUBDIR}
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php4
-	${INSTALL_PROGRAM} ${WRKBUILD}/sapi/cli/php ${PREFIX}/bin
-.for i in dist recommended
-	@sed -e 's,MODULES_DIR,${MODULES_DIR},' \
-	     -e 's,OPENBSD_INCLUDE_PATH,/pear/lib:${CHROOT_DIR}/pear/lib,' \
-		<${WRKSRC}/php.ini-${i} \
-		>${PREFIX}/share/examples/php4/php.ini-${i}
-.endfor
-	@sed ${PHPXS_SUBST} <${FILESDIR}/phpxs >${PREFIX}/sbin/phpxs
-	@chown ${BINOWN}:${BINGRP} ${PREFIX}/sbin/phpxs
-	@chmod ${BINMODE} ${PREFIX}/sbin/phpxs
-	${INSTALL_MAN} ${WRKSRC}/sapi/cli/php.1 ${PREFIX}/man/man1
-
-.include <bsd.port.mk>
--- a/www/php4/core/files/phpxs
+++ b/www/php4/core/files/phpxs
@ -1,115 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: phpxs,v 1.6 2005/02/06 13:10:38 wilfried Exp $
-#
-# Copyright (c) 2002-2004 Anil Madhavapeddy <anil@recoil.org>
-#
-# Permission to use, copy, modify, and distribute this software for any
-# purpose with or without fee is hereby granted, provided that the above
-# copyright notice and this permission notice appear in all copies.
-#
-# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-#
-
-set -e
-PATH=/bin:/usr/bin:/sbin:/usr/sbin
-
-# variables substituted during package build time
-php_version=PHP_VERSION
-php_module_path=MODULES_DIR
-apache_module_path=APACHE_MODULE_DIR
-php_cfg=PHP_CONFIG_FILE
-php_example=TRUEPREFIX/share/examples/php4
-php_module=${apache_module_path}/libphp4.so
-
-showusage() {
-    echo
-    echo "Usage: $0 -a [ -c <location of php.ini> ] <module>"
-    echo "       $0 -r [ -c <location of php.ini> ] <module>"
-    echo "       $0 -s"
-    exit 2
-}
-
-set -- `getopt sarc: $*`
-if test $? != 0 ; then
-    showusage;
-fi
-
-add=0; remove=0;
-for i; do
-    case "$i"
-    in
-        -s)
-            setup=1; shift;;
-        -a)
-            add=1; shift;;
-        -r)
-            remove=1; shift;;
-        -c)
-            php_cfg=$2; shift; shift;;
-        --)
-            shift; break;;
-    esac
-done
-
-module=$1
-
-if [ $setup ]; then
-    if [ ! -f ${php_module} ]; then
-        echo "Unable to locate PHP4 module at ${php_module}"
-        exit;
-    fi
-
-    /usr/sbin/apxs -i -a -n php4 ${php_module}
-    echo
-    echo "You should copy the sample configuration files from"
-    echo "${php_example} to ${php_cfg}"
-    exit;
-fi
-
-if [ ! -r $php_cfg ]; then
-    echo "PHP config file $php_cfg could not be found."
-    showusage;
-fi
-
-if [ ! $module ]; then
-   echo 'Specify a PHP extension module to activate or deactivate.'
-   showusage;
-fi
-
-if [ `expr $add + $remove` -gt 1 ]; then
-    echo 'Cannot specify -a and -r at the same time.'
-    showusage
-fi
-
-if [ `expr $add + $remove` -eq 0 ]; then
-    echo 'Must specify either -a or -r action.'
-    showusage
-fi
-
-# regexp to match an extension entry in the config file
-extmatch='^\;?[[:space:]]{0,2}extension[[:space:]]*=[[:space:]]*'${module}.so
-
-if [ $add -gt 0 ]; then
-    if [ ! -r ${php_module_path}/${module}.so ]; then
-        echo "Module ${module}.so was not found on your system in ${php_module_path}"
-        echo "Try installing package php4-${module}-${php_version} from your package collection"
-        exit;
-    fi
-    if [ `grep -E "${extmatch}" $php_cfg | wc -l` -gt 0 ]; then
-        echo "Activating extension : $module";
-        /usr/bin/perl -pi -e "s/${extmatch}/extension=${module}.so/" $php_cfg
-    else
-        echo "Adding extension : $module";
-        echo "extension=${module}.so" >> $php_cfg;
-    fi
-elif [ $remove -gt 0 ]; then
-    echo "Disabling extension: $module"
-    /usr/bin/perl -pi -e "s/${extmatch}/\;extension=${module}.so/" $php_cfg;
-fi
--- a/www/php4/core/patches/patch-ext_gettext_config_m4
+++ b/www/php4/core/patches/patch-ext_gettext_config_m4
@ -1,21 +0,0 @@
-$OpenBSD: patch-ext_gettext_config_m4,v 1.1 2004/08/12 17:39:50 naddy Exp $
--- ext/gettext/config.m4.orig	Wed Oct  1 04:53:58 2003
-+++ ext/gettext/config.m4	Thu Aug 12 12:44:11 2004
-@@ -18,7 +18,7 @@ if test "$PHP_GETTEXT" != "no"; then
-   GETTEXT_INCDIR=$GETTEXT_DIR/include
-   
-   O_LDFLAGS=$LDFLAGS
-  LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
-+  LDFLAGS="$LDFLAGS -liconv -L$GETTEXT_LIBDIR"
-   AC_CHECK_LIB(intl, bindtextdomain, [
- 	GETTEXT_LIBS=intl
- 	GETTEXT_CHECK_IN_LIB=intl
-@@ -30,7 +30,7 @@ if test "$PHP_GETTEXT" != "no"; then
- 		AC_MSG_ERROR(Unable to find required gettext library)
- 	])
-   )
-  LDFLAGS=$O_LDFLAGS
-+  LDFLAGS="$O_LDFLAGS -liconv"
- 
-   AC_DEFINE(HAVE_LIBINTL,1,[ ])
-   PHP_NEW_EXTENSION(gettext, gettext.c, $ext_shared)
--- a/www/php4/core/patches/patch-pear_PEAR_Config_php
+++ b/www/php4/core/patches/patch-pear_PEAR_Config_php
@ -1,67 +0,0 @@
-$OpenBSD: patch-pear_PEAR_Config_php,v 1.2 2003/08/28 22:30:38 avsm Exp $
--- pear/PEAR/Config.php.orig	2003-08-14 13:12:51.000000000 -0700
-+++ pear/PEAR/Config.php	2003-08-25 19:17:56.000000000 -0700
-@@ -66,12 +66,7 @@ if (getenv('PHP_PEAR_HTTP_PROXY')) {
- if (getenv('PHP_PEAR_INSTALL_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
- } else {
-    if (@is_dir($PEAR_INSTALL_DIR)) {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR',
-               $PEAR_INSTALL_DIR);
-    } else {
-        define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-    }
-+    define('PEAR_CONFIG_DEFAULT_PHP_DIR', OPENBSD_PEAR_ROOT.'/lib');
- }
- 
- // Default for ext_dir
-@@ -93,8 +88,7 @@ if (getenv('PHP_PEAR_EXTENSION_DIR')) {
- if (getenv('PHP_PEAR_DOC_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
- } else {
-    define('PEAR_CONFIG_DEFAULT_DOC_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'docs');
-+    define('PEAR_CONFIG_DEFAULT_DOC_DIR', OPENBSD_PEAR_ROOT.'/doc');
- }
- 
- // Default for bin_dir
-@@ -108,25 +102,21 @@ if (getenv('PHP_PEAR_BIN_DIR')) {
- if (getenv('PHP_PEAR_DATA_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
- } else {
-    define('PEAR_CONFIG_DEFAULT_DATA_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'data');
-+    define('PEAR_CONFIG_DEFAULT_DATA_DIR', OPENBSD_PEAR_ROOT.'/data');
- }
- 
- // Default for test_dir
- if (getenv('PHP_PEAR_TEST_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
- } else {
-    define('PEAR_CONFIG_DEFAULT_TEST_DIR',
-           $PEAR_INSTALL_DIR.DIRECTORY_SEPARATOR.'tests');
-+    define('PEAR_CONFIG_DEFAULT_TEST_DIR', OPENBSD_PEAR_ROOT.'/tests');
- }
- 
- // Default for cache_dir
- if (getenv('PHP_PEAR_CACHE_DIR')) {
-     define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
- } else {
-    define('PEAR_CONFIG_DEFAULT_CACHE_DIR',
-           System::tmpdir() . DIRECTORY_SEPARATOR . 'pear' .
-           DIRECTORY_SEPARATOR . 'cache');
-+    define('PEAR_CONFIG_DEFAULT_CACHE_DIR', OPENBSD_PEAR_ROOT.'/cache');
- }
- 
- // Default for php_bin
-@@ -176,9 +166,7 @@ if (getenv('PHP_PEAR_SIG_TYPE')) {
- if (getenv('PHP_PEAR_SIG_BIN')) {
-     define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
- } else {
-    define('PEAR_CONFIG_DEFAULT_SIG_BIN',
-           System::which(
-               'gpg', OS_WINDOWS ? 'c:\gnupg\gpg.exe' : '/usr/local/bin/gpg'));
-+    define('PEAR_CONFIG_DEFAULT_SIG_BIN', PHP_PREFIX . '/bin/gpg');
- }
- 
- // Default for sig_keydir
--- a/www/php4/core/patches/patch-pear_install-pear_php
+++ b/www/php4/core/patches/patch-pear_install-pear_php
@ -1,16 +0,0 @@
-$OpenBSD: patch-pear_install-pear_php,v 1.2 2003/08/28 22:30:38 avsm Exp $
--- pear/install-pear.php.orig	2003-08-14 13:12:51.000000000 -0700
-+++ pear/install-pear.php	2003-08-25 22:33:58.000000000 -0700
-@@ -46,10 +46,10 @@ if (!empty($bin_dir)) {
- // User supplied a dir prefix
- if (!empty($with_dir)) {
-     $ds = DIRECTORY_SEPARATOR;
-    $config->set('php_dir', $with_dir, 'default');
-+    $config->set('php_dir', $with_dir . $ds . 'lib', 'default');
-     $config->set('doc_dir', $with_dir . $ds . 'doc', 'default');
-     $config->set('data_dir', $with_dir . $ds . 'data', 'default');
-    $config->set('test_dir', $with_dir . $ds . 'test', 'default');
-+    $config->set('test_dir', $with_dir . $ds . 'tests', 'default');
- }
- /* Print PEAR Conf (useful for debuging do NOT REMOVE)
- sort($keys);
--- a/www/php4/core/patches/patch-scripts_Makefile_frag
+++ b/www/php4/core/patches/patch-scripts_Makefile_frag
@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_Makefile_frag,v 1.2 2005/07/12 15:49:27 robert Exp $
--- scripts/Makefile.frag.orig	Wed Jun  8 12:34:41 2005
-+++ scripts/Makefile.frag	Tue Jul 12 13:41:33 2005
-@@ -3,8 +3,8 @@
- # Build environment install
- #
- 
-phpincludedir = $(includedir)/php
-phpbuilddir = $(libdir)/build
-+phpincludedir = $(peardir)/include
-+phpbuilddir = $(peardir)/build
- 
- BUILD_FILES = \
- 	scripts/phpize.m4 \
--- a/www/php4/core/patches/patch-scripts_php_config_in
+++ b/www/php4/core/patches/patch-scripts_php_config_in
@ -1,14 +0,0 @@
-$OpenBSD: patch-scripts_php_config_in,v 1.2 2005/04/04 21:11:42 robert Exp $
--- scripts/php-config.in.orig	Wed Mar 16 07:37:03 2005
-+++ scripts/php-config.in	Sun Apr  3 21:49:32 2005
-@@ -1,8 +1,8 @@
- #! /bin/sh
- 
-prefix="@prefix@"
-+prefix=OPENBSD_PEAR_ROOT
- version="@PHP_VERSION@"
-includedir="@includedir@/php"
-+includedir="@includedir@"
- includes="-I$includedir -I$includedir/main -I$includedir/TSRM -I$includedir/Zend"
- ldflags="@PHP_LDFLAGS@"
- libs="@EXTRA_LIBS@"
--- a/www/php4/core/patches/patch-scripts_phpize_in
+++ b/www/php4/core/patches/patch-scripts_phpize_in
@ -1,17 +0,0 @@
-$OpenBSD: patch-scripts_phpize_in,v 1.2 2005/07/12 15:49:27 robert Exp $
--- scripts/phpize.in.orig	Wed Jun 15 19:13:52 2005
-+++ scripts/phpize.in	Tue Jul 12 13:43:25 2005
-@@ -1,10 +1,10 @@
- #!/bin/sh
- 
- # Variable declaration
-prefix='@prefix@'
-+prefix=OPENBSD_PEAR_ROOT
- exec_prefix="`eval echo @exec_prefix@`"
-phpdir="`eval echo @libdir@`/build"
-includedir="`eval echo @includedir@`/php"
-+phpdir="$prefix/build"
-+includedir="$prefix/include"
- builddir="`pwd`"
- 
- FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4"
--- a/www/php4/core/pkg/DESCR-main
+++ b/www/php4/core/pkg/DESCR-main
@ -1,10 +0,0 @@
-At the most basic level, PHP can do anything any other CGI program
-can do, such as collect form data, generate dynamic page content,
-or send and receive cookies.
-
-PHP also has support for talking to other services using protocols
-such as IMAP, SNMP, NNTP, POP3, or even HTTP. You can also open
-raw network sockets and interact using other protocols.
-
-This package installs a stand-alone binary which can be used for
-command-line scripts, as well as an Apache module.
--- a/www/php4/core/pkg/DESCR-pear
+++ b/www/php4/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 PHP4.
--- a/www/php4/core/pkg/MESSAGE-main
+++ b/www/php4/core/pkg/MESSAGE-main
@ -1,14 +0,0 @@
-To finish the install, enable the php4 module with:
-    ${PREFIX}/sbin/phpxs -s
-
-To enable parsing of PHP scripts, add the following to
-/var/www/conf/httpd.conf:
-
-    AddType application/x-httpd-php .php
-
-Copy the config file below into ${PHP_CONFIG_FILE}
-${PREFIX}/share/examples/php4/php.ini-recommended
-
-Don't forget that the default OpenBSD httpd is chrooted
-into /var/www by default, so you may need to create support
-directories such as /var/www/tmp for PHP to work correctly.
--- a/www/php4/core/pkg/PLIST-main
+++ b/www/php4/core/pkg/PLIST-main
@ -1,18 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.2 2007/05/07 13:46:59 bernd Exp $
-@conflict php5-core-*
-@conflict pear-utils-*
-@pkgpath www/php4/core
-bin/pear
-bin/php
-bin/php-config
-bin/phpize
-lib/php/
-lib/php/libphp4.so
-@man man/man1/php-config.1
-@man man/man1/php.1
-@man man/man1/phpize.1
-sbin/phpxs
-share/examples/php4/
-share/examples/php4/php.ini-dist
-share/examples/php4/php.ini-recommended
-@unexec rm -f /usr/lib/apache/modules/libphp4.so
--- a/www/php4/core/pkg/PLIST-pear
+++ b/www/php4/core/pkg/PLIST-pear
@ -1,321 +0,0 @@
-@comment $OpenBSD: PLIST-pear,v 1.18 2007/05/07 13:46:59 bernd Exp $
-@conflict php5-pear-*
-@conflict 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/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/doc/HTML_Template_IT/
-pear/doc/HTML_Template_IT/examples/
-pear/doc/HTML_Template_IT/examples/sample_it.php
-pear/doc/HTML_Template_IT/examples/templates/
-pear/doc/HTML_Template_IT/examples/templates/main.tpl.htm
-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.nw.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.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_execute.h
-pear/include/Zend/zend_execute_globals.h
-pear/include/Zend/zend_execute_locks.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_istdiostream.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_modules.h
-pear/include/Zend/zend_multibyte.h
-pear/include/Zend/zend_multiply.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_strtod.h
-pear/include/Zend/zend_types.h
-pear/include/Zend/zend_variables.h
-pear/include/acconfig.h
-pear/include/ext/
-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/mbstring/
-pear/include/ext/mbstring/libmbfl/
-pear/include/ext/mbstring/libmbfl/mbfl/
-pear/include/ext/mbstring/libmbfl/mbfl/eaw_table.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_language.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
-pear/include/ext/mbstring/libmbfl/mbfl/mbfl_string.h
-pear/include/ext/mbstring/mbstring.h
-pear/include/ext/mbstring/php_mbregex.h
-pear/include/ext/mbstring/php_unicode.h
-pear/include/ext/mbstring/unicode_data.h
-pear/include/ext/pgsql/
-pear/include/ext/pgsql/php_pgsql.h
-pear/include/ext/session/
-pear/include/ext/session/mod_files.h
-pear/include/ext/session/mod_mm.h
-pear/include/ext/session/mod_user.h
-pear/include/ext/session/php_session.h
-pear/include/ext/standard/
-pear/include/ext/standard/aggregation.h
-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/parsedate.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_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_parsedate.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_var.h
-pear/include/ext/standard/php_versioning.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/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/
-pear/include/ext/xml/expat/ascii.h
-pear/include/ext/xml/expat/asciitab.h
-pear/include/ext/xml/expat/expat.h
-pear/include/ext/xml/expat/iasciitab.h
-pear/include/ext/xml/expat/internal.h
-pear/include/ext/xml/expat/latin1tab.h
-pear/include/ext/xml/expat/nametab.h
-pear/include/ext/xml/expat/utf8tab.h
-pear/include/ext/xml/expat/winconfig.h
-pear/include/ext/xml/expat/xmlrole.h
-pear/include/ext/xml/expat/xmltok.h
-pear/include/ext/xml/expat/xmltok_impl.h
-pear/include/ext/xml/php_xml.h
-pear/include/include/
-pear/include/include/php_sab_info.h
-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/internal_functions_registry.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_embed.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/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/.registry/
-pear/lib/.registry/archive_tar.reg
-pear/lib/.registry/console_getopt.reg
-pear/lib/.registry/html_template_it.reg
-pear/lib/.registry/net_useragent_detect.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/HTML/
-pear/lib/HTML/Template/
-pear/lib/HTML/Template/IT.php
-pear/lib/HTML/Template/ITX.php
-pear/lib/HTML/Template/IT_Error.php
-pear/lib/Net/
-pear/lib/Net/UserAgent/
-pear/lib/Net/UserAgent/Detect.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/Command/
-pear/lib/PEAR/Command.php
-pear/lib/PEAR/Command/Auth.php
-pear/lib/PEAR/Command/Build.php
-pear/lib/PEAR/Command/Common.php
-pear/lib/PEAR/Command/Config.php
-pear/lib/PEAR/Command/Install.php
-pear/lib/PEAR/Command/Mirror.php
-pear/lib/PEAR/Command/Package.php
-pear/lib/PEAR/Command/Registry.php
-pear/lib/PEAR/Command/Remote.php
-pear/lib/PEAR/Common.php
-pear/lib/PEAR/Config.php
-pear/lib/PEAR/Dependency.php
-pear/lib/PEAR/Downloader.php
-pear/lib/PEAR/ErrorStack.php
-pear/lib/PEAR/Exception.php
-pear/lib/PEAR/Frontend/
-pear/lib/PEAR/Frontend/CLI.php
-pear/lib/PEAR/Installer.php
-pear/lib/PEAR/Packager.php
-pear/lib/PEAR/Registry.php
-pear/lib/PEAR/Remote.php
-pear/lib/PEAR/RunTest.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/tests/
-pear/tests/HTML_Template_IT/
-pear/tests/HTML_Template_IT/tests/
-pear/tests/HTML_Template_IT/tests/Console_TestListener.php
-pear/tests/HTML_Template_IT/tests/ITX_api_testcase.php
-pear/tests/HTML_Template_IT/tests/ITX_usage_testcase.php
-pear/tests/HTML_Template_IT/tests/IT_api_testcase.php
-pear/tests/HTML_Template_IT/tests/IT_usage_testcase.php
-pear/tests/HTML_Template_IT/tests/templates/
-pear/tests/HTML_Template_IT/tests/templates/__include.html
-pear/tests/HTML_Template_IT/tests/templates/addblock.html
-pear/tests/HTML_Template_IT/tests/templates/blockiteration.html
-pear/tests/HTML_Template_IT/tests/templates/blocks.html
-pear/tests/HTML_Template_IT/tests/templates/globals.html
-pear/tests/HTML_Template_IT/tests/templates/include.html
-pear/tests/HTML_Template_IT/tests/templates/loadtemplatefile.html
-pear/tests/HTML_Template_IT/tests/templates/replaceblock.html
-pear/tests/HTML_Template_IT/tests/test.php
-pear/tests/XML_RPC/
-pear/tests/XML_RPC/tests/
-pear/tests/XML_RPC/tests/protoport.php
-pear/tests/XML_RPC/tests/test_Dump.php
-@group
--- a/www/php4/core/pkg/SECURITY
+++ b/www/php4/core/pkg/SECURITY
@ -1,16 +0,0 @@
-A couple of minor changes have been made to PHP's
-default installation to make it more secure.
-
-1) Temporary files have greater randomness in their names.
-
-2) URL fopen is OFF by default, as this functionality is
-   easily exploitable for many common PHP scripts out there.
-   Turning it off by default does not affect 99% of users,
-   and turns remote exploits into local ones.
-
-The source has not otherwise been audited.  If you do so,
-please contact the maintainer(s) below.
-
--
-Anil Madhavapeddy, <avsm@openbsd.org>
-$OpenBSD: SECURITY,v 1.1.1.1 2002/06/24 19:23:41 avsm Exp $
--- a/www/php4/core/pkg/UNMESSAGE-main
+++ b/www/php4/core/pkg/UNMESSAGE-main
@ -1,8 +0,0 @@
-To completely deinstall the package you need to
-perform these steps as root:
-
-    edit /var/www/conf/httpd.conf
-    remove the line LoadModule php4_module
-
-Do not do this if you plan on re-installing php4
-package at some future time.
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@ -1,5 +0,0 @@
-MD5 (php-4.4.1.tar.gz) = g6nVLflvaCy7iM6H/xDvtQ==
-RMD160 (php-4.4.1.tar.gz) = AEkqTMD1II9bakQUzcaVGQ96qlY=
-SHA1 (php-4.4.1.tar.gz) = B763TFhPknnw9k3+4xV0Tm9jRQQ=
-SHA256 (php-4.4.1.tar.gz) = wxfMLpOtDYqlGVrqGvgjkihQYdENWhmO6I01pv5lr8w=
-SIZE (php-4.4.1.tar.gz) = 5110458
--- a/www/php4/extensions/Makefile
+++ b/www/php4/extensions/Makefile
@ -1,332 +0,0 @@
-# $OpenBSD: Makefile,v 1.59 2007/11/20 19:23:25 sturm Exp $
-
-FULLPKGNAME-main=	php4-extensions-${V}p1
-COMMENT-main=	informational package about PHP4 extensions
-
-MULTI_PACKAGES=-main
-
-# extensions get installed under the apache chroot
-PREFIX=		${CHROOT_DIR}
-
-FLAVORS=	no_x11
-FLAVOR?=
-
-WANTLIB=	stdc++ m
-
-MODULES=	devel/gettext
-
-CONFIGURE_ARGS+=	--with-apxs=/usr/sbin/apxs \
-			--with-iconv-dir=${LOCALBASE} \
-			--with-iconv=${LOCALBASE}
-
-GRAPHIC_DEPENDS=	jpeg.>=62::graphics/jpeg \
-			png.>=3::graphics/png
-
-GRAPHIC_CONFIG=		--with-jpeg-dir=${LOCALBASE} \
-			--with-png-dir=${LOCALBASE} \
-			--with-zlib-dir=/usr
-
-# bz2
-PSEUDO_FLAVORS+=	no_bz2
-.if ${FLAVOR:L:Mno_bz2}
-CONFIGURE_ARGS+=	--without-bz2
-.else
-MULTI_PACKAGES+=	-bz2
-COMMENT-bz2=		bzip2 compression extensions for php4
-CONFIGURE_ARGS+=	--with-bz2=shared,${LOCALBASE}
-LIB_DEPENDS-bz2=	bz2.>=10::archivers/bzip2
-.endif
-
-# curl
-PSEUDO_FLAVORS+=	no_curl
-.if ${FLAVOR:L:Mno_curl}
-CONFIGURE_ARGS+=	--without-curl
-.else
-MULTI_PACKAGES+=	-curl
-COMMENT-curl=		curl URL library extensions for php4
-CONFIGURE_ARGS+=	--with-curl=shared,${LOCALBASE}
-LIB_DEPENDS-curl=	curl.>=2::net/curl
-WANTLIB-curl=		${WANTLIB} crypto idn ssl z
-FULLPKGNAME-curl=	php4-curl-${V}p2
-.endif
-
-# dba
-PSEUDO_FLAVORS+=	no_dba
-.if ${FLAVOR:L:Mno_dba}
-CONFIGURE_ARGS+=	--disable-dba
-.else
-MULTI_PACKAGES+=	-dba
-COMMENT-dba=		dba GDBM access extensions for php4
-CONFIGURE_ARGS+=	--enable-dba=shared --with-gdbm=${LOCALBASE}
-LIB_DEPENDS-dba=	gdbm.>=2::databases/gdbm
-.endif
-
-# dbase
-PSEUDO_FLAVORS+=	no_dbase
-.if ${FLAVOR:L:Mno_dbase}
-CONFIGURE_ARGS+=	--disable-dbase
-.else
-MULTI_PACKAGES+=	-dbase
-COMMENT-dbase=		dBase database access extensions for php4
-CONFIGURE_ARGS+=	--enable-dbase=shared
-LIB_DEPENDS-dbase=
-.endif
-
-# dbx
-PSEUDO_FLAVORS+=	no_dbx
-.if ${FLAVOR:L:Mno_dbx}
-CONFIGURE_ARGS+=	--disable-dbx
-.else
-MULTI_PACKAGES+=	-dbx
-COMMENT-dbx=		dbx database abstraction interface for php4
-CONFIGURE_ARGS+=	--enable-dbx=shared
-LIB_DEPENDS-dbx=
-.endif
-
-# domxml
-PSEUDO_FLAVORS+=	no_domxml
-.if ${FLAVOR:L:Mno_domxml}
-CONFIGURE_ARGS+=	--disable-dom
-.else
-MULTI_PACKAGES+=	-domxml
-COMMENT-domxml=		manipulate XML via the DOM API in php4
-CONFIGURE_ARGS+=	--with-dom=shared,${LOCALBASE}
-LIB_DEPENDS-domxml=	xml2.>=6::textproc/libxml
-WANTLIB-domxml=		${WANTLIB} z iconv
-.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 php4
-CONFIGURE_ARGS+=	--enable-filepro=shared
-LIB_DEPENDS-filepro=
-.endif
-
-# gd
-PSEUDO_FLAVORS+=	no_gd
-.if ${FLAVOR:L:Mno_gd}
-CONFIGURE_ARGS+=	--without-gd --without-xpm-dir --without-ttf \
-			--without-freetype-dir
-.else
-MULTI_PACKAGES+=	-gd
-COMMENT-gd=		image manipulation extensions for php4
-LIB_DEPENDS-gd=		ttf.>=1::print/freetype ${GRAPHIC_DEPENDS} \
-			t1.>=5::devel/t1lib
-WANTLIB-gd=		${WANTLIB} z
-CONFIGURE_ARGS+=	--with-gd=shared ${GRAPHIC_CONFIG} \
-			--with-ttf=shared,${LOCALBASE} --without-freetype-dir \
-			--with-t1lib=${LOCALBASE}
-.if !${FLAVOR:L:Mno_x11}
-USE_X11=               yes
-CONFIGURE_ARGS+=       --with-xpm-dir=${X11BASE}
-WANTLIB-gd+=		X11 Xpm
-FULLPKGNAME-gd=		php4-gd-${V}p5
-.else
-CONFIGURE_ARGS+=       --without-xpm-dir
-FULLPKGNAME-gd=		php4-gd-${V}p5-no_x11
-.endif
-.endif
-
-# gmp
-PSEUDO_FLAVORS+=	no_gmp
-.if ${FLAVOR:L:Mno_gmp}
-CONFIGURE_ARGS+=	--without-gmp
-.else
-MULTI_PACKAGES+=	-gmp
-COMMENT-gmp=		gmp math library support for php4
-CONFIGURE_ARGS+=	--with-gmp=shared,${LOCALBASE}
-LIB_DEPENDS-gmp=	gmp.>=4::devel/gmp
-.endif
-
-# imap
-PSEUDO_FLAVORS+=	no_imap
-.if ${FLAVOR:L:Mno_imap}
-CONFIGURE_ARGS+=	--without-imap --without-kerberos
-.else
-MULTI_PACKAGES+=	-imap
-COMMENT-imap=		imap, pop3 and nntp extensions for php4
-CONFIGURE_ARGS+=	--with-imap=shared,${LOCALBASE} \
-			--with-kerberos=/usr --with-imap-ssl
-LIB_DEPENDS-imap=	c-client.>=5::mail/imap-uw,-c-client
-WANTLIB-imap=		${WANTLIB} des gssapi crypto krb5 ssl
-FULLPKGNAME-imap=	php4-imap-$Vp2
-.endif
-
-# ldap
-PSEUDO_FLAVORS+=	no_ldap
-.if ${FLAVOR:L:Mno_ldap}
-CONFIGURE_ARGS+=	--without-ldap
-.else
-MULTI_PACKAGES+=	-ldap
-COMMENT-ldap=		ldap protocol extensions for php4
-CONFIGURE_ARGS+=	--with-ldap=shared,${LOCALBASE}
-LIB_DEPENDS-ldap=	ldap.>=2,lber::databases/openldap
-.endif
-
-# mcrypt
-PSEUDO_FLAVORS+=	no_mcrypt
-.if ${FLAVOR:L:Mno_mcrypt}
-CONFIGURE_ARGS+=	--without-mcrypt
-.else
-MULTI_PACKAGES+=	-mcrypt
-COMMENT-mcrypt=		mcrypt encryption/decryption extensions for php4
-CONFIGURE_ARGS+=	--with-mcrypt=shared,${LOCALBASE}
-LIB_DEPENDS-mcrypt=	mcrypt::security/libmcrypt ltdl.>=1::devel/libtool,-ltdl
-.endif
-
-# mhash
-PSEUDO_FLAVORS+=	no_mhash
-.if ${FLAVOR:L:Mno_mhash}
-CONFIGURE_ARGS+=	--without-mhash
-.else
-MULTI_PACKAGES+=	-mhash
-COMMENT-mhash=		mhash extensions for php4
-CONFIGURE_ARGS+=	--with-mhash=shared,${LOCALBASE}
-LIB_DEPENDS-mhash=	mhash.>=2::security/mhash
-.endif
-
-# mysql
-PSEUDO_FLAVORS+=	no_mysql
-.if ${FLAVOR:L:Mno_mysql}
-CONFIGURE_ARGS+=	--without-mysql
-.else
-MULTI_PACKAGES+=	-mysql
-COMMENT-mysql=		mysql database access extensions for php4
-CONFIGURE_ARGS+=	--with-mysql=shared,${LOCALBASE}
-LIB_DEPENDS-mysql=	lib/mysql/mysqlclient.>=10::databases/mysql
-.endif
-
-# ncurses
-PSEUDO_FLAVORS+=	no_ncurses
-.if ${FLAVOR:L:Mno_ncurses}
-CONFIGURE_ARGS+=	--without-ncurses
-.else
-MULTI_PACKAGES+=	-ncurses
-COMMENT-ncurses=	ncurses extensions for php4
-CONFIGURE_ARGS+=	--with-ncurses=shared,${LOCALBASE}
-LIB_DEPENDS-ncurses=
-WANTLIB-ncurses=	${WANTLIB} ncurses panel
-.endif
-
-# odbc
-PSEUDO_FLAVORS+=	no_odbc
-.if ${FLAVOR:L:Mno_odbc}
-CONFIGURE_ARGS+=	--without-odbc
-.else
-MULTI_PACKAGES+=	-odbc
-COMMENT-odbc=		odbc database access extensions for php4
-CONFIGURE_ARGS+=        --with-iodbc=shared
-LIB_DEPENDS-odbc=	iodbc.>=2::databases/iodbc
-.endif
-
-# pdf
-PSEUDO_FLAVORS+=	no_pdf
-.if ${FLAVOR:L:Mno_pdf}
-CONFIGURE_ARGS+=	--without-pdflib
-.else
-MULTI_PACKAGES+=	-pdf
-COMMENT-pdf=		pdf viewing and creation extensions for php4
-CONFIGURE_ARGS+=	--with-pdflib=shared,${LOCALBASE} ${GRAPHIC_CONFIG} \
-			--with-tiff-dir=${LOCALBASE}
-LIB_DEPENDS-pdf=	pdf.>=2::print/pdflib ${GRAPHIC_DEPENDS} \
-			tiff.>=35::graphics/tiff
-WANTLIB-pdf=		${WANTLIB} z
-.endif
-
-# pgsql
-PSEUDO_FLAVORS+=	no_pgsql
-.if ${FLAVOR:L:Mno_pgsql}
-CONFIGURE_ARGS+=	--without-pgsql
-.else
-MULTI_PACKAGES+=	-pgsql
-COMMENT-pgsql=		pgsql database access extensions for php4
-CONFIGURE_ARGS+=	--with-pgsql=shared,${LOCALBASE}
-LIB_DEPENDS-pgsql=	pq.>=2:postgresql-client-*:databases/postgresql
-.endif
-
-# shmop
-PSEUDO_FLAVORS+=	no_shmop
-.if ${FLAVOR:L:Mno_shmop}
-CONFIGURE_ARGS+=	--disable-shmop
-.else
-MULTI_PACKAGES+=	-shmop
-COMMENT-shmop=		shared memory extensions for php4
-CONFIGURE_ARGS+=	--enable-shmop=shared
-LIB_DEPENDS-shmop=
-.endif
-
-# snmp
-PSEUDO_FLAVORS+=	no_snmp
-.if ${FLAVOR:L:Mno_snmp}
-CONFIGURE_ARGS+=	--without-snmp
-.else
-MULTI_PACKAGES+=	-snmp
-COMMENT-snmp=		snmp protocol extensions for php4
-CONFIGURE_ARGS+=	--with-snmp=shared,${LOCALBASE} --enable-ucd-snmp-hack
-LIB_DEPENDS-snmp=	netsnmp.>=6.2::net/net-snmp
-WANTLIB-snmp=		${WANTLIB} crypto
-.endif
-
-# sybase-ct
-PSEUDO_FLAVORS+=	no_sybase_ct
-.if ${FLAVOR:L:Mno_sybase_ct}
-CONFIGURE_ARGS+=	--without-sybase-ct
-.else
-MULTI_PACKAGES+=	-sybase_ct
-COMMENT-sybase_ct=	sybase database access extensions for php4
-CONFIGURE_ARGS+=        --with-sybase-ct=shared,${LOCALBASE}
-LIB_DEPENDS-sybase_ct=	ct::databases/freetds
-.endif
-
-# xml-rpc
-PSEUDO_FLAVORS+=	no_xmlrpc
-.if ${FLAVOR:L:Mno_xmlrpc}
-CONFIGURE_ARGS+=	--without-xmlrpc
-.else
-MULTI_PACKAGES+=	-xmlrpc
-COMMENT-xmlrpc=		XML RPC functions for php4
-CONFIGURE_ARGS+=	--with-xmlrpc=shared
-WANTLIB-xmlrpc=		${WANTLIB} expat iconv
-LIB_DEPENDS-xmlrpc=
-FULLPKGNAME-xmlrpc=	php4-xmlrpc-${V}p3
-.endif
-
-# xslt
-PSEUDO_FLAVORS+=	no_xslt
-.if ${FLAVOR:L:Mno_xslt}
-CONFIGURE_ARGS+=	--disable-xslt
-.else
-MULTI_PACKAGES+=	-xslt
-COMMENT-xslt=		xslt transformation extensions for php4
-CONFIGURE_ARGS+=	--enable-xslt=shared --with-xslt-sablot=shared,${LOCALBASE} 
-LIB_DEPENDS-xslt=	sablot.>=96::textproc/sablotron
-WANTLIB-xslt=		${WANTLIB} expat iconv
-FULLPKGNAME-xslt=	php4-xslt-${V}p2
-.endif
-
-.for i in ${MULTI_PACKAGES}
-FULLPKGNAME${i}?=	php4${i}-${V}p1
-RUN_DEPENDS${i}=	:php4-core-${V}:www/php4/core
-MODULE_NAME${i}=	${i:S/-//g}
-.endfor
-
-MESSAGE=		${PKGDIR}/MESSAGE
-SUBST_VARS=		MODULE_NAME PHP_CONFIG_FILE LOCALBASE V
-
-LIB_DEPENDS-main=
-MESSAGE-main=		${PKGDIR}/DESCR-main
-WANTLIB-main=
-
-do-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/${MODULES_SUBDIR}
-.for m in ${MULTI_PACKAGES:N-main:S/-//g}
-	${INSTALL_DATA} ${WRKBUILD}/modules/${m}.so \
-		${PREFIX}/${MODULES_SUBDIR}/${m}.so
-.endfor
-
-
-.include <bsd.port.mk>
--- a/www/php4/extensions/patches/patch-ext_curl_curl_c
+++ b/www/php4/extensions/patches/patch-ext_curl_curl_c
@ -1,20 +0,0 @@
-$OpenBSD: patch-ext_curl_curl_c,v 1.3 2006/11/18 19:16:26 naddy Exp $
--- ext/curl/curl.c.orig	Mon Oct 17 04:42:51 2005
-+++ ext/curl/curl.c	Sat Nov 18 18:29:03 2006
-@@ -160,7 +160,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);
-@@ -198,7 +198,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/php4/extensions/patches/patch-ext_gd_config_m4
+++ b/www/php4/extensions/patches/patch-ext_gd_config_m4
@ -1,19 +0,0 @@
-$OpenBSD: patch-ext_gd_config_m4,v 1.5 2003/05/23 20:07:18 avsm Exp $
--- ext/gd/config.m4.orig	Mon Apr 21 20:07:50 2003
-+++ ext/gd/config.m4	Fri May 23 14:56:44 2003
-@@ -87,13 +87,13 @@ AC_DEFUN(PHP_GD_PNG,[
-       AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
-     fi
- 
-    if test ! -f $GD_PNG_DIR/include/png.h; then
-+    if test ! -f $GD_PNG_DIR/include/libpng/png.h; then
-       AC_MSG_ERROR([png.h not found.])
-     fi
- 
-     PHP_CHECK_LIBRARY(png,png_write_image,
-     [
-      PHP_ADD_INCLUDE($GD_PNG_DIR/include)
-+      PHP_ADD_INCLUDE($GD_PNG_DIR/include/libpng)
-       PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
-       PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
-     ],[
--- a/www/php4/extensions/patches/patch-ext_imap_php_imap_c
+++ b/www/php4/extensions/patches/patch-ext_imap_php_imap_c
@ -1,21 +0,0 @@
-$OpenBSD: patch-ext_imap_php_imap_c,v 1.1 2007/10/30 10:13:05 ajacoutot Exp $
--- ext/imap/php_imap.c.orig	Sun Oct 28 00:22:52 2007
-+++ ext/imap/php_imap.c	Sun Oct 28 00:23:13 2007
-@@ -71,7 +71,7 @@ static int _php_imap_address_size(ADDRESS *addresslist
- void rfc822_date(char *date);
- char *cpystr(const char *str);
- char *cpytxt(SIZEDTEXT *dst, char *text, unsigned long size);
-long utf8_mime2text(SIZEDTEXT *src, SIZEDTEXT *dst);
-+long utf8_mime2text (SIZEDTEXT *src, SIZEDTEXT *dst, long flags);
- unsigned long find_rightmost_bit(unsigned long *valptr);
- void fs_give(void **block);
- void *fs_get(size_t size);
-@@ -2061,7 +2061,7 @@ PHP_FUNCTION(imap_utf8)
- 	dest.size = 0;
- 
- 	cpytxt(&src, Z_STRVAL_PP(str), Z_STRLEN_PP(str));
-	utf8_mime2text(&src, &dest);
-+	utf8_mime2text(&src, &dest, U8T_CANONICAL);
- 	RETURN_STRINGL(dest.data, strlen(dest.data), 1);
- }
- /* }}} */
--- a/www/php4/extensions/patches/patch-ext_pdf_config_m4
+++ b/www/php4/extensions/patches/patch-ext_pdf_config_m4
@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_pdf_config_m4,v 1.4 2004/01/05 17:02:33 avsm Exp $
--- ext/pdf/config.m4.orig	2004-01-05 09:30:28.000000000 +0000
-+++ ext/pdf/config.m4	2004-01-05 09:32:53.000000000 +0000
-@@ -72,7 +72,7 @@ if test "$PHP_PDFLIB" != "no"; then
-     ],[
-       AC_MSG_ERROR([libtiff not found!])
-     ],[
-      -L$PHP_TIFF_DIR/lib
-+      -L$PHP_TIFF_DIR/lib -ljpeg -lz
-     ])
-   else
-     AC_MSG_WARN([If configure fails, try --with-tiff-dir=<DIR>])
--- a/www/php4/extensions/pkg/DESCR-bz2
+++ b/www/php4/extensions/pkg/DESCR-bz2
@ -1,2 +0,0 @@
-The bzip2 functions are used to transparently read and write bzip2
-(.bz2) compressed files within PHP4.
--- a/www/php4/extensions/pkg/DESCR-curl
+++ b/www/php4/extensions/pkg/DESCR-curl
@ -1,8 +0,0 @@
-PHP supports libcurl, a library created by Daniel Stenberg, that
-allows you to connect and communicate to many different types of
-servers with many different types of protocols. libcurl currently
-supports the http, https, ftp, gopher, telnet, dict, file, and ldap
-protocols. libcurl also supports HTTPS certificates, HTTP POST,
-HTTP PUT, FTP uploading (this can also be done with PHP's ftp
-extension), HTTP form based upload, proxies, cookies, and user+password
-authentication.
--- a/www/php4/extensions/pkg/DESCR-dba
+++ b/www/php4/extensions/pkg/DESCR-dba
@ -1,8 +0,0 @@
-These functions build the foundation for accessing Berkeley DB style
-databases.
-
-This is a general abstraction layer for several file-based databases.
-As such, functionality is limited to a common subset of features
-supported by modern databases such as Sleepycat Software's DB2.
-(This is not to be confused with IBM's DB2 software, which is
-supported through the ODBC functions.)
--- a/www/php4/extensions/pkg/DESCR-dbase
+++ b/www/php4/extensions/pkg/DESCR-dbase
@ -1,18 +0,0 @@
-These functions allow you to access records stored in dBase-format
-(dbf) databases.
-
-There is no support for indexes or memo fields. There is no support
-for locking, too. Two concurrent webserver processes modifying the
-same dBase file will very likely ruin your database.
-
-dBase files are simple sequential files of fixed length records.
-Records are appended to the end of the file and delete records are
-kept until you call dbase_pack().
-
-We recommend that you do not use dBase files as your production
-database. Choose any real SQL server instead; MySQL or Postgres are
-common choices with PHP. dBase support is here to allow you to
-import and export data to and from your web database, because the
-file format is commonly understood by Windows spreadsheets and
-organizers.
-
--- a/www/php4/extensions/pkg/DESCR-dbx
+++ b/www/php4/extensions/pkg/DESCR-dbx
@ -1,3 +0,0 @@
-Database abstraction layer, allowing database-independent PHP code
-with some semblance of efficiency.
-
--- a/www/php4/extensions/pkg/DESCR-domxml
+++ b/www/php4/extensions/pkg/DESCR-domxml
@ -1,2 +0,0 @@
-This PHP extension allows the parsing of XML formatted files using
-the DOM API.
--- a/www/php4/extensions/pkg/DESCR-filepro
+++ b/www/php4/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/php4/extensions/pkg/DESCR-gd
+++ b/www/php4/extensions/pkg/DESCR-gd
@ -1,12 +0,0 @@
-You can use the image functions in PHP to get the size of JPEG,
-GIF, PNG, SWF, TIFF and JPEG2000 images.
-
-By using the GD library, you will also be able to create and
-manipulate images. Support for TrueType and PostScript fonts
-is also included.
-
-The format of images you are able to manipulate depend on the version
-of GD you install, and any other libraries GD might need to access
-those image formats. Versions of GD older than gd-1.6 support gif
-format images, and do not support png, where versions greater than
-gd-1.6 support png, not gif.
--- a/www/php4/extensions/pkg/DESCR-gmp
+++ b/www/php4/extensions/pkg/DESCR-gmp
@ -1,2 +0,0 @@
-These functions allow you to work with arbitrary-length integers
-using the GNU MP library.
--- a/www/php4/extensions/pkg/DESCR-imap
+++ b/www/php4/extensions/pkg/DESCR-imap
@ -1,3 +0,0 @@
-These PHP4 functions are not limited to the IMAP protocol, despite
-their name. The underlying c-client library also supports NNTP,
-POP3 and local mailbox access methods.
--- a/www/php4/extensions/pkg/DESCR-ldap
+++ b/www/php4/extensions/pkg/DESCR-ldap
@ -1,13 +0,0 @@
-LDAP is the Lightweight Directory Access Protocol, and is a protocol
-used to access "Directory Servers". The Directory is a special kind
-of database that holds information in a tree structure.
-
-The concept is similar to your hard disk directory structure, except
-that in this context, the root directory is "The world" and the
-first level subdirectories are "countries". Lower levels of the
-directory structure contain entries for companies, organisations
-or places, while yet lower still we find directory entries for
-people, and perhaps equipment or documents.
-
-The PHP LDAP library allows you to query and set values in remote
-and local LDAP databases.
--- a/www/php4/extensions/pkg/DESCR-main
+++ b/www/php4/extensions/pkg/DESCR-main
@ -1,12 +0,0 @@
-
-This is a place-holder package to inform you that the PHP port is
-now split into small sub-packages, designed to allow you to install
-modules independently of the main PHP engine.
-
-For example, to install the IMAP module, just pkg_add the
-php-imap-${V}.tgz package and activate it using the
-'phpxs' command.
-
-This package contains no files or dependencies and may be
-safely uninstalled.
-
--- a/www/php4/extensions/pkg/DESCR-mcrypt
+++ b/www/php4/extensions/pkg/DESCR-mcrypt
@ -1,5 +0,0 @@
-This is an interface to the mcrypt library, which supports a wide
-variety of block algorithms such as DES, TripleDES, Blowfish
-(default), 3-WAY, SAFER-SK64, SAFER-SK128, TWOFISH, TEA, RC2 and
-GOST in CBC, OFB, CFB and ECB cipher modes. Additionally, it supports
-RC6 and IDEA which are considered "non-free".
--- a/www/php4/extensions/pkg/DESCR-mhash
+++ b/www/php4/extensions/pkg/DESCR-mhash
@ -1,5 +0,0 @@
-This is an interface to the mhash library. mhash supports a wide
-variety of hash algorithms such as MD5, SHA1, GOST, and many others.
-
-Mhash can be used to create checksums, message digests, message
-authentication codes, and more.
--- a/www/php4/extensions/pkg/DESCR-mysql
+++ b/www/php4/extensions/pkg/DESCR-mysql
@ -1,5 +0,0 @@
-These functions allow you to access MySQL database servers. More
-information about MySQL can be found at http://www.mysql.com/.
-
-Documentation for MySQL can be found at
-http://www.mysql.com/documentation/.
--- a/www/php4/extensions/pkg/DESCR-ncurses
+++ b/www/php4/extensions/pkg/DESCR-ncurses
@ -1,5 +0,0 @@
-ncurses (new curses) is a free software emulation of curses in
-System V Rel 4.0 (and above). It uses terminfo format, supports
-pads, colors, multiple highlights, form characters and function key
-mapping.
-
--- a/www/php4/extensions/pkg/DESCR-odbc
+++ b/www/php4/extensions/pkg/DESCR-odbc
@ -1,5 +0,0 @@
-In addition to normal ODBC support, the Unified ODBC functions in
-PHP allow you to access several databases that have borrowed the
-semantics of the ODBC API to implement their own API. Instead of
-maintaining multiple database drivers that were all nearly identical,
-these drivers have been unified into a single set of ODBC functions.
--- a/www/php4/extensions/pkg/DESCR-pdf
+++ b/www/php4/extensions/pkg/DESCR-pdf
@ -1,13 +0,0 @@
-The PDF functions in PHP can create PDF files using the PDFlib
-library created by Thomas Merz. PDFlib is available for download
-at http://www.pdflib.com/pdflib/index.html, but requires that you
-purchase a license for commercial use.
-
-All of the functions in PDFlib and the PHP module have identical
-function names and parameters. You will need to understand some of
-the basic concepts of PDF and PostScript to efficiently use this
-extension. All lengths and coordinates are measured in PostScript
-points. There are generally 72 PostScript points to an inch, but
-this depends on the output resolution. Please see the PDFlib
-documentation included with the source distribution of PDFlib for
-a more thorough explanation of the coordinate system used.
--- a/www/php4/extensions/pkg/DESCR-pgsql
+++ b/www/php4/extensions/pkg/DESCR-pgsql
@ -1,13 +0,0 @@
-Postgres, developed originally in the UC Berkeley Computer Science
-Department, pioneered many of the object-relational concepts now
-becoming available in some commercial databases. It provides
-SQL92/SQL99 language support, transaction integrity and type
-extensibility. PostgreSQL is an open source descendant of this
-original Berkeley code.
-
-PostgreSQL database is Open Source product and available without
-cost. To use PostgreSQL support, you need PostgreSQL 6.5 or later.
-PostgreSQL 7.0 or later to enable all PostgreSQL module feature.
-PostgreSQL supports many character encoding including multibyte
-character encoding. The current version and more information about
-PostgreSQL is available at http://www.postgresql.org/.
--- a/www/php4/extensions/pkg/DESCR-shmop
+++ b/www/php4/extensions/pkg/DESCR-shmop
@ -1,2 +0,0 @@
-Shmop is an easy to use set of functions that allows php to read,
-write, create and delete UNIX shared memory segments.
--- a/www/php4/extensions/pkg/DESCR-snmp
+++ b/www/php4/extensions/pkg/DESCR-snmp
@ -1,2 +0,0 @@
-This module makes SNMP reading and writing functions accessible
-from within PHP.
--- a/www/php4/extensions/pkg/DESCR-sybase_ct
+++ b/www/php4/extensions/pkg/DESCR-sybase_ct
@ -1,3 +0,0 @@
-This PHP4 modules contains functions to access the Sybase database.
-It makes use of the FreeTDS implementation to perform the actual
-communications.
--- a/www/php4/extensions/pkg/DESCR-xmlrpc
+++ b/www/php4/extensions/pkg/DESCR-xmlrpc
@ -1,4 +0,0 @@
-These functions can be used to write XML-RPC servers and clients.
-You can find more information about XML-RPC at http://www.xmlrpc.com/,
-and more documentation on this extension and its functions at
-http://xmlrpc-epi.sourceforge.net/.
--- a/www/php4/extensions/pkg/DESCR-xslt
+++ b/www/php4/extensions/pkg/DESCR-xslt
@ -1,10 +0,0 @@
-XSLT (Extensible Stylesheet Language (XSL) Transformations) is a
-language for transforming XML documents into other XML documents.
-It is a standard defined by The World Wide Web consortium (W3C).
-Information about XSLT and related technologies can be found at
-http://www.w3.org/TR/xslt.
-
-This PHP extension provides a processor independent API to XSLT
-transformations. Currently this extension only supports the Sablotron
-library from the Ginger Alliance. Support is planned for other
-libraries, such as the Xalan library or the libxslt library.
--- a/www/php4/extensions/pkg/MESSAGE
+++ b/www/php4/extensions/pkg/MESSAGE
@ -1,4 +0,0 @@
-Enable this module in php.ini using the following command:
-
-      ${LOCALBASE}/sbin/phpxs -a ${MODULE_NAME}
-
--- a/www/php4/extensions/pkg/PLIST-bz2
+++ b/www/php4/extensions/pkg/PLIST-bz2
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-bz2,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-bz2-*
-lib/php/modules/bz2.so
--- a/www/php4/extensions/pkg/PLIST-curl
+++ b/www/php4/extensions/pkg/PLIST-curl
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-curl,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-curl-*
-lib/php/modules/curl.so
--- a/www/php4/extensions/pkg/PLIST-dba
+++ b/www/php4/extensions/pkg/PLIST-dba
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-dba,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-dba-*
-lib/php/modules/dba.so
--- a/www/php4/extensions/pkg/PLIST-dbase
+++ b/www/php4/extensions/pkg/PLIST-dbase
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-dbase,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-dbase-*
-lib/php/modules/dbase.so
--- a/www/php4/extensions/pkg/PLIST-dbx
+++ b/www/php4/extensions/pkg/PLIST-dbx
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-dbx,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-dbx-*
-lib/php/modules/dbx.so
--- a/www/php4/extensions/pkg/PLIST-domxml
+++ b/www/php4/extensions/pkg/PLIST-domxml
@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-domxml,v 1.1 2002/09/11 23:16:48 avsm Exp $
-lib/php/modules/domxml.so
--- a/www/php4/extensions/pkg/PLIST-filepro
+++ b/www/php4/extensions/pkg/PLIST-filepro
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-filepro,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-filepro-*
-lib/php/modules/filepro.so
--- a/www/php4/extensions/pkg/PLIST-gd
+++ b/www/php4/extensions/pkg/PLIST-gd
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-gd,v 1.3 2005/03/16 21:55:54 naddy Exp $
-@conflict php5-gd-*
-lib/php/modules/gd.so
--- a/www/php4/extensions/pkg/PLIST-gmp
+++ b/www/php4/extensions/pkg/PLIST-gmp
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-gmp,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-gmp-*
-lib/php/modules/gmp.so
--- a/www/php4/extensions/pkg/PLIST-imap
+++ b/www/php4/extensions/pkg/PLIST-imap
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-imap,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-imap-*
-lib/php/modules/imap.so
--- a/www/php4/extensions/pkg/PLIST-ldap
+++ b/www/php4/extensions/pkg/PLIST-ldap
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-ldap,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-ldap-*
-lib/php/modules/ldap.so
--- a/www/php4/extensions/pkg/PLIST-main
+++ b/www/php4/extensions/pkg/PLIST-main
@ -1,5 +0,0 @@
-@comment $OpenBSD: PLIST-main,v 1.1 2006/11/24 08:39:03 espie Exp $
-@pkgpath www/php4/extensions
-lib/
-lib/php/
-lib/php/modules/
--- a/www/php4/extensions/pkg/PLIST-mcrypt
+++ b/www/php4/extensions/pkg/PLIST-mcrypt
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-mcrypt,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-mcrypt-*
-lib/php/modules/mcrypt.so
--- a/www/php4/extensions/pkg/PLIST-mhash
+++ b/www/php4/extensions/pkg/PLIST-mhash
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-mhash,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-mhash-*
-lib/php/modules/mhash.so
--- a/www/php4/extensions/pkg/PLIST-mysql
+++ b/www/php4/extensions/pkg/PLIST-mysql
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-mysql,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-mysql-*
-lib/php/modules/mysql.so
--- a/www/php4/extensions/pkg/PLIST-ncurses
+++ b/www/php4/extensions/pkg/PLIST-ncurses
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-ncurses,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-ncurses-*
-lib/php/modules/ncurses.so
--- a/www/php4/extensions/pkg/PLIST-odbc
+++ b/www/php4/extensions/pkg/PLIST-odbc
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-odbc,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-odbc-*
-lib/php/modules/odbc.so
--- a/www/php4/extensions/pkg/PLIST-pdf
+++ b/www/php4/extensions/pkg/PLIST-pdf
@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-pdf,v 1.1.1.1 2002/06/24 19:27:46 avsm Exp $
-lib/php/modules/pdf.so
--- a/www/php4/extensions/pkg/PLIST-pgsql
+++ b/www/php4/extensions/pkg/PLIST-pgsql
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-pgsql,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-pgsql-*
-lib/php/modules/pgsql.so
--- a/www/php4/extensions/pkg/PLIST-shmop
+++ b/www/php4/extensions/pkg/PLIST-shmop
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-shmop,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-shmop-*
-lib/php/modules/shmop.so
--- a/www/php4/extensions/pkg/PLIST-snmp
+++ b/www/php4/extensions/pkg/PLIST-snmp
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-snmp,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-snmp-*
-lib/php/modules/snmp.so
--- a/www/php4/extensions/pkg/PLIST-sybase_ct
+++ b/www/php4/extensions/pkg/PLIST-sybase_ct
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-sybase_ct,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-sybase_ct-*
-lib/php/modules/sybase_ct.so
--- a/www/php4/extensions/pkg/PLIST-xmlrpc
+++ b/www/php4/extensions/pkg/PLIST-xmlrpc
@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST-xmlrpc,v 1.2 2004/12/21 12:15:02 espie Exp $
-@conflict php5-xmlrpc-*
-lib/php/modules/xmlrpc.so
--- a/www/php4/extensions/pkg/PLIST-xslt
+++ b/www/php4/extensions/pkg/PLIST-xslt
@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-xslt,v 1.1.1.1 2002/06/24 19:27:46 avsm Exp $
-lib/php/modules/xslt.so
--- a/www/php4/patches/patch-aclocal_m4
+++ b/www/php4/patches/patch-aclocal_m4
@ -1,33 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.7 2005/04/04 21:11:42 robert Exp $
--- aclocal.m4.orig	Wed Mar 30 16:35:19 2005
-+++ aclocal.m4	Sun Apr  3 22:21:42 2005
-@@ -1660,10 +1660,9 @@
-     if test "$PHP_KERBEROS_DIR"; then
-       found_kerberos=yes
-       PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, $1)
-      PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
-       PHP_ADD_LIBRARY(krb5, 1, $1)
-      PHP_ADD_LIBRARY(k5crypto, 1, $1)
-      PHP_ADD_LIBRARY(com_err,  1, $1)
-+      PHP_ADD_LIBRARY(crypto, 1, $1)
-+      PHP_ADD_LIBRARY(gssapi, 1, $1)
-       PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
-     fi
-   fi
-@@ -1757,6 +1756,7 @@
-   
-     PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
-       PHP_ADD_LIBRARY(crypto,,$1)
-+      PHP_ADD_LIBRARY(des,,$1)
-     ],[
-       AC_MSG_ERROR([libcrypto not found!])
-     ],[
-@@ -4231,7 +4231,7 @@
-     shlibpath_overrides_runpath=yes
-   fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-+  finish_cmds=
-   shlibpath_var=LD_LIBRARY_PATH
-   ;;
- 
--- a/www/php4/patches/patch-configure_in
+++ b/www/php4/patches/patch-configure_in
@ -1,44 +0,0 @@
-$OpenBSD: patch-configure_in,v 1.12 2005/04/04 21:11:42 robert Exp $
--- configure.in.orig	Wed Mar 30 16:18:36 2005
-+++ configure.in	Sun Apr  3 21:47:19 2005
-@@ -30,10 +30,7 @@
- AC_PREREQ(2.13)
- AC_INIT(README.CVS-RULES)
- 
-PHP_CONFIG_NICE(config.nice)
-for arg in $0 "$@"; do
-  CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
-done
-+CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
- 
- PHP_CANONICAL_HOST
- AC_CONFIG_HEADER(main/php_config.h)
-@@ -838,7 +835,7 @@
- 
- case $php_build_target in
- program|static)
-    standard_libtool_flag='-prefer-non-pic -static'
-+    standard_libtool_flag='-static'
-     if test -z "$PHP_MODULES"; then
-         enable_shared=no
-     fi
-@@ -846,8 +843,8 @@
- shared)
-     enable_static=no
-     case $with_pic in
-      yes) standard_libtool_flag='-prefer-pic';;
-      no)  standard_libtool_flag='-prefer-non-pic';;
-+      yes) standard_libtool_flag='';;
-+      no)  standard_libtool_flag='';;
-     esac
-     EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
- ;;
-@@ -1032,7 +1029,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"`
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
-+INCLUDE_PATH=.:$libdir
- 
- exec_prefix=$old_exec_prefix
- libdir=$old_libdir
--- a/www/php4/patches/patch-ext_bcmath_libbcmath_src_output_c
+++ b/www/php4/patches/patch-ext_bcmath_libbcmath_src_output_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_bcmath_libbcmath_src_output_c,v 1.1 2003/11/15 18:11:35 avsm Exp $
--- ext/bcmath/libbcmath/src/output.c.orig	2003-11-14 08:15:42.000000000 +0000
-+++ ext/bcmath/libbcmath/src/output.c	2003-11-14 08:16:22.000000000 +0000
-@@ -71,7 +71,7 @@ bc_out_long (val, size, space, out_char)
-   int len, ix;
- 
-   if (space) (*out_char) (' ');
-  sprintf (digits, "%ld", val);
-+  snprintf (digits, sizeof digits, "%ld", val);
-   len = strlen (digits);
-   while (size > len)
-     {
--- a/www/php4/patches/patch-ext_bcmath_libbcmath_src_rt_c
+++ b/www/php4/patches/patch-ext_bcmath_libbcmath_src_rt_c
@ -1,21 +0,0 @@
-$OpenBSD: patch-ext_bcmath_libbcmath_src_rt_c,v 1.1 2003/11/15 18:11:35 avsm Exp $
--- ext/bcmath/libbcmath/src/rt.c.orig	2000-11-22 20:20:02.000000000 +0000
-+++ ext/bcmath/libbcmath/src/rt.c	2003-11-14 08:30:51.000000000 +0000
-@@ -45,7 +45,7 @@ void bc_rt_warn (char *mesg ,...)
-   char error_mesg [255];
- 
-   va_start (args, mesg);
-  vsprintf (error_mesg, mesg, args);
-+  vsnprintf (error_mesg, sizeof error_mesg, mesg, args);
-   va_end (args);
- 
-   fprintf (stderr, "bc math warning: %s\n", error_mesg);
-@@ -58,7 +58,7 @@ void bc_rt_error (char *mesg ,...)
-   char error_mesg [255];
- 
-   va_start (args, mesg);
-  vsprintf (error_mesg, mesg, args);
-+  vsnprintf (error_mesg, sizeof error_mesg, mesg, args);
-   va_end (args);
- 
-   fprintf (stderr, "bc math error: %s\n", error_mesg);
--- a/www/php4/patches/patch-ext_calendar_calendar_c
+++ b/www/php4/patches/patch-ext_calendar_calendar_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_calendar_calendar_c,v 1.1 2003/11/15 18:11:35 avsm Exp $
--- ext/calendar/calendar.c.orig	2003-11-14 08:29:51.000000000 +0000
-+++ ext/calendar/calendar.c	2003-11-14 08:30:16.000000000 +0000
-@@ -276,7 +276,7 @@ PHP_FUNCTION(cal_from_jd)
- 			Z_LVAL_PP(jd),
- 			&year, &month, &day);
- 
-	sprintf(date, "%i/%i/%i", month, day, year);
-+	snprintf(date, sizeof date, "%i/%i/%i", month, day, year);
- 	add_assoc_string(return_value, "date", date, 1);
- 	
- 	add_assoc_long(return_value, "month", month);
--- a/www/php4/patches/patch-ext_standard_basic_functions_c
+++ b/www/php4/patches/patch-ext_standard_basic_functions_c
@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_standard_basic_functions_c,v 1.1 2005/11/07 21:33:58 bernd Exp $
--- ext/standard/basic_functions.c.orig	Mon Nov  7 17:07:59 2005
-+++ ext/standard/basic_functions.c	Mon Nov  7 17:08:25 2005
-@@ -802,8 +802,8 @@ function_entry basic_functions[] = {
- 	PHP_FE(prev,					first_arg_force_ref)
- 	PHP_FE(next,					first_arg_force_ref)
- 	PHP_FE(reset,					first_arg_force_ref)
-	PHP_FE(current,					NULL)
-	PHP_FE(key,					NULL)
-+	PHP_FE(current,					first_arg_force_ref)
-+	PHP_FE(key,					first_arg_force_ref)
- 	PHP_FE(min,																NULL)
- 	PHP_FE(max,																NULL)
- 	PHP_FE(in_array,														NULL)
--- a/www/php4/patches/patch-ext_standard_exec_c
+++ b/www/php4/patches/patch-ext_standard_exec_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-ext_standard_exec_c,v 1.2 2004/06/06 18:09:22 avsm Exp $
--- ext/standard/exec.c.orig	2004-05-18 14:43:33.000000000 +0100
-+++ ext/standard/exec.c	2004-06-06 19:11:28.000000000 +0100
-@@ -952,7 +952,7 @@ PHP_FUNCTION(proc_open)
- 				close(descriptors[i].childend);
- 		}
- 
-		execl("/bin/sh", "sh", "-c", command, NULL);
-+		execl("/bin/sh", "sh", "-c", command, (void *)NULL);
- 		_exit(127);
- 
- 	} else if (child < 0) {
--- a/www/php4/patches/patch-ltmain_sh
+++ b/www/php4/patches/patch-ltmain_sh
@ -1,61 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.5 2007/07/01 20:40:50 kurt Exp $
--- ltmain.sh.orig	Tue Feb 15 03:52:33 2005
-+++ ltmain.sh	Fri Jun 29 10:57:55 2007
-@@ -1529,6 +1529,16 @@ compiler."
- 	  alldeplibs=yes
- 	  continue
- 	  ;;
-+	-pthread)
-+	  if test "$linkmode,$pass" = "prog,link"; then
-+	    compile_deplibs="$deplib $compile_deplibs"
-+	    finalize_deplibs="$deplib $finalize_deplibs"
-+	  else
-+	    deplibs="$deplib $deplibs"
-+	    test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
-+	  fi
-+	  continue
-+	  ;;
- 	esac # case $deplib
- 	if test $found = yes || test -f "$lib"; then :
- 	else
-@@ -4580,40 +4590,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = ":" && exit 0
- 
-    echo "----------------------------------------------------------------------"
-    echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      echo "   $libdir"
-    done
-    echo
-    echo "If you ever happen to want to link against installed libraries"
-    echo "in a given directory, LIBDIR, you must either use libtool, and"
-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    echo
-    echo "See any operating system documentation about shared libraries for"
-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 
--- a/www/php4/patches/patch-main_php_h
+++ b/www/php4/patches/patch-main_php_h
@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_h,v 1.1 2004/11/24 19:03:15 robert Exp $
--- main/php.h.orig	Wed Nov 24 18:38:07 2004
-+++ main/php.h	Wed Nov 24 18:38:38 2004
-@@ -143,7 +143,7 @@
- char *strtok_r(char *s, const char *delim, char **last);
- #endif
- 
-#ifndef HAVE_SOCKLEN_T
-+#if !defined(HAVE_SOCKLEN_T) && !defined(__OpenBSD__)
- typedef unsigned int socklen_t;
- #endif
- 
--- a/www/php4/patches/patch-main_php_open_temporary_file_c
+++ b/www/php4/patches/patch-main_php_open_temporary_file_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-main_php_open_temporary_file_c,v 1.4 2003/05/23 20:08:33 avsm Exp $
--- main/php_open_temporary_file.c.orig	Fri Apr 25 19:11:42 2003
-+++ main/php_open_temporary_file.c	Thu May 22 16:20:29 2003
-@@ -132,7 +132,7 @@ static int php_do_open_temporary_file(co
- 		trailing_slash = "/";
- 	}
- 
-	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx);
-+	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx);
- 
- #ifdef PHP_WIN32
- 	if (GetTempFileName(path, pfx, 0, opened_path)) {
--- a/www/php4/patches/patch-php_ini-dist
+++ b/www/php4/patches/patch-php_ini-dist
@ -1,182 +0,0 @@
-$OpenBSD: patch-php_ini-dist,v 1.16 2005/07/12 15:49:27 robert Exp $
--- php.ini-dist.orig	Thu Apr 28 15:14:45 2005
-+++ php.ini-dist	Tue Jul 12 13:34:41 2005
-@@ -408,10 +408,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"  
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-+include_path = ".:OPENBSD_INCLUDE_PATH"
- 
- ; The root of the PHP pages, used only if nonempty.
- ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -425,7 +422,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "./"
-+extension_dir = "MODULES_DIR"
- 
- ; 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
-@@ -494,7 +491,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"
-@@ -513,77 +510,6 @@
- ; auto_detect_line_endings = Off
- 
- 
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-;   extension=modulename.extension
-;
-; For example, on Windows:
-;
-;   extension=msql.dll
-;
-; ... or under UNIX:
-;
-;   extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information 
-; needs to go here.  Specify the location of the extension with the
-; extension_dir directive above.
-
-
-;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-;
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_crack.dll
-;extension=php_curl.dll
-;extension=php_db.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_dbx.dll
-;extension=php_domxml.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_hyperwave.dll
-;extension=php_iconv.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.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_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pdf.dll
-;extension=php_pgsql.dll
-;extension=php_printer.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sybase_ct.dll
-;extension=php_w32api.dll
-;extension=php_xmlrpc.dll
-;extension=php_xslt.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
-
-
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
- ;;;;;;;;;;;;;;;;;;;
-@@ -595,13 +521,6 @@
- define_syslog_variables  = Off
- 
- [mail function]
-; For Win32 only.
-SMTP = localhost
-smtp_port = 25
-
-; For Win32 only.
-;sendmail_from = me@example.com
-
- ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
- ;sendmail_path =
- 
-@@ -1115,3 +1034,56 @@
- ; Local Variables:
- ; tab-width: 4
- ; End:
-+
-+;;;;;;;;;;;;;;;;;;;;;;
-+; Dynamic Extensions ;
-+;;;;;;;;;;;;;;;;;;;;;;
-+;
-+; If you wish to have an extension loaded automatically, use the following
-+; syntax:
-+;
-+;   extension=modulename.so
-+;
-+; Note that it should be the name of the module only; no directory information
-+; needs to go here.  Specify the location of the extension with the
-+; extension_dir directive above.
-+
-+;extension=bz2.so
-+;extension=cpdf.so
-+;extension=crack.so
-+;extension=curl.so
-+;extension=db.so
-+;extension=dba.so
-+;extension=dbase.so
-+;extension=dbx.so
-+;extension=domxml.so
-+;extension=exif.so
-+;extension=fbsql.so
-+;extension=fdf.so
-+;extension=filepro.so
-+;extension=gd.so
-+;extension=hyperwave.so
-+;extension=ifx.so
-+;extension=imap.so
-+;extension=interbase.so
-+;extension=java.so
-+;extension=ldap.so
-+;extension=mbstring.so
-+;extension=mcrypt.so
-+;extension=mhash.so
-+;extension=ming.so
-+;extension=mssql.so
-+;extension=msql.so
-+;extension=oci8.so
-+;extension=openssl.so
-+;extension=oracle.so
-+;extension=pdf.so
-+;extension=pgsql.so
-+;extension=printer.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=sockets.so
-+;extension=sybase_ct.so
-+;extension=xmlrpc.so
-+;extension=xslt.so
-+;extension=yaz.so
--- a/www/php4/patches/patch-php_ini-recommended
+++ b/www/php4/patches/patch-php_ini-recommended
@ -1,182 +0,0 @@
-$OpenBSD: patch-php_ini-recommended,v 1.13 2005/07/12 15:49:27 robert Exp $
--- php.ini-recommended.orig	Thu Apr 28 15:14:46 2005
-+++ php.ini-recommended	Tue Jul 12 13:38:48 2005
-@@ -423,10 +423,7 @@
- ;;;;;;;;;;;;;;;;;;;;;;;;;
- 
- ; UNIX: "/path1:/path2"  
-;include_path = ".:/php/includes"
-;
-; Windows: "\path1;\path2"
-;include_path = ".;c:\php\includes"
-+include_path = ".:OPENBSD_INCLUDE_PATH"
- 
- ; The root of the PHP pages, used only if nonempty.
- ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root
-@@ -440,7 +437,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
-extension_dir = "./"
-+extension_dir = "MODULES_DIR"
- 
- ; 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
-@@ -509,7 +506,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"
-@@ -528,77 +525,6 @@
- ; auto_detect_line_endings = Off
- 
- 
-;;;;;;;;;;;;;;;;;;;;;;
-; Dynamic Extensions ;
-;;;;;;;;;;;;;;;;;;;;;;
-;
-; If you wish to have an extension loaded automatically, use the following
-; syntax:
-;
-;   extension=modulename.extension
-;
-; For example, on Windows:
-;
-;   extension=msql.dll
-;
-; ... or under UNIX:
-;
-;   extension=msql.so
-;
-; Note that it should be the name of the module only; no directory information 
-; needs to go here.  Specify the location of the extension with the
-; extension_dir directive above.
-
-
-;Windows Extensions
-;Note that MySQL and ODBC support is now built in, so no dll is needed for it.
-;
-;extension=php_mbstring.dll
-;extension=php_bz2.dll
-;extension=php_cpdf.dll
-;extension=php_crack.dll
-;extension=php_curl.dll
-;extension=php_db.dll
-;extension=php_dba.dll
-;extension=php_dbase.dll
-;extension=php_dbx.dll
-;extension=php_domxml.dll
-;extension=php_exif.dll
-;extension=php_fdf.dll
-;extension=php_filepro.dll
-;extension=php_gd2.dll
-;extension=php_gettext.dll
-;extension=php_hyperwave.dll
-;extension=php_iconv.dll
-;extension=php_ifx.dll
-;extension=php_iisfunc.dll
-;extension=php_imap.dll
-;extension=php_interbase.dll
-;extension=php_java.dll
-;extension=php_ldap.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_oci8.dll
-;extension=php_openssl.dll
-;extension=php_oracle.dll
-;extension=php_pdf.dll
-;extension=php_pgsql.dll
-;extension=php_printer.dll
-;extension=php_shmop.dll
-;extension=php_snmp.dll
-;extension=php_sockets.dll
-;extension=php_sybase_ct.dll
-;extension=php_w32api.dll
-;extension=php_xmlrpc.dll
-;extension=php_xslt.dll
-;extension=php_yaz.dll
-;extension=php_zip.dll
-
-
- ;;;;;;;;;;;;;;;;;;;
- ; Module Settings ;
- ;;;;;;;;;;;;;;;;;;;
-@@ -610,13 +536,6 @@
- define_syslog_variables  = Off
- 
- [mail function]
-; For Win32 only.
-SMTP = localhost
-smtp_port = 25
-
-; For Win32 only.
-;sendmail_from = me@example.com
-
- ; For Unix only.  You may supply arguments as well (default: "sendmail -t -i").
- ;sendmail_path =
- 
-@@ -1113,3 +1032,56 @@
- ; Local Variables:
- ; tab-width: 4
- ; End:
-+
-+;;;;;;;;;;;;;;;;;;;;;;
-+; Dynamic Extensions ;
-+;;;;;;;;;;;;;;;;;;;;;;
-+;
-+; If you wish to have an extension loaded automatically, use the following
-+; syntax:
-+;
-+;   extension=modulename.so
-+;
-+; Note that it should be the name of the module only; no directory information
-+; needs to go here.  Specify the location of the extension with the
-+; extension_dir directive above.
-+
-+;extension=bz2.so
-+;extension=cpdf.so
-+;extension=crack.so
-+;extension=curl.so
-+;extension=db.so
-+;extension=dba.so
-+;extension=dbase.so
-+;extension=dbx.so
-+;extension=domxml.so
-+;extension=exif.so
-+;extension=fbsql.so
-+;extension=fdf.so
-+;extension=filepro.so
-+;extension=gd.so
-+;extension=hyperwave.so
-+;extension=ifx.so
-+;extension=imap.so
-+;extension=interbase.so
-+;extension=java.so
-+;extension=ldap.so
-+;extension=mbstring.so
-+;extension=mcrypt.so
-+;extension=mhash.so
-+;extension=ming.so
-+;extension=mssql.so
-+;extension=msql.so
-+;extension=oci8.so
-+;extension=openssl.so
-+;extension=oracle.so
-+;extension=pdf.so
-+;extension=pgsql.so
-+;extension=printer.so
-+;extension=shmop.so
-+;extension=snmp.so
-+;extension=sockets.so
-+;extension=sybase_ct.so
-+;extension=xmlrpc.so
-+;extension=xslt.so
-+;extension=yaz.so
--- a/www/php4/pear/Makefile.pear
+++ b/www/php4/pear/Makefile.pear
@ -1,9 +0,0 @@
-# $OpenBSD: Makefile.pear,v 1.1 2004/08/03 12:54:40 espie 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/php4/pear/pear.port.mk
+++ b/www/php4/pear/pear.port.mk
@ -1,13 +0,0 @@
-# $OpenBSD: pear.port.mk,v 1.2 2005/12/14 06:57:18 brad Exp $
-# PHP PEAR module
-
-RUN_DEPENDS+=    :php4-pear-4.4.*:www/php4/core,-pear
-BUILD_DEPENDS+=  :php4-pear-4.4.*:www/php4/core,-pear
-
-NO_BUILD=       Yes
-NO_REGRESS=     Yes
-
-MAKE_FILE=	${PORTSDIR}/www/php4/pear/Makefile.pear
-FAKE_FLAGS+=	WRKINST=${WRKINST} WRKDIR=${WRKDIR}
-
-PREFIX=		/var/www