Importing PHP 5.3.2 as lang/php53.

This package and lang/php5 aren't installed at the same time.
Setting PHP_VERSION_DEFAULT as "5" or "53" to select PHP 5.2.x or 5.3.x.


PHP is an HTML-embedded scripting language. It is modular, with
some object-oriented features. Much of its syntax is borrowed from
C, Java and Perl with a couple of unique PHP-specific features
thrown in.  The language is designed to allow web developers to
write dynamically generated pages quickly.

10 files changed, 257 insertions, 0 deletions

diff --git a/lang/php53/patches/patch-aa b/lang/php53/patches/patch-aa
new file mode 100644
index 00000000000..937a2c6de37
--- /dev/null
+++ b/lang/php53/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- acinclude.m4.orig	2009-11-29 06:13:22.000000000 +0000
++++ acinclude.m4
+@@ -2335,7 +2335,7 @@ AC_DEFUN([PHP_SETUP_OPENSSL],[
+   if test "$found_openssl" = "no"; then
+   
+     if test "$PHP_OPENSSL_DIR" = "yes"; then
+-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
++      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
+     fi
+ 
+     for i in $PHP_OPENSSL_DIR; do
diff --git a/lang/php53/patches/patch-ab b/lang/php53/patches/patch-ab
new file mode 100644
index 00000000000..8a040ed4fea
--- /dev/null
+++ b/lang/php53/patches/patch-ab
@@ -0,0 +1,63 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- configure.orig	2010-03-13 06:01:16.000000000 +0000
++++ configure
+@@ -12194,7 +12194,7 @@ EOF
+   PHP_VAR_SUBST="$PHP_VAR_SUBST SAPI_CGI_PATH"
+ 
+ 
+-        INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)\$(bindir)/\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php-cgi\$(program_suffix)\$(EXEEXT)"
++        INSTALL_IT="@echo \"Installing PHP CGI binary: \$(INSTALL_ROOT)@CGIDIR@\"; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) \$(INSTALL_ROOT)@CGIDIR@/php"
+     
+   PHP_SAPI=cgi
+   
+@@ -21515,7 +21515,7 @@ fi
+     if test "$found_openssl" = "no"; then
+   
+     if test "$PHP_OPENSSL_DIR" = "yes"; then
+-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
++      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
+     fi
+ 
+     for i in $PHP_OPENSSL_DIR; do
+@@ -34398,7 +34398,7 @@ fi
+     if test "$found_openssl" = "no"; then
+   
+     if test "$PHP_OPENSSL_DIR" = "yes"; then
+-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
++      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
+     fi
+ 
+     for i in $PHP_OPENSSL_DIR; do
+@@ -48467,7 +48467,7 @@ fi
+     if test "$found_openssl" = "no"; then
+   
+     if test "$PHP_OPENSSL_DIR" = "yes"; then
+-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
++      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
+     fi
+ 
+     for i in $PHP_OPENSSL_DIR; do
+@@ -82684,7 +82684,7 @@ fi
+     if test "$found_openssl" = "no"; then
+   
+     if test "$PHP_OPENSSL_DIR" = "yes"; then
+-      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl"
++      PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl /"
+     fi
+ 
+     for i in $PHP_OPENSSL_DIR; do
+@@ -104623,12 +104623,7 @@ old_CC=$CC
+ if test "$PHP_THREAD_SAFETY" = "yes" && test -n "$ac_cv_pthreads_cflags"; then
+   CXXFLAGS="$CXXFLAGS $ac_cv_pthreads_cflags"
+   INLINE_CFLAGS="$INLINE_CFLAGS $ac_cv_pthreads_cflags"
+-  cat >meta_ccld<<EOF
+-#! /bin/sh
+-exec $CC $ac_cv_pthreads_cflags \$@
+-EOF
+-  CC="$abs_builddir/meta_ccld"
+-  chmod +x meta_ccld
++  CPPFLAGS="$CPPFLAGS $ac_cv_pthreads_cflags"
+ fi
+ 
+ if test "$PHP_THREAD_SAFETY" = "yes" && test "$PHP_MYSQL" = "yes"; then
diff --git a/lang/php53/patches/patch-ac b/lang/php53/patches/patch-ac
new file mode 100644
index 00000000000..a76a602da46
--- /dev/null
+++ b/lang/php53/patches/patch-ac
@@ -0,0 +1,32 @@
+$NetBSD: patch-ac,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- ext/gd/config.m4.orig	2009-05-27 08:18:24.000000000 +0000
++++ ext/gd/config.m4
+@@ -45,18 +45,7 @@ dnl Checks for the configure options
+ dnl
+ 
+ AC_DEFUN([PHP_GD_ZLIB],[
+-	if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then
+-		if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then
+-			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib"
+-		elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then
+-			PHP_ZLIB_DIR="$PHP_ZLIB_DIR"
+-			PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include"
+-		else
+-			AC_MSG_ERROR([Can't find zlib headers under "$PHP_ZLIB_DIR"])
+-		fi
+-	else
+-		for i in /usr/local /usr; do
++		for i in "$PHP_ZLIB_DIR" /usr/local /usr; do
+ 			if test -f "$i/include/zlib/zlib.h"; then
+ 				PHP_ZLIB_DIR="$i"
+ 				PHP_ZLIB_INCDIR="$i/include/zlib"
+@@ -65,7 +54,6 @@ AC_DEFUN([PHP_GD_ZLIB],[
+ 				PHP_ZLIB_INCDIR="$i/include"
+ 			fi
+ 		done
+-	fi
+ ])
+ 
+ AC_DEFUN([PHP_GD_JPEG],[
diff --git a/lang/php53/patches/patch-ad b/lang/php53/patches/patch-ad
new file mode 100644
index 00000000000..dbfacb5c872
--- /dev/null
+++ b/lang/php53/patches/patch-ad
@@ -0,0 +1,28 @@
+$NetBSD: patch-ad,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- ext/imap/config.m4.orig	2010-02-07 13:06:54.000000000 +0000
++++ ext/imap/config.m4
+@@ -48,6 +48,14 @@ AC_DEFUN([PHP_IMAP_TEST_BUILD], [
+   ])
+ ])
+ 
++dsl Must be before --with-kerberos, affects the check
++PHP_ARG_WITH(imap-linkage,use IMAP c-client linkage,
++[  --with-imap-linkage     Use IMAP c-client linkage to determine supported items.])
++
++if test "$PHP_IMAP_LINKAGE" != "no"; then  
++	AC_DEFINE(HAVE_IMAP_LINKAGE, 1, [ ])
++fi
++
+ AC_DEFUN([PHP_IMAP_KRB_CHK], [
+   if test "$PHP_KERBEROS" != "no"; then
+     PHP_SETUP_KERBEROS(IMAP_SHARED_LIBADD,
+@@ -59,7 +67,7 @@ AC_DEFUN([PHP_IMAP_KRB_CHK], [
+       Check the path given to --with-kerberos (if no path is given, searches in /usr/kerberos, /usr/local and /usr )
+       ])
+     ])
+-  else
++  elif test "$PHP_IMAP_LINKAGE" != "yes"; then
+     AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [
+       AC_MSG_ERROR([This c-client library is built with Kerberos support. 
+ 
diff --git a/lang/php53/patches/patch-ae b/lang/php53/patches/patch-ae
new file mode 100644
index 00000000000..214dad63013
--- /dev/null
+++ b/lang/php53/patches/patch-ae
@@ -0,0 +1,25 @@
+$NetBSD: patch-ae,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- ext/pdo/config.m4.orig	2008-07-25 13:46:24.000000000 +0000
++++ ext/pdo/config.m4
+@@ -37,20 +37,6 @@ if test "$PHP_PDO" != "no"; then
+ 
+   PHP_PDO_PEAR_CHECK
+ 
+-  if test "$ext_shared" = "yes" ; then
+-    case $host_alias in
+-      *darwin*)
+-          AC_MSG_ERROR([
+-Due to the way that loadable modules work on OSX/Darwin, you need to
+-compile the PDO package statically into the PHP core.
+-
+-Please follow the instructions at: http://netevil.org/node.php?nid=202
+-for more detail on this issue.
+-          ])
+-        ext_shared=no
+-        ;;
+-    esac
+-  fi
+   PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c pdo_sqlstate.c, $ext_shared)
+   ifdef([PHP_ADD_EXTENSION_DEP],
+   [
diff --git a/lang/php53/patches/patch-af b/lang/php53/patches/patch-af
new file mode 100644
index 00000000000..71c6710c9c0
--- /dev/null
+++ b/lang/php53/patches/patch-af
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- ext/phar/Makefile.frag.orig	2009-07-23 15:48:04.000000000 +0000
++++ ext/phar/Makefile.frag
+@@ -44,4 +44,4 @@ install-pharcmd: pharcmd
+ 	-@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir)
+ 	$(INSTALL) $(builddir)/phar.phar $(INSTALL_ROOT)$(bindir)
+ 	-@rm -f $(INSTALL_ROOT)$(bindir)/phar
+-	$(LN_S) -f $(bindir)/phar.phar $(INSTALL_ROOT)$(bindir)/phar
++	$(LN_S) -f phar.phar $(INSTALL_ROOT)$(bindir)/phar
diff --git a/lang/php53/patches/patch-ag b/lang/php53/patches/patch-ag
new file mode 100644
index 00000000000..e75fc6b6b35
--- /dev/null
+++ b/lang/php53/patches/patch-ag
@@ -0,0 +1,10 @@
+$NetBSD: patch-ag,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- ext/phar/phar/phar.php.orig	2008-08-01 13:42:56.000000000 +0000
++++ ext/phar/phar/phar.php
+@@ -1,4 +1,4 @@
+-#!/usr/local/bin/php
++#!@PREFIX@/bin/php
+ <?php
+ 
+ /** @file phar.php
diff --git a/lang/php53/patches/patch-ah b/lang/php53/patches/patch-ah
new file mode 100644
index 00000000000..a9d8d147324
--- /dev/null
+++ b/lang/php53/patches/patch-ah
@@ -0,0 +1,33 @@
+$NetBSD: patch-ah,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- php.ini-development.orig	2009-11-05 13:29:34.000000000 +0000
++++ php.ini-development
+@@ -781,7 +781,7 @@ default_mimetype = "text/html"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:@PREFIX@/lib/php"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -802,8 +802,8 @@ doc_root =
+ ; http://php.net/user-dir
+ user_dir =
+ 
+-; Directory in which the loadable extensions (modules) reside.
+-; http://php.net/extension-dir
++; Directory in which the loadable extensions (modules) reside. If not
++; defined, then use the extension directory specified at compile-time.
+ ; extension_dir = "./"
+ ; On windows:
+ ; extension_dir = "ext"
+@@ -872,7 +872,7 @@ file_uploads = On
+ ; Temporary directory for HTTP uploaded files (will use system default if not
+ ; specified).
+ ; http://php.net/upload-tmp-dir
+-;upload_tmp_dir =
++upload_tmp_dir = /tmp
+ 
+ ; Maximum allowed size for uploaded files.
+ ; http://php.net/upload-max-filesize
diff --git a/lang/php53/patches/patch-ai b/lang/php53/patches/patch-ai
new file mode 100644
index 00000000000..5a9ad425d40
--- /dev/null
+++ b/lang/php53/patches/patch-ai
@@ -0,0 +1,33 @@
+$NetBSD: patch-ai,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- php.ini-production.orig	2009-11-05 13:29:34.000000000 +0000
++++ php.ini-production
+@@ -781,7 +781,7 @@ default_mimetype = "text/html"
+ ;;;;;;;;;;;;;;;;;;;;;;;;;
+ 
+ ; UNIX: "/path1:/path2"
+-;include_path = ".:/php/includes"
++include_path = ".:@PREFIX@/lib/php"
+ ;
+ ; Windows: "\path1;\path2"
+ ;include_path = ".;c:\php\includes"
+@@ -802,8 +802,8 @@ doc_root =
+ ; http://php.net/user-dir
+ user_dir =
+ 
+-; Directory in which the loadable extensions (modules) reside.
+-; http://php.net/extension-dir
++; Directory in which the loadable extensions (modules) reside. If not
++; defined, then use the extension directory specified at compile-time.
+ ; extension_dir = "./"
+ ; On windows:
+ ; extension_dir = "ext"
+@@ -872,7 +872,7 @@ file_uploads = On
+ ; Temporary directory for HTTP uploaded files (will use system default if not
+ ; specified).
+ ; http://php.net/upload-tmp-dir
+-;upload_tmp_dir =
++upload_tmp_dir = /tmp
+ 
+ ; Maximum allowed size for uploaded files.
+ ; http://php.net/upload-max-filesize
diff --git a/lang/php53/patches/patch-aj b/lang/php53/patches/patch-aj
new file mode 100644
index 00000000000..78e0e9d815f
--- /dev/null
+++ b/lang/php53/patches/patch-aj
@@ -0,0 +1,10 @@
+$NetBSD: patch-aj,v 1.1.1.1 2010/03/16 15:31:58 taca Exp $
+
+--- run-tests.php.orig	2010-01-03 09:23:27.000000000 +0000
++++ run-tests.php
+@@ -1,4 +1,4 @@
+-#!/usr/bin/php
++#!@PREFIX@/bin/php
+ <?php
+ /*
+    +----------------------------------------------------------------------+