patch php.ini-dist and php.ini-recommended to comment out extension_dir

and to uncomment and explicitly set upload_tmp_dir, so that this works
out of box (patches adapted from www/php4)

pointed out by Martti Kuparinen on tech-pkg@

4 files changed, 54 insertions, 3 deletions

diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 9b6c53f8786..f6e26788990 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.21 2005/12/04 21:28:07 jdolecek Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/06 08:32:22 jdolecek Exp $
 #
 
 PKGNAME=		php-${PHP_BASE_VERS}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		lang
 
 HOMEPAGE=		http://www.php.net/
diff --git a/lang/php5/distinfo b/lang/php5/distinfo
index 9acfb1bc7bd..e319f0f2918 100644
--- a/lang/php5/distinfo
+++ b/lang/php5/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.12 2005/12/04 12:02:08 jdolecek Exp $
+$NetBSD: distinfo,v 1.13 2005/12/06 08:32:22 jdolecek Exp $
 
 SHA1 (php-5.1.1.tar.bz2) = 38c59909091c788cab21abb7562f90901da797b9
 RMD160 (php-5.1.1.tar.bz2) = 7578bca79f48b83176c1dfe4c71165de88453744
 Size (php-5.1.1.tar.bz2) = 6149470 bytes
+SHA1 (patch-ag) = 1ded1d7f4daac6806f41864c783f16d3403315e4
+SHA1 (patch-ah) = c7cbd4b9ea0796ea3b7491c2cffb6ddddc518587
 SHA1 (patch-aj) = cc68ce876dc5998becbe2f1f74288b5da5bbaca3
 SHA1 (patch-ak) = 0faa523103e0a9a3c01c78c2fe9a64c0a9b2fc43
 SHA1 (patch-ao) = bbd5aba2e45bb236eafac351f382633ef76b51f0
diff --git a/lang/php5/patches/patch-ag b/lang/php5/patches/patch-ag
new file mode 100644
index 00000000000..81d16856b8d
--- /dev/null
+++ b/lang/php5/patches/patch-ag
@@ -0,0 +1,24 @@
+$NetBSD: patch-ag,v 1.1 2005/12/06 08:32:22 jdolecek Exp $
+--- php.ini-dist.orig	2003-07-10 00:38:36.000000000 +0200
++++ php.ini-dist	2003-08-30 21:59:51.000000000 +0200
+@@ -424,8 +424,9 @@
+ ; if nonempty.
+ user_dir =
+ 
+-; Directory in which the loadable extensions (modules) reside.
+-extension_dir = "./"
++; Directory in which the loadable extensions (modules) reside. If not
++; defined, then use the extension directory specified at compile-time.
++; extension_dir = "./"
+ 
+ ; Whether or not to enable the dl() function.  The dl() function does NOT work
+ ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+@@ -476,7 +477,7 @@
+ 
+ ; Temporary directory for HTTP uploaded files (will use system default if not
+ ; specified).
+-;upload_tmp_dir =
++upload_tmp_dir = /tmp
+ 
+ ; Maximum allowed size for uploaded files.
+ upload_max_filesize = 2M
diff --git a/lang/php5/patches/patch-ah b/lang/php5/patches/patch-ah
new file mode 100644
index 00000000000..6d2b7dd9bb8
--- /dev/null
+++ b/lang/php5/patches/patch-ah
@@ -0,0 +1,25 @@
+$NetBSD: patch-ah,v 1.1 2005/12/06 08:32:22 jdolecek Exp $
+
+--- php.ini-recommended.orig	2005-11-15 00:14:23.000000000 +0100
++++ php.ini-recommended
+@@ -515,8 +515,9 @@ doc_root =
+ ; if nonempty.
+ user_dir =
+ 
+-; Directory in which the loadable extensions (modules) reside.
+-extension_dir = "./"
++; Directory in which the loadable extensions (modules) reside. If not
++; defined, then use the extension directory specified at compile-time.
++; extension_dir = "./"
+ 
+ ; Whether or not to enable the dl() function.  The dl() function does NOT work
+ ; properly in multithreaded servers, such as IIS or Zeus, and is automatically
+@@ -566,7 +567,7 @@ file_uploads = On
+ 
+ ; Temporary directory for HTTP uploaded files (will use system default if not
+ ; specified).
+-;upload_tmp_dir =
++upload_tmp_dir = /tmp
+ 
+ ; Maximum allowed size for uploaded files.
+ upload_max_filesize = 2M