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

14 files changed, 19 insertions, 66 deletions

diff --git a/databases/php4-dba/Makefile b/databases/php4-dba/Makefile
index c2a3448c10c..9c34e5f441d 100644
--- a/databases/php4-dba/Makefile
+++ b/databases/php4-dba/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2002/11/01 16:34:36 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/31 19:55:27 jdolecek Exp $
 
 MODNAME=		dba
 CATEGORIES+=		databases
-PKGREVISION=		1
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for DBM database access
 
 USE_BUILDLINK2=		YES
diff --git a/databases/php4-dba/distinfo b/databases/php4-dba/distinfo
deleted file mode 100644
index d3cd2b54cbe..00000000000
--- a/databases/php4-dba/distinfo
+++ /dev/null
@@ -1,6 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/10/14 06:21:06 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
-SHA1 (patch-aa) = 6b3d4fdd6bd4874238d6a8f99ebaafb7e422d866
-SHA1 (patch-ab) = 1b272a7f3b94ff934389a1c224befdfdd259051b
diff --git a/databases/php4-dba/patches/patch-aa b/databases/php4-dba/patches/patch-aa
deleted file mode 100644
index 798c1a202d1..00000000000
--- a/databases/php4-dba/patches/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2001/10/27 21:31:32 jlam Exp $
-
---- dba_gdbm.c.orig	Mon Jul 10 06:09:14 2000
-+++ dba_gdbm.c
-@@ -31,2 +31,6 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
diff --git a/databases/php4-dba/patches/patch-ab b/databases/php4-dba/patches/patch-ab
deleted file mode 100644
index 6a6ee69504c..00000000000
--- a/databases/php4-dba/patches/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2001/10/27 21:31:32 jlam Exp $
-
---- dba_ndbm.c.orig	Mon Jul 10 06:09:14 2000
-+++ dba_ndbm.c
-@@ -31,2 +31,6 @@
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
diff --git a/databases/php4-dbase/distinfo b/databases/php4-dbase/distinfo
deleted file mode 100644
index 77323891834..00000000000
--- a/databases/php4-dbase/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
diff --git a/databases/php4-filepro/distinfo b/databases/php4-filepro/distinfo
deleted file mode 100644
index 77323891834..00000000000
--- a/databases/php4-filepro/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
diff --git a/databases/php4-ldap/Makefile b/databases/php4-ldap/Makefile
index 2a10b9e93ac..8fa03b4cbf9 100644
--- a/databases/php4-ldap/Makefile
+++ b/databases/php4-ldap/Makefile
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.7 2003/05/02 11:54:14 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/31 19:55:31 jdolecek Exp $
 
 MODNAME=		ldap
 CATEGORIES+=		databases
-PKGREVISION=		1
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for LDAP database access
 
 USE_BUILDLINK2=		YES
+DISTINFO_FILE=		${PKGDIR}/distinfo
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/databases/php4-ldap/distinfo b/databases/php4-ldap/distinfo
index 6d4fb3557a2..cc1c478b535 100644
--- a/databases/php4-ldap/distinfo
+++ b/databases/php4-ldap/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $
+$NetBSD: distinfo,v 1.7 2003/08/31 19:55:31 jdolecek Exp $
 
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
-SHA1 (patch-aa) = 29c55477c62a3776b56cc6976f43cc8e5d4de390
+SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
+Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (patch-aa) = 8087a4c588d3c5c02dc702654567d1cce5250f33
diff --git a/databases/php4-ldap/patches/patch-aa b/databases/php4-ldap/patches/patch-aa
index 2148af071a1..1e62bcebeaa 100644
--- a/databases/php4-ldap/patches/patch-aa
+++ b/databases/php4-ldap/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2002/02/01 19:22:55 jlam Exp $
+$NetBSD: patch-aa,v 1.3 2003/08/31 19:55:31 jdolecek Exp $
 
---- config.m4.orig	Mon May 21 15:47:15 2001
-+++ config.m4
-@@ -41,13 +41,16 @@
+--- config.m4.orig	2003-08-31 13:11:08.000000000 +0200
++++ config.m4	2003-08-31 13:12:20.000000000 +0200
+@@ -42,13 +42,16 @@
    dnl these here if necessary.   -RL
    dnl Is this really necessary? -Troels Arvin
  
@@ -13,8 +13,8 @@ $NetBSD: patch-aa,v 1.2 2002/02/01 19:22:55 jlam Exp $
      LDAP_PTHREAD=
    fi
  
-   if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.so -o -f $LDAP_LIBDIR/liblber.sl; then
-+    if test -n "$LDAP_PTHREAD"; then 
+   if test -f $LDAP_LIBDIR/liblber.a -o -f $LDAP_LIBDIR/liblber.$SHLIB_SUFFIX_NAME; then
++    if test -n "$LDAP_PTHREAD"; then
 +      PHP_ADD_LIBRARY_WITH_PATH($LDAP_PTHREAD, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
 +    fi
      PHP_ADD_LIBRARY_WITH_PATH(lber, $LDAP_LIBDIR, LDAP_SHARED_LIBADD)
diff --git a/databases/php4-mysql/distinfo b/databases/php4-mysql/distinfo
deleted file mode 100644
index 25e79876b87..00000000000
--- a/databases/php4-mysql/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
diff --git a/databases/php4-odbc/Makefile b/databases/php4-odbc/Makefile
index 2f79921e93c..35f34618990 100644
--- a/databases/php4-odbc/Makefile
+++ b/databases/php4-odbc/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2003/05/02 11:54:14 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2003/08/31 19:55:35 jdolecek Exp $
 
 MODNAME=		odbc
 CATEGORIES+=		databases
-PKGREVISION=		1
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for ODBC access
 
 USE_BUILDLINK2=		YES
diff --git a/databases/php4-odbc/distinfo b/databases/php4-odbc/distinfo
deleted file mode 100644
index 25e79876b87..00000000000
--- a/databases/php4-odbc/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
diff --git a/databases/php4-pgsql/Makefile b/databases/php4-pgsql/Makefile
index 5b1df1b80d0..0b9870a0b5f 100644
--- a/databases/php4-pgsql/Makefile
+++ b/databases/php4-pgsql/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2003/01/05 20:14:26 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/31 19:55:37 jdolecek Exp $
 
 MODNAME=		pgsql
 CATEGORIES+=		databases
-PKGREVISION=		1
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for PostgreSQL databases
 
 USE_BUILDLINK2=		YES
diff --git a/databases/php4-pgsql/distinfo b/databases/php4-pgsql/distinfo
deleted file mode 100644
index 25e79876b87..00000000000
--- a/databases/php4-pgsql/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes