diff options
| -rw-r--r-- | lang/php4/Makefile | 4 | ||||
| -rw-r--r-- | lang/php4/distinfo | 4 | ||||
| -rw-r--r-- | lang/php4/files/patch-ext::pcre::php_pcre.c | 47 |
3 files changed, 3 insertions, 52 deletions
diff --git a/lang/php4/Makefile b/lang/php4/Makefile index a94ea55f8d5d..e819f0b45f6a 100644 --- a/lang/php4/Makefile +++ b/lang/php4/Makefile @@ -20,8 +20,7 @@ # PORTNAME= php4 -PORTVERSION= 4.3.6 -PORTREVISION= 1 +PORTVERSION= 4.3.7 CATEGORIES?= lang devel www MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \ http://downloads.php.net/ilia/:rc \ @@ -304,7 +303,6 @@ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--with-gd \ --enable-gd-native-ttf \ - --enable-gd-jis-conv \ --with-freetype-dir=${LOCALBASE} \ --with-t1lib=${LOCALBASE} \ --with-jpeg-dir=${LOCALBASE} \ diff --git a/lang/php4/distinfo b/lang/php4/distinfo index 0cd6ea768bc7..ec936c6b9b1f 100644 --- a/lang/php4/distinfo +++ b/lang/php4/distinfo @@ -1,2 +1,2 @@ -MD5 (php-4.3.6.tar.bz2) = 79cde484e31871176137eb78014657fa -SIZE (php-4.3.6.tar.bz2) = 3957796 +MD5 (php-4.3.7.tar.bz2) = 5293fdc909a306a2636e0fafcc79442c +SIZE (php-4.3.7.tar.bz2) = 3963734 diff --git a/lang/php4/files/patch-ext::pcre::php_pcre.c b/lang/php4/files/patch-ext::pcre::php_pcre.c deleted file mode 100644 index 164f47283c36..000000000000 --- a/lang/php4/files/patch-ext::pcre::php_pcre.c +++ /dev/null @@ -1,47 +0,0 @@ ---- 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; -- --#ifdef NO_RECURSE -- pcre_stack_malloc = php_pcre_malloc; -- pcre_stack_free = php_pcre_free; --#endif -- - return SUCCESS; - } - /* }}} */ -@@ -548,7 +526,7 @@ - } - } - -- php_pcre_free((void *) stringlist); -+ pcre_free((void *) stringlist); - } - } - else { /* Failed to match */ |