diff options
Diffstat (limited to 'www/php4/patches')
| -rw-r--r-- | www/php4/patches/patch-ab | 14 | ||||
| -rw-r--r-- | www/php4/patches/patch-aj | 35 |
2 files changed, 26 insertions, 23 deletions
diff --git a/www/php4/patches/patch-ab b/www/php4/patches/patch-ab index f6f4e055045..69135de6e4f 100644 --- a/www/php4/patches/patch-ab +++ b/www/php4/patches/patch-ab @@ -1,18 +1,20 @@ -$NetBSD: patch-ab,v 1.13 2003/09/01 10:17:38 cjep Exp $ ---- scripts/phpize.in.orig 2003-08-30 22:28:44.000000000 +0200 -+++ scripts/phpize.in 2003-08-30 22:29:39.000000000 +0200 -@@ -54,10 +54,15 @@ +$NetBSD: patch-ab,v 1.14 2003/11/08 06:58:10 jdolecek Exp $ + +--- scripts/phpize.in.orig 2003-08-27 19:57:32.000000000 +0200 ++++ scripts/phpize.in 2003-11-07 21:44:48.000000000 +0100 +@@ -54,11 +54,15 @@ touch install-sh mkinstalldirs missing -aclocal || exit 1 -autoconf || exit 1 -autoheader || exit 1 --libtoolize -f -c || exit 1 +-libtoolize=`$builddir/build/shtool path glibtoolize libtoolize` +-$libtoolize -f -c || exit 1 +if [ -z "$ACLOCAL" ]; then ACLOCAL=aclocal; fi +if [ -z "$AUTOCONF" ]; then AUTOCONF=autoconf; fi +if [ -z "$AUTOHEADER" ]; then AUTOHEADER=autoheader; fi -+if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=libtoolize; fi ++if [ -z "$LIBTOOLIZE" ]; then LIBTOOLIZE=`$builddir/build/shtool path glibtoolize libtoolize`; fi + +$ACLOCAL || exit 1 +$AUTOCONF || exit 1 diff --git a/www/php4/patches/patch-aj b/www/php4/patches/patch-aj index 427e70ac439..76067e698f1 100644 --- a/www/php4/patches/patch-aj +++ b/www/php4/patches/patch-aj @@ -1,19 +1,20 @@ -$NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $ ---- ext/gettext/gettext.c.orig 2003-08-30 21:56:34.000000000 +0200 -+++ ext/gettext/gettext.c 2003-08-30 21:57:13.000000000 +0200 -@@ -58,6 +58,11 @@ - }; - /* }}} */ - -+#define CHECK(a) if (a == NULL) { \ -+ fprintf(stderr, "%s, %d: NULL value\n", __FILE__, __LINE__); \ -+ a = ""; \ +$NetBSD: patch-aj,v 1.6 2003/11/08 06:58:10 jdolecek Exp $ + +--- ext/gettext/gettext.c.orig 2003-09-24 04:08:48.000000000 +0200 ++++ ext/gettext/gettext.c 2003-11-07 21:47:25.000000000 +0100 +@@ -31,6 +31,11 @@ + #include "ext/standard/info.h" + #include "php_gettext.h" + ++#define CHECK(a) if (a == NULL) { \ ++ fprintf(stderr, "%s, %d: NULL value\n", __FILE__, __LINE__); \ ++ a = ""; \ +} + - zend_module_entry php_gettext_module_entry = { - STANDARD_MODULE_HEADER, - "gettext", -@@ -104,6 +109,7 @@ + /* {{{ php_gettext_functions[] + */ + function_entry php_gettext_functions[] = { +@@ -103,6 +108,7 @@ retval = textdomain(domain_name); @@ -21,7 +22,7 @@ $NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $ RETURN_STRING(retval, 1); } /* }}} */ -@@ -141,6 +147,7 @@ +@@ -140,6 +146,7 @@ msgstr = dgettext(Z_STRVAL_PP(domain_name), Z_STRVAL_PP(msgid)); @@ -29,7 +30,7 @@ $NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $ RETURN_STRING(msgstr, 1); } /* }}} */ -@@ -161,6 +168,7 @@ +@@ -160,6 +167,7 @@ msgstr = dcgettext(Z_STRVAL_PP(domain_name), Z_STRVAL_PP(msgid), Z_LVAL_PP(category)); @@ -37,7 +38,7 @@ $NetBSD: patch-aj,v 1.5 2003/09/01 10:17:39 cjep Exp $ RETURN_STRING(msgstr, 1); } /* }}} */ -@@ -191,6 +199,7 @@ +@@ -190,6 +198,7 @@ retval = bindtextdomain(Z_STRVAL_PP(domain_name), dir_name); |