diff options
| author | martti <martti> | 2002-10-14 06:21:05 +0000 |
|---|---|---|
| committer | martti <martti> | 2002-10-14 06:21:05 +0000 |
| commit | 4e143c2781a0bef924542fd2f932615eccbc99a5 (patch) | |
| tree | 1931aa17ad183137853874ea40e88e55da0898ff | |
| parent | e7870be4dc1bb4cee486b810d153821dfa1151c8 (diff) | |
| download | pkgsrc-4e143c2781a0bef924542fd2f932615eccbc99a5.tar.gz | |
Updated php to 4.2.3
* lots of bug fixes
* experimental apache2 support
* added IPv6 support to gethostbyaddr()
ATTENTION!! register_globals defaults to 'off' now
51 files changed, 235 insertions, 273 deletions
diff --git a/archivers/php4-bz2/distinfo b/archivers/php4-bz2/distinfo index 87bf823fad2..1e6fb63e7ab 100644 --- a/archivers/php4-bz2/distinfo +++ b/archivers/php4-bz2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/03/03 07:47:58 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:05 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/archivers/php4-zlib/distinfo b/archivers/php4-zlib/distinfo index 5fee62e72db..05ad947ae79 100644 --- a/archivers/php4-zlib/distinfo +++ b/archivers/php4-zlib/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:01 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:06 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-dba/distinfo b/databases/php4-dba/distinfo index af5ae7a5888..d3cd2b54cbe 100644 --- a/databases/php4-dba/distinfo +++ b/databases/php4-dba/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2002/02/28 09:50:02 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/14 06:21:06 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes SHA1 (patch-aa) = 6b3d4fdd6bd4874238d6a8f99ebaafb7e422d866 SHA1 (patch-ab) = 1b272a7f3b94ff934389a1c224befdfdd259051b diff --git a/databases/php4-dbase/distinfo b/databases/php4-dbase/distinfo index fcea4029ad9..77323891834 100644 --- a/databases/php4-dbase/distinfo +++ b/databases/php4-dbase/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/02/28 09:50:02 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-filepro/distinfo b/databases/php4-filepro/distinfo index fcea4029ad9..77323891834 100644 --- a/databases/php4-filepro/distinfo +++ b/databases/php4-filepro/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/02/28 09:50:02 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-ldap/distinfo b/databases/php4-ldap/distinfo index cbb882f1a49..6d4fb3557a2 100644 --- a/databases/php4-ldap/distinfo +++ b/databases/php4-ldap/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.5 2002/02/28 09:50:03 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/14 06:21:07 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes SHA1 (patch-aa) = 29c55477c62a3776b56cc6976f43cc8e5d4de390 diff --git a/databases/php4-mysql/distinfo b/databases/php4-mysql/distinfo index efd1d1d922d..25e79876b87 100644 --- a/databases/php4-mysql/distinfo +++ b/databases/php4-mysql/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:03 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-odbc/distinfo b/databases/php4-odbc/distinfo index efd1d1d922d..25e79876b87 100644 --- a/databases/php4-odbc/distinfo +++ b/databases/php4-odbc/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:03 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/databases/php4-pgsql/distinfo b/databases/php4-pgsql/distinfo index efd1d1d922d..25e79876b87 100644 --- a/databases/php4-pgsql/distinfo +++ b/databases/php4-pgsql/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:03 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:08 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-gettext/distinfo b/devel/php4-gettext/distinfo index efd1d1d922d..266a5b04cbe 100644 --- a/devel/php4-gettext/distinfo +++ b/devel/php4-gettext/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:03 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:09 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-gmp/distinfo b/devel/php4-gmp/distinfo index 28ff59450eb..266a5b04cbe 100644 --- a/devel/php4-gmp/distinfo +++ b/devel/php4-gmp/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:04 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:09 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes -SHA1 (patch-aa) = fddcdbbe6bcff276887fdb34948fba51251c62a1 +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-gmp/patches/patch-aa b/devel/php4-gmp/patches/patch-aa deleted file mode 100644 index 343d8abd48d..00000000000 --- a/devel/php4-gmp/patches/patch-aa +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 06:42:12 jlam Exp $ - ---- config.m4.orig Tue Mar 27 15:34:27 2001 -+++ config.m4 -@@ -23,5 +23,6 @@ - - PHP_EXTENSION(gmp, $ext_shared) - AC_DEFINE(HAVE_GMP, 1, [ ]) -- PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib) -+ PHP_SUBST(GMP_SHARED_LIBADD) -+ PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD) - fi diff --git a/devel/php4-pcre/distinfo b/devel/php4-pcre/distinfo index 2fc6e64c727..5749270a0c6 100644 --- a/devel/php4-pcre/distinfo +++ b/devel/php4-pcre/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:04 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:10 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-posix/distinfo b/devel/php4-posix/distinfo index 55b5a566627..ecb12519e11 100644 --- a/devel/php4-posix/distinfo +++ b/devel/php4-posix/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/02/28 09:50:04 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/14 06:21:10 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-session/Makefile b/devel/php4-session/Makefile index 64779e90607..b17dc6b74c2 100644 --- a/devel/php4-session/Makefile +++ b/devel/php4-session/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2002/10/09 18:27:46 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2002/10/14 06:21:10 martti Exp $ MODNAME= session CATEGORIES+= devel -PKGREVISION= 2 +PKGREVISION= # empty COMMENT= PHP4 extension for session-handling USE_BUILDLINK2= YES diff --git a/devel/php4-session/distinfo b/devel/php4-session/distinfo index 2fc6e64c727..5a54395daf4 100644 --- a/devel/php4-session/distinfo +++ b/devel/php4-session/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:04 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:11 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-sysvsem/distinfo b/devel/php4-sysvsem/distinfo index 2fc6e64c727..5a54395daf4 100644 --- a/devel/php4-sysvsem/distinfo +++ b/devel/php4-sysvsem/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:04 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:11 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/devel/php4-sysvshm/distinfo b/devel/php4-sysvshm/distinfo index 67bf51874c1..5a54395daf4 100644 --- a/devel/php4-sysvshm/distinfo +++ b/devel/php4-sysvshm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:05 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:11 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/doc/CHANGES b/doc/CHANGES index eb63a9ceed9..4d5d8afc5e0 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.245 2002/10/14 02:29:37 dmcmahill Exp $ +$NetBSD: CHANGES,v 1.246 2002/10/14 06:21:33 martti Exp $ Changes to the packages collection and infrastructure in 2002: @@ -3201,3 +3201,35 @@ Changes to the packages collection and infrastructure in 2002: Updated verilog-current to 20020921 [dmcmahill 2002-10-13] Updated dinotrace to 9.1h [dmcmahill 2002-10-13] Added verilog-mode-3.60 [dmcmahill 2002-10-13] + Updated php4 to 4.2.3 [martti 2002-10-14] + Updated php4-bz2 to 4.2.3 [martti 2002-10-14] + Updated php4-zlib to 4.2.3 [martti 2002-10-14] + Updated php4-dba to 4.2.3 [martti 2002-10-14] + Updated php4-dbase to 4.2.3 [martti 2002-10-14] + Updated php4-filepro to 4.2.3 [martti 2002-10-14] + Updated php4-ldap to 4.2.3 [martti 2002-10-14] + Updated php4-mysql to 4.2.3 [martti 2002-10-14] + Updated php4-odbc to 4.2.3 [martti 2002-10-14] + Updated php4-pgsql to 4.2.3 [martti 2002-10-14] + Updated php4-gettext to 4.2.3 [martti 2002-10-14] + Updated php4-gmp to 4.2.3 [martti 2002-10-14] + Updated php4-pcre to 4.2.3 [martti 2002-10-14] + Updated php4-posix to 4.2.3 [martti 2002-10-14] + Updated php4-session to 4.2.3 [martti 2002-10-14] + Updated php4-sysvsem to 4.2.3 [martti 2002-10-14] + Updated php4-sysvshm to 4.2.3 [martti 2002-10-14] + Updated php4-gd to 4.2.3 [martti 2002-10-14] + Updated php4-imap to 4.2.3 [martti 2002-10-14] + Updated php4-bcmath to 4.2.3 [martti 2002-10-14] + Updated php4-calendar to 4.2.3 [martti 2002-10-14] + Updated php4-mbstring to 4.2.3 [martti 2002-10-14] + Updated php4-ftp to 4.2.3 [martti 2002-10-14] + Updated php4-snmp to 4.2.3 [martti 2002-10-14] + Updated php4-sockets to 4.2.3 [martti 2002-10-14] + Updated php4-yp to 4.2.3 [martti 2002-10-14] + Updated php4-pdflib to 4.2.3 [martti 2002-10-14] + Updated php4-mcrypt to 4.2.3 [martti 2002-10-14] + Updated php4-mhash to 4.2.3 [martti 2002-10-14] + Updated php4-domxml to 4.2.3 [martti 2002-10-14] + Updated php4-wddx to 4.2.3 [martti 2002-10-14] + Updated php4-xml to 4.2.3 [martti 2002-10-14] diff --git a/graphics/php4-gd/Makefile b/graphics/php4-gd/Makefile index 09cd43b32af..52b82f111d1 100644 --- a/graphics/php4-gd/Makefile +++ b/graphics/php4-gd/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2002/09/22 10:19:57 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2002/10/14 06:21:11 martti Exp $ MODNAME= gd CATEGORIES+= graphics -PKGREVISION= 2 +PKGREVISION= # empty COMMENT= PHP4 extension for GD graphics library USE_BUILDLINK2= YES diff --git a/graphics/php4-gd/distinfo b/graphics/php4-gd/distinfo index 079969f8c20..72792562f9c 100644 --- a/graphics/php4-gd/distinfo +++ b/graphics/php4-gd/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2002/02/28 09:50:05 tron Exp $ +$NetBSD: distinfo,v 1.6 2002/10/14 06:21:11 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/mail/php4-imap/distinfo b/mail/php4-imap/distinfo index 59edbe93f32..dd0cee74cdc 100644 --- a/mail/php4-imap/distinfo +++ b/mail/php4-imap/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:05 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:12 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes SHA1 (patch-aa) = 15b68a0a73cdd6af903b1efc5a768b4bb20b38a4 -SHA1 (patch-ab) = 9e62d755be7bea0efeacef1acb61c1e7b112b0dc +SHA1 (patch-ab) = d3df38e0ff0d818db39f5fe1980318eac2738bcd diff --git a/mail/php4-imap/patches/patch-ab b/mail/php4-imap/patches/patch-ab index 0b3e722f77f..2adba67c508 100644 --- a/mail/php4-imap/patches/patch-ab +++ b/mail/php4-imap/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.2 2001/12/31 23:57:39 jlam Exp $ +$NetBSD: patch-ab,v 1.3 2002/10/14 06:21:12 martti Exp $ ---- php_imap.c.orig Fri Dec 7 11:47:59 2001 -+++ php_imap.c -@@ -410,6 +410,11 @@ +--- php_imap.c.orig Mon Aug 26 01:58:31 2002 ++++ php_imap.c Sat Oct 12 10:49:37 2002 +@@ -421,6 +421,11 @@ ZEND_INIT_MODULE_GLOBALS(imap, php_imap_init_globals, NULL) @@ -14,7 +14,7 @@ $NetBSD: patch-ab,v 1.2 2001/12/31 23:57:39 jlam Exp $ #ifndef PHP_WIN32 mail_link(&unixdriver); /* link in the unix driver */ mail_link(&mhdriver); /* link in the mh driver */ -@@ -430,6 +435,10 @@ +@@ -436,6 +441,10 @@ mail_link(&tenexdriver); /* link in the tenex driver */ mail_link(&mtxdriver); /* link in the mtx driver */ mail_link(&dummydriver); /* link in the dummy driver */ @@ -23,5 +23,5 @@ $NetBSD: patch-ab,v 1.2 2001/12/31 23:57:39 jlam Exp $ +#include "linkage.c" +#endif - /* lets allow NIL */ - REGISTER_MAIN_LONG_CONSTANT("NIL", NIL, CONST_PERSISTENT | CONST_CS); + #ifndef PHP_WIN32 + auth_link(&auth_log); /* link in the log authenticator */ diff --git a/math/php4-bcmath/distinfo b/math/php4-bcmath/distinfo index f737061cc54..0c572cf7ca0 100644 --- a/math/php4-bcmath/distinfo +++ b/math/php4-bcmath/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:05 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:12 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes SHA1 (patch-aa) = 96aed03b5187adc3f02df4ffae1f9e9a14bbd144 -SHA1 (patch-ab) = fdb4a5e27148533d9bc47b1e7d96eda8c0e02cd3 diff --git a/math/php4-bcmath/patches/patch-ab b/math/php4-bcmath/patches/patch-ab deleted file mode 100644 index 740d5f6cfaf..00000000000 --- a/math/php4-bcmath/patches/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/10/16 07:00:05 jlam Exp $ - ---- bcmath.c.orig Thu May 24 08:41:36 2001 -+++ bcmath.c -@@ -28,7 +28,7 @@ - - #include "ext/standard/info.h" - #include "php_bcmath.h" --#include "ext/bcmath/libbcmath/src/bcmath.h" -+#include "libbcmath/src/bcmath.h" - - function_entry bcmath_functions[] = { - PHP_FE(bcadd, NULL) diff --git a/misc/php4-calendar/distinfo b/misc/php4-calendar/distinfo index 67bf51874c1..769d7150f50 100644 --- a/misc/php4-calendar/distinfo +++ b/misc/php4-calendar/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:05 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:13 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/misc/php4-mbstring/distinfo b/misc/php4-mbstring/distinfo index 61efe65527b..769d7150f50 100644 --- a/misc/php4-mbstring/distinfo +++ b/misc/php4-mbstring/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:06 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:13 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/net/php4-ftp/distinfo b/net/php4-ftp/distinfo index 61efe65527b..fa0c0a72d39 100644 --- a/net/php4-ftp/distinfo +++ b/net/php4-ftp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:06 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:14 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/net/php4-snmp/distinfo b/net/php4-snmp/distinfo index 9c0ef3e22d9..ec53c3ed7e0 100644 --- a/net/php4-snmp/distinfo +++ b/net/php4-snmp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/07/25 17:09:34 jonb Exp $ +$NetBSD: distinfo,v 1.2 2002/10/14 06:21:14 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/net/php4-sockets/distinfo b/net/php4-sockets/distinfo index 61efe65527b..fa0c0a72d39 100644 --- a/net/php4-sockets/distinfo +++ b/net/php4-sockets/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:06 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:14 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/net/php4-yp/distinfo b/net/php4-yp/distinfo index 61efe65527b..b134cee5cd3 100644 --- a/net/php4-yp/distinfo +++ b/net/php4-yp/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:06 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:15 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/print/php4-pdflib/distinfo b/print/php4-pdflib/distinfo index c63ed3a65a7..b134cee5cd3 100644 --- a/print/php4-pdflib/distinfo +++ b/print/php4-pdflib/distinfo @@ -1,5 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:07 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:15 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes -SHA1 (patch-aa) = 5bd46f33efb16b344147c9ab58aa991e6c052e21 +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/print/php4-pdflib/patches/patch-aa b/print/php4-pdflib/patches/patch-aa deleted file mode 100644 index a4e6d38ad9d..00000000000 --- a/print/php4-pdflib/patches/patch-aa +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2001/10/16 06:20:44 jlam Exp $ - ---- Makefile.in.orig Mon Feb 12 12:50:37 2001 -+++ Makefile.in -@@ -1,8 +1,7 @@ - - LTLIBRARY_NAME = libpdf.la - LTLIBRARY_SOURCES = pdf.c --LTLIBRARY_SHARED_NAME = libpdf_php.la --PDFLIB_SHARED_LIBBADD = -lpdf --LTLIBRARY_SHARED_LIBADD = $(PDFLIB_SHARED_LIBBADD) -+LTLIBRARY_SHARED_NAME = pdf.la -+LTLIBRARY_SHARED_LIBADD = $(PDFLIB_SHARED_LIBADD) - - include $(top_srcdir)/build/dynlib.mk diff --git a/security/php4-mcrypt/distinfo b/security/php4-mcrypt/distinfo index a9de221b63c..eb01a9e41fc 100644 --- a/security/php4-mcrypt/distinfo +++ b/security/php4-mcrypt/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:07 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:16 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/security/php4-mhash/distinfo b/security/php4-mhash/distinfo index 3c52aced492..77274a40808 100644 --- a/security/php4-mhash/distinfo +++ b/security/php4-mhash/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/06/09 19:22:27 jlam Exp $ +$NetBSD: distinfo,v 1.2 2002/10/14 06:21:16 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/textproc/php4-domxml/distinfo b/textproc/php4-domxml/distinfo index 36ad4377f0f..51afccc3d6f 100644 --- a/textproc/php4-domxml/distinfo +++ b/textproc/php4-domxml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2002/03/08 19:44:22 jlam Exp $ +$NetBSD: distinfo,v 1.3 2002/10/14 06:21:16 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/textproc/php4-wddx/distinfo b/textproc/php4-wddx/distinfo index d158c8637d3..ce30cb0a118 100644 --- a/textproc/php4-wddx/distinfo +++ b/textproc/php4-wddx/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:07 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:17 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes SHA1 (patch-aa) = 6d5a269572190be29252cf018fa1d33fa5d49984 -SHA1 (patch-ab) = 3c496d57ad35656b68281c3a783ef1806acd0be1 -SHA1 (patch-ac) = f1d9cf868cbd955233f8fbcf41346609b9f37dee +SHA1 (patch-ab) = 91276083c16070fd1df3aca05c2dbd2b6585c592 +SHA1 (patch-ac) = b60bc98dced23db2445c663517d510fd0124aeb2 diff --git a/textproc/php4-wddx/patches/patch-ab b/textproc/php4-wddx/patches/patch-ab index e7c8c4628b6..116154c526b 100644 --- a/textproc/php4-wddx/patches/patch-ab +++ b/textproc/php4-wddx/patches/patch-ab @@ -1,10 +1,10 @@ -$NetBSD: patch-ab,v 1.1.1.1 2001/10/16 06:28:06 jlam Exp $ +$NetBSD: patch-ab,v 1.2 2002/10/14 06:21:17 martti Exp $ ---- config.m4.orig Mon May 7 04:22:34 2001 -+++ config.m4 -@@ -4,6 +4,9 @@ - PHP_ARG_ENABLE(wddx,for WDDX support, - [ --enable-wddx Enable WDDX support]) +--- config.m4.orig Fri Nov 30 19:00:04 2001 ++++ config.m4 Sat Oct 12 10:54:29 2002 +@@ -5,6 +5,9 @@ + PHP_ARG_ENABLE(wddx,whether to enable WDDX support, + [ --enable-wddx Enable WDDX support.]) +PHP_ARG_WITH(expat-dir, libexpat dir for WDDX, +[ --with-expat-dir=DIR libexpat dir for WDDX]) @@ -12,7 +12,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/10/16 06:28:06 jlam Exp $ if test "$PHP_WDDX" != "no"; then if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then AC_MSG_WARN(Activating XML) -@@ -11,4 +14,17 @@ +@@ -12,4 +15,17 @@ fi AC_DEFINE(HAVE_WDDX, 1, [ ]) PHP_EXTENSION(wddx, $ext_shared) diff --git a/textproc/php4-wddx/patches/patch-ac b/textproc/php4-wddx/patches/patch-ac index 594a0d4382e..28e8a4d2dfd 100644 --- a/textproc/php4-wddx/patches/patch-ac +++ b/textproc/php4-wddx/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2001/12/31 23:59:23 jlam Exp $ +$NetBSD: patch-ac,v 1.3 2002/10/14 06:21:17 martti Exp $ ---- wddx.c.orig Sat Nov 17 20:23:14 2001 -+++ wddx.c +--- wddx.c.orig Thu Feb 28 08:26:57 2002 ++++ wddx.c Sun Oct 13 12:59:27 2002 @@ -20,2 +20,8 @@ +#define IS_EXT_MODULE @@ -11,7 +11,7 @@ $NetBSD: patch-ac,v 1.2 2001/12/31 23:59:23 jlam Exp $ +#endif + #include "php.h" -@@ -101,2 +107,6 @@ +@@ -106,2 +112,6 @@ /* }}} */ + +#ifdef COMPILE_DL_WDDX diff --git a/textproc/php4-xml/distinfo b/textproc/php4-xml/distinfo index a9de221b63c..dac623ef9a9 100644 --- a/textproc/php4-xml/distinfo +++ b/textproc/php4-xml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.4 2002/02/28 09:50:07 tron Exp $ +$NetBSD: distinfo,v 1.5 2002/10/14 06:21:17 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes diff --git a/www/php4/Makefile b/www/php4/Makefile index 3ff377c9a35..7d3f7db8e5f 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.27 2002/10/02 23:48:07 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2002/10/14 06:21:18 martti Exp $ PKGNAME= php-${PHP_BASE_VERS} -PKGREVISION= 1 CATEGORIES+= lang COMMENT= HTML-embedded scripting language @@ -34,15 +33,12 @@ CONF_FILES= ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR} post-install: - ${RMDIR} ${PREFIX}/include/php/ext/xml/expat/xmltok - ${RMDIR} ${PREFIX}/include/php/ext/xml/expat/xmlparse - ${RMDIR} ${PREFIX}/include/php/ext/xml/expat ${INSTALL_DATA_DIR} ${CGIDIR} ${LN} -sf ../../bin/php ${CGIDIR}/php ${INSTALL_DATA_DIR} ${EGDIR} cd ${WRKSRC}; ${INSTALL_DATA} php.ini-dist php.ini-recommended ${EGDIR} ${INSTALL_DATA_DIR} ${PREFIX}/share/php - ${INSTALL_DATA} ${WRKSRC}/php4.gif ${PREFIX}/share/php + ${INSTALL_DATA} ${WRKSRC}/php.gif ${PREFIX}/share/php .include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 10a39927779..a7a1c9a38cf 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2002/04/12 17:59:57 jlam Exp $ +# $NetBSD: Makefile.common,v 1.26 2002/10/14 06:21:18 martti Exp $ DISTNAME?= php-${PHP_DIST_VERS} CATEGORIES+= www php4 @@ -14,7 +14,7 @@ HOMEPAGE?= http://www.php.net/ # PHP_DIST_VERS version number on the php distfile # PHP_BASE_VERS pkgsrc-mangled version number (convert pl -> .) # -PHP_DIST_VERS= 4.1.2 +PHP_DIST_VERS= 4.2.3 PHP_BASE_VERS= ${PHP_DIST_VERS} DISTFILES?= ${PHP_DISTFILE} @@ -25,7 +25,7 @@ PHP_DISTFILE= ${DISTNAME}${EXTRACT_SUFX} # The number for the last part of the path represents a specific version # of the Zend API. # -PHP_EXTENSION_DIR= lib/php/20010901 +PHP_EXTENSION_DIR= lib/php/20020429 PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} PKG_SYSCONFVAR?= php diff --git a/www/php4/Makefile.module b/www/php4/Makefile.module index b552cb44286..ebd4020901a 100644 --- a/www/php4/Makefile.module +++ b/www/php4/Makefile.module @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.module,v 1.20 2002/10/05 10:54:12 wiz Exp $ +# $NetBSD: Makefile.module,v 1.21 2002/10/14 06:21:18 martti Exp $ # # This Makefile is provided to ease creating PHP4 packages for the extension # modules distributed in the PHP4 sources. @@ -12,9 +12,9 @@ PKGNAME?= php-${MODNAME}-${PHP_BASE_VERS} PKGREVISION?= # empty -DEPENDS+= php>=${PHP_BASE_VERS}nb1:../../www/php4 +DEPENDS+= php>=${PHP_BASE_VERS}:../../www/php4 -AUTOMAKE_REQD?= 1.4 +AUTOMAKE_REQD?= 1.7 .include "../../mk/automake.mk" PKGMODNAME?= ${MODNAME:S/-/_/} diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 1d641999368..441d9e53e83 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.5 2001/11/26 07:34:07 jlam Exp $ +# $NetBSD: Makefile.php,v 1.6 2002/10/14 06:21:18 martti Exp $ .include "../../www/php4/Makefile.common" @@ -42,6 +42,7 @@ PHP4_CONFIGURE_ARGS?= # empty CONFIGURE_ARGS+= ${PHP4_CONFIGURE_ARGS} CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no +CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" post-configure: create-shlibtool diff --git a/www/php4/PLIST b/www/php4/PLIST index 58353c8b4c7..2e6f81769c8 100644 --- a/www/php4/PLIST +++ b/www/php4/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2002/02/28 06:14:46 jlam Exp $ +@comment $NetBSD: PLIST,v 1.5 2002/10/14 06:21:18 martti Exp $ bin/pear bin/pearize bin/php @@ -47,16 +47,26 @@ include/php/Zend/zend_llist.h include/php/Zend/zend_modules.h include/php/Zend/zend_operators.h include/php/Zend/zend_ptr_stack.h +include/php/Zend/zend_qsort.h include/php/Zend/zend_stack.h include/php/Zend/zend_static_allocator.h include/php/Zend/zend_variables.h include/php/acconfig.h +include/php/ext/mbstring/cp932_table.h +include/php/ext/mbstring/mbfilter.h +include/php/ext/mbstring/mbfilter_ja.h +include/php/ext/mbstring/mbregex.h +include/php/ext/mbstring/mbstring.h +include/php/ext/mbstring/unicode_table.h +include/php/ext/mbstring/unicode_table_ja.h include/php/ext/session/mod_files.h include/php/ext/session/mod_mm.h include/php/ext/session/mod_user.h include/php/ext/session/php_session.h +include/php/ext/standard/aggregation.h include/php/ext/standard/base64.h include/php/ext/standard/basic_functions.h +include/php/ext/standard/crc32.h include/php/ext/standard/credits.h include/php/ext/standard/credits_ext.h include/php/ext/standard/credits_sapi.h @@ -75,6 +85,7 @@ include/php/ext/standard/md5.h include/php/ext/standard/microtime.h include/php/ext/standard/pack.h include/php/ext/standard/pageinfo.h +include/php/ext/standard/parsedate.h include/php/ext/standard/php_array.h include/php/ext/standard/php_assert.h include/php/ext/standard/php_browscap.h @@ -83,6 +94,7 @@ include/php/ext/standard/php_dir.h include/php/ext/standard/php_ext_syslog.h include/php/ext/standard/php_filestat.h include/php/ext/standard/php_fopen_wrappers.h +include/php/ext/standard/php_ftok.h include/php/ext/standard/php_image.h include/php/ext/standard/php_incomplete_class.h include/php/ext/standard/php_iptc.h @@ -97,16 +109,27 @@ include/php/ext/standard/php_smart_str.h include/php/ext/standard/php_smart_str_public.h include/php/ext/standard/php_standard.h include/php/ext/standard/php_string.h +include/php/ext/standard/php_type.h include/php/ext/standard/php_var.h include/php/ext/standard/php_versioning.h include/php/ext/standard/quot_print.h include/php/ext/standard/reg.h include/php/ext/standard/scanf.h -include/php/ext/standard/type.h include/php/ext/standard/uniqid.h include/php/ext/standard/url.h include/php/ext/standard/url_scanner.h include/php/ext/standard/url_scanner_ex.h +include/php/ext/xml/expat/ascii.h +include/php/ext/xml/expat/asciitab.h +include/php/ext/xml/expat/expat.h +include/php/ext/xml/expat/iasciitab.h +include/php/ext/xml/expat/latin1tab.h +include/php/ext/xml/expat/nametab.h +include/php/ext/xml/expat/utf8tab.h +include/php/ext/xml/expat/winconfig.h +include/php/ext/xml/expat/xmlrole.h +include/php/ext/xml/expat/xmltok.h +include/php/ext/xml/expat/xmltok_impl.h include/php/ext/xml/php_xml.h include/php/main/SAPI.h include/php/main/build-defs.h @@ -145,21 +168,6 @@ include/php/regex/regex2.h include/php/regex/regex_extra.h include/php/regex/utils.h lib/php/Archive/Tar.php -lib/php/Benchmark/Iterate.php -lib/php/Benchmark/Timer.php -lib/php/Cache.php -lib/php/Cache/Container.php -lib/php/Cache/Container/db.php -lib/php/Cache/Container/dbx.php -lib/php/Cache/Container/file.php -lib/php/Cache/Container/phplib.php -lib/php/Cache/Container/shm.php -lib/php/Cache/DB.php -lib/php/Cache/Error.php -lib/php/Cache/Function.php -lib/php/Cache/Graphics.php -lib/php/Cache/Output.php -lib/php/Cache/OutputCompression.php lib/php/Console/Getopt.php lib/php/Crypt/CBC.php lib/php/Crypt/HCEMD5.php @@ -192,35 +200,31 @@ lib/php/HTML/Select.php lib/php/HTML/Table.php lib/php/HTTP.php lib/php/HTTP/Compress.php -lib/php/Image/Remote.php -lib/php/Log.php -lib/php/Log/Observer.php -lib/php/Log/composite.php -lib/php/Log/file.php -lib/php/Log/mcal.php -lib/php/Log/sql.php -lib/php/Log/syslog.php lib/php/Mail.php lib/php/Mail/RFC822.php -lib/php/Mail/mime.php lib/php/Mail/sendmail.php lib/php/Mail/smtp.php -lib/php/Math/Fraction.php -lib/php/Math/Util.php lib/php/Net/Curl.php lib/php/Net/Dig.php lib/php/Net/SMTP.php -lib/php/Net/Socket.php -lib/php/Numbers/Roman.php lib/php/PEAR.php +lib/php/PEAR/Autoloader.php +lib/php/PEAR/Command.php +lib/php/PEAR/Command/Auth.php +lib/php/PEAR/Command/Common.php +lib/php/PEAR/Command/Config.php +lib/php/PEAR/Command/Install.php +lib/php/PEAR/Command/Package.php +lib/php/PEAR/Command/Registry.php +lib/php/PEAR/Command/Remote.php lib/php/PEAR/Common.php lib/php/PEAR/Config.php +lib/php/PEAR/Dependency.php +lib/php/PEAR/Frontend/CLI.php lib/php/PEAR/Installer.php lib/php/PEAR/Packager.php lib/php/PEAR/Registry.php lib/php/PEAR/Remote.php -lib/php/PEAR/Uploader.php -lib/php/Payment/Verisign.php lib/php/Schedule/At.php lib/php/System.php lib/php/XML/Parser.php @@ -240,19 +244,17 @@ lib/php/build/shtool libexec/cgi-bin/php share/examples/php/php.ini-dist share/examples/php/php.ini-recommended -share/php/php4.gif +share/php/php.gif @dirrm share/php @dirrm share/examples/php @dirrm lib/php/build @dirrm lib/php/XML @dirrm lib/php/Schedule -@dirrm lib/php/Payment +@dirrm lib/php/PEAR/Command +@dirrm lib/php/PEAR/Frontend @dirrm lib/php/PEAR -@dirrm lib/php/Numbers @dirrm lib/php/Net -@dirrm lib/php/Math @dirrm lib/php/Mail -@dirrm lib/php/Log @dirrm lib/php/Image @dirrm lib/php/HTTP @dirrm lib/php/HTML @@ -261,13 +263,12 @@ share/php/php4.gif @dirrm lib/php/DB @dirrm lib/php/Crypt @dirrm lib/php/Console -@dirrm lib/php/Cache/Container -@dirrm lib/php/Cache -@dirrm lib/php/Benchmark @dirrm lib/php/Archive @dirrm include/php/regex @dirrm include/php/main +@dirrm include/php/ext/xml/expat @dirrm include/php/ext/xml +@dirrm include/php/ext/mbstring @dirrm include/php/ext/standard @dirrm include/php/ext/session @dirrm include/php/ext diff --git a/www/php4/distinfo b/www/php4/distinfo index 3d55cd1bcbe..6ddebd446f5 100644 --- a/www/php4/distinfo +++ b/www/php4/distinfo @@ -1,12 +1,11 @@ -$NetBSD: distinfo,v 1.13 2002/10/02 23:48:07 wiz Exp $ +$NetBSD: distinfo,v 1.14 2002/10/14 06:21:19 martti Exp $ -SHA1 (php-4.1.2.tar.gz) = fc4f9685b2b26d6e12af2e746a34fadfe57f0466 -Size (php-4.1.2.tar.gz) = 3359964 bytes +SHA1 (php-4.2.3.tar.gz) = 3e57e8c056bd2f173bba8705293cdfa15aeb93bc +Size (php-4.2.3.tar.gz) = 3413829 bytes SHA1 (patch-aa) = 09fb15fde09bf866d9be016839f33c889d9cefb9 SHA1 (patch-ab) = f385cce407fed6fc1ed705a4507015684bebb1b5 -SHA1 (patch-ac) = 9478c18dbe18e8c4c05dffce31fa3f923562c832 -SHA1 (patch-ad) = 4ac02d0e0e5bd612254020d46292534a0e9445b0 +SHA1 (patch-ac) = f3a3a4a5af6f03a6274aa4875a922b838f1bde1b +SHA1 (patch-ad) = 75288e1a09a12f9ff0ad962282caece245dda942 SHA1 (patch-ae) = e7acc06a63f47053c81ab442b53c68d89d122f78 -SHA1 (patch-af) = 34ec060ed3cdbcfc44286323f85f9938a79b0444 -SHA1 (patch-ag) = 91e84f6d6862a328d3f66f87260e8f2b2953fc11 -SHA1 (patch-ah) = 75404d3b85a82a2b23ceb2b1e9f41d9b09257100 +SHA1 (patch-ag) = a1948af6361e898880e4598654a8ac15fd193b7d +SHA1 (patch-ah) = 27ac564d2d378852ba328fbc0458d222a4bfdb22 diff --git a/www/php4/patches/patch-ac b/www/php4/patches/patch-ac index af613d4f86f..d120f510f29 100644 --- a/www/php4/patches/patch-ac +++ b/www/php4/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.5 2001/12/31 23:54:25 jlam Exp $ +$NetBSD: patch-ac,v 1.6 2002/10/14 06:21:19 martti Exp $ ---- acinclude.m4.orig Sat Nov 17 19:33:19 2001 -+++ acinclude.m4 -@@ -341,10 +341,19 @@ +--- acinclude.m4.orig Mon Jul 29 02:15:18 2002 ++++ acinclude.m4 Sat Oct 12 09:25:51 2002 +@@ -364,10 +364,19 @@ ;; esac @@ -23,8 +23,8 @@ $NetBSD: patch-ac,v 1.5 2001/12/31 23:54:25 jlam Exp $ - test "[$]$1" = "no" && $1=yes fi - AC_MSG_RESULT($ext_output) -@@ -675,7 +684,7 @@ + if test -n "$2"; then +@@ -704,7 +713,7 @@ if test "$1" != "/usr/lib"; then PHP_EXPAND_PATH($1, ai_p) if test "$ext_shared" = "yes" && test -n "$2"; then diff --git a/www/php4/patches/patch-ad b/www/php4/patches/patch-ad index 4a5faeed9f8..856d6bd3f17 100644 --- a/www/php4/patches/patch-ad +++ b/www/php4/patches/patch-ad @@ -1,31 +1,19 @@ -$NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $ +$NetBSD: patch-ad,v 1.11 2002/10/14 06:21:19 martti Exp $ ---- configure.orig Wed Feb 27 04:18:32 2002 -+++ configure -@@ -5138,11 +5138,6 @@ - fi +--- configure.orig Thu Sep 5 23:40:53 2002 ++++ configure Sat Oct 12 09:27:49 2002 +@@ -5396,10 +5396,6 @@ + fi -if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then - CPPFLAGS="$CPPFLAGS -I/usr/pkg/include" - LDFLAGS="$LDFLAGS -L/usr/pkg/lib" -fi -- INCLUDES="$INCLUDES -I\$(top_builddir)/Zend" - - -@@ -16148,10 +16143,6 @@ - - else - echo "$ac_t""no" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_DBA 0 --EOF -- - fi - - -@@ -23572,19 +23563,10 @@ + test -d /usr/ucblib && + if test "/usr/ucblib" != "/usr/lib"; then +@@ -26847,19 +26843,10 @@ else @@ -45,7 +33,7 @@ $NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $ echo "$ac_t""no" 1>&6 fi -@@ -58680,7 +58662,7 @@ +@@ -72831,7 +72818,7 @@ TSRM_LIB='TSRM/libtsrm.la' TSRM_DIR=TSRM @@ -54,7 +42,7 @@ $NetBSD: patch-ad,v 1.10 2002/08/26 00:42:34 grant Exp $ if test "$ZEND_EXPERIMENTAL_ZTS" = "yes"; then cat >> confdefs.h <<\EOF -@@ -63418,7 +63400,7 @@ +@@ -73625,7 +73612,7 @@ if test "$enable_debug" != "yes"; then diff --git a/www/php4/patches/patch-af b/www/php4/patches/patch-af deleted file mode 100644 index 8eefe367d72..00000000000 --- a/www/php4/patches/patch-af +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-af,v 1.4 2001/12/31 23:54:26 jlam Exp $ - ---- pear/Makefile.in.orig Wed Dec 26 14:50:18 2001 -+++ pear/Makefile.in -@@ -168,6 +168,7 @@ - / \ - Zend \ - TSRM \ -+ ext/session \ - ext/standard \ - ext/xml \ - ext/xml/expat/xmlparse \ diff --git a/www/php4/patches/patch-ag b/www/php4/patches/patch-ag index cc81b6312d0..d55e8853186 100644 --- a/www/php4/patches/patch-ag +++ b/www/php4/patches/patch-ag @@ -1,8 +1,8 @@ -$NetBSD: patch-ag,v 1.3 2001/12/31 23:54:26 jlam Exp $ +$NetBSD: patch-ag,v 1.4 2002/10/14 06:21:20 martti Exp $ ---- php.ini-dist.orig Tue Aug 14 16:23:25 2001 -+++ php.ini-dist -@@ -354,8 +354,9 @@ +--- php.ini-dist.orig Sat Aug 24 00:57:06 2002 ++++ php.ini-dist Sat Oct 12 09:29:27 2002 +@@ -367,8 +367,9 @@ ; if nonempty. user_dir = @@ -14,7 +14,7 @@ $NetBSD: patch-ag,v 1.3 2001/12/31 23:54:26 jlam Exp $ ; 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 -@@ -372,7 +373,7 @@ +@@ -396,7 +397,7 @@ ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). diff --git a/www/php4/patches/patch-ah b/www/php4/patches/patch-ah index 9a9a88ef93a..f2b54b1338b 100644 --- a/www/php4/patches/patch-ah +++ b/www/php4/patches/patch-ah @@ -1,8 +1,8 @@ -$NetBSD: patch-ah,v 1.4 2001/12/31 23:54:26 jlam Exp $ +$NetBSD: patch-ah,v 1.5 2002/10/14 06:21:20 martti Exp $ ---- php.ini-recommended.orig Fri Aug 17 12:54:16 2001 -+++ php.ini-recommended -@@ -368,7 +368,7 @@ +--- php.ini-recommended.orig Sat Aug 24 00:57:06 2002 ++++ php.ini-recommended Sat Oct 12 09:29:54 2002 +@@ -373,7 +373,7 @@ user_dir = ; Directory in which the loadable extensions (modules) reside. @@ -11,7 +11,7 @@ $NetBSD: patch-ah,v 1.4 2001/12/31 23:54:26 jlam Exp $ ; 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 -@@ -385,7 +385,7 @@ +@@ -403,7 +403,7 @@ ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). |