diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2004-05-07 23:30:30 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2004-05-07 23:30:30 +0000 |
| commit | ac9bdc26efbf36f809e83906eb42f5ecd914844e (patch) | |
| tree | 9311e77e6d0e13a736e04ba570264854e9f57ef3 /lang/php4/files | |
| parent | Add gaphor 0.3.1, UML modeling environment written in Python. (diff) | |
- Add sysvmsg extension [1]
- Add XML_RPC to PEAR bootstrap [2]
- Use the official pcre fix [3]
- Bump PORTREVISION
Requested by: Andy Smith <andy@strugglers.net> [1]
Submitted by: thierry [2]
Obtained from: php CVS [3]
Notes
Notes:
svn path=/head/; revision=108652
Diffstat (limited to 'lang/php4/files')
| -rw-r--r-- | lang/php4/files/patch-ext::pcre::php_pcre.c | 63 | ||||
| -rw-r--r-- | lang/php4/files/patch-pear::Makefile.frag | 21 |
2 files changed, 50 insertions, 34 deletions
diff --git a/lang/php4/files/patch-ext::pcre::php_pcre.c b/lang/php4/files/patch-ext::pcre::php_pcre.c index c9efc2e0d480..164f47283c36 100644 --- a/lang/php4/files/patch-ext::pcre::php_pcre.c +++ b/lang/php4/files/patch-ext::pcre::php_pcre.c @@ -1,10 +1,30 @@ ---- ext/pcre/php_pcre.c.orig Fri Apr 16 09:21:14 2004 -+++ ext/pcre/php_pcre.c Fri Apr 16 09:23:36 2004 -@@ -106,15 +106,6 @@ - REGISTER_LONG_CONSTANT("PREG_SPLIT_DELIM_CAPTURE", PREG_SPLIT_DELIM_CAPTURE, CONST_CS | CONST_PERSISTENT); +--- ext/pcre/php_pcre.c.orig Sun Feb 1 20:56:16 2004 ++++ ext/pcre/php_pcre.c Sat May 8 00:50:32 2004 +@@ -47,20 +47,6 @@ + + ZEND_DECLARE_MODULE_GLOBALS(pcre) + +- +-static void *php_pcre_malloc(size_t size) +-{ +- return pemalloc(size, 1); +-} +- +- +-static void php_pcre_free(void *ptr) +-{ +- if (ptr) +- pefree(ptr, 1); +-} +- +- + static void php_free_pcre_cache(void *data) + { + pcre_cache_entry *pce = (pcre_cache_entry *) data; +@@ -107,14 +93,6 @@ REGISTER_LONG_CONSTANT("PREG_SPLIT_OFFSET_CAPTURE", PREG_SPLIT_OFFSET_CAPTURE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("PREG_GREP_INVERT", PREG_GREP_INVERT, CONST_CS | CONST_PERSISTENT); -- + - pcre_malloc = php_pcre_malloc; - pcre_free = php_pcre_free; - @@ -16,29 +36,12 @@ return SUCCESS; } /* }}} */ -@@ -130,6 +121,16 @@ - } - /* }}} */ +@@ -548,7 +526,7 @@ + } + } -+/* {{{ PHP_RINIT_FUNCTION(pcre) */ -+static PHP_RINIT_FUNCTION(pcre) -+{ -+ pcre_malloc = php_pcre_malloc; -+ pcre_free = php_pcre_free; -+ -+ return SUCCESS; -+} -+/* }}} */ -+ - /* {{{ pcre_get_compiled_regex - */ - PHPAPI pcre* pcre_get_compiled_regex(char *regex, pcre_extra **extra, int *preg_options) { -@@ -1527,7 +1528,7 @@ - pcre_functions, - PHP_MINIT(pcre), - PHP_MSHUTDOWN(pcre), -- NULL, -+ PHP_RINIT(pcre), - NULL, - PHP_MINFO(pcre), - NO_VERSION_YET, +- php_pcre_free((void *) stringlist); ++ pcre_free((void *) stringlist); + } + } + else { /* Failed to match */ diff --git a/lang/php4/files/patch-pear::Makefile.frag b/lang/php4/files/patch-pear::Makefile.frag index 060066c367b6..ee24944b46c6 100644 --- a/lang/php4/files/patch-pear::Makefile.frag +++ b/lang/php4/files/patch-pear::Makefile.frag @@ -1,6 +1,14 @@ ---- pear/Makefile.frag.orig Sat Apr 12 01:48:37 2003 -+++ pear/Makefile.frag Sat May 17 10:08:54 2003 -@@ -13,10 +13,13 @@ +--- pear/Makefile.frag.orig Tue Sep 2 03:30:13 2003 ++++ pear/Makefile.frag Thu Apr 22 23:52:40 2004 +@@ -1,6 +1,7 @@ + # -*- makefile -*- + + peardir=$(PEAR_INSTALLDIR) ++XML_RPC_ver=1.1.0 + + # Skip all php.ini files altogether + PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 +@@ -13,10 +14,18 @@ install-pear: @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" @@ -12,11 +20,16 @@ - fi + @$(mkinstalldirs) $(INSTALL_ROOT)$(peardir)/bootstrap \ + $(INSTALL_ROOT)$(peardir)/bootstrap/Archive \ -+ $(INSTALL_ROOT)$(peardir)/bootstrap/Console ++ $(INSTALL_ROOT)$(peardir)/bootstrap/Console \ ++ $(INSTALL_ROOT)$(peardir)/bootstrap/XML \ ++ $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC + @cp $(srcdir)/PEAR.php $(srcdir)/System.php \ + $(INSTALL_ROOT)$(peardir)/bootstrap + @cp $(srcdir)/Archive/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Archive + @cp $(srcdir)/Console/*.php $(INSTALL_ROOT)$(peardir)/bootstrap/Console + @cp -R $(srcdir)/OS $(INSTALL_ROOT)$(peardir)/bootstrap + @cp -R $(srcdir)/PEAR $(INSTALL_ROOT)$(peardir)/bootstrap ++ @tar xf $(srcdir)/packages/XML_RPC-$(XML_RPC_ver).tar ++ @cp XML_RPC-$(XML_RPC_ver)/RPC.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML ++ @cp XML_RPC-$(XML_RPC_ver)/Server.php $(INSTALL_ROOT)$(peardir)/bootstrap/XML/RPC |