diff --git a/www/php4/Makefile.inc b/www/php4/Makefile.inc index 0f96b120c05..ccfd89e2ae3 100644 --- a/www/php4/Makefile.inc +++ b/www/php4/Makefile.inc @@ -1,17 +1,18 @@ -# $OpenBSD: Makefile.inc,v 1.12 2003/05/22 14:16:23 naddy Exp $ +# $OpenBSD: Makefile.inc,v 1.13 2003/05/23 20:08:33 avsm Exp $ # This port currently only works with archs supporting dynamic loading # and has Apache that supports DSO's. NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} -V= 4.3.1 +V= 4.3.2RC4 DISTNAME= php-${V} CATEGORIES= www lang MAINTAINER= Anil Madhavapeddy HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net/distributions/ \ +MASTER_SITES= http://downloads.php.net/jani/ \ + http://www.php.net/distributions/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ @@ -38,6 +39,7 @@ MODULES_SUBDIR= lib/php/modules MODULES_DIR= ${CHROOT_DIR}/${MODULES_SUBDIR} CONFIGURE_STYLE= autoconf +AUTOCONF_VERSION= 2.52 CONFIGURE_ENV= CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ EXTENSION_DIR=${MODULES_DIR} diff --git a/www/php4/patches/patch-aclocal_m4 b/www/php4/patches/patch-aclocal_m4 index 0862002d312..d9b83f54583 100644 --- a/www/php4/patches/patch-aclocal_m4 +++ b/www/php4/patches/patch-aclocal_m4 @@ -1,7 +1,7 @@ -$OpenBSD: patch-aclocal_m4,v 1.3 2003/05/02 19:46:04 avsm Exp $ ---- aclocal.m4.orig Wed Jan 22 11:09:53 2003 -+++ aclocal.m4 Wed Jan 22 11:10:12 2003 -@@ -3976,7 +3976,7 @@ openbsd*) +$OpenBSD: patch-aclocal_m4,v 1.4 2003/05/23 20:08:33 avsm Exp $ +--- aclocal.m4.orig Thu May 22 01:25:35 2003 ++++ aclocal.m4 Thu May 22 16:20:29 2003 +@@ -3968,7 +3968,7 @@ openbsd*) shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' diff --git a/www/php4/patches/patch-configure_in b/www/php4/patches/patch-configure_in index 82e210ae0bc..907a177c845 100644 --- a/www/php4/patches/patch-configure_in +++ b/www/php4/patches/patch-configure_in @@ -1,8 +1,8 @@ -$OpenBSD: patch-configure_in,v 1.7 2003/05/02 19:46:04 avsm Exp $ ---- configure.in.orig Fri Dec 27 04:07:18 2002 -+++ configure.in Wed Jan 22 10:48:47 2003 -@@ -34,9 +34,7 @@ dnl check for working sed - PHP_PROG_SED +$OpenBSD: patch-configure_in,v 1.8 2003/05/23 20:08:33 avsm Exp $ +--- configure.in.orig Thu May 22 00:22:00 2003 ++++ configure.in Thu May 22 16:20:29 2003 +@@ -31,9 +31,7 @@ AC_PREREQ(2.13) + AC_INIT(README.CVS-RULES) PHP_CONFIG_NICE(config.nice) -for arg in $0 "$@"; do @@ -12,7 +12,7 @@ $OpenBSD: patch-configure_in,v 1.7 2003/05/02 19:46:04 avsm Exp $ AC_CANONICAL_HOST AC_CONFIG_HEADER(main/php_config.h) -@@ -806,14 +804,14 @@ unset with_pic +@@ -811,14 +809,14 @@ unset with_pic case $php_build_target in program|static) @@ -29,7 +29,7 @@ $OpenBSD: patch-configure_in,v 1.7 2003/05/02 19:46:04 avsm Exp $ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module" ;; esac -@@ -926,7 +924,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd +@@ -938,7 +936,7 @@ EXPANDED_SYSCONFDIR=`eval echo $sysconfd EXPANDED_DATADIR=$datadir EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"` EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"` diff --git a/www/php4/patches/patch-ltmain_sh b/www/php4/patches/patch-ltmain_sh index 15a9141394c..78bc2565c6a 100644 --- a/www/php4/patches/patch-ltmain_sh +++ b/www/php4/patches/patch-ltmain_sh @@ -1,7 +1,7 @@ -$OpenBSD: patch-ltmain_sh,v 1.3 2003/05/02 19:46:04 avsm Exp $ ---- ltmain.sh.orig Sun Jun 30 00:24:48 2002 -+++ ltmain.sh Mon Jan 20 14:01:25 2003 -@@ -4446,40 +4446,6 @@ relink_command=\"$relink_command\"" +$OpenBSD: patch-ltmain_sh,v 1.4 2003/05/23 20:08:33 avsm Exp $ +--- ltmain.sh.orig Mon Feb 10 17:12:17 2003 ++++ ltmain.sh Thu May 22 16:20:29 2003 +@@ -4524,40 +4524,6 @@ relink_command=\"$relink_command\"" # Exit here if they wanted silent mode. test "$show" = ":" && exit 0 diff --git a/www/php4/patches/patch-main_php_open_temporary_file_c b/www/php4/patches/patch-main_php_open_temporary_file_c index 384ab7fd7c3..8d838782835 100644 --- a/www/php4/patches/patch-main_php_open_temporary_file_c +++ b/www/php4/patches/patch-main_php_open_temporary_file_c @@ -1,7 +1,7 @@ -$OpenBSD: patch-main_php_open_temporary_file_c,v 1.3 2003/05/02 19:46:04 avsm Exp $ ---- main/php_open_temporary_file.c.orig Sun Jan 19 17:05:39 2003 -+++ main/php_open_temporary_file.c Sun Jan 19 17:05:52 2003 -@@ -128,7 +128,7 @@ static FILE *php_do_open_temporary_file( +$OpenBSD: patch-main_php_open_temporary_file_c,v 1.4 2003/05/23 20:08:33 avsm Exp $ +--- main/php_open_temporary_file.c.orig Fri Apr 25 19:11:42 2003 ++++ main/php_open_temporary_file.c Thu May 22 16:20:29 2003 +@@ -132,7 +132,7 @@ static int php_do_open_temporary_file(co trailing_slash = "/"; } diff --git a/www/php4/patches/patch-php_ini-dist b/www/php4/patches/patch-php_ini-dist index c1425f49b5a..b3ec8abd7ef 100644 --- a/www/php4/patches/patch-php_ini-dist +++ b/www/php4/patches/patch-php_ini-dist @@ -1,7 +1,7 @@ -$OpenBSD: patch-php_ini-dist,v 1.6 2003/05/02 19:46:04 avsm Exp $ ---- php.ini-dist.orig Thu Dec 26 13:27:08 2002 -+++ php.ini-dist Fri May 2 18:11:03 2003 -@@ -403,10 +403,7 @@ default_mimetype = "text/html" +$OpenBSD: patch-php_ini-dist,v 1.7 2003/05/23 20:08:33 avsm Exp $ +--- php.ini-dist.orig Thu May 8 02:23:35 2003 ++++ php.ini-dist Thu May 22 16:21:01 2003 +@@ -408,10 +408,7 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -13,16 +13,16 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2003/05/02 19:46:04 avsm Exp $ ; The root of the PHP pages, used only if nonempty. ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root -@@ -420,7 +417,7 @@ doc_root = +@@ -425,7 +422,7 @@ doc_root = user_dir = ; Directory in which the loadable extensions (modules) reside. --extension_dir = ./ -+extension_dir = MODULES_DIR +-extension_dir = "./" ++extension_dir = "MODULES_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 -@@ -474,7 +471,7 @@ upload_max_filesize = 2M +@@ -479,7 +476,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. @@ -31,11 +31,10 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2003/05/02 19:46:04 avsm Exp $ ; Define the anonymous ftp password (your email address) ;from="john@doe.com" -@@ -492,80 +489,6 @@ default_socket_timeout = 60 - ; fgets() and file() will work regardless of the source of the file. +@@ -498,77 +495,6 @@ default_socket_timeout = 60 ; auto_detect_line_endings = Off -- + -;;;;;;;;;;;;;;;;;;;;;; -; Dynamic Extensions ; -;;;;;;;;;;;;;;;;;;;;;; @@ -71,10 +70,8 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2003/05/02 19:46:04 avsm Exp $ -;extension=php_dbx.dll -;extension=php_domxml.dll -;extension=php_exif.dll --;extension=php_fbsql.dll -;extension=php_fdf.dll -;extension=php_filepro.dll --;extension=php_gd.dll -;extension=php_gd2.dll -;extension=php_gettext.dll -;extension=php_hyperwave.dll @@ -112,7 +109,7 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2003/05/02 19:46:04 avsm Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -577,13 +500,8 @@ default_socket_timeout = 60 +@@ -580,13 +506,8 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] @@ -127,7 +124,7 @@ $OpenBSD: patch-php_ini-dist,v 1.6 2003/05/02 19:46:04 avsm Exp $ ;sendmail_path = [Java] -@@ -1091,3 +1009,57 @@ sockets.use_system_read = On +@@ -1092,3 +1013,57 @@ sockets.use_system_read = On ; Local Variables: ; tab-width: 4 ; End: diff --git a/www/php4/patches/patch-php_ini-recommended b/www/php4/patches/patch-php_ini-recommended index 9ab0f3fc09f..c21537634f2 100644 --- a/www/php4/patches/patch-php_ini-recommended +++ b/www/php4/patches/patch-php_ini-recommended @@ -1,7 +1,7 @@ -$OpenBSD: patch-php_ini-recommended,v 1.4 2003/05/02 19:46:05 avsm Exp $ ---- php.ini-recommended.orig Thu Dec 26 13:27:08 2002 -+++ php.ini-recommended Fri May 2 18:11:27 2003 -@@ -418,11 +418,8 @@ default_mimetype = "text/html" +$OpenBSD: patch-php_ini-recommended,v 1.5 2003/05/23 20:08:33 avsm Exp $ +--- php.ini-recommended.orig Thu May 8 02:23:35 2003 ++++ php.ini-recommended Thu May 22 16:21:19 2003 +@@ -423,11 +423,8 @@ default_mimetype = "text/html" ;;;;;;;;;;;;;;;;;;;;;;;;; ; UNIX: "/path1:/path2" @@ -14,16 +14,16 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2003/05/02 19:46:05 avsm Exp $ ; The root of the PHP pages, used only if nonempty. ; if PHP was not compiled with FORCE_REDIRECT, you SHOULD set doc_root ; if you are running php as a CGI under any web server (other than IIS) -@@ -435,7 +432,7 @@ doc_root = +@@ -440,7 +437,7 @@ doc_root = user_dir = ; Directory in which the loadable extensions (modules) reside. --extension_dir = ./ -+extension_dir = MODULES_DIR +-extension_dir = "./" ++extension_dir = "MODULES_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 -@@ -489,7 +486,7 @@ upload_max_filesize = 2M +@@ -494,7 +491,7 @@ upload_max_filesize = 2M ;;;;;;;;;;;;;;;;;; ; Whether to allow the treatment of URLs (like http:// or ftp://) as files. @@ -32,7 +32,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2003/05/02 19:46:05 avsm Exp $ ; Define the anonymous ftp password (your email address) ;from="john@doe.com" -@@ -508,79 +505,6 @@ default_socket_timeout = 60 +@@ -513,77 +510,6 @@ default_socket_timeout = 60 ; auto_detect_line_endings = Off @@ -71,10 +71,8 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2003/05/02 19:46:05 avsm Exp $ -;extension=php_dbx.dll -;extension=php_domxml.dll -;extension=php_exif.dll --;extension=php_fbsql.dll -;extension=php_fdf.dll -;extension=php_filepro.dll --;extension=php_gd.dll -;extension=php_gd2.dll -;extension=php_gettext.dll -;extension=php_hyperwave.dll @@ -112,7 +110,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2003/05/02 19:46:05 avsm Exp $ ;;;;;;;;;;;;;;;;;;; ; Module Settings ; ;;;;;;;;;;;;;;;;;;; -@@ -592,11 +516,6 @@ default_socket_timeout = 60 +@@ -595,11 +521,6 @@ default_socket_timeout = 60 define_syslog_variables = Off [mail function] @@ -124,7 +122,7 @@ $OpenBSD: patch-php_ini-recommended,v 1.4 2003/05/02 19:46:05 avsm Exp $ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -1083,6 +1002,56 @@ sockets.use_system_read = On +@@ -1087,6 +1008,56 @@ sockets.use_system_read = On ;exif.decode_jis_motorola = JIS ;exif.decode_jis_intel = JIS diff --git a/www/php4/patches/patch-run-tests_php b/www/php4/patches/patch-run-tests_php deleted file mode 100644 index 81447c221ae..00000000000 --- a/www/php4/patches/patch-run-tests_php +++ /dev/null @@ -1,12 +0,0 @@ -$OpenBSD: patch-run-tests_php,v 1.1 2003/05/02 19:46:05 avsm Exp $ ---- run-tests.php.orig Thu Jan 23 13:26:55 2003 -+++ run-tests.php Thu Jan 23 13:27:05 2003 -@@ -44,6 +44,8 @@ if (getenv('TEST_PHP_SRCDIR')) { - - $cwd = getcwd(); - set_time_limit(0); -+ -+ob_flush(); - while(ob_get_level()) { - ob_end_clean(); - }