diff options
| author | salo <salo> | 2006-03-16 12:37:12 +0000 |
|---|---|---|
| committer | salo <salo> | 2006-03-16 12:37:12 +0000 |
| commit | 68536aa6a3954cba57e7093158883b9189dc9488 (patch) | |
| tree | fa01b3f9b7175d84f10cc517433b2491520884ee | |
| parent | 646271889eed76000d2b23d1d4ac3e46554e7cd7 (diff) | |
| download | pkgsrc-68536aa6a3954cba57e7093158883b9189dc9488.tar.gz | |
Add missing patches for #1223
| -rw-r--r-- | www/php4/patches/patch-ao | 17 | ||||
| -rw-r--r-- | www/php4/patches/patch-ap | 12 |
2 files changed, 29 insertions, 0 deletions
diff --git a/www/php4/patches/patch-ao b/www/php4/patches/patch-ao new file mode 100644 index 00000000000..aa22aa6ac86 --- /dev/null +++ b/www/php4/patches/patch-ao @@ -0,0 +1,17 @@ +$NetBSD: patch-ao,v 1.2.2.2 2006/03/16 12:37:12 salo Exp $ + +--- pear/Makefile.frag.orig 2005-11-05 19:19:23.000000000 +0100 ++++ pear/Makefile.frag +@@ -3,10 +3,10 @@ + peardir=$(PEAR_INSTALLDIR) + + # Skip all php.ini files altogether +-PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 ++PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dmemory_limit=16M + + install-pear-packages: $(top_builddir)/sapi/cli/php +- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" $(srcdir)/packages/*.tar ++ @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(srcdir)/install-pear.php -d "$(peardir)" -b "$(bindir)" --force $(srcdir)/packages/*.tar + + install-pear: + @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/" diff --git a/www/php4/patches/patch-ap b/www/php4/patches/patch-ap new file mode 100644 index 00000000000..1e3da48d122 --- /dev/null +++ b/www/php4/patches/patch-ap @@ -0,0 +1,12 @@ +$NetBSD: patch-ap,v 1.1.2.2 2006/03/16 12:37:12 salo Exp $ + +--- pear/install-pear.php.orig 2006-01-07 18:51:54.000000000 +0100 ++++ pear/install-pear.php +@@ -167,6 +167,7 @@ foreach ($install_files as $package => $ + } + } else { + $options['nodeps'] = true; ++ $options['force'] = $force; + $installer->setOptions($options); + $dp = array(&$downloaderpackage); + $installer->setDownloadedPackages($dp); |