diff options
author | dirk <dirk@FreeBSD.org> | 2003-01-29 15:16:08 +0000 |
---|---|---|
committer | dirk <dirk@FreeBSD.org> | 2003-01-29 15:16:08 +0000 |
commit | efec1d991c7dd954ebf488628209a8888cbedc00 (patch) | |
tree | b4aaba1d4d2adf7467f1a8fe1c2226e07c631364 /www/mod_php5/files | |
parent | 026a76eaa195a6e009e9c7652f09fce2c3c495de (diff) | |
download | FreeBSD-ports-efec1d991c7dd954ebf488628209a8888cbedc00.zip FreeBSD-ports-efec1d991c7dd954ebf488628209a8888cbedc00.tar.gz |
Update to 4.3.0.
lang/php was integrated into www/mod_php4.
Diffstat (limited to 'www/mod_php5/files')
-rw-r--r-- | www/mod_php5/files/patch-Makefile.in | 14 | ||||
-rw-r--r-- | www/mod_php5/files/patch-aa | 14 | ||||
-rw-r--r-- | www/mod_php5/files/patch-ext_mcal_config.m4 | 8 | ||||
-rw-r--r-- | www/mod_php5/files/patch-ext_ming_php_ming.h | 11 |
4 files changed, 15 insertions, 32 deletions
diff --git a/www/mod_php5/files/patch-Makefile.in b/www/mod_php5/files/patch-Makefile.in deleted file mode 100644 index 05bf9df..0000000 --- a/www/mod_php5/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_php5/files/patch-aa b/www/mod_php5/files/patch-aa deleted file mode 100644 index d758788..0000000 --- a/www/mod_php5/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_php5/files/patch-ext_mcal_config.m4 b/www/mod_php5/files/patch-ext_mcal_config.m4 index a959746..8216461 100644 --- a/www/mod_php5/files/patch-ext_mcal_config.m4 +++ b/www/mod_php5/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_php5/files/patch-ext_ming_php_ming.h b/www/mod_php5/files/patch-ext_ming_php_ming.h new file mode 100644 index 0000000..f07deba --- /dev/null +++ b/www/mod_php5/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); |