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

13 files changed, 24 insertions, 87 deletions

diff --git a/textproc/Makefile b/textproc/Makefile
index b9fd84ace4d..0dec5689b0b 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.207 2003/08/31 09:43:49 cjep Exp $
+# $NetBSD: Makefile,v 1.208 2003/08/31 19:55:24 jdolecek Exp $
 #
 
 COMMENT=	Text processing utilities (does not include desktop publishing)
@@ -161,7 +161,6 @@ SUBDIR+=	p5-libxml-enno
 SUBDIR+=	par
 SUBDIR+=	php4-domxml
 SUBDIR+=	php4-wddx
-SUBDIR+=	php4-xml
 SUBDIR+=	php4-xslt
 SUBDIR+=	postgresql-autodoc
 SUBDIR+=	psgml-mode
diff --git a/textproc/php4-domxml/Makefile b/textproc/php4-domxml/Makefile
index 68b720003c2..cebb849dc37 100644
--- a/textproc/php4-domxml/Makefile
+++ b/textproc/php4-domxml/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2003/07/13 13:53:35 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2003/08/31 19:55:59 jdolecek Exp $
 
 MODNAME=		domxml
 CATEGORIES+=		textproc
-PHP_PKG_VERS=		# empty
-PKGREVISION=		3
+PKGREVISION=		# empty
 COMMENT=		PHP4 extension for DOM support
 
 USE_BUILDLINK2=		YES
@@ -12,6 +11,8 @@ USE_BUILDLINK2=		YES
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}=shared,${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-dom=shared,${BUILDLINK_PREFIX.libxml2}
+CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib}
 
+.include "../../devel/zlib/buildlink2.mk"
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php4-domxml/distinfo b/textproc/php4-domxml/distinfo
deleted file mode 100644
index 51afccc3d6f..00000000000
--- a/textproc/php4-domxml/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.3 2002/10/14 06:21:16 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
diff --git a/textproc/php4-wddx/Makefile b/textproc/php4-wddx/Makefile
index dd89550962a..73b1f0bac9d 100644
--- a/textproc/php4-wddx/Makefile
+++ b/textproc/php4-wddx/Makefile
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.6 2002/10/09 19:25:50 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2003/08/31 19:56:00 jdolecek Exp $
 
 MODNAME=		wddx
 CATEGORIES+=		textproc
 PKGREVISION=		# empty
 COMMENT=		PHP4 extension for WDDX support
 
-DEPENDS+=		php-session>=${PHP_BASE_VERS}:../../devel/php4-session
-DEPENDS+=		php-xml>=${PHP_BASE_VERS}:../../textproc/php4-xml
-
 USE_BUILDLINK2=		YES
+DISTINFO_FILE=		${PKGDIR}/distinfo
 
 .include "../../www/php4/Makefile.module"
 
diff --git a/textproc/php4-wddx/distinfo b/textproc/php4-wddx/distinfo
index ce30cb0a118..928ebbfd474 100644
--- a/textproc/php4-wddx/distinfo
+++ b/textproc/php4-wddx/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.5 2002/10/14 06:21:17 martti Exp $
+$NetBSD: distinfo,v 1.6 2003/08/31 19:56:00 jdolecek Exp $
 
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
-SHA1 (patch-aa) = 6d5a269572190be29252cf018fa1d33fa5d49984
-SHA1 (patch-ab) = 91276083c16070fd1df3aca05c2dbd2b6585c592
-SHA1 (patch-ac) = b60bc98dced23db2445c663517d510fd0124aeb2
+SHA1 (php-4.3.3.tar.gz) = 6aa670995119a34c408fd362d6c2f57329a1cd3d
+Size (php-4.3.3.tar.gz) = 4565509 bytes
+SHA1 (patch-ab) = db0b22dcd9ed44d050135b2160661d5ba6792b7d
diff --git a/textproc/php4-wddx/patches/patch-aa b/textproc/php4-wddx/patches/patch-aa
deleted file mode 100644
index 1ed08b49da4..00000000000
--- a/textproc/php4-wddx/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 06:28:06 jlam Exp $
-
---- Makefile.in.orig	Mon May  1 18:38:34 2000
-+++ Makefile.in
-@@ -1,5 +1,7 @@
- 
- LTLIBRARY_NAME    = libwddx.la
- LTLIBRARY_SOURCES = wddx.c
-+LTLIBRARY_SHARED_NAME = wddx.la
-+LTLIBRARY_SHARED_LIBADD = $(WDDX_SHARED_LIBADD)
- 
- include $(top_srcdir)/build/dynlib.mk
diff --git a/textproc/php4-wddx/patches/patch-ab b/textproc/php4-wddx/patches/patch-ab
index 116154c526b..1194c126c35 100644
--- a/textproc/php4-wddx/patches/patch-ab
+++ b/textproc/php4-wddx/patches/patch-ab
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.2 2002/10/14 06:21:17 martti Exp $
+$NetBSD: patch-ab,v 1.3 2003/08/31 19:56:01 jdolecek Exp $
 
---- config.m4.orig	Fri Nov 30 19:00:04 2001
-+++ config.m4	Sat Oct 12 10:54:29 2002
+--- config.m4.orig	2003-08-31 19:07:34.000000000 +0200
++++ config.m4	2003-08-31 19:06:32.000000000 +0200
 @@ -5,6 +5,9 @@
  PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
  [  --enable-wddx           Enable WDDX support.])
@@ -15,8 +15,7 @@ $NetBSD: patch-ab,v 1.2 2002/10/14 06:21:17 martti Exp $
 @@ -12,4 +15,17 @@
    fi
    AC_DEFINE(HAVE_WDDX, 1, [ ])
-   PHP_EXTENSION(wddx, $ext_shared)
-+  PHP_SUBST(WDDX_SHARED_LIBADD)
+   PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared)
 +
 +  if test "$PHP_EXPAT_DIR" != "no"; then
 +    if test -f $PHP_EXPAT_DIR/lib/libexpat.a -o -f $PHP_EXPAT_DIR/lib/libexpat.s?; then
@@ -29,4 +28,5 @@ $NetBSD: patch-ab,v 1.2 2002/10/14 06:21:17 martti Exp $
 +      PHP_ADD_INCLUDE($PHP_EXPAT_DIR/include)
 +    fi
 +  fi
++
  fi
diff --git a/textproc/php4-wddx/patches/patch-ac b/textproc/php4-wddx/patches/patch-ac
deleted file mode 100644
index 28e8a4d2dfd..00000000000
--- a/textproc/php4-wddx/patches/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2002/10/14 06:21:17 martti Exp $
-
---- wddx.c.orig	Thu Feb 28 08:26:57 2002
-+++ wddx.c	Sun Oct 13 12:59:27 2002
-@@ -20,2 +20,8 @@
- 
-+#define IS_EXT_MODULE
-+
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
-@@ -106,2 +112,6 @@
- /* }}} */
-+
-+#ifdef COMPILE_DL_WDDX
-+ZEND_GET_MODULE(wddx)
-+#endif /* COMPILE_DL_WDDX */
- 
diff --git a/textproc/php4-xml/DESCR b/textproc/php4-xml/DESCR
deleted file mode 100644
index d5afff9cf73..00000000000
--- a/textproc/php4-xml/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-PHP is a programming language designed to be embedded into web pages.
-This module provides an XML parser for PHP4.
diff --git a/textproc/php4-xml/Makefile b/textproc/php4-xml/Makefile
deleted file mode 100644
index 7c5af7ceb39..00000000000
--- a/textproc/php4-xml/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile,v 1.5 2002/10/09 19:27:39 wiz Exp $
-
-MODNAME=		xml
-CATEGORIES+=		textproc
-PKGREVISION=		# empty
-COMMENT=		PHP4 extension for parsing XML
-
-USE_BUILDLINK2=		YES
-
-.include "../../www/php4/Makefile.module"
-
-CONFIGURE_ARGS+=	--enable-${MODNAME}
-CONFIGURE_ARGS+=	--with-expat-dir=shared,${BUILDLINK_PREFIX.expat}
-
-.include "../../textproc/expat/buildlink2.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/php4-xml/distinfo b/textproc/php4-xml/distinfo
deleted file mode 100644
index dac623ef9a9..00000000000
--- a/textproc/php4-xml/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.5 2002/10/14 06:21:17 martti Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes
diff --git a/textproc/php4-xslt/Makefile b/textproc/php4-xslt/Makefile
index 154c72d8b6a..15c7b178c12 100644
--- a/textproc/php4-xslt/Makefile
+++ b/textproc/php4-xslt/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2003/08/29 15:49:14 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2003/08/31 19:56:04 jdolecek Exp $
 
 MODNAME=		xslt
-PKGREVISION=		2
+PKGREVISION=		# empty
 CATEGORIES+=		textproc
 COMMENT=		PHP4 extension for XSLT functions (Sablotron backend)
 
@@ -10,9 +10,12 @@ USE_BUILDLINK2=		YES
 .include "../../www/php4/Makefile.module"
 
 CONFIGURE_ARGS+=	--enable-${MODNAME}
-CONFIGURE_ARGS+=	--with-${MODNAME}-sablot=shared,${BUILDLINK_PREFIX.sablotron}
-CONFIGURE_ARGS+=	--with-expat-dir=shared,${BUILDLINK_PREFIX.expat}
-# to make configure find libiconv
+CONFIGURE_ARGS+=	--with-${MODNAME}-sablot=${BUILDLINK_PREFIX.sablotron}
+CONFIGURE_ARGS+=	--with-expat-dir=${BUILDLINK_PREFIX.expat}
+
+# this is necessary so that PHP would find either the libc iconv
+# or use the packaged iconv, as appropriate; see also converters/php4-iconv
+CONFIGURE_ARGS+=	--with-iconv-dir
 CONFIGURE_ENV+=		PHP_ICONV=${BUILDLINK_PREFIX.iconv:Q}
 
 PLIST_SRC+=		${.CURDIR}/PLIST.extras
diff --git a/textproc/php4-xslt/distinfo b/textproc/php4-xslt/distinfo
deleted file mode 100644
index a083876a1df..00000000000
--- a/textproc/php4-xslt/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-$NetBSD: distinfo,v 1.4 2002/10/30 15:28:12 wiz Exp $
-
-SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc
-Size (php-4.2.3.tar.gz) = 3413829 bytes