update patches so that this is in sync with what got committed

into PHP CVS tree; the patches will be disposed on next PHP update

PKGREVISION not bumped, the package works exactly same as before

3 files changed, 29 insertions, 11 deletions

diff --git a/math/php4-bcmath/distinfo b/math/php4-bcmath/distinfo
index fd1986d3ba5..6ad1c74a935 100644
--- a/math/php4-bcmath/distinfo
+++ b/math/php4-bcmath/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2003/11/08 06:58:10 jdolecek Exp $
+$NetBSD: distinfo,v 1.9 2003/12/01 14:23:51 jdolecek Exp $
 
 SHA1 (php-4.3.4.tar.bz2) = 3047089b499c004728c90db359a3e42b50f4c1f3
 Size (php-4.3.4.tar.bz2) = 3774324 bytes
-SHA1 (patch-aa) = 87d0642aaa4083e36844fb61065ab44dd33be0e5
+SHA1 (patch-aa) = fca498749e3e9b3eace88734ee6dd63685f5ccca
+SHA1 (patch-ab) = fd34fd321799e337c3d126aec0eb4323267e891f
diff --git a/math/php4-bcmath/patches/patch-aa b/math/php4-bcmath/patches/patch-aa
index 7ac23bdd03a..11e322faae0 100644
--- a/math/php4-bcmath/patches/patch-aa
+++ b/math/php4-bcmath/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.2 2003/08/31 19:55:50 jdolecek Exp $
+$NetBSD: patch-aa,v 1.3 2003/12/01 14:23:51 jdolecek Exp $
 
---- config.m4.orig	2002-03-07 15:18:01.000000000 +0100
-+++ config.m4	2003-08-31 18:24:27.000000000 +0200
-@@ -7,11 +7,11 @@
+This is PHP CVS tree now, remove patch from pkgsrc on next PHP update.
+
+--- config.m4.orig	2003-11-29 14:53:04.000000000 +0100
++++ config.m4	2003-11-29 14:53:13.000000000 +0100
+@@ -7,7 +7,7 @@
  
  if test "$PHP_BCMATH" != "no"; then
    AC_DEFINE(WITH_BCMATH, 1, [Whether you have bcmath])
@@ -11,8 +13,3 @@ $NetBSD: patch-aa,v 1.2 2003/08/31 19:55:50 jdolecek Exp $
  libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \
  libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \
  libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \
- libbcmath/src/rmzero.c libbcmath/src/str2num.c,
--          $ext_shared,,-I@ext_srcdir@/libbcmath/src)
-+          $ext_shared,,-I@ext_srcdir@ -I@ext_srcdir@/../.. -I@ext_srcdir@/libbcmath/src)
-   PHP_ADD_BUILD_DIR($ext_builddir/libbcmath/src)
- fi
diff --git a/math/php4-bcmath/patches/patch-ab b/math/php4-bcmath/patches/patch-ab
new file mode 100644
index 00000000000..fbdef80d6e1
--- /dev/null
+++ b/math/php4-bcmath/patches/patch-ab
@@ -0,0 +1,20 @@
+$NetBSD: patch-ab,v 1.3 2003/12/01 14:23:51 jdolecek Exp $
+
+This is PHP CVS tree now, remove patch from pkgsrc on next PHP update.
+
+--- libbcmath/src/bcmath.h.orig	2002-11-22 10:27:08.000000000 +0100
++++ libbcmath/src/bcmath.h	2003-12-01 15:12:34.000000000 +0100
+@@ -52,8 +52,11 @@
+ 			   in the case of leading zeros generated. */
+     } bc_struct;
+ 
+-#include <php.h>
+-#include <ext/bcmath/php_bcmath.h>
++#include "php.h"
++#ifdef HAVE_CONFIG_H
++#include "../../config.h"
++#endif
++#include "../../php_bcmath.h"
+ 
+ 
+ /* The base used in storing the numbers in n_value above.