Retire PHP 4.

23 files changed, 1 insertions, 758 deletions

diff --git a/www/Makefile b/www/Makefile
index 610f3e6df4b..11c83be6b62 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.698 2010/02/10 17:59:27 joerg Exp $
+# $NetBSD: Makefile,v 1.699 2010/02/10 18:08:33 joerg Exp $
 #
 
 COMMENT=	Packages related to the World Wide Web
@@ -440,7 +440,6 @@ SUBDIR+=	php-FastTemplate
 SUBDIR+=	php-apc
 SUBDIR+=	php-curl
 SUBDIR+=	php-eaccelerator
-SUBDIR+=	php4
 #SUBDIR+=	plone		# only contains Makefile fragments
 SUBDIR+=	plone25
 SUBDIR+=	plone3
diff --git a/www/php4/DESCR b/www/php4/DESCR
deleted file mode 100644
index 2b28e8cc5cc..00000000000
--- a/www/php4/DESCR
+++ /dev/null
@@ -1,5 +0,0 @@
-PHP is an HTML-embedded scripting language. It is modular, with
-some object-oriented features. Much of its syntax is borrowed from
-C, Java and Perl with a couple of unique PHP-specific features
-thrown in.  The language is designed to allow web developers to
-write dynamically generated pages quickly.
diff --git a/www/php4/MESSAGE b/www/php4/MESSAGE
deleted file mode 100644
index 396faaf290c..00000000000
--- a/www/php4/MESSAGE
+++ /dev/null
@@ -1,26 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.12 2007/05/05 21:35:05 adrianp Exp $
-
-To process PHP scripts, you will need a PHP-enabled HTTP server.  You may
-either configure the HTTP server to use the PHP CGI binary located in
-
-	${CGIDIR}/php
-
-or you may install a PHP module for your HTTP server, e.g. ap-php4.
-
-Some additional packages you may wish to install are:
-
-	php-dba		DBM database access
-	php-iconv	character set conversion
-
-Note that php4-pcre, php4-session and php4-xml are no longer separate
-packages since version 4.3.3 because the main PHP4 package has them
-built-in now.
-
-Note that php-openssl is no longer a separate package as of version
-4.4.0nb2 because the main PHP4 package has it built-in now.
-
-As of version 4.4.6nb1 PEAR is no longer installed by default with the
-php package.  In order to use PEAR packages with PHP you will need to
-install the lang/pear package.
-===========================================================================
diff --git a/www/php4/Makefile b/www/php4/Makefile
deleted file mode 100644
index 52d250364da..00000000000
--- a/www/php4/Makefile
+++ /dev/null
@@ -1,68 +0,0 @@
-# $NetBSD: Makefile,v 1.83 2010/01/17 12:02:50 wiz Exp $
-
-PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
-CATEGORIES+=		lang
-COMMENT=		HTML-embedded scripting language
-
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-CONFLICTS+=		ap-php-4.0.3pl1
-
-# PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now
-LIBTOOL_OVERRIDE=	# empty
-USE_TOOLS+=		gmake lex
-
-PKG_OPTIONS_REQUIRED_GROUPS+=	sapi
-PKG_OPTIONS_GROUP.sapi=	cgi fastcgi
-PKG_SUGGESTED_OPTIONS+=	cgi
-
-.include "Makefile.php"
-
-.if !empty(PKG_OPTIONS:Mcgi)
-CONFIGURE_ARGS+=	--enable-discard-path
-CONFIGURE_ARGS+=	--enable-force-cgi-redirect
-.endif
-
-.if !empty(PKG_OPTIONS:Mfastcgi)
-CONFIGURE_ARGS+=	--enable-fastcgi
-.endif
-
-CGIDIR=			${PREFIX}/libexec/cgi-bin
-EGDIR=			${PREFIX}/share/examples/php
-MESSAGE_SUBST+=		CGIDIR=${CGIDIR:Q}
-
-MAKE_ENV+=		INSTALL_ROOT=${DESTDIR}
-
-# On NetBSD ELF platforms, we need to link libgcc.a whole-archive so that
-# certain symbols from the C++ implementation (__get_eh_context, etc.)
-# referenced by DSOs written in C++ will resolve correctly.  We need to
-# prefix the linker flags "-whole-archive -lgcc -no-whole-archive" with
-# "-Wl," to force all of the flags to be passed down to the linker through
-# libtool without change.
-#
-.if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF"
-MAKE_ENV+=		LINK_LIBGCC_LDFLAGS=${LINK_ALL_LIBGCC_HACK:Q}
-.endif
-
-# Ensure we export symbols in the linked shared object.
-LDFLAGS+=		${EXPORT_SYMBOLS_LDFLAGS}
-MAKE_ENV+=		EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
-
-CONF_FILES=	${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini
-OWN_DIRS=	${PREFIX}/${PHP_EXTENSION_DIR}
-
-post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cli/php \
-		${DESTDIR:Q}${PREFIX:Q}/bin/php
-	${INSTALL_DATA} ${WRKSRC}/sapi/cli/php.1 \
-		${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man1/php.1
-	${INSTALL_DATA_DIR} ${DESTDIR:Q}${CGIDIR:Q}
-	${INSTALL_PROGRAM} ${WRKSRC}/sapi/cgi/php ${DESTDIR:Q}${CGIDIR:Q}
-	${INSTALL_DATA_DIR} ${DESTDIR:Q}${EGDIR:Q}
-	cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended \
-		${DESTDIR:Q}${EGDIR:Q}
-	${INSTALL_DATA_DIR} ${DESTDIR:Q}${PREFIX:Q}/share/php
-	${INSTALL_DATA} ${WRKSRC}/php.gif ${DESTDIR:Q}${PREFIX:Q}/share/php
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
deleted file mode 100644
index a4e1ef4cb6f..00000000000
--- a/www/php4/Makefile.common
+++ /dev/null
@@ -1,36 +0,0 @@
-# $NetBSD: Makefile.common,v 1.59 2008/08/23 12:57:20 obache Exp $
-
-DISTNAME?=		php-${PHP_DIST_VERS}
-CATEGORIES+=		www php4
-
-.if !defined(PECL_VERSION)
-MASTER_SITES?=		http://www.php.net/distributions/ \
-			http://php3.de/distributions/
-EXTRACT_SUFX?=		.tar.bz2
-.endif
-
-MAINTAINER?=		jdolecek@NetBSD.org
-HOMEPAGE?=		http://www.php.net/
-
-# Version numbering scheme:
-#
-# PHP_DIST_VERS		version number on the php distfile
-# PHP_BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
-#
-PHP_DIST_VERS=		4.4.9
-PHP_BASE_VERS=		${PHP_DIST_VERS}
-
-DISTFILES?=		${PHP_DISTFILE}
-PHP_DISTFILE=		${DISTNAME}${EXTRACT_SUFX}
-
-# Location of installed PHP4 loadable modules under ${PREFIX}.
-# This is derived from the value of `php-config --extension-dir`.
-# The number for the last part of the path represents a specific version
-# of the Zend API.
-#
-PHP_EXTENSION_DIR=	lib/php/20020429
-PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q}
-
-PKG_SYSCONFVAR?=	php
-
-.include "../../mk/bsd.prefs.mk"
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php
deleted file mode 100644
index 64a4d80e002..00000000000
--- a/www/php4/Makefile.php
+++ /dev/null
@@ -1,69 +0,0 @@
-# $NetBSD: Makefile.php,v 1.40 2008/08/17 18:29:33 adrianp Exp $
-
-.include "../../www/php4/Makefile.common"
-
-# revision of the core PHP interpreter package
-DISTINFO_FILE=		${.CURDIR}/../../www/php4/distinfo
-PATCHDIR=		${.CURDIR}/../../www/php4/patches
-
-USE_LIBTOOL=		YES
-USE_LANGUAGES=		c c++
-GNU_CONFIGURE=		YES
-
-CONFIGURE_ARGS+=	--without-mysql
-CONFIGURE_ARGS+=	--without-iconv
-CONFIGURE_ARGS+=	--without-pear
-
-CONFIGURE_ARGS+=	--disable-posix
-
-CONFIGURE_ARGS+=	--with-config-file-path=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--with-exec-dir=${PREFIX}/libexec/php4
-
-.include "../../mk/bsd.prefs.mk"
-
-CONFIGURE_ARGS+=	--with-regex=system
-
-# Support for linking some PHP4 extensions statically into the php CGI and
-# into the apache mod_php.so DSO.
-#
-# PHP4_CONFIGURE_ARGS should contain GNU configure options, a complete
-# list of which may be found at:
-#
-#	http://www.php.net/manual/en/install.configure.php
-#
-# Note that this is generally not needed as many of the extensions (mysql,
-# pgsql) may be dynamically loaded, and are separately packaged in pkgsrc.
-#
-PHP4_CONFIGURE_ARGS?=	# empty
-CONFIGURE_ARGS+=	${PHP4_CONFIGURE_ARGS}
-
-CONFIGURE_ENV+=		ac_cv_lib_pam_pam_start=no
-CONFIGURE_ENV+=		EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}"
-
-# Note: This expression is the same as ${PKGBASE}, but the latter is
-# not defined yet, so we cannot use it here.
-PKG_OPTIONS_VAR=	PKG_OPTIONS.${PKGNAME:C/-[0-9].*//}
-PKG_SUPPORTED_OPTIONS+=	inet6 ssl
-PKG_SUGGESTED_OPTIONS+=	ssl
-
-SUBST_CLASSES+=		ini
-SUBST_STAGE.ini=	post-patch
-SUBST_FILES.ini=	php.ini-dist
-SUBST_FILES.ini+=	php.ini-recommended
-SUBST_SED.ini=		-e "s|\;include_path = \".:/php/includes\"|include_path = \".:${PREFIX}/lib/php\"|g"
-SUBST_MESSAGE.ini=	Fixing default ini files.
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
-.if !empty(PKG_OPTIONS:Mssl)
-.  include "../../security/openssl/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
-.else
-CONFIGURE_ARGS+=	--without-openssl
-.endif
diff --git a/www/php4/PLIST b/www/php4/PLIST
deleted file mode 100644
index e3f7058941b..00000000000
--- a/www/php4/PLIST
+++ /dev/null
@@ -1,211 +0,0 @@
-@comment $NetBSD: PLIST,v 1.18 2009/06/14 22:00:30 joerg Exp $
-bin/php
-bin/php-config
-bin/phpize
-include/php/TSRM/TSRM.h
-include/php/TSRM/acconfig.h
-include/php/TSRM/readdir.h
-include/php/TSRM/tsrm_config.h
-include/php/TSRM/tsrm_config.nw.h
-include/php/TSRM/tsrm_config.w32.h
-include/php/TSRM/tsrm_config_common.h
-include/php/TSRM/tsrm_nw.h
-include/php/TSRM/tsrm_strtok_r.h
-include/php/TSRM/tsrm_virtual_cwd.h
-include/php/TSRM/tsrm_win32.h
-include/php/Zend/FlexLexer.h
-include/php/Zend/acconfig.h
-include/php/Zend/zend.h
-include/php/Zend/zend_API.h
-include/php/Zend/zend_alloc.h
-include/php/Zend/zend_builtin_functions.h
-include/php/Zend/zend_compile.h
-include/php/Zend/zend_config.h
-include/php/Zend/zend_config.w32.h
-include/php/Zend/zend_constants.h
-include/php/Zend/zend_dynamic_array.h
-include/php/Zend/zend_errors.h
-include/php/Zend/zend_execute.h
-include/php/Zend/zend_execute_globals.h
-include/php/Zend/zend_execute_locks.h
-include/php/Zend/zend_extensions.h
-include/php/Zend/zend_fast_cache.h
-include/php/Zend/zend_globals.h
-include/php/Zend/zend_globals_macros.h
-include/php/Zend/zend_hash.h
-include/php/Zend/zend_highlight.h
-include/php/Zend/zend_indent.h
-include/php/Zend/zend_ini.h
-include/php/Zend/zend_ini_parser.h
-include/php/Zend/zend_ini_scanner.h
-include/php/Zend/zend_istdiostream.h
-include/php/Zend/zend_language_parser.h
-include/php/Zend/zend_language_scanner.h
-include/php/Zend/zend_list.h
-include/php/Zend/zend_llist.h
-include/php/Zend/zend_modules.h
-include/php/Zend/zend_multibyte.h
-include/php/Zend/zend_multiply.h
-include/php/Zend/zend_operators.h
-include/php/Zend/zend_ptr_stack.h
-include/php/Zend/zend_qsort.h
-include/php/Zend/zend_stack.h
-include/php/Zend/zend_static_allocator.h
-include/php/Zend/zend_strtod.h
-include/php/Zend/zend_types.h
-include/php/Zend/zend_variables.h
-include/php/acconfig.h
-include/php/ext/iconv/php_iconv.h
-include/php/ext/mbstring/libmbfl/mbfl/eaw_table.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_8bit.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_pass.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfilter_wchar.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_allocators.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_consts.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_convert.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_defs.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_encoding.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_filter_output.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_ident.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_language.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_memory_device.h
-include/php/ext/mbstring/libmbfl/mbfl/mbfl_string.h
-include/php/ext/mbstring/mbstring.h
-include/php/ext/mbstring/php_mbregex.h
-include/php/ext/mbstring/php_unicode.h
-include/php/ext/mbstring/unicode_data.h
-include/php/ext/pgsql/php_pgsql.h
-include/php/ext/session/mod_files.h
-include/php/ext/session/mod_mm.h
-include/php/ext/session/mod_user.h
-include/php/ext/session/php_session.h
-include/php/ext/standard/aggregation.h
-include/php/ext/standard/base64.h
-include/php/ext/standard/basic_functions.h
-include/php/ext/standard/crc32.h
-include/php/ext/standard/credits.h
-include/php/ext/standard/credits_ext.h
-include/php/ext/standard/credits_sapi.h
-include/php/ext/standard/css.h
-include/php/ext/standard/cyr_convert.h
-include/php/ext/standard/datetime.h
-include/php/ext/standard/dl.h
-include/php/ext/standard/dns.h
-include/php/ext/standard/exec.h
-include/php/ext/standard/file.h
-include/php/ext/standard/flock_compat.h
-include/php/ext/standard/fsock.h
-include/php/ext/standard/head.h
-include/php/ext/standard/html.h
-include/php/ext/standard/info.h
-include/php/ext/standard/md5.h
-include/php/ext/standard/microtime.h
-include/php/ext/standard/pack.h
-include/php/ext/standard/pageinfo.h
-include/php/ext/standard/parsedate.h
-include/php/ext/standard/php_array.h
-include/php/ext/standard/php_assert.h
-include/php/ext/standard/php_browscap.h
-include/php/ext/standard/php_crypt.h
-include/php/ext/standard/php_dir.h
-include/php/ext/standard/php_ext_syslog.h
-include/php/ext/standard/php_filestat.h
-include/php/ext/standard/php_fopen_wrappers.h
-include/php/ext/standard/php_ftok.h
-include/php/ext/standard/php_image.h
-include/php/ext/standard/php_incomplete_class.h
-include/php/ext/standard/php_iptc.h
-include/php/ext/standard/php_lcg.h
-include/php/ext/standard/php_link.h
-include/php/ext/standard/php_mail.h
-include/php/ext/standard/php_math.h
-include/php/ext/standard/php_metaphone.h
-include/php/ext/standard/php_parsedate.h
-include/php/ext/standard/php_rand.h
-include/php/ext/standard/php_smart_str.h
-include/php/ext/standard/php_smart_str_public.h
-include/php/ext/standard/php_standard.h
-include/php/ext/standard/php_string.h
-include/php/ext/standard/php_type.h
-include/php/ext/standard/php_var.h
-include/php/ext/standard/php_versioning.h
-include/php/ext/standard/quot_print.h
-include/php/ext/standard/reg.h
-include/php/ext/standard/scanf.h
-include/php/ext/standard/sha1.h
-include/php/ext/standard/uniqid.h
-include/php/ext/standard/url.h
-include/php/ext/standard/url_scanner.h
-include/php/ext/standard/url_scanner_ex.h
-include/php/ext/xml/expat/ascii.h
-include/php/ext/xml/expat/asciitab.h
-include/php/ext/xml/expat/expat.h
-include/php/ext/xml/expat/iasciitab.h
-include/php/ext/xml/expat/internal.h
-include/php/ext/xml/expat/latin1tab.h
-include/php/ext/xml/expat/nametab.h
-include/php/ext/xml/expat/utf8tab.h
-include/php/ext/xml/expat/winconfig.h
-include/php/ext/xml/expat/xmlrole.h
-include/php/ext/xml/expat/xmltok.h
-include/php/ext/xml/expat/xmltok_impl.h
-include/php/ext/xml/php_xml.h
-include/php/include/php_sab_info.h
-include/php/main/SAPI.h
-include/php/main/build-defs.h
-include/php/main/config.w32.h
-include/php/main/fopen_wrappers.h
-include/php/main/internal_functions_registry.h
-include/php/main/logos.h
-include/php/main/php.h
-include/php/main/php3_compat.h
-include/php/main/php_compat.h
-include/php/main/php_config.h
-include/php/main/php_content_types.h
-include/php/main/php_embed.h
-include/php/main/php_globals.h
-include/php/main/php_ini.h
-include/php/main/php_logos.h
-include/php/main/php_main.h
-include/php/main/php_memory_streams.h
-include/php/main/php_network.h
-include/php/main/php_open_temporary_file.h
-include/php/main/php_output.h
-include/php/main/php_reentrancy.h
-include/php/main/php_regex.h
-include/php/main/php_scandir.h
-include/php/main/php_streams.h
-include/php/main/php_syslog.h
-include/php/main/php_ticks.h
-include/php/main/php_variables.h
-include/php/main/php_version.h
-include/php/main/rfc1867.h
-include/php/main/safe_mode.h
-include/php/main/snprintf.h
-include/php/main/spprintf.h
-include/php/main/win95nt.h
-include/php/regex/cclass.h
-include/php/regex/cname.h
-include/php/regex/regex.h
-include/php/regex/regex2.h
-include/php/regex/regex_extra.h
-include/php/regex/utils.h
-lib/php/build/Makefile.global
-lib/php/build/acinclude.m4
-lib/php/build/config.guess
-lib/php/build/config.sub
-lib/php/build/libtool.m4
-lib/php/build/ltmain.sh
-lib/php/build/mkdep.awk
-lib/php/build/phpize.m4
-lib/php/build/scan_makefile_in.awk
-lib/php/build/shtool
-libexec/cgi-bin/php
-man/man1/php-config.1
-man/man1/php.1
-man/man1/phpize.1
-share/examples/php/php.ini-dist
-share/examples/php/php.ini-recommended
-share/php/php.gif
-@pkgdir lib/php/20020429
diff --git a/www/php4/buildlink3.mk b/www/php4/buildlink3.mk
deleted file mode 100644
index 4904be4b583..00000000000
--- a/www/php4/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.13 2009/03/20 19:25:37 joerg Exp $
-
-BUILDLINK_TREE+=	php
-
-.if !defined(PHP_BUILDLINK3_MK)
-PHP_BUILDLINK3_MK:=
-
-BUILDLINK_API_DEPENDS.php+=		php-4.4.*
-BUILDLINK_ABI_DEPENDS.php+=	php>=4.4.1nb3
-BUILDLINK_PKGSRCDIR.php?=	../../www/php4
-.endif # PHP_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-php
diff --git a/www/php4/distinfo b/www/php4/distinfo
deleted file mode 100644
index 4d0719d8e73..00000000000
--- a/www/php4/distinfo
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: distinfo,v 1.70 2009/12/21 20:02:44 joerg Exp $
-
-SHA1 (php-4.4.9.tar.bz2) = ab3d2205d756ddf93452b57bd6ce6a2014b1c374
-RMD160 (php-4.4.9.tar.bz2) = 0d77092efaccd8fe6efc16635be98c5d4ccfec66
-Size (php-4.4.9.tar.bz2) = 4545009 bytes
-SHA1 (patch-aa) = feb064407950d0fc732b7240e65cac84420d2407
-SHA1 (patch-ab) = 38a4bcd0d65b26c5d8e54e22b552f60831188469
-SHA1 (patch-ac) = 28288b1e79c14fb2b40eaefed0d6d2bff4775607
-SHA1 (patch-ad) = 9ca5d2f59bfeea77a98cd0e727546d11669114cd
-SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
-SHA1 (patch-ah) = 0ac37bd35c4594cb58f1ea85ef811154b644a931
-SHA1 (patch-ai) = 0b9c1c9fb75a64026f2fb3cbd44cc19e0a1f186c
-SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
-SHA1 (patch-ak) = 1f9fbe26c7329e1d18eec053499ee2d574b5b970
-SHA1 (patch-ap) = 2f852abd1e9d0f089add18b2eade2831253ad00e
-SHA1 (patch-at) = f8b3aebd61fe2d5b5a994e1d973424a1ed397f63
-SHA1 (patch-au) = f9798aa440e174f65dde574c4f3b28183b3d18bc
-SHA1 (patch-av) = 1c743357a505b1cd0910c681bf892f0710310526
diff --git a/www/php4/files/pear.sh b/www/php4/files/pear.sh
deleted file mode 100644
index d50d4d95dbd..00000000000
--- a/www/php4/files/pear.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!@SH@
-#
-# $NetBSD: pear.sh,v 1.4 2006/08/16 06:49:56 salo Exp $
-
-# first find which PHP binary to use
-if test "x$PHP_PEAR_PHP_BIN" != "x"; then
-  PHP="$PHP_PEAR_PHP_BIN"
-else
-  if test "@php_bin@" = '@'php_bin'@'; then
-    PHP=php 
-  else
-    PHP="@php_bin@"
-  fi
-fi
-
-# then look for the right pear include dir
-if test "x$PHP_PEAR_INSTALL_DIR" != "x"; then
-  INCDIR=$PHP_PEAR_INSTALL_DIR
-  INCARG="-d include_path=$PHP_PEAR_INSTALL_DIR"
-else
-  if test "@php_dir@" = '@'php_dir'@'; then
-    INCDIR=`dirname $0`
-    INCARG=""  
-  else
-    INCDIR="@php_dir@"
-    INCARG="-d include_path=@php_dir@"
-  fi
-fi
-
-exec $PHP -C -q $INCARG -d output_buffering=1 -d open_basedir="" -d safe_mode=0 -d memory_limit=12M $INCDIR/pearcmd.php "$@"
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa
deleted file mode 100644
index 2f7313d3d33..00000000000
--- a/www/php4/patches/patch-aa
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2004/04/30 00:06:42 lukem Exp $
-
---- sapi/cgi/cgi_main.c.orig	2004-04-01 03:01:45.000000000 +1000
-+++ sapi/cgi/cgi_main.c
-@@ -679,6 +679,20 @@ static void init_request_info(TSRMLS_D)
- 	char *env_script_filename = sapi_cgibin_getenv("SCRIPT_FILENAME",0 TSRMLS_CC);
- 	char *env_path_translated = sapi_cgibin_getenv("PATH_TRANSLATED",0 TSRMLS_CC);
- 	char *script_path_translated = env_script_filename;
-+	char *env_script_name = sapi_cgibin_getenv("SCRIPT_NAME",0 TSRMLS_CC);
-+
-+		/*
-+		 * CGI/1.1, as documented at:
-+		 *	http://cgi-spec.golux.com/
-+		 * mentions SCRIPT_NAME but not SCRIPT_FILENAME.
-+		 * Support web servers that only supply the former,
-+		 * even though PHP 4.3 wants the latter ...
-+		 */
-+	if (!script_path_translated && env_script_name && *env_script_name == '/')  {
-+		env_script_filename = _sapi_cgibin_putenv("SCRIPT_FILENAME",(env_script_name + 1) TSRMLS_CC);
-+
-+		script_path_translated = env_script_filename;
-+	}
- 
- #if !DISCARD_PATH
- 	/* some broken servers do not have script_filename or argv0
-@@ -707,7 +721,6 @@ static void init_request_info(TSRMLS_D)
- 		char *content_length = sapi_cgibin_getenv("CONTENT_LENGTH",0 TSRMLS_CC);
- 		char *content_type = sapi_cgibin_getenv("CONTENT_TYPE",0 TSRMLS_CC);
- 		char *env_path_info = sapi_cgibin_getenv("PATH_INFO",0 TSRMLS_CC);
--		char *env_script_name = sapi_cgibin_getenv("SCRIPT_NAME",0 TSRMLS_CC);
- #if ENABLE_PATHINFO_CHECK
- 		struct stat st;
- 		char *env_redirect_url = sapi_cgibin_getenv("REDIRECT_URL",0 TSRMLS_CC);
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
deleted file mode 100644
index 4f4c1a4c2b5..00000000000
--- a/www/php4/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.22 2006/05/11 06:50:39 minskim Exp $
-
---- acinclude.m4.orig	2005-12-19 14:29:11.000000000 -0800
-+++ acinclude.m4
-@@ -1195,10 +1195,6 @@ AC_DEFUN([PHP_SHARED_MODULE],[
-   install_modules="install-modules"
- 
-   case $host_alias in
--    *darwin*[)]
--      suffix=so
--      link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle -undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
--      ;;
-     *netware*[)]
-       suffix=nlm
-       link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $($2) ifelse($1, php4lib, , -L$(top_builddir)/netware -lphp4lib) $(translit(ifelse($1, php4lib, $1, m4_substr($1, 3)),a-z_-,A-Z__)_SHARED_LIBADD)'
diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
deleted file mode 100644
index 6ffa2475f85..00000000000
--- a/www/php4/patches/patch-ac
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ac,v 1.10 2006/11/03 07:00:40 wiz Exp $
-
---- ext/curl/curl.c.orig	2006-08-10 17:27:11.000000000 +0000
-+++ ext/curl/curl.c
-@@ -93,6 +93,14 @@
- static int  le_curl;
- #define le_curl_name "cURL handle"
- 
-+#ifndef        CURLOPT_PASSWDFUNCTION
-+#define        CURLOPT_PASSWDFUNCTION  0
-+#endif
-+
-+#ifndef CURLOPT_FTPASCII
-+#define        CURLOPT_FTPASCII        0
-+#endif
-+
- #ifdef PHP_CURL_NEED_OPENSSL_TSL /* {{{ */
- static MUTEX_T *php_curl_openssl_tsl = NULL;
- 
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
deleted file mode 100644
index 31c3107023a..00000000000
--- a/www/php4/patches/patch-ad
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-ad,v 1.17 2004/12/09 14:50:23 jlam Exp $
-
---- configure.orig	2004-09-20 18:31:33.000000000 -0400
-+++ configure
-@@ -90314,13 +90314,8 @@ old_CC=$CC
- 
- if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
-   CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
-+  CFLAGS="$CFLAGS $ac_cv_pthreads_cflags"
-   INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
--  cat >meta_ccld<<EOF
--#! /bin/sh
--exec $CC $ac_cv_pthreads_cflags \$@
--EOF
--  CC="$abs_builddir/meta_ccld"
--  chmod +x meta_ccld
- fi
- 
- if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag
deleted file mode 100644
index df59380aeb6..00000000000
--- a/www/php4/patches/patch-ag
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ag,v 1.6 2003/09/01 10:17:38 cjep Exp $
---- php.ini-dist.orig	2003-07-10 00:38:36.000000000 +0200
-+++ php.ini-dist	2003-08-30 21:59:51.000000000 +0200
-@@ -424,8 +424,9 @@
- ; if nonempty.
- user_dir =
- 
--; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+; Directory in which the loadable extensions (modules) reside. If not
-+; defined, then use the extension directory specified at compile-time.
-+; extension_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
-@@ -476,7 +477,7 @@
- 
- ; Temporary directory for HTTP uploaded files (will use system default if not
- ; specified).
--;upload_tmp_dir =
-+upload_tmp_dir = /tmp
- 
- ; Maximum allowed size for uploaded files.
- upload_max_filesize = 2M
diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah
deleted file mode 100644
index 3371efeb58a..00000000000
--- a/www/php4/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.7 2003/09/01 10:17:38 cjep Exp $
---- php.ini-recommended.orig	2003-07-10 00:38:36.000000000 +0200
-+++ php.ini-recommended	2003-08-30 22:01:36.000000000 +0200
-@@ -440,7 +440,7 @@
- user_dir =
- 
- ; Directory in which the loadable extensions (modules) reside.
--extension_dir = "./"
-+; extension_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
-@@ -491,7 +491,7 @@
- 
- ; Temporary directory for HTTP uploaded files (will use system default if not
- ; specified).
--;upload_tmp_dir =
-+upload_tmp_dir = /tmp
- 
- ; Maximum allowed size for uploaded files.
- upload_max_filesize = 2M
diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai
deleted file mode 100644
index 8d70f18731e..00000000000
--- a/www/php4/patches/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ai,v 1.9 2004/10/31 17:45:44 jdolecek Exp $
-
---- ext/mysql/config.m4.orig	Wed Dec 31 11:28:38 2003
-+++ ext/mysql/config.m4	Fri Aug  6 16:43:12 2004
-@@ -3,6 +3,4 @@
- dnl
- 
--sinclude(ext/mysql/libmysql/acinclude.m4)
--sinclude(ext/mysql/libmysql/mysql.m4)
- sinclude(libmysql/acinclude.m4)
- sinclude(libmysql/mysql.m4)
diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj
deleted file mode 100644
index ace86595a34..00000000000
--- a/www/php4/patches/patch-aj
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-aj,v 1.9 2005/04/11 20:02:57 jdolecek Exp $
-
---- ext/imap/config.m4.orig	2005-04-08 20:55:11.000000000 +0200
-+++ ext/imap/config.m4	2005-04-08 20:55:01.000000000 +0200
-@@ -54,6 +54,14 @@
-   ])
- ])
- 
-+dsl Must be before --with-kerberos, affects the check
-+PHP_ARG_WITH(imap-linkage,use IMAP c-client linkage,
-+[  --with-imap-linkage     Use IMAP c-client linkage to determine supported items.])
-+
-+if test "$PHP_IMAP_LINKAGE" != "no"; then  
-+	AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ])
-+fi
-+
- AC_DEFUN([PHP_IMAP_KRB_CHK], [
-   if test "$PHP_KERBEROS" != "no"; then
-     PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD,
-@@ -65,7 +73,7 @@
-       Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
-       ])
-     ])
--  else
-+  elif test "$PHP_IMAP_LINKAGE" != "yes"; then
-     AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
-       AC_MSG_ERROR([This c-client library is built with Kerberos support. 
- 
diff --git a/www/php4/patches/patch-ak b/www/php4/patches/patch-ak
deleted file mode 100644
index feb955eee17..00000000000
--- a/www/php4/patches/patch-ak
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ak,v 1.4 2005/04/21 23:47:46 salo Exp $
-
---- ext/imap/php_imap.c.orig	2005-01-25 15:23:37.000000000 +0100
-+++ ext/imap/php_imap.c	2005-04-22 01:37:25.000000000 +0200
-@@ -415,6 +415,11 @@
- 
- 	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
- 
-+/*
-+ * Optionally use the installed c-client linkage.c to determine which drivers
-+ * are authenticators are linked in. Otherwise use this fixed list.
-+ */
-+#ifndef HAVE_IMAP_LINKAGE
- #ifndef PHP_WIN32
- 	mail_link(&unixdriver);		/* link in the unix driver */
- 	mail_link(&mhdriver);		/* link in the mh driver */
-@@ -430,6 +435,10 @@
- 	mail_link(&tenexdriver);	/* link in the tenex driver */
- 	mail_link(&mtxdriver);		/* link in the mtx driver */
- 	mail_link(&dummydriver);	/* link in the dummy driver */
-+#else /* HAVE_IMAP_LINKAGE */
-+        /* link in the c-client mail and auth drivers */
-+#include "linkage.c"
-+#endif /* HAVE_IMAP_LINKAGE */
- 
- #ifndef PHP_WIN32
- 	auth_link(&auth_log);		/* link in the log authenticator */
diff --git a/www/php4/patches/patch-ap b/www/php4/patches/patch-ap
deleted file mode 100644
index bc9bf0ec89a..00000000000
--- a/www/php4/patches/patch-ap
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2006/03/03 07:11:34 cube Exp $
-
---- pear/install-pear.php.orig	2006-01-07 18:51:54.000000000 +0100
-+++ pear/install-pear.php
-@@ -167,6 +167,7 @@ foreach ($install_files as $package => $
-         }
-     } else {
-         $options['nodeps'] = true;
-+	$options['force'] = $force;
-         $installer->setOptions($options);
-         $dp = array(&$downloaderpackage);
-         $installer->setDownloadedPackages($dp);
diff --git a/www/php4/patches/patch-at b/www/php4/patches/patch-at
deleted file mode 100644
index 4ab86e855a7..00000000000
--- a/www/php4/patches/patch-at
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-at,v 1.1 2006/04/22 10:27:06 jdolecek Exp $
-
---- ext/wddx/wddx.c.orig	2006-04-22 12:18:32.000000000 +0200
-+++ ext/wddx/wddx.c
-@@ -20,2 +20,6 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
diff --git a/www/php4/patches/patch-au b/www/php4/patches/patch-au
deleted file mode 100644
index 3847b0834b8..00000000000
--- a/www/php4/patches/patch-au
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-au,v 1.5 2007/03/11 16:43:49 grant Exp $
-
---- ext/oracle/config.m4.orig	2004-12-30 18:02:18.000000000 +1100
-+++ ext/oracle/config.m4
-@@ -7,6 +7,8 @@ AC_DEFUN([AC_ORACLE_VERSION],[
-   if test -s "$ORACLE_DIR/orainst/unix.rgs"; then
-   	ORACLE_VERSION=`grep '"ocommon"' $ORACLE_DIR/orainst/unix.rgs | sed 's/[ ][ ]*/:/g' | cut -d: -f 6 | cut -c 2-4`
- 	test -z "$ORACLE_VERSION" && ORACLE_VERSION=7.3
-+  elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.10.1; then
-+    ORACLE_VERSION=10.1
-   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.9.0; then
-     ORACLE_VERSION=9.0
-   elif test -f $ORACLE_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.8.0; then
-@@ -141,7 +143,7 @@ if test "$PHP_ORACLE" != "no"; then
-   	  PHP_ADD_LIBRARY_WITH_PATH(clntsh, $ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
- 	  ;;
- 
--	8.1|9.0)
-+	8.1|9.0|10.1)
-   	  PHP_ADD_LIBRARY(clntsh, 1, ORACLE_SHARED_LIBADD)
-   	  PHP_ADD_LIBPATH($ORACLE_DIR/lib, ORACLE_SHARED_LIBADD)
- 	  ;;
diff --git a/www/php4/patches/patch-av b/www/php4/patches/patch-av
deleted file mode 100644
index 0a453c484e1..00000000000
--- a/www/php4/patches/patch-av
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-av,v 1.6 2009/12/21 20:02:44 joerg Exp $
-
---- ext/mssql/config.m4.orig	2009-12-21 19:57:57.000000000 +0000
-+++ ext/mssql/config.m4
-@@ -9,32 +9,7 @@ PHP_ARG_WITH(mssql,for MSSQL support via
- 
- if test "$PHP_MSSQL" != "no"; then
- 
--  FREETDS_INSTALLATION_DIR=""
--  if test "$PHP_MSSQL" = "yes"; then
--
--    for i in /usr/local /usr; do
--      if test -f $i/include/tds.h; then
--        FREETDS_INSTALLATION_DIR=$i
--        break
--      fi
--    done
--
--    if test -z "$FREETDS_INSTALLATION_DIR"; then
--      AC_MSG_ERROR(Cannot find FreeTDS in known installation directories)
--    fi
--
--  elif test "$PHP_MSSQL" != "no"; then
--
--    if test -f $PHP_MSSQL/include/tds.h; then
--      FREETDS_INSTALLATION_DIR=$PHP_MSSQL
--    else
--      AC_MSG_ERROR(Directory $PHP_MSSQL is not a FreeTDS installation directory)
--    fi
--  fi  
--
--  if test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.a" && test ! -r "$FREETDS_INSTALLATION_DIR/lib/libtds.so"; then
--     AC_MSG_ERROR(Could not find $FREETDS_INSTALLATION_DIR/lib/libtds.[a|so])
--  fi
-+  FREETDS_INSTALLATION_DIR=$PHP_MSSQL
- 
-   MSSQL_INCDIR=$FREETDS_INSTALLATION_DIR/include
-   MSSQL_LIBDIR=$FREETDS_INSTALLATION_DIR/lib