4 files changed, 15 insertions, 32 deletions

diff --git a/www/mod_php4/files/patch-Makefile.in b/www/mod_php4/files/patch-Makefile.in
deleted file mode 100644
index 05bf9df10f97..000000000000
--- a/www/mod_php4/files/patch-Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- Makefile.in.orig	Sun Apr 22 03:09:12 2001
-+++ Makefile.in	Wed Dec 19 20:38:06 2001
-@@ -24,7 +24,11 @@
- 
- targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
- 
-+.if defined(STANDALONE)
-+install_targets = install-sapi
-+.else
- install_targets = install-sapi install-modules
-+.endif
- 
- include $(top_srcdir)/build/rules.mk
- include $(top_srcdir)/build/library.mk
diff --git a/www/mod_php4/files/patch-aa b/www/mod_php4/files/patch-aa
deleted file mode 100644
index d758788069d5..000000000000
--- a/www/mod_php4/files/patch-aa
+++ /dev/null
@@ -1,14 +0,0 @@
---- ext/ming/php_ming.h.orig	Mon May 28 02:09:57 2001
-+++ ext/ming/php_ming.h	Mon Oct 15 22:53:37 2001
-@@ -28,7 +28,10 @@
- 
- #if HAVE_MING
- 
--#include "ming.h"
-+#include "ming/ming.h"
-+
-+/* XXX: dirty workaround */
-+#define MING_VERSION_TEXT "0.2a"
- 
- extern zend_module_entry ming_module_entry;
- #define ming_module_ptr &ming_module_entry
diff --git a/www/mod_php4/files/patch-ext_mcal_config.m4 b/www/mod_php4/files/patch-ext_mcal_config.m4
index a9597463f28f..821646154769 100644
--- a/www/mod_php4/files/patch-ext_mcal_config.m4
+++ b/www/mod_php4/files/patch-ext_mcal_config.m4
@@ -1,9 +1,9 @@
---- ext/mcal/config.m4.orig	Tue Mar 27 22:34:31 2001
-+++ ext/mcal/config.m4	Fri Nov 30 09:26:56 2001
-@@ -44,5 +44,14 @@
+--- ext/mcal/config.m4.orig	Wed Mar 27 11:26:16 2002
++++ ext/mcal/config.m4	Fri Jan  3 19:38:46 2003
+@@ -41,5 +41,14 @@
    PHP_SUBST(MCAL_SHARED_LIBADD)
    AC_DEFINE(HAVE_MCAL,1,[ ])
-   PHP_EXTENSION(mcal,$ext_shared)
+   PHP_NEW_EXTENSION(mcal, php_mcal.c, $ext_shared)
 +  cat >> confdefs.h <<\EOF
 +/* Interfaces to callbacks in libmcal */
 +#include <mcal/mcal.h>
diff --git a/www/mod_php4/files/patch-ext_ming_php_ming.h b/www/mod_php4/files/patch-ext_ming_php_ming.h
new file mode 100644
index 000000000000..f07deba0c867
--- /dev/null
+++ b/www/mod_php4/files/patch-ext_ming_php_ming.h
@@ -0,0 +1,11 @@
+--- ext/ming/php_ming.h.orig	Mon Apr  8 02:46:22 2002
++++ ext/ming/php_ming.h	Fri Jan  3 19:35:55 2003
+@@ -24,7 +24,7 @@
+ extern zend_module_entry ming_module_entry;
+ #define ming_module_ptr &ming_module_entry
+ 
+-#include <ming.h>
++#include <ming/ming.h>
+ 
+ PHP_RINIT_FUNCTION(ming);
+ PHP_MINIT_FUNCTION(ming);