Reupdate to 4.3.2RC4.

20 files changed, 30 insertions, 1890 deletions

diff --git a/www/mod_php4/Makefile b/www/mod_php4/Makefile
index 397afe01062..7f1f4355a75 100644
--- a/www/mod_php4/Makefile
+++ b/www/mod_php4/Makefile
@@ -4,107 +4,18 @@
 #
 # $FreeBSD$
 #
+# Instructions on how to enable preferred extensions can be found in the
+# Makefile of the master port (lang/php4).
+#
 
-PORTNAME=	mod_php4
-PORTVERSION=	4.3.1
-PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
-		http://php.he.net/${PHP_DISTDIR}/ \
-		http://www.php3.de/${PHP_DISTDIR}/ \
-		http://au.php.net/${PHP_DISTDIR}/ \
-		http://at.php.net/${PHP_DISTDIR}/ \
-		http://br.php.net/${PHP_DISTDIR}/ \
-		http://php.easydns.com/${PHP_DISTDIR}/ \
-		http://www.php.cz/${PHP_DISTDIR}/ \
-		http://php3.globe.de/${PHP_DISTDIR}/
-DISTNAME=	php-${PORTVERSION}
-
-MAINTAINER=	dirk@FreeBSD.org
-COMMENT=	PHP4 module for Apache
-
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-.if defined(WITH_APACHE2)
-LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
-.endif
-
-PHP_DISTDIR=	distributions
-
-USE_BZIP2=	yes
-USE_SUBMAKE=	yes
-USE_AUTOCONF_VER=213
-.if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
-.else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-.endif
-APXS?=		${LOCALBASE}/sbin/apxs
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	yes
-.endif
-
-.if defined(WITH_APACHE2)
-CONFIGURE_ARGS=	--with-apxs2=${PREFIX}/sbin/apxs \
-		--with-tsrm-pth
-PLIST_SUB=	MOD_DIR=libexec/apache2
-.else
-CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs
-PLIST_SUB=	MOD_DIR=libexec/apache
-.endif
-CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc \
-		--enable-versioning \
-		--with-regex=system \
-		--without-gd \
-		--without-mysql
-
-CFLAGS+=	-I${PREFIX}/include
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		CAT="${CAT}" \
-		PHP4_OPTIONS="${PHP4_OPTIONS}" \
-		REALCURDIR="${.CURDIR}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
-.if !defined(WITH_APACHE2)
-	@${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module."
-	@${ECHO_CMD} ""
-.endif
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
-
-	@${ECHO_CMD} "*****************************************************************************"
-	@${ECHO_CMD} "Make sure the mime.types are connected to the php module properly and"
-	@${ECHO_CMD} "index.php is part of your DirectoryIndex."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "The following should be in your Apache configuration file:"
-	@${ECHO_CMD} "[...]"
-	@${ECHO_CMD} "DirectoryIndex index.php index.html"
-	@${ECHO_CMD} "[...]"
-	@${ECHO_CMD} "AddType application/x-httpd-php .php"
-	@${ECHO_CMD} "AddType application/x-httpd-php-source .phps"
-	@${ECHO_CMD} "[...]"
-	@${ECHO_CMD} "*****************************************************************************"
 
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+MAINTAINER=	sysadmin@alexdupre.com
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
+PKGMESSAGE=	${.CURDIR}/pkg-message
+MASTERDIR=	${.CURDIR}/../../lang/php4
 
-# XXX:
-# Has to be kept in sync with the defaults in configure.php
-.ifndef(WITHOUT_MYSQL)
-.ifmake describe
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.endif
-.endif
+WITHOUT_CLI=	yes
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/mod_php4/distinfo b/www/mod_php4/distinfo
deleted file mode 100644
index 6e45abe2f96..00000000000
--- a/www/mod_php4/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (php-4.3.1.tar.bz2) = bbfe584acb3549c62bb61355165e2ca6
diff --git a/www/mod_php4/files/patch-ext_domxml_config.m4 b/www/mod_php4/files/patch-ext_domxml_config.m4
deleted file mode 100644
index 7c3ff4fac8c..00000000000
--- a/www/mod_php4/files/patch-ext_domxml_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/domxml/config.m4.orig	Wed Dec 19 18:40:15 2001
-+++ ext/domxml/config.m4	Wed Dec 19 18:42:15 2001
-@@ -53,6 +53,8 @@
- 
-   PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
-   PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
-+dnl next line is for iconv.h
-+  PHP_ADD_INCLUDE($DOMXML_DIR/include)
- 
-   if test "$PHP_ZLIB_DIR" = "no"; then
-     AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>)
diff --git a/www/mod_php4/files/patch-ext_mcal_config.m4 b/www/mod_php4/files/patch-ext_mcal_config.m4
deleted file mode 100644
index 82164615476..00000000000
--- a/www/mod_php4/files/patch-ext_mcal_config.m4
+++ /dev/null
@@ -1,17 +0,0 @@
---- ext/mcal/config.m4.orig	Wed Mar 27 11:26:16 2002
-+++ ext/mcal/config.m4	Fri Jan  3 19:38:46 2003
-@@ -41,5 +41,14 @@
-   PHP_SUBST(MCAL_SHARED_LIBADD)
-   AC_DEFINE(HAVE_MCAL,1,[ ])
-   PHP_NEW_EXTENSION(mcal, php_mcal.c, $ext_shared)
-+  cat >> confdefs.h <<\EOF
-+/* Interfaces to callbacks in libmcal */
-+#include <mcal/mcal.h>
-+void cc_searched (unsigned long cal_uid) {}
-+void cc_fetched(const CALEVENT *event) {}
-+void cc_login(const char **user, const char **pwd) {}
-+void cc_vlog(const char *fmt,va_list ap) {}
-+void cc_vdlog(const char *fmt,va_list ap) {}
-+EOF
- fi
- 
diff --git a/www/mod_php4/files/patch-ext_ming_php_ming.h b/www/mod_php4/files/patch-ext_ming_php_ming.h
deleted file mode 100644
index f07deba0c86..00000000000
--- a/www/mod_php4/files/patch-ext_ming_php_ming.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/ming/php_ming.h.orig	Mon Apr  8 02:46:22 2002
-+++ ext/ming/php_ming.h	Fri Jan  3 19:35:55 2003
-@@ -24,7 +24,7 @@
- extern zend_module_entry ming_module_entry;
- #define ming_module_ptr &ming_module_entry
- 
--#include <ming.h>
-+#include <ming/ming.h>
- 
- PHP_RINIT_FUNCTION(ming);
- PHP_MINIT_FUNCTION(ming);
diff --git a/www/mod_php4/files/patch-ext_sybase_ct_config.m4 b/www/mod_php4/files/patch-ext_sybase_ct_config.m4
deleted file mode 100644
index 127a369b108..00000000000
--- a/www/mod_php4/files/patch-ext_sybase_ct_config.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- ext/sybase_ct/config.m4.orig	Fri Nov 30 23:12:31 2001
-+++ ext/sybase_ct/config.m4	Tue Apr 23 21:53:54 2002
-@@ -30,17 +30,12 @@
-     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
-     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-   else
--    PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
-     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
--    PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
--    PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
-   
--    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
-+    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-   
-     PHP_CHECK_LIBRARY(tcl, netg_errstr, [
-       PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
--    ],[ 
--      PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
-     ],[ 
-       $SYBASE_CT_LIBS 
-     ])
diff --git a/www/mod_php4/pkg-descr b/www/mod_php4/pkg-descr
deleted file mode 100644
index cea408b8d55..00000000000
--- a/www/mod_php4/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Server-side, cross-platform, HTML embedded scripting language which
-offers easy database integration.
-
-WWW:	http://www.php.net/
diff --git a/www/mod_php4/pkg-message b/www/mod_php4/pkg-message
index c984c30fe06..b37ebc0c85a 100644
--- a/www/mod_php4/pkg-message
+++ b/www/mod_php4/pkg-message
@@ -1,20 +1,18 @@
 *****************************************************************************
+
 You have installed the mod_php4 package.
 
-Have a look at the mod_php4 _port_ if you need additional support for
-databases other than MySQL, e. g.
+Have a look at the php-mod-dev port if you need additional extensions
+other than ctype, MySQL, PCRE, POSIX, session, tokenizer, XML and ZLIB.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/mod_php4.tar
 
-Make sure the mime.types are connected to the php module properly and
-index.php is part of your DirectoryIndex.
+Make sure index.php is part of your DirectoryIndex.
+
+You should add the following to your Apache configuration file:
 
-The following should be in your Apache configuration file:
-[...]
-DirectoryIndex index.php index.html
-[...]
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
-[...]
+
 *****************************************************************************
diff --git a/www/mod_php4/pkg-plist b/www/mod_php4/pkg-plist
deleted file mode 100644
index 115ff74278c..00000000000
--- a/www/mod_php4/pkg-plist
+++ /dev/null
@@ -1,389 +0,0 @@
-bin/pear
-bin/php
-bin/php-config
-bin/phpextdist
-bin/phpize
-etc/php.ini-dist
-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_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_types.h
-include/php/Zend/zend_variables.h
-include/php/acconfig.h
-include/php/ext/mbstring/cp932_table.h
-include/php/ext/mbstring/mbfilter.h
-include/php/ext/mbstring/mbfilter_cn.h
-include/php/ext/mbstring/mbfilter_ja.h
-include/php/ext/mbstring/mbfilter_kr.h
-include/php/ext/mbstring/mbfilter_ru.h
-include/php/ext/mbstring/mbfilter_tw.h
-include/php/ext/mbstring/mbregex.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/mbstring/unicode_table.h
-include/php/ext/mbstring/unicode_table_cn.h
-include/php/ext/mbstring/unicode_table_ja.h
-include/php/ext/mbstring/unicode_table_kr.h
-include/php/ext/mbstring/unicode_table_ru.h
-include/php/ext/mbstring/unicode_table_tw.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/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/main/SAPI.h
-include/php/main/build-defs.h
-include/php/main/config.nw.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_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/php_version.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/.filemap
-lib/php/.lock
-lib/php/.registry/Archive_Tar.reg
-lib/php/.registry/Console_Getopt.reg
-lib/php/.registry/DB.reg
-lib/php/.registry/HTTP.reg
-lib/php/.registry/Mail.reg
-lib/php/.registry/Net_SMTP.reg
-lib/php/.registry/Net_Socket.reg
-lib/php/.registry/PEAR.reg
-lib/php/.registry/XML_Parser.reg
-lib/php/.registry/XML_RPC.reg
-lib/php/Archive/Tar.php
-lib/php/Console/Getopt.php
-lib/php/DB.php
-lib/php/DB/common.php
-lib/php/DB/dbase.php
-lib/php/DB/fbsql.php
-lib/php/DB/ibase.php
-lib/php/DB/ifx.php
-lib/php/DB/msql.php
-lib/php/DB/mssql.php
-lib/php/DB/mysql.php
-lib/php/DB/oci8.php
-lib/php/DB/odbc.php
-lib/php/DB/pgsql.php
-lib/php/DB/storage.php
-lib/php/DB/sybase.php
-lib/php/HTTP.php
-lib/php/Mail.php
-lib/php/Mail/RFC822.php
-lib/php/Mail/mail.php
-lib/php/Mail/sendmail.php
-lib/php/Mail/smtp.php
-lib/php/Net/SMTP.php
-lib/php/Net/Socket.php
-lib/php/OS/Guess.php
-lib/php/PEAR.php
-lib/php/PEAR/Autoloader.php
-lib/php/PEAR/Builder.php
-lib/php/PEAR/Command.php
-lib/php/PEAR/Command/Auth.php
-lib/php/PEAR/Command/Build.php
-lib/php/PEAR/Command/Common.php
-lib/php/PEAR/Command/Config.php
-lib/php/PEAR/Command/Install.php
-lib/php/PEAR/Command/Package.php
-lib/php/PEAR/Command/Registry.php
-lib/php/PEAR/Command/Remote.php
-lib/php/PEAR/Common.php
-lib/php/PEAR/Config.php
-lib/php/PEAR/Dependency.php
-lib/php/PEAR/Frontend/CLI.php
-lib/php/PEAR/Installer.php
-lib/php/PEAR/Packager.php
-lib/php/PEAR/Registry.php
-lib/php/PEAR/Remote.php
-lib/php/System.php
-lib/php/XML/Parser.php
-lib/php/XML/RPC.php
-lib/php/XML/RPC/Server.php
-lib/php/build/Makefile.global
-lib/php/build/acinclude.m4
-lib/php/build/mkdep.awk
-lib/php/build/pear.m4
-lib/php/build/scan_makefile_in.awk
-lib/php/build/shtool
-lib/php/data/PEAR/package.dtd
-lib/php/data/PEAR/template.spec
-lib/php/docs/Archive_Tar/docs/Archive_Tar.txt
-lib/php/docs/DB/DB/IDEAS
-lib/php/docs/DB/DB/MAINTAINERS
-lib/php/docs/DB/DB/STATUS
-lib/php/docs/DB/DB/TESTERS
-lib/php/tests/DB/tests/db_error.phpt
-lib/php/tests/DB/tests/db_error2.phpt
-lib/php/tests/DB/tests/db_factory.phpt
-lib/php/tests/DB/tests/db_ismanip.phpt
-lib/php/tests/DB/tests/db_parsedsn.phpt
-lib/php/tests/DB/tests/driver/01connect.phpt
-lib/php/tests/DB/tests/driver/02fetch.phpt
-lib/php/tests/DB/tests/driver/03simplequery.phpt
-lib/php/tests/DB/tests/driver/04numcols.phpt
-lib/php/tests/DB/tests/driver/05sequences.phpt
-lib/php/tests/DB/tests/driver/06prepexec.phpt
-lib/php/tests/DB/tests/driver/08affectedrows.phpt
-lib/php/tests/DB/tests/driver/09numrows.phpt
-lib/php/tests/DB/tests/driver/10errormap.phpt
-lib/php/tests/DB/tests/driver/13limit.phpt
-lib/php/tests/DB/tests/driver/14fetchmode_object.phpt
-lib/php/tests/DB/tests/driver/15quote.phpt
-lib/php/tests/DB/tests/ibase/01connect.phpt
-lib/php/tests/DB/tests/ibase/02fetch.phpt
-lib/php/tests/DB/tests/ibase/03simplequery.phpt
-lib/php/tests/DB/tests/ibase/04numcols.phpt
-lib/php/tests/DB/tests/ibase/05sequences.phpt
-lib/php/tests/DB/tests/ibase/06prepexec.phpt
-lib/php/tests/DB/tests/ibase/10errormap.phpt
-lib/php/tests/DB/tests/mysql/01connect.phpt
-lib/php/tests/DB/tests/mysql/02fetch.phpt
-lib/php/tests/DB/tests/mysql/03simplequery.phpt
-lib/php/tests/DB/tests/mysql/04numcols.phpt
-lib/php/tests/DB/tests/mysql/05sequences.phpt
-lib/php/tests/DB/tests/mysql/06prepexec.phpt
-lib/php/tests/DB/tests/mysql/07errornative.phpt
-lib/php/tests/DB/tests/mysql/08affectedrows.phpt
-lib/php/tests/DB/tests/mysql/09numrows.phpt
-lib/php/tests/DB/tests/mysql/10errormap.phpt
-lib/php/tests/DB/tests/mysql/12tableinfo.phpt
-lib/php/tests/DB/tests/mysql/13limit.phpt
-lib/php/tests/DB/tests/mysql/14fetchmode_object.phpt
-lib/php/tests/DB/tests/oci8/01connect.phpt
-lib/php/tests/DB/tests/oci8/02fetch.phpt
-lib/php/tests/DB/tests/oci8/03simplequery.phpt
-lib/php/tests/DB/tests/oci8/04numcols.phpt
-lib/php/tests/DB/tests/oci8/05sequences.phpt
-lib/php/tests/DB/tests/oci8/06prepexec.phpt
-lib/php/tests/DB/tests/oci8/07errornative.phpt
-lib/php/tests/DB/tests/oci8/08affectedrows.phpt
-lib/php/tests/DB/tests/oci8/09numrows.phpt
-lib/php/tests/DB/tests/oci8/10errormap.phpt
-lib/php/tests/DB/tests/oci8/13limit.phpt
-lib/php/tests/DB/tests/odbc/01connect.phpt
-lib/php/tests/DB/tests/odbc/02fetch.phpt
-lib/php/tests/DB/tests/odbc/03simplequery.phpt
-lib/php/tests/DB/tests/odbc/04numcols.phpt
-lib/php/tests/DB/tests/odbc/06prepexec.phpt
-lib/php/tests/DB/tests/odbc/07errornative.phpt
-lib/php/tests/DB/tests/odbc/09numrows.phpt
-lib/php/tests/DB/tests/odbc/10errormap.phpt
-lib/php/tests/DB/tests/pgsql/01connect.phpt
-lib/php/tests/DB/tests/pgsql/02fetch.phpt
-lib/php/tests/DB/tests/pgsql/03simplequery.phpt
-lib/php/tests/DB/tests/pgsql/04numcols.phpt
-lib/php/tests/DB/tests/pgsql/05sequences.phpt
-lib/php/tests/DB/tests/pgsql/06prepexec.phpt
-lib/php/tests/DB/tests/pgsql/07errornative.phpt
-lib/php/tests/DB/tests/pgsql/08affectedrows.phpt
-lib/php/tests/DB/tests/pgsql/09numrows.phpt
-lib/php/tests/DB/tests/pgsql/10errormap.phpt
-lib/php/tests/DB/tests/pgsql/11transact.phpt
-lib/php/tests/DB/tests/pgsql/13limit.phpt
-lib/php/tests/DB/tests/pgsql/14fetchmode_object.phpt
-lib/php/tests/XML_Parser/tests/001.phpt
-lib/php/tests/XML_Parser/tests/002.phpt
-lib/php/tests/XML_Parser/tests/003.phpt
-lib/php/tests/XML_Parser/tests/004.phpt
-lib/php/tests/XML_Parser/tests/005.phpt
-lib/php/tests/XML_Parser/tests/test2.xml
-lib/php/tests/XML_Parser/tests/test3.xml
-%%MOD_DIR%%/libphp4.so
-@exec %D/sbin/apxs -e -a -n php4 %f
-@unexec %D/sbin/apxs -e -A -n php4 %f
-@dirrm include/php/TSRM
-@dirrm include/php/Zend
-@dirrm include/php/ext/mbstring
-@dirrm include/php/ext/pgsql
-@dirrm include/php/ext/session
-@dirrm include/php/ext/standard
-@dirrm include/php/ext/xml/expat
-@dirrm include/php/ext/xml
-@dirrm include/php/ext
-@dirrm include/php/main
-@dirrm include/php/regex
-@dirrm include/php
-@dirrm lib/php/.registry
-@dirrm lib/php/Archive
-@dirrm lib/php/Console
-@dirrm lib/php/DB
-@dirrm lib/php/Mail
-@dirrm lib/php/Net
-@dirrm lib/php/OS
-@dirrm lib/php/PEAR/Command
-@dirrm lib/php/PEAR/Frontend
-@dirrm lib/php/PEAR
-@dirrm lib/php/XML/RPC
-@dirrm lib/php/XML
-@dirrm lib/php/build
-@dirrm lib/php/data/PEAR
-@dirrm lib/php/data
-@dirrm lib/php/docs/Archive_Tar/docs
-@dirrm lib/php/docs/Archive_Tar
-@dirrm lib/php/docs/DB/DB
-@dirrm lib/php/docs/DB
-@dirrm lib/php/docs
-@dirrm lib/php/extensions/no-debug-non-zts-20020429
-@dirrm lib/php/extensions
-@dirrm lib/php/tests/DB/tests/driver
-@dirrm lib/php/tests/DB/tests/ibase
-@dirrm lib/php/tests/DB/tests/mysql
-@dirrm lib/php/tests/DB/tests/oci8
-@dirrm lib/php/tests/DB/tests/odbc
-@dirrm lib/php/tests/DB/tests/pgsql
-@dirrm lib/php/tests/DB/tests
-@dirrm lib/php/tests/DB
-@dirrm lib/php/tests/XML_Parser/tests
-@dirrm lib/php/tests/XML_Parser
-@dirrm lib/php/tests
-@dirrm lib/php
-@exec mkdir -p %D/lib/php/extensions/no-debug-non-zts-20020429
diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php
deleted file mode 100644
index 56d14c635d4..00000000000
--- a/www/mod_php4/scripts/configure.php
+++ /dev/null
@@ -1,385 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${BATCH}" ]; then
-	if [ "${PHP4_OPTIONS}" ]; then
-		set ${PHP4_OPTIONS}
-	else
-		set \"zlib\" \"MySQL\"
-	fi
-else
-	/usr/bin/dialog --title "configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-GD1		"GD 1.x library support" OFF \
-GD2		"GD 2.x library support" OFF \
-zlib		"zlib library support" ON \
-bzip2		"bzip2 library support" OFF \
-cracklib	"cracklib dict support" OFF \
-mcrypt		"Encryption support" OFF \
-mhash		"Crypto-hashing support" OFF \
-pdflib		"pdflib support" OFF \
-IMAP		"IMAP support" OFF \
-IMAP-SSL	"IMAP-SSL support (implies IMAP)" OFF \
-MySQL		"MySQL database support" ON \
-PostgreSQL	"PostgreSQL database support" OFF \
-SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
-SybaseCT	"Sybase/MS-SQL database support (CT-lib)" OFF \
-Interbase	"Interbase 6 database support (Firebird)" OFF \
-dBase		"dBase database support" OFF \
-GDBM		"GNU database manager support" OFF \
-OpenLDAP1	"OpenLDAP 1.x support" OFF \
-OpenLDAP2	"OpenLDAP 2.x support" OFF \
-OpenSSL		"OpenSSL support" OFF \
-SNMP		"SNMP support" OFF \
-XML		"XML support" OFF \
-XMLRPC		"XMLRPC-EPI support (implies XML and iconv)" OFF \
-XSLT		"Sablotron support (implies XML and iconv)" OFF \
-WDDX		"WDDX support (implies XML)" OFF \
-DOMXML		"DOM support" OFF \
-FTP		"File Transfer Protocol support" OFF \
-CURL		"CURL support" OFF \
-gettext		"gettext library support" OFF \
-iconv		"iconv support" OFF \
-recode		"recode support" OFF \
-pspell		"pspell support" OFF \
-mbregex		"multibyte regular expressions module" OFF \
-mbstring	"multibyte string module" OFF \
-YP		"YP/NIS support" OFF \
-BCMath		"BCMath support" OFF \
-Hyperwave	"Hyperwave support" OFF \
-mcve		"MCVE Credit Card Verification support" OFF \
-ming		"ming library support" OFF \
-MCAL		"Modular Calendar Access Library support" OFF \
-sockets		"sockets support" OFF \
-sysvsem		"System V semaphore support" OFF \
-sysvshm		"System V shared memory support" OFF \
-transsid	"Transparent session id" OFF \
-yaz		"YAZ support (ANSI/NISO Z39.50)" OFF \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
-exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-
-while [ "$1" ]; do
-	case $1 in
-		\"GD1\")
-			echo "LIB_DEPENDS+=	gd.2:\${PORTSDIR}/graphics/gd"
-			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
-			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
-			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
-			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
-			echo "		--enable-gd-native-ttf \\"
-			echo "		--with-freetype-dir=\${LOCALBASE} \\"
-			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
-			echo "		--with-png-dir=\${LOCALBASE}"
-			if [ "$GD2" ]; then
-				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			GD1=1
-			;;
-
-		\"GD2\")
-			echo "LIB_DEPENDS+=	gd.4:\${PORTSDIR}/graphics/gd2"
-			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
-			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
-			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
-			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
-			echo "		--enable-gd-native-ttf \\"
-			echo "		--with-freetype-dir=\${LOCALBASE} \\"
-			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
-			echo "		--with-png-dir=\${LOCALBASE}"
-			if [ "$GD1" ]; then
-				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			GD2=1
- 			;;
-		\"zlib\")
-			echo "CONFIGURE_ARGS+=--with-zlib"
-			;;
-		\"bzip2\")
-			if [ -x /usr/bin/bzip2 ]; then
-				BZ2PREFIX=/usr
-			else
-				BZ2PREFIX=/usr/local
-				echo "LIB_DEPENDS+=	bz2.1:\${PORTSDIR}/archivers/bzip2"
-			fi
-			echo "CONFIGURE_ARGS+=--with-bz2=${BZ2PREFIX}"
-			;;
-		\"cracklib\")
-			echo "BUILD_DEPENDS+=   \${LOCALBASE}/lib/libcrack.a:\${PORTSDIR}/security/cracklib"
-			echo "CONFIGURE_ARGS+=--with-crack=\${LOCALBASE}"
-			;;
-		\"mcrypt\")
-			echo "LIB_DEPENDS+=	mcrypt.8:\${PORTSDIR}/security/libmcrypt"
-			echo "CONFIGURE_ARGS+=--with-mcrypt=\${LOCALBASE}"
-			;;
-		\"mhash\")
-			echo "LIB_DEPENDS+=	mhash.2:\${PORTSDIR}/security/mhash"
-			echo "CONFIGURE_ARGS+=--with-mhash=\${LOCALBASE}"
-			;;
-		\"pdflib\")
-			echo "LIB_DEPENDS+=	pdf.5:\${PORTSDIR}/print/pdflib"
-			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
-			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
-			echo "LIB_DEPENDS+=	tiff.4:\${PORTSDIR}/graphics/tiff"
-			echo "CONFIGURE_ARGS+=--with-pdflib=\${LOCALBASE} \\"
-			echo "		--with-zlib-dir=/usr \\"
-			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
-			echo "		--with-png-dir=\${LOCALBASE} \\"
-			echo "		--with-tiff-dir=\${LOCALBASE}"
-			;;
-		\"IMAP\")
-			if [ -z "$IMAP" ]; then
-				echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
-				echo "CONFIGURE_ARGS+=--with-imap=\${LOCALBASE}"
-				IMAP=1
-			fi
-			;;
-		\"IMAP-SSL\")
-			echo "CONFIGURE_ARGS+=--with-imap-ssl=\${LOCALBASE}"
-			if [ -z "$IMAP" ]; then
-				set $* \"IMAP\"
-			fi
- 			;;
-		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
-			echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}"
-			MYSQL=1
-			;;
-		\"PostgreSQL\")
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			if [ -x ${LOCALBASE}/pgsql/bin/postgres -a ! -x ${LOCALBASE}/bin/postgres ]; then
-				PGPREFIX=${LOCALBASE}/pgsql
-			else
-				PGPREFIX=${LOCALBASE}
-				echo "CFLAGS+=-I\${LOCALBASE}/include/pgsql"
-			fi
-			echo "PGPREFIX=${PGPREFIX}"
-			echo "CONFIGURE_ARGS+=--with-pgsql=\${PGPREFIX}"
-			if /usr/bin/ldd ${PGPREFIX}/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then
-				echo "USE_OPENSSL=	yes"
-				LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
-			fi
-			;;
-		\"SybaseDB\")
-			echo "LIB_DEPENDS+=	sybdb.3:\${PORTSDIR}/databases/freetds"
-			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
-			echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}"
-			if [ "$SYBASECT" ]; then
-				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			SYBASEDB=1
-			;;
-		\"SybaseCT\")
-			echo "LIB_DEPENDS+=	ct.1:\${PORTSDIR}/databases/freetds"
-			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
-			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}"
-			if [ "$SYBASEDB" ]; then
-				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			SYBASECT=1
-			;;
-		\"Interbase\")
-			echo "LIB_DEPENDS+=	gds.1:\${PORTSDIR}/databases/firebird"
-			echo "CONFIGURE_ARGS+=--with-interbase=\${LOCALBASE}/firebird"
-			;;
-		\"dBase\")
-			echo "CONFIGURE_ARGS+=--with-dbase"
-			;;
-		\"GDBM\")
-			echo "LIB_DEPENDS+=	gdbm.3:\${PORTSDIR}/databases/gdbm"
-			echo "CONFIGURE_ARGS+=--with-gdbm=\${LOCALBASE}"
-			;;
-		\"OpenLDAP1\")
-			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap12"
-			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap12"
-			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
-			if [ "$OPENLDAP2" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
-				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
-			fi
-			OPENLDAP1=1
-			;;
-		\"OpenLDAP2\")
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
-			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20"
-			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
-			if [ "$OPENLDAP1" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
-				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
-			fi
-			OPENLDAP2=1
-			;;
-		\"OpenSSL\")
-			echo "USE_OPENSSL=yes"
-			echo "CONFIGURE_ARGS+=--with-openssl=\${OPENSSLBASE}"
-			;;
-		\"SNMP\")
-			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/net-snmp4"
-			echo "CONFIGURE_ARGS+=--with-snmp=\${LOCALBASE} --enable-ucd-snmp-hack --with-openssl=\${OPENSSLBASE}"
-			echo "USE_OPENSSL=	yes"
-			LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
-			;;
-		\"XML\")
-			if [ -z "$XML" ]; then
-				echo "LIB_DEPENDS+=	expat.4:\${PORTSDIR}/textproc/expat2"
-				echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}"
-				XML=1
-			fi
-			;;
-		\"XMLRPC\")
-			echo "CONFIGURE_ARGS+=--with-xmlrpc"
-			if [ -z "$XML" ]; then
-				set $* \"XML\"
-			fi
-			if [ -z "$ICONV" ]; then
-				set $* \"iconv\"
-			fi
-			;;
-		\"XSLT\")
-			echo "LIB_DEPENDS+=	sablot.70:\${PORTSDIR}/textproc/sablotron"
-			echo "CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=\${LOCALBASE}"
-			if [ -z "$XML" ]; then
-				set $* \"XML\"
-			fi
-			if [ -z "$ICONV" ]; then
-				set $* \"iconv\"
-			fi
-			;;
-		\"WDDX\")
-			echo "CONFIGURE_ARGS+=--enable-wddx"
-			if [ -z "$XML" ]; then
-				set $* \"XML\"
-			fi
-			;;
-		\"DOMXML\")
-			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
-			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
-			;;
-		\"FTP\")
-			echo "CONFIGURE_ARGS+=--enable-ftp"
-			;;
-		\"CURL\")
-			echo "CONFIGURE_ARGS+=--with-curl=\${LOCALBASE}"
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
-                        ;;
-		\"gettext\")
-			echo "LIB_DEPENDS+=	intl.4:\${PORTSDIR}/devel/gettext"
-			echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
-			;;
-		\"iconv\")
-			if [ -z "$ICONV" ]; then
-				echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
-				echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}"
-				ICONV=1
-			fi
-			;;
-		\"recode\")
-			echo "LIB_DEPENDS+=	recode.3:\${PORTSDIR}/converters/recode"
-			echo "CONFIGURE_ARGS+=--with-recode=\${LOCALBASE}"
-			;;
-		\"pspell\")
-			echo "LIB_DEPENDS+=	aspell.15:\${PORTSDIR}/textproc/aspell"
-			echo "CONFIGURE_ARGS+=--with-pspell=\${LOCALBASE}"
-			;;
-		\"mbregex\")
-			echo "CONFIGURE_ARGS+=--enable-mbregex"
-			;;
-		\"mbstring\")
-			echo "CONFIGURE_ARGS+=--enable-mbstring"
-			;;
-		\"YP\")
-			echo "CONFIGURE_ARGS+=--enable-yp"
-			;;
-		\"BCMath\")
-			echo "CONFIGURE_ARGS+=--enable-bcmath"
-			;;
-		\"Hyperwave\")
-			echo "CONFIGURE_ARGS+=--with-hyperwave=yes"
-			;;
-		\"mcve\")
-			echo "LIB_DEPENDS+=	mcve.3:\${PORTSDIR}/devel/libmcve"
-			echo "CONFIGURE_ARGS+=--with-mcve=\${LOCALBASE}"
- 			;;
-		\"ming\")
-			echo "LIB_DEPENDS+=	ming.3:\${PORTSDIR}/graphics/ming"
-			echo "CONFIGURE_ARGS+=--with-ming=\${LOCALBASE}"
-			;;
-		\"MCAL\")
-			echo "CONFIGURE_ARGS+=--with-mcal=\${LOCALBASE}"
-			echo "LIB_DEPENDS+=	mcal.0:\${PORTSDIR}/misc/libmcal"
-			;;
-		\"sockets\")
-			echo "CONFIGURE_ARGS+=--enable-sockets"
-			;;
-		\"sysvsem\")
-			echo "CONFIGURE_ARGS+=--enable-sysvsem"
-			;;
-		\"sysvshm\")
-			echo "CONFIGURE_ARGS+=--enable-sysvshm"
-			;;
-		\"transsid\")
-			echo "CONFIGURE_ARGS+=--enable-trans-sid"
-			;;
-		\"yaz\")
-			echo "LIB_DEPENDS+=	yaz.2:\${PORTSDIR}/net/yaz"
-			echo "CONFIGURE_ARGS+=--with-yaz=\${LOCALBASE}/bin"
-			;;
-		*)
-			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ "${LIBS}" ]; then
-	echo "CONFIGURE_ENV+=	LIBS='${LIBS}'"
-fi
-
-if [ -z "${MYSQL}" ]; then
-	echo "WITHOUT_MYSQL=	1"
-fi
diff --git a/www/mod_php5/Makefile b/www/mod_php5/Makefile
index 397afe01062..7f1f4355a75 100644
--- a/www/mod_php5/Makefile
+++ b/www/mod_php5/Makefile
@@ -4,107 +4,18 @@
 #
 # $FreeBSD$
 #
+# Instructions on how to enable preferred extensions can be found in the
+# Makefile of the master port (lang/php4).
+#
 
-PORTNAME=	mod_php4
-PORTVERSION=	4.3.1
-PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	www
-MASTER_SITES=	http://us.php.net/${PHP_DISTDIR}/ \
-		http://php.he.net/${PHP_DISTDIR}/ \
-		http://www.php3.de/${PHP_DISTDIR}/ \
-		http://au.php.net/${PHP_DISTDIR}/ \
-		http://at.php.net/${PHP_DISTDIR}/ \
-		http://br.php.net/${PHP_DISTDIR}/ \
-		http://php.easydns.com/${PHP_DISTDIR}/ \
-		http://www.php.cz/${PHP_DISTDIR}/ \
-		http://php3.globe.de/${PHP_DISTDIR}/
-DISTNAME=	php-${PORTVERSION}
-
-MAINTAINER=	dirk@FreeBSD.org
-COMMENT=	PHP4 module for Apache
-
-BUILD_DEPENDS=	${APXS}:${APACHE_PORT}
-RUN_DEPENDS=	${APXS}:${APACHE_PORT}
-.if defined(WITH_APACHE2)
-LIB_DEPENDS=	pth.20:${PORTSDIR}/devel/pth
-.endif
-
-PHP_DISTDIR=	distributions
-
-USE_BZIP2=	yes
-USE_SUBMAKE=	yes
-USE_AUTOCONF_VER=213
-.if defined(WITH_APACHE2)
-APACHE_PORT?=	${PORTSDIR}/www/apache2
-.else
-APACHE_PORT?=	${PORTSDIR}/www/apache13
-.endif
-APXS?=		${LOCALBASE}/sbin/apxs
-
-.if !defined(BATCH) && !defined(PACKAGE_BUILDING)
-IS_INTERACTIVE=	yes
-.endif
-
-.if defined(WITH_APACHE2)
-CONFIGURE_ARGS=	--with-apxs2=${PREFIX}/sbin/apxs \
-		--with-tsrm-pth
-PLIST_SUB=	MOD_DIR=libexec/apache2
-.else
-CONFIGURE_ARGS=	--with-apxs=${PREFIX}/sbin/apxs
-PLIST_SUB=	MOD_DIR=libexec/apache
-.endif
-CONFIGURE_ARGS+=--with-config-file-path=${PREFIX}/etc \
-		--enable-versioning \
-		--with-regex=system \
-		--without-gd \
-		--without-mysql
-
-CFLAGS+=	-I${PREFIX}/include
-
-SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}" \
-		TOUCH="${TOUCH}" \
-		MKDIR="${MKDIR}" \
-		CAT="${CAT}" \
-		PHP4_OPTIONS="${PHP4_OPTIONS}" \
-		REALCURDIR="${.CURDIR}"
-
-pre-fetch:
-	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.php
-.if !defined(WITH_APACHE2)
-	@${ECHO_CMD} "Define WITH_APACHE2 to build mod_php4 as an apache2 module."
-	@${ECHO_CMD} ""
-.endif
-
-post-install:
-	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc
-
-	@${ECHO_CMD} "*****************************************************************************"
-	@${ECHO_CMD} "Make sure the mime.types are connected to the php module properly and"
-	@${ECHO_CMD} "index.php is part of your DirectoryIndex."
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "The following should be in your Apache configuration file:"
-	@${ECHO_CMD} "[...]"
-	@${ECHO_CMD} "DirectoryIndex index.php index.html"
-	@${ECHO_CMD} "[...]"
-	@${ECHO_CMD} "AddType application/x-httpd-php .php"
-	@${ECHO_CMD} "AddType application/x-httpd-php-source .phps"
-	@${ECHO_CMD} "[...]"
-	@${ECHO_CMD} "*****************************************************************************"
 
-post-clean:
-	@${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc
+MAINTAINER=	sysadmin@alexdupre.com
 
-.if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc)
-.include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc"
-.endif
+PKGMESSAGE=	${.CURDIR}/pkg-message
+MASTERDIR=	${.CURDIR}/../../lang/php4
 
-# XXX:
-# Has to be kept in sync with the defaults in configure.php
-.ifndef(WITHOUT_MYSQL)
-.ifmake describe
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
-.endif
-.endif
+WITHOUT_CLI=	yes
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/www/mod_php5/distinfo b/www/mod_php5/distinfo
deleted file mode 100644
index 6e45abe2f96..00000000000
--- a/www/mod_php5/distinfo
+++ /dev/null
@@ -1 +0,0 @@
-MD5 (php-4.3.1.tar.bz2) = bbfe584acb3549c62bb61355165e2ca6
diff --git a/www/mod_php5/files/patch-ext_domxml_config.m4 b/www/mod_php5/files/patch-ext_domxml_config.m4
deleted file mode 100644
index 7c3ff4fac8c..00000000000
--- a/www/mod_php5/files/patch-ext_domxml_config.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/domxml/config.m4.orig	Wed Dec 19 18:40:15 2001
-+++ ext/domxml/config.m4	Wed Dec 19 18:42:15 2001
-@@ -53,6 +53,8 @@
- 
-   PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
-   PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)
-+dnl next line is for iconv.h
-+  PHP_ADD_INCLUDE($DOMXML_DIR/include)
- 
-   if test "$PHP_ZLIB_DIR" = "no"; then
-     AC_MSG_ERROR(DOMXML requires ZLIB. Use --with-zlib-dir=<DIR>)
diff --git a/www/mod_php5/files/patch-ext_mcal_config.m4 b/www/mod_php5/files/patch-ext_mcal_config.m4
deleted file mode 100644
index 82164615476..00000000000
--- a/www/mod_php5/files/patch-ext_mcal_config.m4
+++ /dev/null
@@ -1,17 +0,0 @@
---- ext/mcal/config.m4.orig	Wed Mar 27 11:26:16 2002
-+++ ext/mcal/config.m4	Fri Jan  3 19:38:46 2003
-@@ -41,5 +41,14 @@
-   PHP_SUBST(MCAL_SHARED_LIBADD)
-   AC_DEFINE(HAVE_MCAL,1,[ ])
-   PHP_NEW_EXTENSION(mcal, php_mcal.c, $ext_shared)
-+  cat >> confdefs.h <<\EOF
-+/* Interfaces to callbacks in libmcal */
-+#include <mcal/mcal.h>
-+void cc_searched (unsigned long cal_uid) {}
-+void cc_fetched(const CALEVENT *event) {}
-+void cc_login(const char **user, const char **pwd) {}
-+void cc_vlog(const char *fmt,va_list ap) {}
-+void cc_vdlog(const char *fmt,va_list ap) {}
-+EOF
- fi
- 
diff --git a/www/mod_php5/files/patch-ext_ming_php_ming.h b/www/mod_php5/files/patch-ext_ming_php_ming.h
deleted file mode 100644
index f07deba0c86..00000000000
--- a/www/mod_php5/files/patch-ext_ming_php_ming.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ext/ming/php_ming.h.orig	Mon Apr  8 02:46:22 2002
-+++ ext/ming/php_ming.h	Fri Jan  3 19:35:55 2003
-@@ -24,7 +24,7 @@
- extern zend_module_entry ming_module_entry;
- #define ming_module_ptr &ming_module_entry
- 
--#include <ming.h>
-+#include <ming/ming.h>
- 
- PHP_RINIT_FUNCTION(ming);
- PHP_MINIT_FUNCTION(ming);
diff --git a/www/mod_php5/files/patch-ext_sybase_ct_config.m4 b/www/mod_php5/files/patch-ext_sybase_ct_config.m4
deleted file mode 100644
index 127a369b108..00000000000
--- a/www/mod_php5/files/patch-ext_sybase_ct_config.m4
+++ /dev/null
@@ -1,21 +0,0 @@
---- ext/sybase_ct/config.m4.orig	Fri Nov 30 23:12:31 2001
-+++ ext/sybase_ct/config.m4	Tue Apr 23 21:53:54 2002
-@@ -30,17 +30,12 @@
-     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
-     SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-   else
--    PHP_ADD_LIBRARY(cs,, SYBASE_CT_SHARED_LIBADD)
-     PHP_ADD_LIBRARY(ct,, SYBASE_CT_SHARED_LIBADD)
--    PHP_ADD_LIBRARY(comn,, SYBASE_CT_SHARED_LIBADD)
--    PHP_ADD_LIBRARY(intl,, SYBASE_CT_SHARED_LIBADD)
-   
--    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl"
-+    SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct"
-   
-     PHP_CHECK_LIBRARY(tcl, netg_errstr, [
-       PHP_ADD_LIBRARY(tcl,,SYBASE_CT_SHARED_LIBADD)
--    ],[ 
--      PHP_ADD_LIBRARY(sybtcl,,SYBASE_CT_SHARED_LIBADD)
-     ],[ 
-       $SYBASE_CT_LIBS 
-     ])
diff --git a/www/mod_php5/pkg-descr b/www/mod_php5/pkg-descr
deleted file mode 100644
index cea408b8d55..00000000000
--- a/www/mod_php5/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-Server-side, cross-platform, HTML embedded scripting language which
-offers easy database integration.
-
-WWW:	http://www.php.net/
diff --git a/www/mod_php5/pkg-message b/www/mod_php5/pkg-message
index c984c30fe06..b37ebc0c85a 100644
--- a/www/mod_php5/pkg-message
+++ b/www/mod_php5/pkg-message
@@ -1,20 +1,18 @@
 *****************************************************************************
+
 You have installed the mod_php4 package.
 
-Have a look at the mod_php4 _port_ if you need additional support for
-databases other than MySQL, e. g.
+Have a look at the php-mod-dev port if you need additional extensions
+other than ctype, MySQL, PCRE, POSIX, session, tokenizer, XML and ZLIB.
 
 You can find it at
 ftp://ftp.freebsd.org/pub/FreeBSD/FreeBSD-current/ports/www/mod_php4.tar
 
-Make sure the mime.types are connected to the php module properly and
-index.php is part of your DirectoryIndex.
+Make sure index.php is part of your DirectoryIndex.
+
+You should add the following to your Apache configuration file:
 
-The following should be in your Apache configuration file:
-[...]
-DirectoryIndex index.php index.html
-[...]
 AddType application/x-httpd-php .php
 AddType application/x-httpd-php-source .phps
-[...]
+
 *****************************************************************************
diff --git a/www/mod_php5/pkg-plist b/www/mod_php5/pkg-plist
deleted file mode 100644
index 115ff74278c..00000000000
--- a/www/mod_php5/pkg-plist
+++ /dev/null
@@ -1,389 +0,0 @@
-bin/pear
-bin/php
-bin/php-config
-bin/phpextdist
-bin/phpize
-etc/php.ini-dist
-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_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_types.h
-include/php/Zend/zend_variables.h
-include/php/acconfig.h
-include/php/ext/mbstring/cp932_table.h
-include/php/ext/mbstring/mbfilter.h
-include/php/ext/mbstring/mbfilter_cn.h
-include/php/ext/mbstring/mbfilter_ja.h
-include/php/ext/mbstring/mbfilter_kr.h
-include/php/ext/mbstring/mbfilter_ru.h
-include/php/ext/mbstring/mbfilter_tw.h
-include/php/ext/mbstring/mbregex.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/mbstring/unicode_table.h
-include/php/ext/mbstring/unicode_table_cn.h
-include/php/ext/mbstring/unicode_table_ja.h
-include/php/ext/mbstring/unicode_table_kr.h
-include/php/ext/mbstring/unicode_table_ru.h
-include/php/ext/mbstring/unicode_table_tw.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/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/main/SAPI.h
-include/php/main/build-defs.h
-include/php/main/config.nw.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_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/php_version.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/.filemap
-lib/php/.lock
-lib/php/.registry/Archive_Tar.reg
-lib/php/.registry/Console_Getopt.reg
-lib/php/.registry/DB.reg
-lib/php/.registry/HTTP.reg
-lib/php/.registry/Mail.reg
-lib/php/.registry/Net_SMTP.reg
-lib/php/.registry/Net_Socket.reg
-lib/php/.registry/PEAR.reg
-lib/php/.registry/XML_Parser.reg
-lib/php/.registry/XML_RPC.reg
-lib/php/Archive/Tar.php
-lib/php/Console/Getopt.php
-lib/php/DB.php
-lib/php/DB/common.php
-lib/php/DB/dbase.php
-lib/php/DB/fbsql.php
-lib/php/DB/ibase.php
-lib/php/DB/ifx.php
-lib/php/DB/msql.php
-lib/php/DB/mssql.php
-lib/php/DB/mysql.php
-lib/php/DB/oci8.php
-lib/php/DB/odbc.php
-lib/php/DB/pgsql.php
-lib/php/DB/storage.php
-lib/php/DB/sybase.php
-lib/php/HTTP.php
-lib/php/Mail.php
-lib/php/Mail/RFC822.php
-lib/php/Mail/mail.php
-lib/php/Mail/sendmail.php
-lib/php/Mail/smtp.php
-lib/php/Net/SMTP.php
-lib/php/Net/Socket.php
-lib/php/OS/Guess.php
-lib/php/PEAR.php
-lib/php/PEAR/Autoloader.php
-lib/php/PEAR/Builder.php
-lib/php/PEAR/Command.php
-lib/php/PEAR/Command/Auth.php
-lib/php/PEAR/Command/Build.php
-lib/php/PEAR/Command/Common.php
-lib/php/PEAR/Command/Config.php
-lib/php/PEAR/Command/Install.php
-lib/php/PEAR/Command/Package.php
-lib/php/PEAR/Command/Registry.php
-lib/php/PEAR/Command/Remote.php
-lib/php/PEAR/Common.php
-lib/php/PEAR/Config.php
-lib/php/PEAR/Dependency.php
-lib/php/PEAR/Frontend/CLI.php
-lib/php/PEAR/Installer.php
-lib/php/PEAR/Packager.php
-lib/php/PEAR/Registry.php
-lib/php/PEAR/Remote.php
-lib/php/System.php
-lib/php/XML/Parser.php
-lib/php/XML/RPC.php
-lib/php/XML/RPC/Server.php
-lib/php/build/Makefile.global
-lib/php/build/acinclude.m4
-lib/php/build/mkdep.awk
-lib/php/build/pear.m4
-lib/php/build/scan_makefile_in.awk
-lib/php/build/shtool
-lib/php/data/PEAR/package.dtd
-lib/php/data/PEAR/template.spec
-lib/php/docs/Archive_Tar/docs/Archive_Tar.txt
-lib/php/docs/DB/DB/IDEAS
-lib/php/docs/DB/DB/MAINTAINERS
-lib/php/docs/DB/DB/STATUS
-lib/php/docs/DB/DB/TESTERS
-lib/php/tests/DB/tests/db_error.phpt
-lib/php/tests/DB/tests/db_error2.phpt
-lib/php/tests/DB/tests/db_factory.phpt
-lib/php/tests/DB/tests/db_ismanip.phpt
-lib/php/tests/DB/tests/db_parsedsn.phpt
-lib/php/tests/DB/tests/driver/01connect.phpt
-lib/php/tests/DB/tests/driver/02fetch.phpt
-lib/php/tests/DB/tests/driver/03simplequery.phpt
-lib/php/tests/DB/tests/driver/04numcols.phpt
-lib/php/tests/DB/tests/driver/05sequences.phpt
-lib/php/tests/DB/tests/driver/06prepexec.phpt
-lib/php/tests/DB/tests/driver/08affectedrows.phpt
-lib/php/tests/DB/tests/driver/09numrows.phpt
-lib/php/tests/DB/tests/driver/10errormap.phpt
-lib/php/tests/DB/tests/driver/13limit.phpt
-lib/php/tests/DB/tests/driver/14fetchmode_object.phpt
-lib/php/tests/DB/tests/driver/15quote.phpt
-lib/php/tests/DB/tests/ibase/01connect.phpt
-lib/php/tests/DB/tests/ibase/02fetch.phpt
-lib/php/tests/DB/tests/ibase/03simplequery.phpt
-lib/php/tests/DB/tests/ibase/04numcols.phpt
-lib/php/tests/DB/tests/ibase/05sequences.phpt
-lib/php/tests/DB/tests/ibase/06prepexec.phpt
-lib/php/tests/DB/tests/ibase/10errormap.phpt
-lib/php/tests/DB/tests/mysql/01connect.phpt
-lib/php/tests/DB/tests/mysql/02fetch.phpt
-lib/php/tests/DB/tests/mysql/03simplequery.phpt
-lib/php/tests/DB/tests/mysql/04numcols.phpt
-lib/php/tests/DB/tests/mysql/05sequences.phpt
-lib/php/tests/DB/tests/mysql/06prepexec.phpt
-lib/php/tests/DB/tests/mysql/07errornative.phpt
-lib/php/tests/DB/tests/mysql/08affectedrows.phpt
-lib/php/tests/DB/tests/mysql/09numrows.phpt
-lib/php/tests/DB/tests/mysql/10errormap.phpt
-lib/php/tests/DB/tests/mysql/12tableinfo.phpt
-lib/php/tests/DB/tests/mysql/13limit.phpt
-lib/php/tests/DB/tests/mysql/14fetchmode_object.phpt
-lib/php/tests/DB/tests/oci8/01connect.phpt
-lib/php/tests/DB/tests/oci8/02fetch.phpt
-lib/php/tests/DB/tests/oci8/03simplequery.phpt
-lib/php/tests/DB/tests/oci8/04numcols.phpt
-lib/php/tests/DB/tests/oci8/05sequences.phpt
-lib/php/tests/DB/tests/oci8/06prepexec.phpt
-lib/php/tests/DB/tests/oci8/07errornative.phpt
-lib/php/tests/DB/tests/oci8/08affectedrows.phpt
-lib/php/tests/DB/tests/oci8/09numrows.phpt
-lib/php/tests/DB/tests/oci8/10errormap.phpt
-lib/php/tests/DB/tests/oci8/13limit.phpt
-lib/php/tests/DB/tests/odbc/01connect.phpt
-lib/php/tests/DB/tests/odbc/02fetch.phpt
-lib/php/tests/DB/tests/odbc/03simplequery.phpt
-lib/php/tests/DB/tests/odbc/04numcols.phpt
-lib/php/tests/DB/tests/odbc/06prepexec.phpt
-lib/php/tests/DB/tests/odbc/07errornative.phpt
-lib/php/tests/DB/tests/odbc/09numrows.phpt
-lib/php/tests/DB/tests/odbc/10errormap.phpt
-lib/php/tests/DB/tests/pgsql/01connect.phpt
-lib/php/tests/DB/tests/pgsql/02fetch.phpt
-lib/php/tests/DB/tests/pgsql/03simplequery.phpt
-lib/php/tests/DB/tests/pgsql/04numcols.phpt
-lib/php/tests/DB/tests/pgsql/05sequences.phpt
-lib/php/tests/DB/tests/pgsql/06prepexec.phpt
-lib/php/tests/DB/tests/pgsql/07errornative.phpt
-lib/php/tests/DB/tests/pgsql/08affectedrows.phpt
-lib/php/tests/DB/tests/pgsql/09numrows.phpt
-lib/php/tests/DB/tests/pgsql/10errormap.phpt
-lib/php/tests/DB/tests/pgsql/11transact.phpt
-lib/php/tests/DB/tests/pgsql/13limit.phpt
-lib/php/tests/DB/tests/pgsql/14fetchmode_object.phpt
-lib/php/tests/XML_Parser/tests/001.phpt
-lib/php/tests/XML_Parser/tests/002.phpt
-lib/php/tests/XML_Parser/tests/003.phpt
-lib/php/tests/XML_Parser/tests/004.phpt
-lib/php/tests/XML_Parser/tests/005.phpt
-lib/php/tests/XML_Parser/tests/test2.xml
-lib/php/tests/XML_Parser/tests/test3.xml
-%%MOD_DIR%%/libphp4.so
-@exec %D/sbin/apxs -e -a -n php4 %f
-@unexec %D/sbin/apxs -e -A -n php4 %f
-@dirrm include/php/TSRM
-@dirrm include/php/Zend
-@dirrm include/php/ext/mbstring
-@dirrm include/php/ext/pgsql
-@dirrm include/php/ext/session
-@dirrm include/php/ext/standard
-@dirrm include/php/ext/xml/expat
-@dirrm include/php/ext/xml
-@dirrm include/php/ext
-@dirrm include/php/main
-@dirrm include/php/regex
-@dirrm include/php
-@dirrm lib/php/.registry
-@dirrm lib/php/Archive
-@dirrm lib/php/Console
-@dirrm lib/php/DB
-@dirrm lib/php/Mail
-@dirrm lib/php/Net
-@dirrm lib/php/OS
-@dirrm lib/php/PEAR/Command
-@dirrm lib/php/PEAR/Frontend
-@dirrm lib/php/PEAR
-@dirrm lib/php/XML/RPC
-@dirrm lib/php/XML
-@dirrm lib/php/build
-@dirrm lib/php/data/PEAR
-@dirrm lib/php/data
-@dirrm lib/php/docs/Archive_Tar/docs
-@dirrm lib/php/docs/Archive_Tar
-@dirrm lib/php/docs/DB/DB
-@dirrm lib/php/docs/DB
-@dirrm lib/php/docs
-@dirrm lib/php/extensions/no-debug-non-zts-20020429
-@dirrm lib/php/extensions
-@dirrm lib/php/tests/DB/tests/driver
-@dirrm lib/php/tests/DB/tests/ibase
-@dirrm lib/php/tests/DB/tests/mysql
-@dirrm lib/php/tests/DB/tests/oci8
-@dirrm lib/php/tests/DB/tests/odbc
-@dirrm lib/php/tests/DB/tests/pgsql
-@dirrm lib/php/tests/DB/tests
-@dirrm lib/php/tests/DB
-@dirrm lib/php/tests/XML_Parser/tests
-@dirrm lib/php/tests/XML_Parser
-@dirrm lib/php/tests
-@dirrm lib/php
-@exec mkdir -p %D/lib/php/extensions/no-debug-non-zts-20020429
diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php
deleted file mode 100644
index 56d14c635d4..00000000000
--- a/www/mod_php5/scripts/configure.php
+++ /dev/null
@@ -1,385 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-
-if [ -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc ]; then
-	exit
-fi
-
-tempfile=`/usr/bin/mktemp -t checklist`
-
-if [ "${BATCH}" ]; then
-	if [ "${PHP4_OPTIONS}" ]; then
-		set ${PHP4_OPTIONS}
-	else
-		set \"zlib\" \"MySQL\"
-	fi
-else
-	/usr/bin/dialog --title "configuration options" --clear \
-		--checklist "\n\
-Please select desired options:" -1 -1 16 \
-GD1		"GD 1.x library support" OFF \
-GD2		"GD 2.x library support" OFF \
-zlib		"zlib library support" ON \
-bzip2		"bzip2 library support" OFF \
-cracklib	"cracklib dict support" OFF \
-mcrypt		"Encryption support" OFF \
-mhash		"Crypto-hashing support" OFF \
-pdflib		"pdflib support" OFF \
-IMAP		"IMAP support" OFF \
-IMAP-SSL	"IMAP-SSL support (implies IMAP)" OFF \
-MySQL		"MySQL database support" ON \
-PostgreSQL	"PostgreSQL database support" OFF \
-SybaseDB	"Sybase/MS-SQL database support (DB-lib)" OFF \
-SybaseCT	"Sybase/MS-SQL database support (CT-lib)" OFF \
-Interbase	"Interbase 6 database support (Firebird)" OFF \
-dBase		"dBase database support" OFF \
-GDBM		"GNU database manager support" OFF \
-OpenLDAP1	"OpenLDAP 1.x support" OFF \
-OpenLDAP2	"OpenLDAP 2.x support" OFF \
-OpenSSL		"OpenSSL support" OFF \
-SNMP		"SNMP support" OFF \
-XML		"XML support" OFF \
-XMLRPC		"XMLRPC-EPI support (implies XML and iconv)" OFF \
-XSLT		"Sablotron support (implies XML and iconv)" OFF \
-WDDX		"WDDX support (implies XML)" OFF \
-DOMXML		"DOM support" OFF \
-FTP		"File Transfer Protocol support" OFF \
-CURL		"CURL support" OFF \
-gettext		"gettext library support" OFF \
-iconv		"iconv support" OFF \
-recode		"recode support" OFF \
-pspell		"pspell support" OFF \
-mbregex		"multibyte regular expressions module" OFF \
-mbstring	"multibyte string module" OFF \
-YP		"YP/NIS support" OFF \
-BCMath		"BCMath support" OFF \
-Hyperwave	"Hyperwave support" OFF \
-mcve		"MCVE Credit Card Verification support" OFF \
-ming		"ming library support" OFF \
-MCAL		"Modular Calendar Access Library support" OFF \
-sockets		"sockets support" OFF \
-sysvsem		"System V semaphore support" OFF \
-sysvshm		"System V shared memory support" OFF \
-transsid	"Transparent session id" OFF \
-yaz		"YAZ support (ANSI/NISO Z39.50)" OFF \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `cat $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-${MKDIR} ${WRKDIRPREFIX}${REALCURDIR}
-exec > ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-
-while [ "$1" ]; do
-	case $1 in
-		\"GD1\")
-			echo "LIB_DEPENDS+=	gd.2:\${PORTSDIR}/graphics/gd"
-			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
-			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
-			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
-			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
-			echo "		--enable-gd-native-ttf \\"
-			echo "		--with-freetype-dir=\${LOCALBASE} \\"
-			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
-			echo "		--with-png-dir=\${LOCALBASE}"
-			if [ "$GD2" ]; then
-				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			GD1=1
-			;;
-
-		\"GD2\")
-			echo "LIB_DEPENDS+=	gd.4:\${PORTSDIR}/graphics/gd2"
-			echo "LIB_DEPENDS+=	freetype.9:\${PORTSDIR}/print/freetype2"
-			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
-			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
-			echo "CONFIGURE_ARGS+=--with-gd=\${LOCALBASE} \\"
-			echo "		--enable-gd-native-ttf \\"
-			echo "		--with-freetype-dir=\${LOCALBASE} \\"
-			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
-			echo "		--with-png-dir=\${LOCALBASE}"
-			if [ "$GD1" ]; then
-				echo "GD1 and GD2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			GD2=1
- 			;;
-		\"zlib\")
-			echo "CONFIGURE_ARGS+=--with-zlib"
-			;;
-		\"bzip2\")
-			if [ -x /usr/bin/bzip2 ]; then
-				BZ2PREFIX=/usr
-			else
-				BZ2PREFIX=/usr/local
-				echo "LIB_DEPENDS+=	bz2.1:\${PORTSDIR}/archivers/bzip2"
-			fi
-			echo "CONFIGURE_ARGS+=--with-bz2=${BZ2PREFIX}"
-			;;
-		\"cracklib\")
-			echo "BUILD_DEPENDS+=   \${LOCALBASE}/lib/libcrack.a:\${PORTSDIR}/security/cracklib"
-			echo "CONFIGURE_ARGS+=--with-crack=\${LOCALBASE}"
-			;;
-		\"mcrypt\")
-			echo "LIB_DEPENDS+=	mcrypt.8:\${PORTSDIR}/security/libmcrypt"
-			echo "CONFIGURE_ARGS+=--with-mcrypt=\${LOCALBASE}"
-			;;
-		\"mhash\")
-			echo "LIB_DEPENDS+=	mhash.2:\${PORTSDIR}/security/mhash"
-			echo "CONFIGURE_ARGS+=--with-mhash=\${LOCALBASE}"
-			;;
-		\"pdflib\")
-			echo "LIB_DEPENDS+=	pdf.5:\${PORTSDIR}/print/pdflib"
-			echo "LIB_DEPENDS+=	jpeg.9:\${PORTSDIR}/graphics/jpeg"
-			echo "LIB_DEPENDS+=	png.5:\${PORTSDIR}/graphics/png"
-			echo "LIB_DEPENDS+=	tiff.4:\${PORTSDIR}/graphics/tiff"
-			echo "CONFIGURE_ARGS+=--with-pdflib=\${LOCALBASE} \\"
-			echo "		--with-zlib-dir=/usr \\"
-			echo "		--with-jpeg-dir=\${LOCALBASE} \\"
-			echo "		--with-png-dir=\${LOCALBASE} \\"
-			echo "		--with-tiff-dir=\${LOCALBASE}"
-			;;
-		\"IMAP\")
-			if [ -z "$IMAP" ]; then
-				echo "LIB_DEPENDS+=	c-client4.8:\${PORTSDIR}/mail/cclient"
-				echo "CONFIGURE_ARGS+=--with-imap=\${LOCALBASE}"
-				IMAP=1
-			fi
-			;;
-		\"IMAP-SSL\")
-			echo "CONFIGURE_ARGS+=--with-imap-ssl=\${LOCALBASE}"
-			if [ -z "$IMAP" ]; then
-				set $* \"IMAP\"
-			fi
- 			;;
-		\"MySQL\")
-			echo "LIB_DEPENDS+=	mysqlclient.10:\${PORTSDIR}/databases/mysql323-client"
-			echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}"
-			MYSQL=1
-			;;
-		\"PostgreSQL\")
-			echo "POSTGRESQL_PORT?=	databases/postgresql7"
-			echo "LIB_DEPENDS+=	pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
-			if [ -x ${LOCALBASE}/pgsql/bin/postgres -a ! -x ${LOCALBASE}/bin/postgres ]; then
-				PGPREFIX=${LOCALBASE}/pgsql
-			else
-				PGPREFIX=${LOCALBASE}
-				echo "CFLAGS+=-I\${LOCALBASE}/include/pgsql"
-			fi
-			echo "PGPREFIX=${PGPREFIX}"
-			echo "CONFIGURE_ARGS+=--with-pgsql=\${PGPREFIX}"
-			if /usr/bin/ldd ${PGPREFIX}/bin/postgres 2> /dev/null | /usr/bin/grep -q "libssl"; then
-				echo "USE_OPENSSL=	yes"
-				LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
-			fi
-			;;
-		\"SybaseDB\")
-			echo "LIB_DEPENDS+=	sybdb.3:\${PORTSDIR}/databases/freetds"
-			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
-			echo "CONFIGURE_ARGS+=--with-sybase=\${LOCALBASE}"
-			if [ "$SYBASECT" ]; then
-				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			SYBASEDB=1
-			;;
-		\"SybaseCT\")
-			echo "LIB_DEPENDS+=	ct.1:\${PORTSDIR}/databases/freetds"
-			echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
-			echo "CONFIGURE_ARGS+=--with-sybase-ct=\${LOCALBASE}"
-			if [ "$SYBASEDB" ]; then
-				echo "SybaseDB and SybaseCT are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			SYBASECT=1
-			;;
-		\"Interbase\")
-			echo "LIB_DEPENDS+=	gds.1:\${PORTSDIR}/databases/firebird"
-			echo "CONFIGURE_ARGS+=--with-interbase=\${LOCALBASE}/firebird"
-			;;
-		\"dBase\")
-			echo "CONFIGURE_ARGS+=--with-dbase"
-			;;
-		\"GDBM\")
-			echo "LIB_DEPENDS+=	gdbm.3:\${PORTSDIR}/databases/gdbm"
-			echo "CONFIGURE_ARGS+=--with-gdbm=\${LOCALBASE}"
-			;;
-		\"OpenLDAP1\")
-			echo "LIB_DEPENDS+=	ldap.1:\${PORTSDIR}/net/openldap12"
-			echo "LIB_DEPENDS+=	lber.1:\${PORTSDIR}/net/openldap12"
-			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
-			if [ "$OPENLDAP2" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
-				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
-			fi
-			OPENLDAP1=1
-			;;
-		\"OpenLDAP2\")
-			echo "LIB_DEPENDS+=	ldap.2:\${PORTSDIR}/net/openldap20"
-			echo "LIB_DEPENDS+=	lber.2:\${PORTSDIR}/net/openldap20"
-			echo "CONFIGURE_ARGS+=--with-ldap=\${LOCALBASE}"
-			if [ "$OPENLDAP1" ]; then
-				echo "OpenLDAP1 and OpenLDAP2 are mutually exclusive." > /dev/stderr
-				rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-				exit 1
-			fi
-			if [ -f /usr/lib/libkrb.a -a -f /usr/lib/libdes.a -a ! -L /usr/lib/libdes.a ]; then
-				LIBS="${LIBS} -lkrb -ldes -L\${LOCALBASE}/lib"
-			fi
-			OPENLDAP2=1
-			;;
-		\"OpenSSL\")
-			echo "USE_OPENSSL=yes"
-			echo "CONFIGURE_ARGS+=--with-openssl=\${OPENSSLBASE}"
-			;;
-		\"SNMP\")
-			echo "LIB_DEPENDS+=	snmp.4:\${PORTSDIR}/net/net-snmp4"
-			echo "CONFIGURE_ARGS+=--with-snmp=\${LOCALBASE} --enable-ucd-snmp-hack --with-openssl=\${OPENSSLBASE}"
-			echo "USE_OPENSSL=	yes"
-			LIBS="${LIBS} -L\${OPENSSLBASE}/lib -lcrypto -lssl"
-			;;
-		\"XML\")
-			if [ -z "$XML" ]; then
-				echo "LIB_DEPENDS+=	expat.4:\${PORTSDIR}/textproc/expat2"
-				echo "CONFIGURE_ARGS+=--with-expat-dir=\${LOCALBASE}"
-				XML=1
-			fi
-			;;
-		\"XMLRPC\")
-			echo "CONFIGURE_ARGS+=--with-xmlrpc"
-			if [ -z "$XML" ]; then
-				set $* \"XML\"
-			fi
-			if [ -z "$ICONV" ]; then
-				set $* \"iconv\"
-			fi
-			;;
-		\"XSLT\")
-			echo "LIB_DEPENDS+=	sablot.70:\${PORTSDIR}/textproc/sablotron"
-			echo "CONFIGURE_ARGS+=--enable-xslt --with-xslt-sablot=\${LOCALBASE}"
-			if [ -z "$XML" ]; then
-				set $* \"XML\"
-			fi
-			if [ -z "$ICONV" ]; then
-				set $* \"iconv\"
-			fi
-			;;
-		\"WDDX\")
-			echo "CONFIGURE_ARGS+=--enable-wddx"
-			if [ -z "$XML" ]; then
-				set $* \"XML\"
-			fi
-			;;
-		\"DOMXML\")
-			echo "LIB_DEPENDS+=	xml2.5:\${PORTSDIR}/textproc/libxml2"
-			echo "CONFIGURE_ARGS+=--with-dom=\${LOCALBASE}"
-			;;
-		\"FTP\")
-			echo "CONFIGURE_ARGS+=--enable-ftp"
-			;;
-		\"CURL\")
-			echo "CONFIGURE_ARGS+=--with-curl=\${LOCALBASE}"
-			echo "BUILD_DEPENDS+=	\${LOCALBASE}/lib/libcurl.a:\${PORTSDIR}/ftp/curl"
-                        ;;
-		\"gettext\")
-			echo "LIB_DEPENDS+=	intl.4:\${PORTSDIR}/devel/gettext"
-			echo "CONFIGURE_ARGS+=--with-gettext=\${LOCALBASE}"
-			;;
-		\"iconv\")
-			if [ -z "$ICONV" ]; then
-				echo "LIB_DEPENDS+=	iconv.3:\${PORTSDIR}/converters/libiconv"
-				echo "CONFIGURE_ARGS+=--with-iconv=\${LOCALBASE}"
-				ICONV=1
-			fi
-			;;
-		\"recode\")
-			echo "LIB_DEPENDS+=	recode.3:\${PORTSDIR}/converters/recode"
-			echo "CONFIGURE_ARGS+=--with-recode=\${LOCALBASE}"
-			;;
-		\"pspell\")
-			echo "LIB_DEPENDS+=	aspell.15:\${PORTSDIR}/textproc/aspell"
-			echo "CONFIGURE_ARGS+=--with-pspell=\${LOCALBASE}"
-			;;
-		\"mbregex\")
-			echo "CONFIGURE_ARGS+=--enable-mbregex"
-			;;
-		\"mbstring\")
-			echo "CONFIGURE_ARGS+=--enable-mbstring"
-			;;
-		\"YP\")
-			echo "CONFIGURE_ARGS+=--enable-yp"
-			;;
-		\"BCMath\")
-			echo "CONFIGURE_ARGS+=--enable-bcmath"
-			;;
-		\"Hyperwave\")
-			echo "CONFIGURE_ARGS+=--with-hyperwave=yes"
-			;;
-		\"mcve\")
-			echo "LIB_DEPENDS+=	mcve.3:\${PORTSDIR}/devel/libmcve"
-			echo "CONFIGURE_ARGS+=--with-mcve=\${LOCALBASE}"
- 			;;
-		\"ming\")
-			echo "LIB_DEPENDS+=	ming.3:\${PORTSDIR}/graphics/ming"
-			echo "CONFIGURE_ARGS+=--with-ming=\${LOCALBASE}"
-			;;
-		\"MCAL\")
-			echo "CONFIGURE_ARGS+=--with-mcal=\${LOCALBASE}"
-			echo "LIB_DEPENDS+=	mcal.0:\${PORTSDIR}/misc/libmcal"
-			;;
-		\"sockets\")
-			echo "CONFIGURE_ARGS+=--enable-sockets"
-			;;
-		\"sysvsem\")
-			echo "CONFIGURE_ARGS+=--enable-sysvsem"
-			;;
-		\"sysvshm\")
-			echo "CONFIGURE_ARGS+=--enable-sysvshm"
-			;;
-		\"transsid\")
-			echo "CONFIGURE_ARGS+=--enable-trans-sid"
-			;;
-		\"yaz\")
-			echo "LIB_DEPENDS+=	yaz.2:\${PORTSDIR}/net/yaz"
-			echo "CONFIGURE_ARGS+=--with-yaz=\${LOCALBASE}/bin"
-			;;
-		*)
-			echo "Invalid option(s): $*" > /dev/stderr
-			rm -f ${WRKDIRPREFIX}${REALCURDIR}/Makefile.inc
-			exit 1
-			;;
-	esac
-	shift
-done
-
-if [ "${LIBS}" ]; then
-	echo "CONFIGURE_ENV+=	LIBS='${LIBS}'"
-fi
-
-if [ -z "${MYSQL}" ]; then
-	echo "WITHOUT_MYSQL=	1"
-fi