ssb             Tue Jan  9 17:02:00 2001 EDT

  Added files:                 
    /php4/pear/scripts  pear.in php-config.in phpextdist phpize.in 

  Removed files:               
    /php4/pear  pear.in php-config.in phpextdist phpize.in run-tests.in 

  Modified files:              
    /php4/pear  DB.php HTTP.php Mail.php Makefile.in PEAR.php.in 
                package.dtd 
    /php4/pear/Benchmark        Iterate.php Timer.php 
    /php4/pear/Cache    Function_Cache.php 
    /php4/pear/Crypt    HCEMD5.php 
    /php4/pear/DB       common.php ibase.php msql.php mssql.php mysql.php 
                        oci8.php odbc.php pgsql.php storage.php sybase.php 
    /php4/pear/Date     Human.php 
    /php4/pear/File     Find.php Passwd.php 
    /php4/pear/HTML     Form.php 
    /php4/pear/Image    Remote.php 
    /php4/pear/Mail     rfc822.php sendmail.php smtp.php 
    /php4/pear/Math     Fraction.php Util.php 
    /php4/pear/Net      Curl.php SMTP.php Socket.php 
    /php4/pear/Numbers  Roman.php 
    /php4/pear/PEAR     Installer.php 
    /php4/pear/Payment  Verisign.php 
    /php4/pear/XML      Parser.php 
  Log:
  * updated copyrights (thanks Colin)
  * moved scripts to own directory (bug #7635)
  
  
Index: php4/pear/DB.php
diff -u php4/pear/DB.php:1.42 php4/pear/DB.php:1.43
--- php4/pear/DB.php:1.42       Sat Dec  9 17:32:16 2000
+++ php4/pear/DB.php    Tue Jan  9 17:01:52 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
 // |                                                                      |
 // +----------------------------------------------------------------------+
 //
-// $Id: DB.php,v 1.42 2000/12/10 01:32:16 ssb Exp $
+// $Id: DB.php,v 1.43 2001/01/10 01:01:52 ssb Exp $
 //
 // Database independent query interface.
 //
Index: php4/pear/HTTP.php
diff -u php4/pear/HTTP.php:1.4 php4/pear/HTTP.php:1.5
--- php4/pear/HTTP.php:1.4      Sun Jul 23 22:41:00 2000
+++ php4/pear/HTTP.php  Tue Jan  9 17:01:52 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
 // |                                                                      |
 // +----------------------------------------------------------------------+
 //
-// $Id: HTTP.php,v 1.4 2000/07/24 05:41:00 david Exp $
+// $Id: HTTP.php,v 1.5 2001/01/10 01:01:52 ssb Exp $
 //
 // HTTP utility functions.
 //
Index: php4/pear/Mail.php
diff -u php4/pear/Mail.php:1.7 php4/pear/Mail.php:1.8
--- php4/pear/Mail.php:1.7      Fri Jan  5 12:03:01 2001
+++ php4/pear/Mail.php  Tue Jan  9 17:01:52 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/Makefile.in
diff -u php4/pear/Makefile.in:1.58 php4/pear/Makefile.in:1.59
--- php4/pear/Makefile.in:1.58  Fri Jan  5 12:05:27 2001
+++ php4/pear/Makefile.in       Tue Jan  9 17:01:52 2001
@@ -106,16 +106,15 @@
        dynlib.m4 \
        acinclude.m4
 
-bin_PROGRAMS = phpize php-config pear
+bin_SCRIPTS = phpize php-config pear phpextdist
 
 install-build:
        $(mkinstalldirs) $(phpbuilddir) $(bindir) && \
        (cd $(top_srcdir) && cp $(BUILD_FILES) $(phpbuilddir))
 
 install-programs:
-       $(INSTALL) -m 755 $(srcdir)/phpextdist $(bindir)/phpextdist
-       for prog in $(bin_PROGRAMS); do \
-               $(INSTALL) -m 755 $$prog $(bindir)/$$prog; \
+       for prog in $(bin_SCRIPTS); do \
+               $(INSTALL) -m 755 scripts/$$prog $(bindir)/$$prog; \
        done
 
 HEADER_DIRS = \
@@ -143,14 +142,14 @@
 Makefile: Makefile.in $(top_builddir)/config.status
        (cd ..;CONFIG_FILES=pear/Makefile CONFIG_HEADERS= 
$(top_builddir)/config.status)
 
-pear: pear.in $(top_builddir)/config.status
-       (cd ..;CONFIG_FILES=pear/pear CONFIG_HEADERS= $(top_builddir)/config.status)
+scripts/pear: scripts/pear.in $(top_builddir)/config.status
+       (cd ..;CONFIG_FILES=pear/scripts/pear CONFIG_HEADERS= 
+$(top_builddir)/config.status)
 
-phpize: phpize.in $(top_builddir)/config.status
-       (cd ..;CONFIG_FILES=pear/phpize CONFIG_HEADERS= $(top_builddir)/config.status)
+scripts/phpize: scripts/phpize.in $(top_builddir)/config.status
+       (cd ..;CONFIG_FILES=pear/scripts/phpize CONFIG_HEADERS= 
+$(top_builddir)/config.status)
 
-php-config: php-config.in $(top_builddir)/config.status
-       (cd ..;CONFIG_FILES=pear/php-config CONFIG_HEADERS= 
$(top_builddir)/config.status)
+scripts/php-config: scripts/php-config.in $(top_builddir)/config.status
+       (cd ..;CONFIG_FILES=pear/scripts/php-config CONFIG_HEADERS= 
+$(top_builddir)/config.status)
 
 PEAR.php: PEAR.php.in $(top_builddir)/config.status
        (cd ..;CONFIG_FILES=pear/PEAR.php CONFIG_HEADERS= 
$(top_builddir)/config.status)
Index: php4/pear/PEAR.php.in
diff -u php4/pear/PEAR.php.in:1.10 php4/pear/PEAR.php.in:1.11
--- php4/pear/PEAR.php.in:1.10  Mon Dec  4 13:03:17 2000
+++ php4/pear/PEAR.php.in       Tue Jan  9 17:01:52 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.0 of the PHP license,       |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
 // |          Stig Bakken <[EMAIL PROTECTED]>                                   |
 // +----------------------------------------------------------------------+
 //
-// $Id: PEAR.php.in,v 1.10 2000/12/04 21:03:17 chagenbu Exp $
+// $Id: PEAR.php.in,v 1.11 2001/01/10 01:01:52 ssb Exp $
 //
 
 define('PEAR_ERROR_RETURN', 1);
Index: php4/pear/package.dtd
diff -u php4/pear/package.dtd:1.1 php4/pear/package.dtd:1.2
--- php4/pear/package.dtd:1.1   Mon Jul 24 17:55:36 2000
+++ php4/pear/package.dtd       Tue Jan  9 17:01:52 2001
@@ -1,18 +1,13 @@
 <!--
-     $Id: package.dtd,v 1.1 2000/07/25 00:55:36 ssb Exp $
+     $Id: package.dtd,v 1.2 2001/01/10 01:01:52 ssb Exp $
 
      This is the PEAR package description, version 1.0.
      It should be used with the informal public identifier:
 
          "-//PHP Group//DTD PEAR Package 1.0//EN//XML"
 
-     Using XML namespaces is optional, but the namespace that should
-     be used for this DTD is:
+     Copyright (c) 1997-2001 The PHP Group             
 
-         "http://xmlns.php.net/pear/package".
-
-     Copyright (c) 1997, 1998, 1999, 2000 The PHP Group
-
      This source file is subject to version 2.02 of the PHP license,
      that is bundled with this package in the file LICENSE, and is
      available at through the world-wide-web at
@@ -30,9 +25,10 @@
 <!ENTITY % global.atts         "id             ID      #IMPLIED">
 
 <!--============== attributes common to several elements ===================-->
+<!ENTITY % role.atts           "Role           (php|ext|test|doc) 'php'">
 <!ENTITY % extension.atts      "Debug          (on|off) 'off'
                                 ThreadSafe     (on|off) 'off'">
-<!ENTITY % format.atts         "Format         CDATA   #REQUIRED">
+<!ENTITY % format.atts         "Format         CDATA   #IMPLIED">
 
 <!--=============== ELEMENT: Package =======================================-->
 <!ELEMENT Package              (Name,Summary,Maintainer,Release,FileList)>
@@ -76,38 +72,16 @@
 <!ATTLIST Notes                        %global.atts;>
 
 <!--=============== ELEMENT: FileList ======================================-->
-<!ELEMENT FileList             (DestDir |
-                                Dir     | File     |
-                                ExtDir  | ExtFile  |
-                                DocDir  | DocFile)*>
+<!ELEMENT FileList             (Dir | File)*>
 <!ATTLIST FileList             %global.atts;>
 
-<!--=============== ELEMENT: DestDir =======================================-->
-<!ELEMENT DestDir              (#PCDATA)>
-<!ATTLIST DestDir              %global.atts;>
-
 <!--=============== ELEMENT: Dir ===========================================-->
 <!ELEMENT Dir                  (#PCDATA)>
 <!ATTLIST Dir                  %global.atts;>
 
 <!--=============== ELEMENT: File ==========================================-->
 <!ELEMENT File                 (#PCDATA)>
-<!ATTLIST File                 %global.atts;>
-
-<!--=============== ELEMENT: ExtDir ========================================-->
-<!ELEMENT ExtDir               (#PCDATA)>
-<!ATTLIST ExtDir               %global.atts;>
-
-<!--=============== ELEMENT: ExtFile =======================================-->
-<!ELEMENT ExtFile              (#PCDATA)>
-<!ATTLIST ExtFile              %global.atts;
-                               %extension.atts;>
-
-<!--=============== ELEMENT: DocDir ========================================-->
-<!ELEMENT DocDir               (#PCDATA)>
-<!ATTLIST DocDir               %global.atts;>
-
-<!--=============== ELEMENT: DocFile =======================================-->
-<!ELEMENT DocFile              (#PCDATA)>
-<!ATTLIST DocFile              %global.atts;
-                               %format.atts;>
+<!ATTLIST File                 %global.atts;
+                                %role.atts;
+                                %extension.atts;
+                                %format.atts;>
Index: php4/pear/Benchmark/Iterate.php
diff -u php4/pear/Benchmark/Iterate.php:1.3 php4/pear/Benchmark/Iterate.php:1.4
--- php4/pear/Benchmark/Iterate.php:1.3 Thu Jan  4 15:55:46 2001
+++ php4/pear/Benchmark/Iterate.php     Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sebastian Bergmann <[EMAIL PROTECTED]>               |
 // +----------------------------------------------------------------------+
 //
-// $Id: Iterate.php,v 1.3 2001/01/04 23:55:46 sbergmann Exp $
+// $Id: Iterate.php,v 1.4 2001/01/10 01:01:53 ssb Exp $
 //
 
 require_once 'Benchmark/Timer.php';
@@ -37,7 +37,7 @@
 *     $result = $benchmark->get();
 * 
 * @author   Sebastian Bergmann <[EMAIL PROTECTED]>
-* @version  $Revision: 1.3 $
+* @version  $Revision: 1.4 $
 * @access   public
 */
 
Index: php4/pear/Benchmark/Timer.php
diff -u php4/pear/Benchmark/Timer.php:1.6 php4/pear/Benchmark/Timer.php:1.7
--- php4/pear/Benchmark/Timer.php:1.6   Thu Jan  4 15:55:46 2001
+++ php4/pear/Benchmark/Timer.php       Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sebastian Bergmann <[EMAIL PROTECTED]>               |
 // +----------------------------------------------------------------------+
 //
-// $Id: Timer.php,v 1.6 2001/01/04 23:55:46 sbergmann Exp $
+// $Id: Timer.php,v 1.7 2001/01/10 01:01:53 ssb Exp $
 //
 
 /**
@@ -37,7 +37,7 @@
  *     $profiling = $timer->getProfiling();
  * 
  * @author   Sebastian Bergmann <[EMAIL PROTECTED]>
- * @version  $Revision: 1.6 $
+ * @version  $Revision: 1.7 $
  * @access   public
  */
 class Benchmark_Timer
Index: php4/pear/Cache/Function_Cache.php
diff -u php4/pear/Cache/Function_Cache.php:1.1 php4/pear/Cache/Function_Cache.php:1.2
--- php4/pear/Cache/Function_Cache.php:1.1      Sun Dec 10 10:40:23 2000
+++ php4/pear/Cache/Function_Cache.php  Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sebastian Bergmann <[EMAIL PROTECTED]>               |
 // +----------------------------------------------------------------------+
 //
-// $Id: Function_Cache.php,v 1.1 2000/12/10 18:40:23 sbergmann Exp $
+// $Id: Function_Cache.php,v 1.2 2001/01/10 01:01:53 ssb Exp $
 //
 
 /**
@@ -58,7 +58,7 @@
 * 
 * @author   Sebastian Bergmann <[EMAIL PROTECTED]>
 * @module   Function_Cache
-* @version  $Revision: 1.1 $
+* @version  $Revision: 1.2 $
 * @access   public
 */
 
Index: php4/pear/Crypt/HCEMD5.php
diff -u php4/pear/Crypt/HCEMD5.php:1.4 php4/pear/Crypt/HCEMD5.php:1.5
--- php4/pear/Crypt/HCEMD5.php:1.4      Tue Jan  2 19:42:38 2001
+++ php4/pear/Crypt/HCEMD5.php  Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/DB/common.php
diff -u php4/pear/DB/common.php:1.34 php4/pear/DB/common.php:1.35
--- php4/pear/DB/common.php:1.34        Wed Dec 13 06:41:04 2000
+++ php4/pear/DB/common.php     Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/DB/ibase.php
diff -u php4/pear/DB/ibase.php:1.14 php4/pear/DB/ibase.php:1.15
--- php4/pear/DB/ibase.php:1.14 Sat Dec  9 19:18:56 2000
+++ php4/pear/DB/ibase.php      Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sterling Hughes <[EMAIL PROTECTED]>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: ibase.php,v 1.14 2000/12/10 03:18:56 ssb Exp $
+// $Id: ibase.php,v 1.15 2001/01/10 01:01:53 ssb Exp $
 //
 // Database independent query interface definition for PHP's Interbase
 // extension.
Index: php4/pear/DB/msql.php
diff -u php4/pear/DB/msql.php:1.13 php4/pear/DB/msql.php:1.14
--- php4/pear/DB/msql.php:1.13  Sat Dec  9 19:18:56 2000
+++ php4/pear/DB/msql.php       Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sterling Hughes <[EMAIL PROTECTED]>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: msql.php,v 1.13 2000/12/10 03:18:56 ssb Exp $
+// $Id: msql.php,v 1.14 2001/01/10 01:01:53 ssb Exp $
 //
 // Database independent query interface definition for PHP's Mini-SQL
 // extension.
Index: php4/pear/DB/mssql.php
diff -u php4/pear/DB/mssql.php:1.16 php4/pear/DB/mssql.php:1.17
--- php4/pear/DB/mssql.php:1.16 Sat Dec  9 19:18:56 2000
+++ php4/pear/DB/mssql.php      Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sterling Hughes <[EMAIL PROTECTED]>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: mssql.php,v 1.16 2000/12/10 03:18:56 ssb Exp $
+// $Id: mssql.php,v 1.17 2001/01/10 01:01:53 ssb Exp $
 //
 // Database independent query interface definition for PHP's Microsoft SQL Server
 // extension.
Index: php4/pear/DB/mysql.php
diff -u php4/pear/DB/mysql.php:1.43 php4/pear/DB/mysql.php:1.44
--- php4/pear/DB/mysql.php:1.43 Mon Dec 18 00:44:03 2000
+++ php4/pear/DB/mysql.php      Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/DB/oci8.php
diff -u php4/pear/DB/oci8.php:1.15 php4/pear/DB/oci8.php:1.16
--- php4/pear/DB/oci8.php:1.15  Mon Dec 25 11:37:22 2000
+++ php4/pear/DB/oci8.php       Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/DB/odbc.php
diff -u php4/pear/DB/odbc.php:1.23 php4/pear/DB/odbc.php:1.24
--- php4/pear/DB/odbc.php:1.23  Sun Jan  7 18:45:29 2001
+++ php4/pear/DB/odbc.php       Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/DB/pgsql.php
diff -u php4/pear/DB/pgsql.php:1.25 php4/pear/DB/pgsql.php:1.26
--- php4/pear/DB/pgsql.php:1.25 Thu Dec 14 18:37:09 2000
+++ php4/pear/DB/pgsql.php      Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/DB/storage.php
diff -u php4/pear/DB/storage.php:1.10 php4/pear/DB/storage.php:1.11
--- php4/pear/DB/storage.php:1.10       Sat Dec  9 19:18:56 2000
+++ php4/pear/DB/storage.php    Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/DB/sybase.php
diff -u php4/pear/DB/sybase.php:1.12 php4/pear/DB/sybase.php:1.13
--- php4/pear/DB/sybase.php:1.12        Sat Dec  9 19:18:56 2000
+++ php4/pear/DB/sybase.php     Tue Jan  9 17:01:53 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sterling Hughes <[EMAIL PROTECTED]>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: sybase.php,v 1.12 2000/12/10 03:18:56 ssb Exp $
+// $Id: sybase.php,v 1.13 2001/01/10 01:01:53 ssb Exp $
 //
 // Database independent query interface definition for PHP's Sybase
 // extension.
Index: php4/pear/Date/Human.php
diff -u php4/pear/Date/Human.php:1.1 php4/pear/Date/Human.php:1.2
--- php4/pear/Date/Human.php:1.1        Tue Jan  2 21:14:39 2001
+++ php4/pear/Date/Human.php    Tue Jan  9 17:01:54 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.0 of the PHP license,       |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Allan Kent <[EMAIL PROTECTED]>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: Human.php,v 1.1 2001/01/03 05:14:39 chagenbu Exp $
+// $Id: Human.php,v 1.2 2001/01/10 01:01:54 ssb Exp $
 //
 
 /**
Index: php4/pear/File/Find.php
diff -u php4/pear/File/Find.php:1.10 php4/pear/File/Find.php:1.11
--- php4/pear/File/Find.php:1.10        Wed Aug 23 18:34:16 2000
+++ php4/pear/File/Find.php     Tue Jan  9 17:01:54 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sterling Hughes <[EMAIL PROTECTED]>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: Find.php,v 1.10 2000/08/24 01:34:16 sterling Exp $
+// $Id: Find.php,v 1.11 2001/01/10 01:01:54 ssb Exp $
 //
 // Commonly needed functions searching directory trees
 //
Index: php4/pear/File/Passwd.php
diff -u php4/pear/File/Passwd.php:1.2 php4/pear/File/Passwd.php:1.3
--- php4/pear/File/Passwd.php:1.2       Fri Jan  5 12:05:27 2001
+++ php4/pear/File/Passwd.php   Tue Jan  9 17:01:55 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.0 of the PHP license,       |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Rasmus Lerdorf <[EMAIL PROTECTED]>                             |
 // +----------------------------------------------------------------------+
 //
-// $Id: Passwd.php,v 1.2 2001/01/05 20:05:27 chagenbu Exp $
+// $Id: Passwd.php,v 1.3 2001/01/10 01:01:55 ssb Exp $
 //
 // Manipulate standard UNIX passwd,.htpasswd and CVS pserver passwd files
 
Index: php4/pear/HTML/Form.php
diff -u php4/pear/HTML/Form.php:1.6 php4/pear/HTML/Form.php:1.7
--- php4/pear/HTML/Form.php:1.6 Wed Nov 29 05:30:55 2000
+++ php4/pear/HTML/Form.php     Tue Jan  9 17:01:55 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.0 of the PHP license,       |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
 // |          Urs Gehrig <[EMAIL PROTECTED]>                                  |
 // +----------------------------------------------------------------------+
 //
-// $Id: Form.php,v 1.6 2000/11/29 13:30:55 ssb Exp $
+// $Id: Form.php,v 1.7 2001/01/10 01:01:55 ssb Exp $
 //
 // HTML form utility functions.
 //
Index: php4/pear/Image/Remote.php
diff -u php4/pear/Image/Remote.php:1.1 php4/pear/Image/Remote.php:1.2
--- php4/pear/Image/Remote.php:1.1      Sat Jan  6 15:13:19 2001
+++ php4/pear/Image/Remote.php  Tue Jan  9 17:01:55 2001
@@ -4,7 +4,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.0 of the PHP license,       |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
 // | Authors: Mika Tuupola <[EMAIL PROTECTED]>                       |
 // +----------------------------------------------------------------------+
 //
-// $Id: Remote.php,v 1.1 2001/01/06 23:13:19 tuupola Exp $
+// $Id: Remote.php,v 1.2 2001/01/10 01:01:55 ssb Exp $
 
 define("GIF_SIGNATURE_LENGTH",      3);
 define("GIF_VERSION_LENGTH",        3);
@@ -89,7 +89,7 @@
      *        only http.
      *
      * @author Mika Tuupola <[EMAIL PROTECTED]>
-     * @version $Revision: 1.1 $
+     * @version $Revision: 1.2 $
      */
 
     function Image_Remote($input) 
Index: php4/pear/Mail/rfc822.php
diff -u php4/pear/Mail/rfc822.php:1.2 php4/pear/Mail/rfc822.php:1.3
--- php4/pear/Mail/rfc822.php:1.2       Wed Jan  3 10:24:20 2001
+++ php4/pear/Mail/rfc822.php   Tue Jan  9 17:01:55 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -20,7 +20,7 @@
  * RFC 822 Email address list validation Utility
  *
  * @author  Richard Heyes <[EMAIL PROTECTED]>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
  */
 class Mail_rfc822 {
     
Index: php4/pear/Mail/sendmail.php
diff -u php4/pear/Mail/sendmail.php:1.2 php4/pear/Mail/sendmail.php:1.3
--- php4/pear/Mail/sendmail.php:1.2     Thu Nov  2 12:20:39 2000
+++ php4/pear/Mail/sendmail.php Tue Jan  9 17:01:55 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/Mail/smtp.php
diff -u php4/pear/Mail/smtp.php:1.1 php4/pear/Mail/smtp.php:1.2
--- php4/pear/Mail/smtp.php:1.1 Wed Oct 25 10:16:08 2000
+++ php4/pear/Mail/smtp.php     Tue Jan  9 17:01:55 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/Math/Fraction.php
diff -u php4/pear/Math/Fraction.php:1.1 php4/pear/Math/Fraction.php:1.2
--- php4/pear/Math/Fraction.php:1.1     Sun Nov  5 10:59:45 2000
+++ php4/pear/Math/Fraction.php Tue Jan  9 17:01:56 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sebastian Bergmann <[EMAIL PROTECTED]>               |
 // +----------------------------------------------------------------------+
 //
-// $Id: Fraction.php,v 1.1 2000/11/05 18:59:45 sbergmann Exp $
+// $Id: Fraction.php,v 1.2 2001/01/10 01:01:56 ssb Exp $
 //
 
   /**
@@ -34,7 +34,7 @@
   *   $a->add( $b );
   * 
   * @author   Sebastian Bergmann <[EMAIL PROTECTED]>
-  * @version  $Revision: 1.1 $
+  * @version  $Revision: 1.2 $
   * @access   public
   */
 
Index: php4/pear/Math/Util.php
diff -u php4/pear/Math/Util.php:1.1 php4/pear/Math/Util.php:1.2
--- php4/pear/Math/Util.php:1.1 Sun Nov  5 10:59:45 2000
+++ php4/pear/Math/Util.php     Tue Jan  9 17:01:56 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sebastian Bergmann <[EMAIL PROTECTED]>               |
 // +----------------------------------------------------------------------+
 //
-// $Id: Util.php,v 1.1 2000/11/05 18:59:45 sbergmann Exp $
+// $Id: Util.php,v 1.2 2001/01/10 01:01:56 ssb Exp $
 //
 
   // {{{ gcd( $a, $b )
Index: php4/pear/Net/Curl.php
diff -u php4/pear/Net/Curl.php:1.2 php4/pear/Net/Curl.php:1.3
--- php4/pear/Net/Curl.php:1.2  Sat Dec 23 08:20:52 2000
+++ php4/pear/Net/Curl.php      Tue Jan  9 17:01:56 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -16,7 +16,7 @@
 // | Authors: Sterling Hughes <[EMAIL PROTECTED]>                          |
 // +----------------------------------------------------------------------+
 //
-// $Id: Curl.php,v 1.2 2000/12/23 16:20:52 sterling Exp $
+// $Id: Curl.php,v 1.3 2001/01/10 01:01:56 ssb Exp $
 //
 // A nice friendly OO interface for CURL
 //
Index: php4/pear/Net/SMTP.php
diff -u php4/pear/Net/SMTP.php:1.1 php4/pear/Net/SMTP.php:1.2
--- php4/pear/Net/SMTP.php:1.1  Wed Oct 25 10:16:08 2000
+++ php4/pear/Net/SMTP.php      Tue Jan  9 17:01:56 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/Net/Socket.php
diff -u php4/pear/Net/Socket.php:1.4 php4/pear/Net/Socket.php:1.5
--- php4/pear/Net/Socket.php:1.4        Wed Oct 11 15:22:19 2000
+++ php4/pear/Net/Socket.php    Tue Jan  9 17:01:56 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.0 of the PHP license,       |
 // | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
 // |          Chuck Hagenbuch <[EMAIL PROTECTED]>                           |
 // +----------------------------------------------------------------------+
 //
-// $Id: Socket.php,v 1.4 2000/10/11 22:22:19 chagenbu Exp $
+// $Id: Socket.php,v 1.5 2001/01/10 01:01:56 ssb Exp $
 //
 
 require_once 'PEAR.php';
Index: php4/pear/Numbers/Roman.php
diff -u php4/pear/Numbers/Roman.php:1.1 php4/pear/Numbers/Roman.php:1.2
--- php4/pear/Numbers/Roman.php:1.1     Wed Dec 27 09:49:11 2000
+++ php4/pear/Numbers/Roman.php Tue Jan  9 17:01:57 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/PEAR/Installer.php
diff -u php4/pear/PEAR/Installer.php:1.5 php4/pear/PEAR/Installer.php:1.6
--- php4/pear/PEAR/Installer.php:1.5    Sun Jan  7 18:54:35 2001
+++ php4/pear/PEAR/Installer.php        Tue Jan  9 17:01:57 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |
Index: php4/pear/Payment/Verisign.php
diff -u php4/pear/Payment/Verisign.php:1.2 php4/pear/Payment/Verisign.php:1.3
--- php4/pear/Payment/Verisign.php:1.2  Mon Jul 24 01:05:51 2000
+++ php4/pear/Payment/Verisign.php      Tue Jan  9 17:01:58 2001
@@ -3,7 +3,7 @@
    +----------------------------------------------------------------------+
    | PHP version 4.0                                                      |
    +----------------------------------------------------------------------+
-   | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+   | Copyright (c) 1997-2001 The PHP Group                                |
    +----------------------------------------------------------------------+
    | This source file is subject to version 2.02 of the PHP license,      |
    | that is bundled with this package in the file LICENSE, and is        |
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: Verisign.php,v 1.2 2000/07/24 08:05:51 ssb Exp $ */
+/* $Id: Verisign.php,v 1.3 2001/01/10 01:01:58 ssb Exp $ */
 
 /*                 ******** NOTICE ********
  *
Index: php4/pear/XML/Parser.php
diff -u php4/pear/XML/Parser.php:1.4 php4/pear/XML/Parser.php:1.5
--- php4/pear/XML/Parser.php:1.4        Tue Dec  5 18:53:15 2000
+++ php4/pear/XML/Parser.php    Tue Jan  9 17:01:58 2001
@@ -3,7 +3,7 @@
 // +----------------------------------------------------------------------+
 // | PHP version 4.0                                                      |
 // +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000 The PHP Group                   |
+// | Copyright (c) 1997-2001 The PHP Group                                |
 // +----------------------------------------------------------------------+
 // | This source file is subject to version 2.02 of the PHP license,      |
 // | that is bundled with this package in the file LICENSE, and is        |

Index: php4/pear/scripts/pear.in
+++ php4/pear/scripts/pear.in
#!@prefix@/bin/php -q
<?php // -*- C++ -*-

require_once "PEAR.php";
require_once "PEAR/Installer.php";

error_reporting(7);

$stderr = fopen("php://stderr", "w");

$debug = 1;
$optind = 1;

while ($optind < $argc && $argv[$optind][0] == "-") {
    switch (substr($argv[$optind], 1)) {
        case "v":
            $debug = (int)$argv[++$optind];
            break;
        case "-":
            $optind++;
            break 2;
        default:
            fputs($stderr, "Unknown option: $argv[$optind]\n");
            /* fall through */
        case "?":
        case "h":
            usage();
            break;
    }
    
    $optind++;
}

$pkgfile = $argv[$optind];

if (!$pkgfile) {
    usage();
}

$p = new PEAR_Installer();
$p->debug = $debug;
$p->install($pkgfile);

function usage()
{
    global $stderr;
    fputs($stderr,
          "Usage: pear [-v n] [-h] <package>\n".
          "Options:\n".
          "     -v   set verbosity level to <n> (0-2, default 1)\n".
          "     -h   display help/usage (this message)\n");
    fclose($stderr);
    exit;
}

?>

Index: php4/pear/scripts/php-config.in
+++ php4/pear/scripts/php-config.in
#! /bin/sh

prefix="@prefix@"
includedir="@includedir@/php"
includes="-I$includedir -I$includedir/main -I$includedir/Zend"
if test '@TSRM_DIR@' != ''; then
    includes="$includes -I$includedir/TSRM"
fi
extension_dir='@EXTENSION_DIR@'

case "$1" in
--prefix)
        echo $prefix;;
--includes)
        echo $includes;;
--extension-dir)
        echo $extension_dir;;
*)
        echo "Usage: $0 [--prefix|--includes|--extension-dir]"
        exit 1;;
esac

exit 0

Index: php4/pear/scripts/phpize.in
+++ php4/pear/scripts/phpize.in
#! /bin/sh

prefix='@prefix@'
phpdir="$prefix/lib/php/build"
builddir="`pwd`"
FILES_BUILD="dynlib.mk fastgen.sh library.mk ltlib.mk mkdep.awk program.mk rules.mk 
rules_common.mk rules_pear.mk shtool"
FILES="acinclude.m4 dynlib.m4"

if test ! -r config.m4; then
  echo "Cannot find config.m4. "
  echo "Make sure that you run $0 in the top level source directory of the module"
  exit 1
fi

test -d build || mkdir build

(cd $phpdir && cp $FILES_BUILD $builddir/build)
(cd $phpdir && cp $FILES $builddir)

mv build/rules_pear.mk build/rules.mk

sed \
-e "s#@prefix@#$prefix#" \
< $phpdir/pear.m4 > configure.in

touch install-sh mkinstalldirs missing

aclocal
autoconf
autoheader
libtoolize -f -c

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
To contact the list administrators, e-mail: [EMAIL PROTECTED]

Reply via email to