Update to 3.0.16. Mainly bug fixes, though some new features as well -

the list is just too long, see http://www.php.net/ChangeLog.php3 for
details.

7 files changed, 22 insertions, 56 deletions

diff --git a/www/php3/Makefile b/www/php3/Makefile
index 6ea3565b699..2e82e6277b0 100644
--- a/www/php3/Makefile
+++ b/www/php3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/02/29 18:10:24 explorer Exp $
+# $NetBSD: Makefile,v 1.11 2000/04/12 17:51:57 jdolecek Exp $
 #
 
 DISTNAME=	php-${PHP_VERSION}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.php.net/
 
 DEPENDS+=	gdbm-1.7.3:../../databases/gdbm
 
-PHP_VERSION=	3.0.7
+PHP_VERSION=	3.0.16
 
 .if defined(BUILDING_EXTENSION_MODULE) || defined(BUILDING_SERVER_MODULE)
 DEPENDS+=	php-${PHP_VERSION}:../../www/php3
@@ -51,11 +51,7 @@ do-install:
 		${PREFIX}/bin/php2convert
 	if [ ! -d ${PREFIX}/libexec/cgi-bin ]; then \
 	  ${MKDIR}  ${PREFIX}/libexec/cgi-bin ; fi
-	${LN} -sf ${PREFIX}/bin/php ${PREFIX}/libexec/cgi-bin/php
-	cd ${WRKSRC}/dbase && \
-		${INSTALL_PROGRAM} dbfadd dbfcreat dbfdel dbfget dbflst \
-			dbfndx dbfpack dbftst ${PREFIX}/bin/
-	${INSTALL_SCRIPT} ${WRKSRC}/dbase/dbfscan ${PREFIX}/bin/
+	${LN} -sf ../../bin/php ${PREFIX}/libexec/cgi-bin/php
 	${INSTALL_DATA_DIR} ${PREFIX}/lib/php3 ${PREFIX}/share/php3
 	${INSTALL_DATA} ${WRKSRC}/extra/icons/* ${PREFIX}/share/php3/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/php3
diff --git a/www/php3/files/md5 b/www/php3/files/md5
index d813efc2422..0d780252827 100644
--- a/www/php3/files/md5
+++ b/www/php3/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.3 1999/05/03 19:45:44 tv Exp $
+$NetBSD: md5,v 1.4 2000/04/12 17:51:58 jdolecek Exp $
 
-MD5 (php-3.0.7.tar.gz) = 3881388d0bc88f0fda5bb925d908314a
+MD5 (php-3.0.16.tar.gz) = 0dc379181f625c30f635c2cf3080acb1
diff --git a/www/php3/files/patch-sum b/www/php3/files/patch-sum
index cd70b74ace2..a2ac5e6f91e 100644
--- a/www/php3/files/patch-sum
+++ b/www/php3/files/patch-sum
@@ -1,10 +1,9 @@
-$NetBSD: patch-sum,v 1.2 1999/12/07 11:22:03 rh Exp $
+$NetBSD: patch-sum,v 1.3 2000/04/12 17:51:58 jdolecek Exp $
 
 MD5 (patch-aa) = 618e4926bd55d562d324ba43c81eb441
 MD5 (patch-ab) = 2ee86872739cacc964f53d3798859531
 MD5 (patch-ac) = cebaa37b0348f11233c285dfd7571aea
 MD5 (patch-ad) = 0f8b89bbf9f430f5f66446fbb3f1daf2
-MD5 (patch-ae) = 6de1565d690f9438088f3a8e06fbcb03
 MD5 (patch-af) = 30bb3522e86d1178d0dda36913301ba1
 MD5 (patch-ag) = 31f5c4a4aea7e216e43af958775feeba
 MD5 (patch-ah) = 32e19163c24436abd0cc711d16b5524f
diff --git a/www/php3/patches/patch-ad b/www/php3/patches/patch-ad
index 71868439bf1..415c8c7a4a0 100644
--- a/www/php3/patches/patch-ad
+++ b/www/php3/patches/patch-ad
@@ -1,20 +1,13 @@
-$NetBSD: patch-ad,v 1.1 1999/05/03 19:45:44 tv Exp $
+$NetBSD: patch-ad,v 1.2 2000/04/12 17:51:58 jdolecek Exp $
 
---- Makefile.in.orig	Sun May  2 16:20:41 1999
-+++ Makefile.in	Sun May  2 16:21:02 1999
-@@ -58,13 +58,13 @@
+--- Makefile.in.orig	Thu Mar 30 06:14:21 2000
++++ Makefile.in	Wed Apr 12 19:23:52 2000
+@@ -63,7 +63,7 @@
         snprintf.c php3_sprintf.c alloc.c list.c highlight.c debugger.c \
         configuration-parser.tab.c configuration-scanner.c \
         request_info.c safe_mode.c fopen-wrappers.c constants.c \
 -       php3_realpath.c alloca.c php_compat.c
 +       php3_realpath.c alloca.c php_compat.c abstractions.c
- OBJS = language-parser.tab.o language-scanner.o main.o php3_hash.o operators.o \
-        variables.o token_cache.o stack.o internal_functions.o \
-        snprintf.o php3_sprintf.o alloc.o list.o highlight.o debugger.o \
-        configuration-parser.tab.o configuration-scanner.o \
-        request_info.o safe_mode.o fopen-wrappers.o constants.o \
--       php3_realpath.o alloca.o php_compat.o @LIBOBJS@
-+       php3_realpath.o alloca.o php_compat.o abstractions.o @LIBOBJS@
  
- FUNCTIONS_SOURCE = functions/adabasd.c functions/aspell.c functions/apache.c functions/fhttpd.c \
-        functions/basic_functions.c \
+ OBJS = $(SOURCE:.c=.o) @LIBOBJS@
+ 
diff --git a/www/php3/patches/patch-ae b/www/php3/patches/patch-ae
deleted file mode 100644
index 1a86f54c22a..00000000000
--- a/www/php3/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 1999/05/03 19:45:44 tv Exp $
-
---- dbase/Makefile.in.orig	Sun May  2 17:01:57 1999
-+++ dbase/Makefile.in	Sun May  2 17:02:08 1999
-@@ -11,7 +11,7 @@
- LIB=@libdir@
- 
- CC=@CC@
--CFLAGS=-I. -I@srcdir@ @CFLAGS@
-+CFLAGS=-I. -I@srcdir@ @CFLAGS@ @CFLAGS_SHLIB@
- RANLIB=@RANLIB@
- 
- TARGETS = dbflst tmpl dbfadd dbfdel dbfpack dbfget dbfndx dbfcreat \
diff --git a/www/php3/patches/patch-ah b/www/php3/patches/patch-ah
index 10952f89905..2c915696b67 100644
--- a/www/php3/patches/patch-ah
+++ b/www/php3/patches/patch-ah
@@ -1,19 +1,19 @@
-$NetBSD: patch-ah,v 1.2 1999/06/15 22:32:01 tron Exp $
+$NetBSD: patch-ah,v 1.3 2000/04/12 17:51:58 jdolecek Exp $
 
---- configure.orig	Fri May  7 10:05:45 1999
-+++ configure	Fri May  7 10:06:05 1999
-@@ -3729,6 +3729,7 @@
+--- configure.orig	Wed Apr  5 01:32:58 2000
++++ configure	Wed Apr 12 19:35:13 2000
+@@ -4373,6 +4373,7 @@
  fi
  
  
 +LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
  
  echo $ac_n "checking for Apache module support via DSO through APXS""... $ac_c" 1>&6
- echo "configure:3735: checking for Apache module support via DSO through APXS" >&5
-@@ -3748,7 +3748,7 @@
-     CFLAGS_SHLIB=`perl -V:cccdlflags | cut -d\' -f2`
-     LDFLAGS_SHLIB=`perl -V:lddlflags | cut -d\' -f2`
-     LDFLAGS_SHLIB_EXPORT=`perl -V:ccdlflags | cut -d\' -f2`
+ echo "configure:4379: checking for Apache module support via DSO through APXS" >&5
+@@ -4395,7 +4396,7 @@
+ 	if test "a`$APXS -q LD_SHLIB`" = "a" || test "`$APXS -q LIBEXECDIR`" = "modules"; then
+ 		PHP_APXS_BROKEN=yes
+ 	fi
 -    PHP_LIBS=-L/usr/local/lib
 +    PHP_LIBS="-L${PREFIX}/lib -Wl,-R${PREFIX}/lib"
      STRONGHOLD=
diff --git a/www/php3/pkg/PLIST b/www/php3/pkg/PLIST
index 9df3f5d2570..55a3c8b1804 100644
--- a/www/php3/pkg/PLIST
+++ b/www/php3/pkg/PLIST
@@ -1,13 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/05/03 21:32:46 tv Exp $
-bin/dbfadd
-bin/dbfcreat
-bin/dbfdel
-bin/dbfget
-bin/dbflst
-bin/dbfndx
-bin/dbfpack
-bin/dbfscan
-bin/dbftst
+@comment $NetBSD: PLIST,v 1.5 2000/04/12 17:51:58 jdolecek Exp $
 bin/php
 bin/php2convert
 etc/php3.ini.example