openbsd-current, 4.2.2->4.2.3RC1
| From: | Anil Madhavapeddy | Date: | Mon, 26 Aug 2002 23:50:28 +0000 |
| Subject: | openbsd-current, 4.2.2->4.2.3RC1 | ||
| Groups: | php.qa | ||
| Request: | Send a blank email to php-qa+get-5897@lists.php.net to get a copy of this message | ||
Please test the attached patch to see if any of your modules
break for PHP-4.2.3RC1. This patch ONLY applies and works on
systems running openbsd-current. The pear module will not work,
since cvs doesn't do binary diffs, but all else should be fine.
Anil
Index: Makefile.inc =================================================================== RCS file: /cvs/ports/www/php4/Makefile.inc,v retrieving revision 1.6 diff -u -r1.6 Makefile.inc --- Makefile.inc 20 Aug 2002 02:56:48 -0000 1.6 +++ Makefile.inc 26 Aug 2002 23:47:10 -0000 @@ -4,7 +4,7 @@ # and has Apache that supports DSO's. ONLY_FOR_ARCHS= alpha i386 m68k powerpc sparc sparc64 -V= 4.2.2 +V= 4.2.3RC1 DISTNAME= php-${V} CATEGORIES= www lang @@ -13,7 +13,7 @@ HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net/distributions/ \ +MASTER_SITES= http://www.php.net/~zeev/ http://www.php.net/distributions/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ Index: core/Makefile =================================================================== RCS file: /cvs/ports/www/php4/core/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- core/Makefile 12 Aug 2002 04:27:41 -0000 1.5 +++ core/Makefile 26 Aug 2002 23:47:10 -0000 @@ -56,4 +56,3 @@ .endif .include <bsd.port.mk> - Index: core/distinfo =================================================================== RCS file: /cvs/ports/www/php4/core/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- core/distinfo 22 Jul 2002 16:47:33 -0000 1.2 +++ core/distinfo 26 Aug 2002 23:47:10 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b -RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb -SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 +MD5 (php-4.2.3RC1.tar.gz) = af847a22c92b9925efc251f46e487236 +RMD160 (php-4.2.3RC1.tar.gz) = 0fa270b1a1f188796caeef191fec2e88a6cedd9c +SHA1 (php-4.2.3RC1.tar.gz) = 2afabff60dba7232a60475ae90fe75aed638e694 Index: core/patches/patch-php_ini-dist =================================================================== RCS file: /cvs/ports/www/php4/core/patches/patch-php_ini-dist,v retrieving revision 1.5 diff -u -r1.5 patch-php_ini-dist --- core/patches/patch-php_ini-dist 17 Aug 2002 01:39:26 -0000 1.5 +++ core/patches/patch-php_ini-dist 26 Aug 2002 23:47:10 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2002/08/17 01:39:26 avsm Exp $ ---- php.ini-dist.orig Mon Apr 8 02:15:16 2002 -+++ php.ini-dist Sat Aug 17 02:33:38 2002 +--- php.ini-dist.orig Wed Aug 14 23:35:36 2002 ++++ php.ini-dist Sat Aug 24 12:54:49 2002 @@ -356,9 +356,6 @@ default_mimetype = "text/html" ; UNIX: "/path1:/path2" ;include_path = ".:/php/includes" @@ -119,16 +119,7 @@ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -746,7 +664,7 @@ session.cache_limiter = nocache - session.cache_expire = 180 - - ; use transient sid support if enabled by compiling with --enable-trans-sid. --session.use_trans_sid = 1 -+session.use_trans_sid = 0 - - url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -@@ -877,6 +795,41 @@ sockets.use_system_read = On +@@ -885,6 +803,41 @@ sockets.use_system_read = On ;fbsql.max_results = 128 ;fbsql.batchSize = 1000 Index: core/patches/patch-php_ini-recommended =================================================================== RCS file: /cvs/ports/www/php4/core/patches/patch-php_ini-recommended,v retrieving revision 1.5 diff -u -r1.5 patch-php_ini-recommended --- core/patches/patch-php_ini-recommended 17 Aug 2002 01:39:26 -0000 1.5 +++ core/patches/patch-php_ini-recommended 26 Aug 2002 23:47:10 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2002/08/17 01:39:26 avsm Exp $ ---- php.ini-recommended.orig Wed Apr 24 02:51:50 2002 -+++ php.ini-recommended Sat Aug 17 02:34:55 2002 +--- php.ini-recommended.orig Wed Aug 14 23:35:36 2002 ++++ php.ini-recommended Sat Aug 24 12:54:49 2002 @@ -361,9 +361,6 @@ default_mimetype = "text/html" ; UNIX: "/path1:/path2" ;include_path = ".:/php/includes" @@ -119,16 +119,7 @@ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -753,7 +671,7 @@ session.cache_limiter = nocache - session.cache_expire = 180 - - ; use transient sid support if enabled by compiling with --enable-trans-sid. --session.use_trans_sid = 1 -+session.use_trans_sid = 0 - - url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -@@ -884,6 +802,41 @@ sockets.use_system_read = On +@@ -892,6 +810,41 @@ sockets.use_system_read = On ;fbsql.max_results = 128 ;fbsql.batchSize = 1000 Index: extensions/Makefile =================================================================== RCS file: /cvs/ports/www/php4/extensions/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- extensions/Makefile 17 Aug 2002 01:33:57 -0000 1.13 +++ extensions/Makefile 26 Aug 2002 23:47:15 -0000 @@ -223,6 +223,18 @@ LIB_DEPENDS+= snmp.42::net/ucd-snmp .endif +# pspell +#PSEUDO_FLAVORS+= no_pspell +#.if ${FLAVOR:L:Mno_pspell} +#CONFIGURE_ARGS+= --without-pspell +#.else +#MULTI_PACKAGES+= -pspell +#COMMENT-pspell= "spell checking extensions for php4" +#CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE} +#LIB_DEPENDS+= pspell-modules::textproc/pspell \ +# aspell.11::textproc/aspell +#.endif + # sybase-ct PSEUDO_FLAVORS+= no_sybase_ct .if ${FLAVOR:L:Mno_sybase_ct} @@ -242,7 +254,8 @@ MULTI_PACKAGES+= -xml COMMENT-xml= "xml parsing extensions for php4" CONFIGURE_ARGS+= --with-wddx=shared --with-xml=shared \ - --with-expat-dir=shared,${LOCALBASE} + --with-expat-dir=shared,${LOCALBASE} \ + --with-dom=shared,${LOCALBASE} XML_DEPENDS= expat.2::textproc/expat .endif Index: extensions/distinfo =================================================================== RCS file: /cvs/ports/www/php4/extensions/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- extensions/distinfo 22 Jul 2002 16:47:33 -0000 1.2 +++ extensions/distinfo 26 Aug 2002 23:47:15 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b -RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb -SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 +MD5 (php-4.2.3RC1.tar.gz) = af847a22c92b9925efc251f46e487236 +RMD160 (php-4.2.3RC1.tar.gz) = 0fa270b1a1f188796caeef191fec2e88a6cedd9c +SHA1 (php-4.2.3RC1.tar.gz) = 2afabff60dba7232a60475ae90fe75aed638e694 Index: extensions/patches/patch-aclocal_m4 =================================================================== RCS file: /cvs/ports/www/php4/extensions/patches/patch-aclocal_m4,v retrieving revision 1.1 diff -u -r1.1 patch-aclocal_m4 --- extensions/patches/patch-aclocal_m4 12 Aug 2002 04:30:21 -0000 1.1 +++ extensions/patches/patch-aclocal_m4 26 Aug 2002 23:47:15 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2002/08/12 04:30:21 avsm Exp $ ---- aclocal.m4.orig Thu Aug 8 00:42:18 2002 -+++ aclocal.m4 Thu Aug 8 00:42:41 2002 -@@ -4087,7 +4087,7 @@ openbsd*) +--- aclocal.m4.orig Sat Aug 24 02:08:12 2002 ++++ aclocal.m4 Sat Aug 24 13:34:25 2002 +@@ -3683,7 +3683,7 @@ openbsd*) shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' Index: extensions/patches/patch-ext_gmp_config_m4 =================================================================== RCS file: extensions/patches/patch-ext_gmp_config_m4 diff -N extensions/patches/patch-ext_gmp_config_m4 --- extensions/patches/patch-ext_gmp_config_m4 24 Jun 2002 19:27:48 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-ext_gmp_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $ ---- ext/gmp/config.m4.orig Fri Nov 30 18:59:37 2001 -+++ ext/gmp/config.m4 Wed Jun 19 22:18:14 2002 -@@ -21,5 +21,6 @@ if test "$PHP_GMP" != "no"; then - - PHP_EXTENSION(gmp, $ext_shared) - AC_DEFINE(HAVE_GMP, 1, [ ]) -- PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib) -+ PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD) -+ PHP_SUBST(GMP_SHARED_LIBADD) - fi Index: extensions/patches/patch-ext_imap_config_m4 =================================================================== RCS file: /cvs/ports/www/php4/extensions/patches/patch-ext_imap_config_m4,v retrieving revision 1.2 diff -u -r1.2 patch-ext_imap_config_m4 --- extensions/patches/patch-ext_imap_config_m4 9 Jul 2002 18:14:17 -0000 1.2 +++ extensions/patches/patch-ext_imap_config_m4 26 Aug 2002 23:47:15 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-ext_imap_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $ ---- ext/imap/config.m4.orig Tue Aug 7 12:18:04 2001 -+++ ext/imap/config.m4 Sat Apr 6 17:40:25 2002 +--- ext/imap/config.m4.orig Wed Aug 21 00:09:01 2002 ++++ ext/imap/config.m4 Sat Aug 24 13:34:25 2002 @@ -36,10 +36,12 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ if test "$PHP_KERBEROS" != "no"; then AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) @@ -16,7 +16,7 @@ + PHP_ADD_LIBRARY(kafs, 1, IMAP_SHARED_LIBADD) else AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ - AC_MSG_ERROR(This c-client library is build with Kerberos support. + AC_MSG_ERROR(This c-client library is built with Kerberos support. @@ -71,7 +73,7 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [ old_LIBS=$LIBS LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" Index: extensions/patches/patch-ext_pgsql_config_m4 =================================================================== RCS file: /cvs/ports/www/php4/extensions/patches/patch-ext_pgsql_config_m4,v retrieving revision 1.2 diff -u -r1.2 patch-ext_pgsql_config_m4 --- extensions/patches/patch-ext_pgsql_config_m4 9 Jul 2002 18:14:17 -0000 1.2 +++ extensions/patches/patch-ext_pgsql_config_m4 26 Aug 2002 23:47:15 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-ext_pgsql_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $ ---- ext/pgsql/config.m4.orig Mon Apr 1 12:44:52 2002 -+++ ext/pgsql/config.m4 Tue Jul 9 18:17:23 2002 +--- ext/pgsql/config.m4.orig Thu Aug 1 11:19:17 2002 ++++ ext/pgsql/config.m4 Sat Aug 24 13:35:19 2002 @@ -27,7 +27,7 @@ if test "$PHP_PGSQL" != "no"; then done for j in lib lib/pgsql lib/postgres lib/postgresql ""; do -- if test -f "$i/$j/libpq.so"; then -+ if test -f $i/$j/libpq.so*; then +- if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then ++ if test -f "$i/$j/libpq.so*" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi done Index: pear/distinfo =================================================================== RCS file: /cvs/ports/www/php4/pear/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- pear/distinfo 22 Jul 2002 16:47:33 -0000 1.2 +++ pear/distinfo 26 Aug 2002 23:47:15 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b -RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb -SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 +MD5 (php-4.2.3RC1.tar.gz) = af847a22c92b9925efc251f46e487236 +RMD160 (php-4.2.3RC1.tar.gz) = 0fa270b1a1f188796caeef191fec2e88a6cedd9c +SHA1 (php-4.2.3RC1.tar.gz) = 2afabff60dba7232a60475ae90fe75aed638e694 Index: pear/files/pear-412-421.tgz =================================================================== RCS file: /cvs/ports/www/php4/pear/files/pear-412-421.tgz,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 pear-412-421.tgz Binary files /tmp/cvsx12053 and pear-412-421.tgz differ Index: pear/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/php4/pear/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pear/pkg/PLIST 24 Jun 2002 19:30:31 -0000 1.1.1.1 +++ pear/pkg/PLIST 26 Aug 2002 23:47:26 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2002/06/24 19:30:31 avsm Exp $ +@comment $OpenBSD$ bin/pear bin/pearize bin/php-config @@ -184,6 +184,8 @@ lib/php/DB/sybase.php lib/php/Date/Calc.php lib/php/Date/Human.php +lib/php/File.php +lib/php/File/CSV.php lib/php/File/Find.php lib/php/File/Passwd.php lib/php/File/SearchReplace.php @@ -208,8 +210,13 @@ lib/php/Log/syslog.php lib/php/Mail.php lib/php/Mail/RFC822.php +lib/php/Mail/mime.php +lib/php/Mail/mimeDecode.php +lib/php/Mail/mimePart.php lib/php/Mail/sendmail.php lib/php/Mail/smtp.php +lib/php/Mail/xmail.dtd +lib/php/Mail/xmail.xsl lib/php/Net/Curl.php lib/php/Net/Dig.php lib/php/Net/SMTP.php
Index: Makefile.inc =================================================================== RCS file: /cvs/ports/www/php4/Makefile.inc,v retrieving revision 1.6 diff -u -r1.6 Makefile.inc --- Makefile.inc 20 Aug 2002 02:56:48 -0000 1.6 +++ Makefile.inc 26 Aug 2002 23:47:10 -0000 @@ -4,7 +4,7 @@ # and has Apache that supports DSO's. ONLY_FOR_ARCHS= alpha i386 m68k powerpc sparc sparc64 -V= 4.2.2 +V= 4.2.3RC1 DISTNAME= php-${V} CATEGORIES= www lang @@ -13,7 +13,7 @@ HOMEPAGE= http://www.php.net/ -MASTER_SITES= http://www.php.net/distributions/ \ +MASTER_SITES= http://www.php.net/~zeev/ http://www.php.net/distributions/ \ http://se.php.net/distributions/ \ http://no.php.net/distributions/ \ http://uk.php.net/distributions/ Index: core/Makefile =================================================================== RCS file: /cvs/ports/www/php4/core/Makefile,v retrieving revision 1.5 diff -u -r1.5 Makefile --- core/Makefile 12 Aug 2002 04:27:41 -0000 1.5 +++ core/Makefile 26 Aug 2002 23:47:10 -0000 @@ -56,4 +56,3 @@ .endif .include <bsd.port.mk> - Index: core/distinfo =================================================================== RCS file: /cvs/ports/www/php4/core/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- core/distinfo 22 Jul 2002 16:47:33 -0000 1.2 +++ core/distinfo 26 Aug 2002 23:47:10 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b -RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb -SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 +MD5 (php-4.2.3RC1.tar.gz) = af847a22c92b9925efc251f46e487236 +RMD160 (php-4.2.3RC1.tar.gz) = 0fa270b1a1f188796caeef191fec2e88a6cedd9c +SHA1 (php-4.2.3RC1.tar.gz) = 2afabff60dba7232a60475ae90fe75aed638e694 Index: core/patches/patch-php_ini-dist =================================================================== RCS file: /cvs/ports/www/php4/core/patches/patch-php_ini-dist,v retrieving revision 1.5 diff -u -r1.5 patch-php_ini-dist --- core/patches/patch-php_ini-dist 17 Aug 2002 01:39:26 -0000 1.5 +++ core/patches/patch-php_ini-dist 26 Aug 2002 23:47:10 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-php_ini-dist,v 1.5 2002/08/17 01:39:26 avsm Exp $ ---- php.ini-dist.orig Mon Apr 8 02:15:16 2002 -+++ php.ini-dist Sat Aug 17 02:33:38 2002 +--- php.ini-dist.orig Wed Aug 14 23:35:36 2002 ++++ php.ini-dist Sat Aug 24 12:54:49 2002 @@ -356,9 +356,6 @@ default_mimetype = "text/html" ; UNIX: "/path1:/path2" ;include_path = ".:/php/includes" @@ -119,16 +119,7 @@ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -746,7 +664,7 @@ session.cache_limiter = nocache - session.cache_expire = 180 - - ; use transient sid support if enabled by compiling with --enable-trans-sid. --session.use_trans_sid = 1 -+session.use_trans_sid = 0 - - url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -@@ -877,6 +795,41 @@ sockets.use_system_read = On +@@ -885,6 +803,41 @@ sockets.use_system_read = On ;fbsql.max_results = 128 ;fbsql.batchSize = 1000 Index: core/patches/patch-php_ini-recommended =================================================================== RCS file: /cvs/ports/www/php4/core/patches/patch-php_ini-recommended,v retrieving revision 1.5 diff -u -r1.5 patch-php_ini-recommended --- core/patches/patch-php_ini-recommended 17 Aug 2002 01:39:26 -0000 1.5 +++ core/patches/patch-php_ini-recommended 26 Aug 2002 23:47:10 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-php_ini-recommended,v 1.5 2002/08/17 01:39:26 avsm Exp $ ---- php.ini-recommended.orig Wed Apr 24 02:51:50 2002 -+++ php.ini-recommended Sat Aug 17 02:34:55 2002 +--- php.ini-recommended.orig Wed Aug 14 23:35:36 2002 ++++ php.ini-recommended Sat Aug 24 12:54:49 2002 @@ -361,9 +361,6 @@ default_mimetype = "text/html" ; UNIX: "/path1:/path2" ;include_path = ".:/php/includes" @@ -119,16 +119,7 @@ ; For Unix only. You may supply arguments as well (default: "sendmail -t -i"). ;sendmail_path = -@@ -753,7 +671,7 @@ session.cache_limiter = nocache - session.cache_expire = 180 - - ; use transient sid support if enabled by compiling with --enable-trans-sid. --session.use_trans_sid = 1 -+session.use_trans_sid = 0 - - url_rewriter.tags = "a=href,area=href,frame=src,input=src,form=fakeentry" - -@@ -884,6 +802,41 @@ sockets.use_system_read = On +@@ -892,6 +810,41 @@ sockets.use_system_read = On ;fbsql.max_results = 128 ;fbsql.batchSize = 1000 Index: extensions/Makefile =================================================================== RCS file: /cvs/ports/www/php4/extensions/Makefile,v retrieving revision 1.13 diff -u -r1.13 Makefile --- extensions/Makefile 17 Aug 2002 01:33:57 -0000 1.13 +++ extensions/Makefile 26 Aug 2002 23:47:15 -0000 @@ -223,6 +223,18 @@ LIB_DEPENDS+= snmp.42::net/ucd-snmp .endif +# pspell +#PSEUDO_FLAVORS+= no_pspell +#.if ${FLAVOR:L:Mno_pspell} +#CONFIGURE_ARGS+= --without-pspell +#.else +#MULTI_PACKAGES+= -pspell +#COMMENT-pspell= "spell checking extensions for php4" +#CONFIGURE_ARGS+= --with-pspell=shared,${LOCALBASE} +#LIB_DEPENDS+= pspell-modules::textproc/pspell \ +# aspell.11::textproc/aspell +#.endif + # sybase-ct PSEUDO_FLAVORS+= no_sybase_ct .if ${FLAVOR:L:Mno_sybase_ct} @@ -242,7 +254,8 @@ MULTI_PACKAGES+= -xml COMMENT-xml= "xml parsing extensions for php4" CONFIGURE_ARGS+= --with-wddx=shared --with-xml=shared \ - --with-expat-dir=shared,${LOCALBASE} + --with-expat-dir=shared,${LOCALBASE} \ + --with-dom=shared,${LOCALBASE} XML_DEPENDS= expat.2::textproc/expat .endif Index: extensions/distinfo =================================================================== RCS file: /cvs/ports/www/php4/extensions/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- extensions/distinfo 22 Jul 2002 16:47:33 -0000 1.2 +++ extensions/distinfo 26 Aug 2002 23:47:15 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b -RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb -SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 +MD5 (php-4.2.3RC1.tar.gz) = af847a22c92b9925efc251f46e487236 +RMD160 (php-4.2.3RC1.tar.gz) = 0fa270b1a1f188796caeef191fec2e88a6cedd9c +SHA1 (php-4.2.3RC1.tar.gz) = 2afabff60dba7232a60475ae90fe75aed638e694 Index: extensions/patches/patch-aclocal_m4 =================================================================== RCS file: /cvs/ports/www/php4/extensions/patches/patch-aclocal_m4,v retrieving revision 1.1 diff -u -r1.1 patch-aclocal_m4 --- extensions/patches/patch-aclocal_m4 12 Aug 2002 04:30:21 -0000 1.1 +++ extensions/patches/patch-aclocal_m4 26 Aug 2002 23:47:15 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2002/08/12 04:30:21 avsm Exp $ ---- aclocal.m4.orig Thu Aug 8 00:42:18 2002 -+++ aclocal.m4 Thu Aug 8 00:42:41 2002 -@@ -4087,7 +4087,7 @@ openbsd*) +--- aclocal.m4.orig Sat Aug 24 02:08:12 2002 ++++ aclocal.m4 Sat Aug 24 13:34:25 2002 +@@ -3683,7 +3683,7 @@ openbsd*) shlibpath_overrides_runpath=yes fi library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix' Index: extensions/patches/patch-ext_gmp_config_m4 =================================================================== RCS file: extensions/patches/patch-ext_gmp_config_m4 diff -N extensions/patches/patch-ext_gmp_config_m4 --- extensions/patches/patch-ext_gmp_config_m4 24 Jun 2002 19:27:48 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-ext_gmp_config_m4,v 1.1.1.1 2002/06/24 19:27:48 avsm Exp $ ---- ext/gmp/config.m4.orig Fri Nov 30 18:59:37 2001 -+++ ext/gmp/config.m4 Wed Jun 19 22:18:14 2002 -@@ -21,5 +21,6 @@ if test "$PHP_GMP" != "no"; then - - PHP_EXTENSION(gmp, $ext_shared) - AC_DEFINE(HAVE_GMP, 1, [ ]) -- PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib) -+ PHP_ADD_LIBRARY_WITH_PATH(gmp, $GMP_DIR/lib, GMP_SHARED_LIBADD) -+ PHP_SUBST(GMP_SHARED_LIBADD) - fi Index: extensions/patches/patch-ext_imap_config_m4 =================================================================== RCS file: /cvs/ports/www/php4/extensions/patches/patch-ext_imap_config_m4,v retrieving revision 1.2 diff -u -r1.2 patch-ext_imap_config_m4 --- extensions/patches/patch-ext_imap_config_m4 9 Jul 2002 18:14:17 -0000 1.2 +++ extensions/patches/patch-ext_imap_config_m4 26 Aug 2002 23:47:15 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-ext_imap_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $ ---- ext/imap/config.m4.orig Tue Aug 7 12:18:04 2001 -+++ ext/imap/config.m4 Sat Apr 6 17:40:25 2002 +--- ext/imap/config.m4.orig Wed Aug 21 00:09:01 2002 ++++ ext/imap/config.m4 Sat Aug 24 13:34:25 2002 @@ -36,10 +36,12 @@ AC_DEFUN(PHP_IMAP_KRB_CHK, [ if test "$PHP_KERBEROS" != "no"; then AC_DEFINE(HAVE_IMAP_KRB,1,[ ]) @@ -16,7 +16,7 @@ + PHP_ADD_LIBRARY(kafs, 1, IMAP_SHARED_LIBADD) else AC_EGREP_HEADER(auth_gss, $IMAP_INC_DIR/linkage.h, [ - AC_MSG_ERROR(This c-client library is build with Kerberos support. + AC_MSG_ERROR(This c-client library is built with Kerberos support. @@ -71,7 +73,7 @@ AC_DEFUN(PHP_IMAP_SSL_CHK, [ old_LIBS=$LIBS LIBS="$LIBS -L$IMAP_LIBDIR -l$IMAP_LIB" Index: extensions/patches/patch-ext_pgsql_config_m4 =================================================================== RCS file: /cvs/ports/www/php4/extensions/patches/patch-ext_pgsql_config_m4,v retrieving revision 1.2 diff -u -r1.2 patch-ext_pgsql_config_m4 --- extensions/patches/patch-ext_pgsql_config_m4 9 Jul 2002 18:14:17 -0000 1.2 +++ extensions/patches/patch-ext_pgsql_config_m4 26 Aug 2002 23:47:15 -0000 @@ -1,12 +1,12 @@ $OpenBSD: patch-ext_pgsql_config_m4,v 1.2 2002/07/09 18:14:17 avsm Exp $ ---- ext/pgsql/config.m4.orig Mon Apr 1 12:44:52 2002 -+++ ext/pgsql/config.m4 Tue Jul 9 18:17:23 2002 +--- ext/pgsql/config.m4.orig Thu Aug 1 11:19:17 2002 ++++ ext/pgsql/config.m4 Sat Aug 24 13:35:19 2002 @@ -27,7 +27,7 @@ if test "$PHP_PGSQL" != "no"; then done for j in lib lib/pgsql lib/postgres lib/postgresql ""; do -- if test -f "$i/$j/libpq.so"; then -+ if test -f $i/$j/libpq.so*; then +- if test -f "$i/$j/libpq.so" || test -f "$i/$j/libpq.a"; then ++ if test -f "$i/$j/libpq.so*" || test -f "$i/$j/libpq.a"; then PGSQL_LIBDIR=$i/$j fi done Index: pear/distinfo =================================================================== RCS file: /cvs/ports/www/php4/pear/distinfo,v retrieving revision 1.2 diff -u -r1.2 distinfo --- pear/distinfo 22 Jul 2002 16:47:33 -0000 1.2 +++ pear/distinfo 26 Aug 2002 23:47:15 -0000 @@ -1,3 +1,3 @@ -MD5 (php-4.2.2.tar.gz) = 2c3c803152878c799cdf551d56bd142b -RMD160 (php-4.2.2.tar.gz) = 8266439f7ce6ca5f189b21ef33fdca0c3f9514cb -SHA1 (php-4.2.2.tar.gz) = fc90b8f82b30367600dfece2fdd1ee00d05b02b5 +MD5 (php-4.2.3RC1.tar.gz) = af847a22c92b9925efc251f46e487236 +RMD160 (php-4.2.3RC1.tar.gz) = 0fa270b1a1f188796caeef191fec2e88a6cedd9c +SHA1 (php-4.2.3RC1.tar.gz) = 2afabff60dba7232a60475ae90fe75aed638e694 Index: pear/files/pear-412-421.tgz =================================================================== RCS file: /cvs/ports/www/php4/pear/files/pear-412-421.tgz,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 pear-412-421.tgz Binary files /tmp/cvsx12053 and pear-412-421.tgz differ Index: pear/pkg/PLIST =================================================================== RCS file: /cvs/ports/www/php4/pear/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 PLIST --- pear/pkg/PLIST 24 Jun 2002 19:30:31 -0000 1.1.1.1 +++ pear/pkg/PLIST 26 Aug 2002 23:47:26 -0000 @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2002/06/24 19:30:31 avsm Exp $ +@comment $OpenBSD$ bin/pear bin/pearize bin/php-config @@ -184,6 +184,8 @@ lib/php/DB/sybase.php lib/php/Date/Calc.php lib/php/Date/Human.php +lib/php/File.php +lib/php/File/CSV.php lib/php/File/Find.php lib/php/File/Passwd.php lib/php/File/SearchReplace.php @@ -208,8 +210,13 @@ lib/php/Log/syslog.php lib/php/Mail.php lib/php/Mail/RFC822.php +lib/php/Mail/mime.php +lib/php/Mail/mimeDecode.php +lib/php/Mail/mimePart.php lib/php/Mail/sendmail.php lib/php/Mail/smtp.php +lib/php/Mail/xmail.dtd +lib/php/Mail/xmail.xsl lib/php/Net/Curl.php lib/php/Net/Dig.php lib/php/Net/SMTP.php