Update php4 and modules to 4.0.5. Changes from version 4.0.4.1nb1 include

many general bugfixes, important fixes to the pgsql module to support
PostgreSQL transactions correctly, speedups, and a zlib output compressor.

16 files changed, 275 insertions, 183 deletions

diff --git a/www/php4/Makefile b/www/php4/Makefile
index 10346289c5a..b3ecc9ddc00 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2001/04/30 03:25:15 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2001/05/14 14:12:28 jlam Exp $
 
 .include "../../www/php4/Makefile.common"
 
@@ -9,15 +9,33 @@ COMMENT=		PHP4: Hypertext Preprocessor
 
 CONFLICTS+=		ap-php-4.0.3pl1
 
+CGIDIR=			${PREFIX}/libexec/cgi-bin
 EGDIR=			${PREFIX}/share/examples/php
 
+DEINSTALL_FILE=		${WRKDIR}/DEINSTALL
+INSTALL_FILE=		${WRKDIR}/INSTALL
+
+pre-install:
+	${INSTALL_DATA_DIR} ${PREFIX}/share/thttpd
+	${SED}	-e "s|@PHP_CONFDIR@|${PHP_CONFDIR}|g"			\
+		-e "s|@CAT@|${CAT}|g"					\
+		-e "s|@RM@|${RM}|g"					\
+		${PKGDIR}/DEINSTALL > ${DEINSTALL_FILE}
+	${SED}	-e "s|@PHP_CONFDIR@|${PHP_CONFDIR}|g"			\
+		-e "s|@CAT@|${CAT}|g"					\
+		-e "s|@CHMOD@|${CHMOD}|g"				\
+		-e "s|@CP@|${CP}|g"					\
+		${PKGDIR}/INSTALL > ${INSTALL_FILE}
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} PRE-INSTALL
+
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/libexec/cgi-bin
-	${LN} -sf ../../bin/php ${PREFIX}/libexec/cgi-bin/php
+	${INSTALL_DATA_DIR} ${CGIDIR}
+	${LN} -sf ../../bin/php ${CGIDIR}/php
 	${TOUCH} ${PREFIX}/${PHP_EXTENSION_DIR}/.directory
 	${INSTALL_DATA_DIR} ${EGDIR}
 	cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-optimized ${EGDIR}
 	${INSTALL_DATA_DIR} ${PREFIX}/share/php
 	${INSTALL_DATA} ${WRKSRC}/php4.gif ${PREFIX}/share/php
+	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common
index f64f2df526d..8b9addce9ea 100644
--- a/www/php4/Makefile.common
+++ b/www/php4/Makefile.common
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile.common,v 1.10 2001/05/01 17:28:41 jlam Exp $
+# $NetBSD: Makefile.common,v 1.11 2001/05/14 14:12:28 jlam Exp $
 
 DISTNAME=		php-${PHP_DIST_VERS}
-PHP_DIST_VERS=		4.0.4pl1
-PHP_BASE_VERS=		4.0.4.1
-PHP_VERS=		${PHP_BASE_VERS}nb1
+PHP_DIST_VERS=		4.0.5
+PHP_BASE_VERS=		${PHP_DIST_VERS}
+PHP_VERS=		${PHP_BASE_VERS}
 CATEGORIES+=		www php4
-
-# Note the http address is written this way by purpose, so that bsd.pkg.mk DTRT
 MASTER_SITES=		http://www.php.net/distributions/ \
 			http://php3.de/distributions/ \
 			ftp://ftp.php.net/pub/distributions/
@@ -24,7 +22,7 @@ PATCHDIR=		${.CURDIR}/../../www/php4/patches
 # Location of installed PHP4 loadable modules under ${PREFIX}.
 # This is derived from the value of `php-config --extension-dir`.
 #
-PHP_EXTENSION_DIR=	lib/php/extensions/no-debug-non-zts-20001214
+PHP_EXTENSION_DIR=	lib/php/extensions/no-debug-non-zts-20001222
 PLIST_SUBST+=		PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR}
 
 USE_LIBTOOL=		# defined
diff --git a/www/php4/distinfo b/www/php4/distinfo
index 86a3e2540c2..d5b491528e9 100644
--- a/www/php4/distinfo
+++ b/www/php4/distinfo
@@ -1,11 +1,12 @@
-$NetBSD: distinfo,v 1.3 2001/05/01 17:56:45 jlam Exp $
+$NetBSD: distinfo,v 1.4 2001/05/14 14:12:28 jlam Exp $
 
-SHA1 (php-4.0.4pl1.tar.gz) = 15570c0d59277588ff825d4e09ea615205e1b852
-Size (php-4.0.4pl1.tar.gz) = 2439189 bytes
-SHA1 (patch-aa) = edbfea1d308910442c11e84a5bd04c00144170e7
-SHA1 (patch-ab) = b8b04c16ae8e8c0c1d78adb16ffbbcfb5fc0a75c
-SHA1 (patch-ad) = 04b6123920c1c24dedcb032f785217ca193b7f36
-SHA1 (patch-ae) = e8a2ed7a684faf0f439ff3c26cce88c2d9b9aebc
-SHA1 (patch-af) = e6b2995d5ede074f73d69a93ab361519811268df
+SHA1 (php-4.0.5.tar.gz) = 91819cc92200b2839bfc94d55e0f14e4b0375f68
+Size (php-4.0.5.tar.gz) = 2684069 bytes
+SHA1 (patch-aa) = b616d54851cabb599a597f79d42a2265704e2fb1
+SHA1 (patch-ab) = 982630468096659c9e80b8aa69b5ef0f529ba480
+SHA1 (patch-ad) = 66d2f1b8bc557ffa4ff92d738527dd1f08ade8b0
+SHA1 (patch-ae) = 02544646e87acea327b22d53956b5551c8a9a623
+SHA1 (patch-af) = b1ab346ff1b71d9a68908af31c1f62475220f677
 SHA1 (patch-ag) = c5f04ef52b9d44cd0a4251d3074e4dbc668987e7
-SHA1 (patch-ah) = 7abe1f61ead385534e76386e5b75f674416231d8
+SHA1 (patch-ai) = 9f142482852f31079e553afe0cd55c7b4f727af6
+SHA1 (patch-aj) = 54ac6761303048f06d469e9d1162b0f39cb7d3ae
diff --git a/www/php4/patches/patch-aa b/www/php4/patches/patch-aa
index e4981103204..07ed1518ba5 100644
--- a/www/php4/patches/patch-aa
+++ b/www/php4/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2001/03/13 21:34:03 jlam Exp $
+$NetBSD: patch-aa,v 1.6 2001/05/14 14:12:28 jlam Exp $
 
---- configure.in.orig	Thu Jan 11 13:18:18 2001
+--- configure.in.orig	Mon Apr 30 09:37:22 2001
 +++ configure.in
-@@ -340,7 +340,8 @@
+@@ -353,7 +353,8 @@
  
  dnl Check for IPv6 support
  AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
@@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.5 2001/03/13 21:34:03 jlam Exp $
  #include <netinet/in.h>], [struct sockaddr_in6 s; int i=AF_INET6; s],
    ac_cv_ipv6_support=yes, ac_cv_ipv6_support=no)])
  if test "$ac_cv_ipv6_support" = yes; then
-@@ -837,10 +838,6 @@
+@@ -820,10 +821,6 @@
      PHP_CONFIGURE_PART(Configuring shared libtool)
      $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
      SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab
index 613a7726326..5e20eefecfa 100644
--- a/www/php4/patches/patch-ab
+++ b/www/php4/patches/patch-ab
@@ -1,50 +1,24 @@
-$NetBSD: patch-ab,v 1.6 2001/05/01 17:56:46 jlam Exp $
+$NetBSD: patch-ab,v 1.7 2001/05/14 14:12:29 jlam Exp $
 
---- configure.orig	Thu Jan 11 13:39:29 2001
+--- configure.orig	Mon Apr 30 09:47:59 2001
 +++ configure
-@@ -6336,6 +6336,7 @@
+@@ -6392,6 +6392,7 @@
    cat > conftest.$ac_ext <<EOF
- #line 6338 "configure"
+ #line 6394 "configure"
  #include "confdefs.h"
 +#include <sys/types.h>
  #include <sys/socket.h>
  #include <netinet/in.h>
  int main() {
-@@ -23088,12 +23089,7 @@
- 
-   LIBS=$old_LIBS
-   LDFLAGS="$old_LDFLAGS"
--  if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
--	cat >> confdefs.h <<\EOF
--#define HAVE_LIBMCRYPT22 1
--EOF
--
--  elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-+  if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-     
-  case "ltdl" in
-  c|c_r|pthread*) ;;
-@@ -23110,6 +23106,11 @@
- #define HAVE_LIBMCRYPT24 1
- EOF
- 
-+  elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
-+	cat >> confdefs.h <<\EOF
-+#define HAVE_LIBMCRYPT22 1
-+EOF
-+
-   else
-     { echo "configure: error: Sorry" 1>&2; exit 1; }
-   fi
-@@ -40176,6 +40177,7 @@
+@@ -43649,6 +43650,7 @@
  fi
  
  
 +if false; then
  echo $ac_n "checking for pam_start in -lpam""... $ac_c" 1>&6
- echo "configure:40181: checking for pam_start in -lpam" >&5
+ echo "configure:43654: checking for pam_start in -lpam" >&5
  ac_lib_var=`echo pam'_'pam_start | sed 'y%./+-%__p_%'`
-@@ -40220,6 +40222,8 @@
+@@ -43693,6 +43695,8 @@
  else
    echo "$ac_t""no" 1>&6
  fi
@@ -53,7 +27,7 @@ $NetBSD: patch-ab,v 1.6 2001/05/01 17:56:46 jlam Exp $
   
  
  for ac_func in getcwd getwd
-@@ -47325,9 +47329,6 @@
+@@ -51503,9 +51507,6 @@
  
      $SHELL $srcdir/ltconfig --output=shlibtool --disable-static --srcdir=$srcdir --cache-file=./config.cache $srcdir/ltmain.sh
      SHARED_LIBTOOL='$(SHELL) $(top_builddir)/shlibtool'
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 13b0171952d..8ecc31550f4 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,28 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2001/03/14 00:10:00 jlam Exp $
+$NetBSD: patch-ad,v 1.4 2001/05/14 14:12:29 jlam Exp $
 
---- ext/imap/php_imap.c.orig	Wed Oct 25 13:43:52 2000
+--- ext/imap/php_imap.c.orig	Tue Apr 24 10:17:41 2001
 +++ ext/imap/php_imap.c
-@@ -183,7 +183,19 @@
- void mail_close_it(zend_rsrc_list_entry *rsrc)
- {
- 	pils *imap_le_struct = (pils *)rsrc->ptr;
-+	IMAPLS_FETCH();
-+
- 	mail_close_full(imap_le_struct->imap_stream, imap_le_struct->flags);
-+
-+	if (IMAPG(imap_user)) {
-+		efree(IMAPG(imap_user));
-+		IMAPG(imap_user) = 0;
-+	}
-+	if (IMAPG(imap_password)) {
-+		efree(IMAPG(imap_password));
-+		IMAPG(imap_password) = 0;
-+	}
-+
- 	efree(imap_le_struct);
- }
- 
-@@ -392,7 +404,11 @@
+@@ -427,7 +427,11 @@
  	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
  
  
@@ -35,59 +15,3 @@ $NetBSD: patch-ad,v 1.3 2001/03/14 00:10:00 jlam Exp $
  #ifndef PHP_WIN32
  	mail_link(&unixdriver);   /* link in the unix driver */
  #endif
-@@ -633,6 +649,14 @@
- 		}
- 	}
- 
-+	if (IMAPG(imap_user)) {
-+		efree(IMAPG(imap_user));
-+	}
-+
-+	if (IMAPG(imap_password)) {
-+		efree(IMAPG(imap_password));
-+	}
-+
- 	IMAPG(imap_user)     = estrndup(Z_STRVAL_PP(user), Z_STRLEN_PP(user));
- 	IMAPG(imap_password) = estrndup(Z_STRVAL_PP(passwd), Z_STRLEN_PP(passwd));
- 	
-@@ -712,6 +736,8 @@
- 				}
-  			}
- 			efree(hashed_details);
-+			efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
-+			efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
- 			RETURN_FALSE;
- 		}
- 
-@@ -721,6 +747,8 @@
- 			node = malloc(sizeof(pils));
- 			if (node == NULL) {
- 				efree(hashed_details);
-+				efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
-+				efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
- 				RETURN_FALSE;
- 			}
- 
-@@ -757,6 +785,8 @@
- 
- 			free(headp);
- 			efree(hashed_details);
-+			efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
-+			efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
-  			RETURN_FALSE;
- 		}
- 
-@@ -766,11 +796,11 @@
- 	} else {
- #endif
- 		imap_stream = mail_open(NIL, Z_STRVAL_PP(mailbox), flags);
--		efree(IMAPG(imap_user));
--		efree(IMAPG(imap_password));
- 
- 		if (imap_stream == NIL) {
- 			php_error(E_WARNING, "Couldn't open stream %s\n", (*mailbox)->value.str.val);
-+			efree(IMAPG(imap_user)); IMAPG(imap_user) = 0;
-+			efree(IMAPG(imap_password)); IMAPG(imap_password) = 0;
- 			RETURN_FALSE;
- 		}
- 
diff --git a/www/php4/patches/patch-ae b/www/php4/patches/patch-ae
index 1cd1ab919e9..52bb5830642 100644
--- a/www/php4/patches/patch-ae
+++ b/www/php4/patches/patch-ae
@@ -1,15 +1,16 @@
-$NetBSD: patch-ae,v 1.1 2000/12/25 21:03:47 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2001/05/14 14:12:29 jlam Exp $
 
---- ext/standard/config.m4.orig	Wed Jul 19 12:19:40 2000
+--- ext/standard/config.m4.orig	Sun Mar 11 05:08:27 2001
 +++ ext/standard/config.m4
-@@ -136,10 +136,6 @@
+@@ -187,9 +187,11 @@
  
  AC_CHECK_FUNC(dlopen, [AC_DEFINE(HAVE_LIBDL,1,[ ])])
  
--AC_CHECK_LIB(pam, pam_start, [
--  EXTRA_LIBS="$EXTRA_LIBS -lpam"
--  AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) 
--
++if false; then
+ AC_CHECK_LIB(pam, pam_start, [
+   EXTRA_LIBS="$EXTRA_LIBS -lpam"
+   AC_DEFINE(HAVE_LIBPAM,1,[ ]) ], []) 
++fi # if false
+ 
  AC_CHECK_FUNCS(getcwd getwd)
  
- AC_CRYPT_CAP
diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af
index 1d8f0d5bd63..ee2a5a884d0 100644
--- a/www/php4/patches/patch-af
+++ b/www/php4/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.1 2001/01/25 17:18:08 jlam Exp $
+$NetBSD: patch-af,v 1.2 2001/05/14 14:12:30 jlam Exp $
 
---- Makefile.in.orig	Sun Jun 11 14:51:17 2000
+--- Makefile.in.orig	Tue Mar 20 13:15:10 2001
 +++ Makefile.in
 @@ -19,7 +19,7 @@
  PROGRAM_NAME         = php
  PROGRAM_SOURCES      = stub.c
- PROGRAM_LDADD        = libphp4.la
+ PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
 -PROGRAM_LDFLAGS      = -export-dynamic	
 +PROGRAM_LDFLAGS      = -static -export-dynamic	
  PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah
deleted file mode 100644
index e7c7a8d78cd..00000000000
--- a/www/php4/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2001/05/01 17:56:46 jlam Exp $
-
---- ext/mcrypt/config.m4.orig	Sat Sep  9 08:24:20 2000
-+++ ext/mcrypt/config.m4
-@@ -27,11 +27,11 @@
-   AC_CHECK_LIB(mcrypt, mcrypt_module_open, [LIBS="$LIBS -lltdl"],[ ],)
-   LIBS=$old_LIBS
-   LDFLAGS="$old_LDFLAGS"
--  if test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
--	AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ])
--  elif test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-+  if test "$ac_cv_lib_mcrypt_mcrypt_module_open" = "yes"; then
-     AC_ADD_LIBRARY(ltdl)
--	AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ])
-+    AC_DEFINE(HAVE_LIBMCRYPT24,1,[ ])
-+  elif test "$ac_cv_lib_mcrypt_init_mcrypt" = "yes"; then
-+    AC_DEFINE(HAVE_LIBMCRYPT22,1,[ ])
-   else
-     AC_MSG_ERROR(Sorry, I was not able to diagnose which libmcrypt version you have installed.)
-   fi
diff --git a/www/php4/patches/patch-ai b/www/php4/patches/patch-ai
new file mode 100644
index 00000000000..80857e5abbb
--- /dev/null
+++ b/www/php4/patches/patch-ai
@@ -0,0 +1,25 @@
+$NetBSD: patch-ai,v 1.1 2001/05/14 14:12:30 jlam Exp $
+
+--- php.ini-dist.orig	Sun Apr 22 07:58:49 2001
++++ php.ini-dist
+@@ -318,8 +318,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
+@@ -336,7 +337,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-aj b/www/php4/patches/patch-aj
new file mode 100644
index 00000000000..804e051cccd
--- /dev/null
+++ b/www/php4/patches/patch-aj
@@ -0,0 +1,13 @@
+$NetBSD: patch-aj,v 1.1 2001/05/14 14:12:30 jlam Exp $
+
+--- main/php_open_temporary_file.c.orig	Mon Feb 26 01:07:31 2001
++++ main/php_open_temporary_file.c
+@@ -110,7 +110,7 @@
+ 		trailing_slash = "/";
+ 	}
+ 
+-	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXX", path, trailing_slash, pfx);
++	(void)snprintf(opened_path, MAXPATHLEN, "%s%s%sXXXXXXXXXX", path, trailing_slash, pfx);
+ 
+ #ifdef PHP_WIN32
+ 	if (GetTempFileName(path, pfx, 0, opened_path)) {
diff --git a/www/php4/pkg/DEINSTALL b/www/php4/pkg/DEINSTALL
new file mode 100644
index 00000000000..3b5eca1f08c
--- /dev/null
+++ b/www/php4/pkg/DEINSTALL
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# $NetBSD: DEINSTALL,v 1.1 2001/05/14 14:12:30 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CAT="@CAT@"
+RM="@RM@"
+
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/php
+CONFDIR="@PHP_CONFDIR@"
+CONFFILES="php.ini"
+
+case ${STAGE} in
+DEINSTALL)
+	# Remove configuration files if they don't differ from the default
+	# config file.
+	#
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}-dist
+		if diff -q ${FILE} ${SAMPLEFILE} >/dev/null
+		then
+			${RM} -f ${FILE}
+		fi
+	done
+	;;
+
+POST-DEINSTALL)
+	modified_files=''
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		if [ -f ${FILE} ]
+		then
+			modified_files="${modified_files} ${FILE}"
+		fi
+	done
+
+	if [ -n "${modified_files}" ]
+	then
+		${CAT} << EOF
+===========================================================================
+If you won't be using ${PKGNAME} any longer, you may want to remove the
+following files:
+
+EOF
+		for file in ${modified_files}
+		do
+			echo "	${file}"
+		done
+		${CAT} << EOF
+===========================================================================
+EOF
+	fi
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/php4/pkg/INSTALL b/www/php4/pkg/INSTALL
new file mode 100644
index 00000000000..ef1f7182600
--- /dev/null
+++ b/www/php4/pkg/INSTALL
@@ -0,0 +1,56 @@
+#! /bin/sh
+#
+# $NetBSD: INSTALL,v 1.1 2001/05/14 14:12:30 jlam Exp $
+
+PKGNAME=$1
+STAGE=$2
+
+CAT="@CAT@"
+CHMOD="@CHMOD@"
+CP="@CP@"
+
+SAMPLECONFDIR=${PKG_PREFIX}/share/examples/php
+CONFDIR="@PHP_CONFDIR@"
+CONFFILES="php.ini"
+
+case ${STAGE} in
+PRE-INSTALL)
+	;;
+
+POST-INSTALL)
+	echo "Installing configuration files:"
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		SAMPLEFILE=${SAMPLECONFDIR}/${file}-dist
+		if [ -f ${FILE} ]
+		then
+			echo "    ${FILE} already exists"
+		else
+			echo "    ${FILE}"
+			${CP} ${SAMPLEFILE} ${FILE}
+			${CHMOD} 644 ${FILE}
+		fi
+	done
+	${CAT} << EOF
+
+===========================================================================
+Some files you might need to customize include the following:
+
+EOF
+	for file in ${CONFFILES}
+	do
+		FILE=${CONFDIR}/${file}
+		echo "	${FILE}"
+	done
+	${CAT} << EOF
+===========================================================================
+EOF
+	;;
+
+*)
+	echo "Unexpected argument: ${STAGE}"
+	exit 1
+	;;
+esac
+exit 0
diff --git a/www/php4/pkg/MESSAGE b/www/php4/pkg/MESSAGE
index 384a71535fc..9fc97e0b18f 100644
--- a/www/php4/pkg/MESSAGE
+++ b/www/php4/pkg/MESSAGE
@@ -1,9 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2001/04/30 03:25:16 jlam Exp $
-
-Before using PHP, you must first create the configuration file:
-
-	${PHP_CONFDIR}/php.ini
+$NetBSD: MESSAGE,v 1.5 2001/05/14 14:12:31 jlam Exp $
 
 Example configuration files suitable as a basis for a custom php.ini may
 be found at:
diff --git a/www/php4/pkg/MESSAGE.module b/www/php4/pkg/MESSAGE.module
index 4bd4adf3fb3..9deeebbec0d 100644
--- a/www/php4/pkg/MESSAGE.module
+++ b/www/php4/pkg/MESSAGE.module
@@ -1,11 +1,9 @@
 ===========================================================================
-$NetBSD: MESSAGE.module,v 1.3 2001/01/29 11:34:47 wiz Exp $
+$NetBSD: MESSAGE.module,v 1.4 2001/05/14 14:12:31 jlam Exp $
 
-To enable this package, add the following lines to php.ini:
+To enable this module, add the following to ${PHP_CONFDIR}/php.ini:
 
-    extension_dir=${PREFIX}/${PHP_EXTENSION_DIR}
     extension=${MODNAME}.so
 
 and restart your PHP4-enabled HTTP server to load this module.
-
 ===========================================================================
diff --git a/www/php4/pkg/PLIST b/www/php4/pkg/PLIST
index 6280ba408e0..5850d172933 100644
--- a/www/php4/pkg/PLIST
+++ b/www/php4/pkg/PLIST
@@ -1,11 +1,9 @@
-@comment $NetBSD: PLIST,v 1.8 2001/05/02 22:22:43 jlam Exp $
+@comment $NetBSD: PLIST,v 1.9 2001/05/14 14:12:31 jlam Exp $
 bin/pear
 bin/php
 bin/php-config
 bin/phpextdist
 bin/phpize
-include/php/acconfig.h
-include/php/php_version.h
 include/php/TSRM/TSRM.h
 include/php/TSRM/acconfig.h
 include/php/TSRM/readdir.h
@@ -16,7 +14,6 @@ include/php/TSRM/tsrm_strtok_r.h
 include/php/TSRM/tsrm_virtual_cwd.h
 include/php/Zend/FlexLexer.h
 include/php/Zend/acconfig.h
-include/php/Zend/modules.h
 include/php/Zend/zend.h
 include/php/Zend/zend_API.h
 include/php/Zend/zend_alloc.h
@@ -39,15 +36,18 @@ 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_operators.h
 include/php/Zend/zend_ptr_stack.h
 include/php/Zend/zend_stack.h
 include/php/Zend/zend_static_allocator.h
 include/php/Zend/zend_variables.h
+include/php/acconfig.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/credits.h
@@ -115,7 +115,7 @@ include/php/ext/xml/php_xml.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/fopen_wrappers.h
 include/php/main/internal_functions_registry.h
 include/php/main/logos.h
 include/php/main/php.h
@@ -139,6 +139,7 @@ include/php/main/rfc1867.h
 include/php/main/safe_mode.h
 include/php/main/snprintf.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
@@ -147,6 +148,17 @@ include/php/regex/regex_extra.h
 include/php/regex/utils.h
 lib/php/Benchmark/Iterate.php
 lib/php/Benchmark/Timer.php
+lib/php/Cache.php
+lib/php/Cache/Container.php
+lib/php/Cache/Container/db.php
+lib/php/Cache/Container/file.php
+lib/php/Cache/Container/phplib.php
+lib/php/Cache/Container/shm.php
+lib/php/Cache/Function.php
+lib/php/Cache/Graphics.php
+lib/php/Cache/Output.php
+lib/php/Console/Getopt.php
+lib/php/Crypt/CBC.php
 lib/php/Crypt/HCEMD5.php
 lib/php/DB.php
 lib/php/DB/common.php
@@ -160,19 +172,41 @@ lib/php/DB/pgsql.php
 lib/php/DB/storage.php
 lib/php/DB/sybase.php
 lib/php/Date/Calc.php
+lib/php/Date/Human.php
 lib/php/File/Find.php
+lib/php/File/Passwd.php
 lib/php/File/SearchReplace.php
 lib/php/HTML/Form.php
+lib/php/HTML/IT.php
+lib/php/HTML/ITX.php
+lib/php/HTML/Processor.php
 lib/php/HTTP.php
+lib/php/HTTP/Compress.php
+lib/php/Image/Remote.php
+lib/php/Log.php
+lib/php/Log/composite.php
+lib/php/Log/file.php
+lib/php/Log/mcal.php
+lib/php/Log/observer.php
+lib/php/Log/sql.php
+lib/php/Log/syslog.php
 lib/php/Mail.php
+lib/php/Mail/RFC822.php
 lib/php/Mail/sendmail.php
 lib/php/Mail/smtp.php
+lib/php/Math/Fraction.php
+lib/php/Math/Util.php
+lib/php/Net/Curl.php
+lib/php/Net/Dig.php
 lib/php/Net/SMTP.php
 lib/php/Net/Socket.php
+lib/php/Numbers/Roman.php
 lib/php/PEAR.php
 lib/php/PEAR/Installer.php
 lib/php/Payment/Verisign.php
+lib/php/Schedule/At.php
 lib/php/XML/Parser.php
+lib/php/XML/RPC.php
 lib/php/build/acinclude.m4
 lib/php/build/dynlib.m4
 lib/php/build/dynlib.mk
@@ -186,26 +220,35 @@ lib/php/build/rules.mk
 lib/php/build/rules_common.mk
 lib/php/build/rules_pear.mk
 lib/php/build/shtool
-lib/php/extensions/no-debug-non-zts-20001214/.directory
+lib/php/extensions/no-debug-non-zts-20001222/.directory
 libexec/cgi-bin/php
 share/examples/php/php.ini-dist
 share/examples/php/php.ini-optimized
 share/php/php4.gif
 @dirrm share/php
 @dirrm share/examples/php
-@dirrm lib/php/extensions/no-debug-non-zts-20001214
+@dirrm lib/php/extensions/no-debug-non-zts-20001222
 @dirrm lib/php/extensions
 @dirrm lib/php/build
 @dirrm lib/php/XML
+@dirrm lib/php/Schedule
 @dirrm lib/php/Payment
 @dirrm lib/php/PEAR
+@dirrm lib/php/Numbers
 @dirrm lib/php/Net
+@dirrm lib/php/Math
 @dirrm lib/php/Mail
+@dirrm lib/php/Log
+@dirrm lib/php/Image
+@dirrm lib/php/HTTP
 @dirrm lib/php/HTML
 @dirrm lib/php/File
 @dirrm lib/php/Date
 @dirrm lib/php/DB
 @dirrm lib/php/Crypt
+@dirrm lib/php/Console
+@dirrm lib/php/Cache/Container
+@dirrm lib/php/Cache
 @dirrm lib/php/Benchmark
 @dirrm lib/php
 @dirrm include/php/regex