Update PHP to final 4.3.3

Some highlights of changes since 4.2.3:
* PCRE updated to 4.3, GD to 2.0.15
* improved Apache2 support
* much improved stream & URL wrapper support, output compression support
* added CLI (Command Line Interface) SAPI
* debug_backtrace() backported from ZendEngine2
* faster build system
* huge number of other bug fixes and improvements

Packaging changes:
* 'pcre', 'xml', and 'session' modules folded back into main package -
  'pcre' and 'xml' is required by PEAR, and 'session' is just too essential
  to be separate
* 'gd' module now uses bundled PHP GD library, which is better integrated
* PHP modules use shared distinfo when possible to ease future PHP updates
* ${PREFIX}/bin/php is now CLI version, ${PREFIX}/libexec/cgi-big/php
  remains CGI version

4 files changed, 21 insertions, 40 deletions

diff --git a/mail/php4-imap/Makefile b/mail/php4-imap/Makefile
index e739a92e934..bbda670c2ce 100644
--- a/mail/php4-imap/Makefile
+++ b/mail/php4-imap/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.10 2003/07/28 15:52:22 adam Exp $
+# $NetBSD: Makefile,v 1.11 2003/08/31 19:55:47 jdolecek Exp $
 
 MODNAME=		imap
 CATEGORIES+=		mail
-PKGREVISION=		2
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for IMAP (Internet Mailbox Access Protocol)
 
 USE_BUILDLINK2=		YES
+DISTINFO_FILE=		${PKGDIR}/distinfo
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo
index aac57b58157..dfe9fa34f50 100644
--- a/mail/php4-imap/distinfo
+++ b/mail/php4-imap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2002/11/02 00:05:04 elric Exp $
+$NetBSD: distinfo,v 1.7 2003/08/31 19:55:48 jdolecek Exp $
 
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
-SHA1 (patch-aa) = 237256b28c175aa71e5fe76e3df363f9c8203682
-SHA1 (patch-ab) = d3df38e0ff0d818db39f5fe1980318eac2738bcd
+SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
+Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (patch-aa) = 88bdeff65b4a8c2abe46b969715702b31020bb28
+SHA1 (patch-ab) = fbdb1acceacf4f514c28d7ef5dba61bcc451f308
diff --git a/mail/php4-imap/patches/patch-aa b/mail/php4-imap/patches/patch-aa
index e0aba512a23..134ea4634a8 100644
--- a/mail/php4-imap/patches/patch-aa
+++ b/mail/php4-imap/patches/patch-aa
@@ -1,38 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2002/11/02 00:05:05 elric Exp $
+$NetBSD: patch-aa,v 1.4 2003/08/31 19:55:48 jdolecek Exp $
 
---- config.m4.orig	Tue Aug 20 19:09:01 2002
-+++ config.m4	Thu Oct 31 17:59:46 2002
-@@ -40,12 +40,6 @@
-     PHP_ADD_LIBRARY(krb5, 1, IMAP_SHARED_LIBADD)
+--- config.m4.orig	2003-08-31 15:11:49.000000000 +0200
++++ config.m4	2003-08-31 15:12:05.000000000 +0200
+@@ -91,13 +91,6 @@
      PHP_ADD_LIBRARY(k5crypto, 1, IMAP_SHARED_LIBADD)
      PHP_ADD_LIBRARY(com_err,  1, IMAP_SHARED_LIBADD)
+     PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
 -  else
 -    AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
--      AC_MSG_ERROR(This c-client library is built with Kerberos support. 
+-      AC_MSG_ERROR([This c-client library is built with Kerberos support. 
 -
--      Add --with-kerberos<=DIR> to your configure line. Check config.log for details.)
+-      Add --with-kerberos to your configure line. Check config.log for details.
+-      ])
 -    ])
    fi
  
  ])
-@@ -65,8 +59,8 @@
-   if test "$PHP_IMAP_SSL" != "no"; then
-     AC_DEFINE(HAVE_IMAP_SSL,1,[ ])
-     PHP_ADD_LIBPATH($PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
--    PHP_ADD_LIBRARY_DEFER(ssl,, IMAP_SHARED_LIBADD)
--    PHP_ADD_LIBRARY_DEFER(crypto,, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY_WITH_PATH(crypto, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY_WITH_PATH(ssl, $PHP_IMAP_SSL/lib, IMAP_SHARED_LIBADD)
-   else
-     old_LIBS=$LIBS
-     LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB"
-@@ -162,8 +156,7 @@
-     fi
- 
-     PHP_ADD_INCLUDE($IMAP_INC_DIR)
--    PHP_ADD_LIBPATH($IMAP_LIBDIR, IMAP_SHARED_LIBADD)
--    PHP_ADD_LIBRARY_DEFER($IMAP_LIB,, IMAP_SHARED_LIBADD)
-+    PHP_ADD_LIBRARY_WITH_PATH($IMAP_LIB, $IMAP_LIBDIR, IMAP_SHARED_LIBADD)
-     PHP_IMAP_KRB_CHK
-     PHP_IMAP_SSL_CHK
- fi
diff --git a/mail/php4-imap/patches/patch-ab b/mail/php4-imap/patches/patch-ab
index 2adba67c508..ef2efa0e6dc 100644
--- a/mail/php4-imap/patches/patch-ab
+++ b/mail/php4-imap/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.3 2002/10/14 06:21:12 martti Exp $
+$NetBSD: patch-ab,v 1.4 2003/08/31 19:55:48 jdolecek Exp $
 
---- php_imap.c.orig	Mon Aug 26 01:58:31 2002
-+++ php_imap.c	Sat Oct 12 10:49:37 2002
-@@ -421,6 +421,11 @@
+--- php_imap.c.orig	2003-06-17 16:13:25.000000000 +0200
++++ php_imap.c	2003-08-31 15:12:30.000000000 +0200
+@@ -408,6 +408,11 @@
  
  	ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL)
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.3 2002/10/14 06:21:12 martti Exp $
  #ifndef PHP_WIN32
  	mail_link(&unixdriver);		/* link in the unix driver */
  	mail_link(&mhdriver);		/* link in the mh driver */
-@@ -436,6 +441,10 @@
+@@ -423,6 +428,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 */