Updated php to 4.2.3

* lots of bug fixes
* experimental apache2 support
* added IPv6 support to gethostbyaddr()

ATTENTION!! register_globals defaults to 'off' now

5 files changed, 26 insertions, 50 deletions

diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac
index af613d4f86f..d120f510f29 100644
--- a/www/php4/patches/patch-ac
+++ b/www/php4/patches/patch-ac
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.5 2001/12/31 23:54:25 jlam Exp $
+$NetBSD: patch-ac,v 1.6 2002/10/14 06:21:19 martti Exp $
 
---- acinclude.m4.orig	Sat Nov 17 19:33:19 2001
-+++ acinclude.m4
-@@ -341,10 +341,19 @@
+--- acinclude.m4.orig	Mon Jul 29 02:15:18 2002
++++ acinclude.m4	Sat Oct 12 09:25:51 2002
+@@ -364,10 +364,19 @@
    ;;
  esac
  
@@ -23,8 +23,8 @@ $NetBSD: patch-ac,v 1.5 2001/12/31 23:54:25 jlam Exp $
 -  test "[$]$1" = "no" && $1=yes
  fi
  
- AC_MSG_RESULT($ext_output)
-@@ -675,7 +684,7 @@
+ if test -n "$2"; then
+@@ -704,7 +713,7 @@
    if test "$1" != "/usr/lib"; then
      PHP_EXPAND_PATH($1, ai_p)
      if test "$ext_shared" = "yes" && test -n "$2"; then
diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad
index 4a5faeed9f8..856d6bd3f17 100644
--- a/www/php4/patches/patch-ad
+++ b/www/php4/patches/patch-ad
@@ -1,31 +1,19 @@
-$NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $
+$NetBSD: patch-ad,v 1.11 2002/10/14 06:21:19 martti Exp $
 
---- configure.orig	Wed Feb 27 04:18:32 2002
-+++ configure
-@@ -5138,11 +5138,6 @@
-   fi
+--- configure.orig	Thu Sep  5 23:40:53 2002
++++ configure	Sat Oct 12 09:27:49 2002
+@@ -5396,10 +5396,6 @@
  
+   fi
  
 -if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
 -       CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
 -       LDFLAGS="$LDFLAGS -L/usr/pkg/lib"
 -fi
--
  INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
- 
- 
-@@ -16148,10 +16143,6 @@
- 
- else
-   echo "$ac_t""no" 1>&6
--  cat >> confdefs.h <<\EOF
--#define HAVE_DBA 0
--EOF
--
- fi
- 
- 
-@@ -23572,19 +23563,10 @@
+ test -d /usr/ucblib && 
+   if test "/usr/ucblib" != "/usr/lib"; then
+@@ -26847,19 +26843,10 @@
  
  
    else
@@ -45,7 +33,7 @@ $NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $
    echo "$ac_t""no" 1>&6
  
  fi
-@@ -58680,7 +58662,7 @@
+@@ -72831,7 +72818,7 @@
  
  TSRM_LIB='TSRM/libtsrm.la'
  TSRM_DIR=TSRM
@@ -54,7 +42,7 @@ $NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $
  
  if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then
    cat >> confdefs.h <<\EOF
-@@ -63418,7 +63400,7 @@
+@@ -73625,7 +73612,7 @@
  
  if test "$enable_debug" != "yes"; then
    
diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af
deleted file mode 100644
index 8eefe367d72..00000000000
--- a/www/php4/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/12/31 23:54:26 jlam Exp $
-
---- pear/Makefile.in.orig	Wed Dec 26 14:50:18 2001
-+++ pear/Makefile.in
-@@ -168,6 +168,7 @@
- 	/ \
- 	Zend \
- 	TSRM \
-+	ext/session \
- 	ext/standard \
- 	ext/xml \
- 	ext/xml/expat/xmlparse \
diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag
index cc81b6312d0..d55e8853186 100644
--- a/www/php4/patches/patch-ag
+++ b/www/php4/patches/patch-ag
@@ -1,8 +1,8 @@
-$NetBSD: patch-ag,v 1.3 2001/12/31 23:54:26 jlam Exp $
+$NetBSD: patch-ag,v 1.4 2002/10/14 06:21:20 martti Exp $
 
---- php.ini-dist.orig	Tue Aug 14 16:23:25 2001
-+++ php.ini-dist
-@@ -354,8 +354,9 @@
+--- php.ini-dist.orig	Sat Aug 24 00:57:06 2002
++++ php.ini-dist	Sat Oct 12 09:29:27 2002
+@@ -367,8 +367,9 @@
  ; if nonempty.
  user_dir =
  
@@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.3 2001/12/31 23:54:26 jlam Exp $
  
  ; 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
-@@ -372,7 +373,7 @@
+@@ -396,7 +397,7 @@
  
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).
diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah
index 9a9a88ef93a..f2b54b1338b 100644
--- a/www/php4/patches/patch-ah
+++ b/www/php4/patches/patch-ah
@@ -1,8 +1,8 @@
-$NetBSD: patch-ah,v 1.4 2001/12/31 23:54:26 jlam Exp $
+$NetBSD: patch-ah,v 1.5 2002/10/14 06:21:20 martti Exp $
 
---- php.ini-recommended.orig	Fri Aug 17 12:54:16 2001
-+++ php.ini-recommended
-@@ -368,7 +368,7 @@
+--- php.ini-recommended.orig	Sat Aug 24 00:57:06 2002
++++ php.ini-recommended	Sat Oct 12 09:29:54 2002
+@@ -373,7 +373,7 @@
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
@@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.4 2001/12/31 23:54:26 jlam Exp $
  
  ; 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
-@@ -385,7 +385,7 @@
+@@ -403,7 +403,7 @@
  
  ; Temporary directory for HTTP uploaded files (will use system default if not
  ; specified).