27 files changed, 126 insertions, 544 deletions

diff --git a/devel/pear-Console_Getopt/Makefile b/devel/pear-Console_Getopt/Makefile
index cefd3d77e75a..2e75eb8fdd61 100644
--- a/devel/pear-Console_Getopt/Makefile
+++ b/devel/pear-Console_Getopt/Makefile
@@ -7,33 +7,21 @@
 
 PORTNAME=	Console_Getopt
 PORTVERSION=	1.0
+PORTREVISION=	1
 CATEGORIES=	devel www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR command-line option parser
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
-RUN_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install \
-		${LOCALBASE}/bin/php:${PORTSDIR}/www/mod_php4
-
-NO_BUILD=	yes
+BUILD_DEPENDS=	pear:${PORTSDIR}/lang/php4
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 .include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.endif
-LPHP_LIB=	lib/php
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 do-install:
-	@${MV} ${PEARDIR}/Console/Getopt.php ${PEARDIR}/Console/Getopt.php.dist
+	@${MKDIR} ${PEARDIR}/Console
 	@${CP} -Rp ${WRKSRC}/Console/Getopt.php ${PEARDIR}/Console
-	@${CHOWN} -R root:wheel ${PEARDIR}/Console/Getopt.php
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Console
 
 .include <bsd.port.post.mk>
diff --git a/devel/pear-Console_Getopt/pkg-plist b/devel/pear-Console_Getopt/pkg-plist
index 3887db705822..c6259b2b2c8b 100644
--- a/devel/pear-Console_Getopt/pkg-plist
+++ b/devel/pear-Console_Getopt/pkg-plist
@@ -1,3 +1,6 @@
-@exec mv %D/lib/php/Console/Getopt.php %D/lib/php/Console/Getopt.php.dist
 %%PEARDIR%%/Console/Getopt.php
-@unexec mv %D/lib/php/Console/Getopt.php.dist %D/lib/php/Console/Getopt.php || true
+%%PKGREGDIR%%/package.xml
+@dirrm %%PEARDIR%%/Console
+@dirrm %%PKGREGDIR%%
+@unexec rmdir %D/share/pear/.registry 2> /dev/null || true
+@unexec rmdir %D/share/pear/packages 2> /dev/null || true
diff --git a/devel/pear-Date/Makefile b/devel/pear-Date/Makefile
index e404ff8c069a..e0d485fe916a 100644
--- a/devel/pear-Date/Makefile
+++ b/devel/pear-Date/Makefile
@@ -7,32 +7,19 @@
 
 PORTNAME=	Date
 PORTVERSION=	1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR Date and Time Zone Classes
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 NO_BUILD=	yes
 
 .include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.else
-PHP_BASE=	${LOCALBASE}
-.endif
-PEAR=		${LOCALBASE}/bin/pear
-LPHP_LIB=	lib/php
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 MANIFEST=	Date Date.php
 
@@ -42,8 +29,4 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${FILE}
 .endfor
 
-post-install:
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
-
 .include <bsd.port.post.mk>
diff --git a/devel/pear-Date/pkg-descr b/devel/pear-Date/pkg-descr
index 79031a72fe82..632938198296 100644
--- a/devel/pear-Date/pkg-descr
+++ b/devel/pear-Date/pkg-descr
@@ -7,4 +7,4 @@ It does not rely on 32-bit system date stamps, so you can display calendars
 and compare dates that date pre 1970 and post 2038. This package also provides
 a class to convert date strings between Gregorian and Human calendar formats.
 
-WWW: http://pear.php.net/package-info.php?pacid=57
+WWW: http://pear.php.net/package-info.php?package=Date
diff --git a/devel/pear-Date/pkg-plist b/devel/pear-Date/pkg-plist
index 36dbf6d688da..604bc8430393 100644
--- a/devel/pear-Date/pkg-plist
+++ b/devel/pear-Date/pkg-plist
@@ -2,4 +2,6 @@
 %%PEARDIR%%/Date/Human.php
 %%PEARDIR%%/Date/TimeZone.php
 %%PEARDIR%%/Date.php
+%%PKGREGDIR%%/package.xml
 @dirrm %%PEARDIR%%/Date
+@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-HTML_Common/Makefile b/devel/pear-HTML_Common/Makefile
index e24a4e0c7b9b..2212f83429a4 100644
--- a/devel/pear-HTML_Common/Makefile
+++ b/devel/pear-HTML_Common/Makefile
@@ -6,41 +6,21 @@
 #
 
 PORTNAME=	HTML_Common
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.2
 CATEGORIES=	devel www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR::HTML_Common is a base class for other HTML classes
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-
 .include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.else
-PHP_BASE=	${LOCALBASE}
-.endif
-PEAR=		${LOCALBASE}/bin/pear
-LPHP_LIB=	lib/php
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 do-install:
 	@${MKDIR} ${PEARDIR}/HTML
 	@${CP} -Rp ${WRKSRC}/Common.php ${PEARDIR}/HTML
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML
 
-post-install:
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
-
 .include <bsd.port.post.mk>
diff --git a/devel/pear-HTML_Common/distinfo b/devel/pear-HTML_Common/distinfo
index 1187d9e4f9cf..7515760252ba 100644
--- a/devel/pear-HTML_Common/distinfo
+++ b/devel/pear-HTML_Common/distinfo
@@ -1 +1 @@
-MD5 (PEAR/HTML_Common-1.0.tgz) = 7190426df5f75e53b5ac5a6de8ec56b5
+MD5 (PEAR/HTML_Common-1.2.tgz) = f4244caffa5534d54babdfeedb371be3
diff --git a/devel/pear-HTML_Common/pkg-deinstall b/devel/pear-HTML_Common/pkg-deinstall
deleted file mode 100644
index c17e9d19ced0..000000000000
--- a/devel/pear-HTML_Common/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Remove package declaration from PEAR's registry.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-PKG_NAME=${1%%-[0-9._]*}
-PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
-
-${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/devel/pear-HTML_Common/pkg-descr b/devel/pear-HTML_Common/pkg-descr
index a2959a73b976..af279c653a11 100644
--- a/devel/pear-HTML_Common/pkg-descr
+++ b/devel/pear-HTML_Common/pkg-descr
@@ -5,4 +5,4 @@ attributes handling.
 * Handles comments in HTML code.
 * Handles layout and tabs for nicer HTML code.
 
-WWW: http://pear.php.net/package-info.php?pacid=69
+WWW: http://pear.php.net/package-info.php?package=HTML_Common
diff --git a/devel/pear-HTML_Common/pkg-plist b/devel/pear-HTML_Common/pkg-plist
index 20031ff27b56..0edd84806154 100644
--- a/devel/pear-HTML_Common/pkg-plist
+++ b/devel/pear-HTML_Common/pkg-plist
@@ -1,2 +1,4 @@
 %%PEARDIR%%/HTML/Common.php
+%%PKGREGDIR%%/package.xml
 @dirrm %%PEARDIR%%/HTML
+@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 9d2a588d355c..416b2989b3c8 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -7,35 +7,20 @@
 
 PORTNAME=	HTML_Select_Common
 PORTVERSION=	1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Some small PEAR classes to handle common <select> lists
 
-BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common
-RUN_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common \
+BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
 		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-
-EXAMPLESDIR=	${PREFIX}/share/examples/pear/${PORTNAME}
+EXAMPLESDIR=	${PEARDIR}/HTML/Select/Common/examples
 
 .include <bsd.port.pre.mk>
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.else
-PHP_BASE=	${LOCALBASE}
-.endif
-PEAR=		${LOCALBASE}/bin/pear
-LPHP_LIB=	lib/php
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
 MANIFEST=	Country.php FRDepartements.php UKCounty.php USState.php
 EXAMPLES=	Country.php FRDepartements.php UKCounty.php USState.php
@@ -47,10 +32,6 @@ do-install:
 .endfor
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Select/Common
 	@${CHMOD} a-x ${PEARDIR}/HTML/Select/Common/*
-#Note: Select.php is still needed for Kronolith 1.0
-#	but should be removed with the next release.
-	@${CP} -p ${FILESDIR}/Select.php ${PEARDIR}/HTML
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Select.php
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${EXAMPLESDIR}
 .for FILE in ${EXAMPLES}
@@ -59,8 +40,4 @@ do-install:
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
-post-install:
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
-
 .include <bsd.port.post.mk>
diff --git a/devel/pear-HTML_Select_Common/files/Select.php b/devel/pear-HTML_Select_Common/files/Select.php
deleted file mode 100644
index fafdbbfe041a..000000000000
--- a/devel/pear-HTML_Select_Common/files/Select.php
+++ /dev/null
@@ -1,328 +0,0 @@
-<?php
-/* vim: set expandtab tabstop=4 shiftwidth=4: */
-// +----------------------------------------------------------------------+
-// | PHP Version 4                                                        |
-// +----------------------------------------------------------------------+
-// | Copyright (c) 1997, 1998, 1999, 2000, 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        |
-// | available at through the world-wide-web at                           |
-// | http://www.php.net/license/2_02.txt.                                 |
-// | If you did not receive a copy of the PHP license and are unable to   |
-// | obtain it through the world-wide-web, please send a note to          |
-// | license@php.net so we can mail you a copy immediately.               |
-// +----------------------------------------------------------------------+
-// | Author: Adam Daniel <adaniel1@eesus.jnj.com>                         |
-// +----------------------------------------------------------------------+
-//
-// $Id: Select.php,v 1.10.2.2 2002/04/09 19:04:19 ssb Exp $
-
-require_once 'PEAR.php';
-require_once 'HTML/Common.php';
-
-/**
- * Class to dynamically create an HTML SELECT
- *
- * @author       Adam Daniel <adaniel1@eesus.jnj.com>
- * @version      1.2
- * @since        PHP4.04pl1
- * @access       public
- */
-class HTML_Select extends HTML_Common
-{
-    
-    /**
-     * Contains the select options
-     *
-     * @var       array
-     * @since     1.0
-     * @access    private
-     */
-    var $_options = array();
-    
-    /**
-     * Default values of the SELECT
-     * 
-     * @var       string
-     * @since     1.0
-     * @access    private
-     */
-    var $_values = array();
-
-    /**
-     * Class constructor
-     *
-     * @param     string    $name       (optional)Name attribute of the SELECT
-     * @param     int       $size       (optional) Size attribute of the SELECT
-     * @param     bool      $multiple   (optional)Whether the select will allow multiple 
-     *                                  selections or not
-     * @param     mixed     $attributes (optional)Either a typical HTML attribute string 
-     *                                  or an associative array
-     * @param     int       $tabOffset  (optional)Number of tabs to offset HTML source
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function HTML_Select($name = '', $size = 1, $multiple = false, $attributes = null, $tabOffset = 0)
-    {
-        HTML_Common::HTML_Common($attributes, $tabOffset);
-        $attr = array('name' => $name, 'size' => $size);
-        if ($multiple) {
-            $attr[] = 'multiple="multiple"';
-        }
-        $this->updateAttributes($attr);
-        $this->setSelectedValues(array());
-    }
-    
-    /**
-     * Returns the current API version 
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    double
-     * @throws    
-     */
-    function apiVersion()
-    {
-        return 1.2;
-    }
-
-    /**
-     * Sets the default values of the select box
-     * 
-     * @param     mixed    $values  Array or comma delimited string of selected values
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function setSelectedValues($values)
-    {
-        if (is_string($values)) {
-            $values = split("[ ]?,[ ]?", $values);
-        }
-        $this->_values = $values;  
-    }
-    
-    /**
-     * Returns an array of the selected values
-     * 
-     * @since     1.0
-     * @access    public
-     * @return    array of selected values
-     * @throws    
-     */
-    function getSelectedValues()
-    {
-        return $this->_values;
-    }
-
-    /**
-     * Adds a new OPTION to the SELECT
-     *
-     * @param     string    $text       Display text for the OPTION
-     * @param     string    $value      Value for the OPTION
-     * @param     bool      $selected   Whether the option is selected or not
-     * @param     mixed     $attributes Either a typical HTML attribute string 
-     *                                  or an associative array
-     * @since     1.0
-     * @access    public
-     * @return    void
-     * @throws    
-     */
-    function addOption($text, $value, $selected = false, $attributes = null)
-    {
-        if ($selected && !in_array($value, $this->_values)) {
-            $this->_values[] = $value;
-        }
-        
-        $attributes = $this->_parseAttributes($attributes);
-        $attr['value'] = $value;
-        $this->_updateAttrArray($attributes, $attr);
-        $this->_options[] = array('text' => $text, 'attr' => $attributes);
-    }
-    
-    /**
-     * Loads the options from an associative array
-     * 
-     * @param     array    $arr     Associative array of options
-     * @param     mixed    $values  (optional) Array or comma delimited string of selected values
-     * @since     1.0
-     * @access    public
-     * @return    PEAR_Error on error or true
-     * @throws    PEAR_Error
-     */
-    function loadArray($arr, $values=null)
-    {
-        if (!is_array($arr)) {
-            return new PEAR_ERROR('First argument to HTML_Select::loadArray is not a valid array');
-        }
-        if (isset($values)) {
-            $this->setSelectedValues($values);
-        }
-        while (list($key, $value) = each($arr)) {
-            $this->addOption($key, $value);
-        }
-        return true;
-    }
-    
-    /**
-     * Loads the options from an array with numeric keys, using the
-     * array values as the form values as well as labels.
-     * 
-     * @param     array    $arr     Array of options
-     * @param     mixed    $values  (optional) Array or comma delimited string of selected values
-     * @since     1.2
-     * @access    public
-     * @return    PEAR_Error on error or true
-     * @throws    PEAR_Error
-     */
-    function loadValueArray($arr, $values = null)
-    {
-        if (!is_array($arr)) {
-            return new PEAR_ERROR("First argument to HTML_Select::loadArray is not a valid array");
-        }
-        if (isset($values)) {
-            $this->setSelectedValues($values);
-        }
-        foreach ($arr as $value) {
-            $this->addOption($value, $value);
-        }
-        return true;
-    }
-    
-    /**
-     * Loads the options from DB_result object
-     * 
-     * If no column names are specified the first two columns of the result are
-     * used as the text and value columns respectively
-     * @param     object    $result     DB_result object 
-     * @param     string    $textCol    (optional) Name of column to display as the OPTION text 
-     * @param     string    $valueCol   (optional) Name of column to use as the OPTION value 
-     * @param     mixed     $values     (optional) Array or comma delimited string of selected values
-     * @since     1.0
-     * @access    public
-     * @return    PEAR_Error on error or true
-     * @throws    PEAR_Error
-     */
-    function loadDbResult(&$result, $textCol=null, $valueCol=null, $values=null)
-    {
-        include_once 'DB.php';
-        
-        if (!is_object($result) || (get_class($result) != "db_result" && 
-            is_subclass_of($result, "db_result"))) {
-            return new PEAR_ERROR("First argument to HTML_Select::loadDbResult is not a valid DB_result");
-        }
-         if (isset($values)) {
-            $this->setSelectedValues($values);
-        }
-        $fetchMode = ($textCol && $valueCol) ? DB_FETCHMODE_ASSOC : DB_FETCHMODE_DEFAULT;
-        while (is_array($row = $result->fetchRow($fetchMode)) ) {
-            if ($fetchMode == DB_FETCHMODE_ASSOC) {
-                $this->addOption($row[$textCol], $row[$valueCol]);
-            } else {
-                $this->addOption($row[0], $row[1]);
-            }
-        }
-        return true;
-    }
-    
-    /**
-     * Queries a database and loads the options from the results
-     *
-     * @param     mixed     $conn       Either an existing DB connection or a valid dsn 
-     * @param     string    $sql        SQL query string
-     * @param     string    $textCol    (optional) Name of column to display as the OPTION text 
-     * @param     string    $valueCol   (optional) Name of column to use as the OPTION value 
-     * @param     mixed     $values     (optional) Array or comma delimited string of selected values
-     * @since     1.1
-     * @access    private
-     * @return    void
-     * @throws    
-     */
-    function loadQuery(&$conn, $sql, $textCol=null, $valueCol=null, $values=null)
-    {
-        include_once 'DB.php';
-        
-        if (is_string($conn)) {
-            $dbConn = &DB::connect($conn, true);
-            if (DB::isError($dbConn)) return $dbConn;
-        } elseif (is_subclass_of($conn, "db_common")) {
-            $dbConn = $conn;
-        } else {
-            return new PEAR_Error("Argument 1 of HTML_Select::loadQuery is not a valid type");
-        }
-        $result = @$dbConn->query($sql);
-        if (DB::isError($result)) return $result;
-        return $this->loadDbResult($result, $textCol, $valueCol, $values);
-    }
-
-    /**
-     * Loads options from different types of data sources
-     *
-     * This method is a simulated overloaded method.  The arguments, other than the
-     * first are optional and only mean something depending on the type of the first argument.
-     * If the first argument is an array then all arguments are passed in order to loadArray.
-     * If the first argument is a db_result then all arguments are passed in order to loadDbResult.
-     * If the first argument is a string or a DB connection then all arguments are 
-     * passed in order to loadQuery.
-     * @param     mixed     $options     Options source currently supports assoc array or DB_result
-     * @param     mixed     $param1     (optional) See function detail
-     * @param     mixed     $param2     (optional) See function detail
-     * @param     mixed     $param3     (optional) See function detail
-     * @param     mixed     $param4     (optional) See function detail
-     * @since     1.1
-     * @access    public
-     * @return    PEAR_Error on error or true
-     * @throws    PEAR_Error
-     */
-    function load(&$options, $param1=null, $param2=null, $param3=null, $param4=null)
-    {
-        switch (true) {
-            case is_array($options):
-                return $this->loadArray($options, $param1);
-                break;
-            case (get_class($options) == "db_result" || is_subclass_of($options, "db_result")):
-                return $this->loadDbResult($options, $param1, $param2, $param3);
-                break;
-            case (is_string($options) || is_subclass_of($options, "db_common")):
-                return $this->loadQuery($options, $param1, $param2, $param3, $param4);
-                break;
-        }
-    }
-    
-    /**
-     * Returns the SELECT in HTML
-     *
-     * @since     1.0
-     * @access    public
-     * @return    string
-     * @throws    
-     */
-    function toHtml()
-    {
-        $tabs = $this->_getTabs();
-        $name = $this->_attributes['name'];
-        $strHtml = $tabs;
-        if ($this->_comment) {
-            $strHtml .= "<!-- $this->_comment -->\n$tabs";
-        }
-        $strHtml .=
-            '<select' . $this->_getAttrString($this->_attributes) . '>';
-        foreach ($this->_options as $option) {
-            if (@in_array($option['attr']['value'], $this->_values)) {
-                $option['attr']['selected'] = 'selected';
-            }
-            $attrString = $this->_getAttrString($option['attr']);
-            $strHtml .=
-                '<option' . $attrString . '>' .
-                htmlspecialchars($option['text']) . '</option>';
-        }
-        $strHtml .= '</select>';
-        return $strHtml;
-    }
-    
-}
-?>
diff --git a/devel/pear-HTML_Select_Common/pkg-deinstall b/devel/pear-HTML_Select_Common/pkg-deinstall
deleted file mode 100644
index c17e9d19ced0..000000000000
--- a/devel/pear-HTML_Select_Common/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Remove package declaration from PEAR's registry.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-PKG_NAME=${1%%-[0-9._]*}
-PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
-
-${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/devel/pear-HTML_Select_Common/pkg-descr b/devel/pear-HTML_Select_Common/pkg-descr
index 28afa4d25c57..86a99b8a47c0 100644
--- a/devel/pear-HTML_Select_Common/pkg-descr
+++ b/devel/pear-HTML_Select_Common/pkg-descr
@@ -4,4 +4,4 @@ o UK counties
 o US States
 o FR Departements
 
-WWW: http://pear.php.net/package-info.php?pacid=165
+WWW: http://pear.php.net/package-info.php?package=HTML_Select_Common
diff --git a/devel/pear-HTML_Select_Common/pkg-plist b/devel/pear-HTML_Select_Common/pkg-plist
index 2cdb1182ed8c..af2e48853208 100644
--- a/devel/pear-HTML_Select_Common/pkg-plist
+++ b/devel/pear-HTML_Select_Common/pkg-plist
@@ -1,12 +1,13 @@
-%%PEARDIR%%/HTML/Select.php
 %%PEARDIR%%/HTML/Select/Common/Country.php
 %%PEARDIR%%/HTML/Select/Common/FRDepartements.php
 %%PEARDIR%%/HTML/Select/Common/UKCounty.php
 %%PEARDIR%%/HTML/Select/Common/USState.php
+%%PKGREGDIR%%/package.xml
 %%PORTDOCS%%%%EXAMPLESDIR%%/Country.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/FRDepartements.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/UKCounty.php
 %%PORTDOCS%%%%EXAMPLESDIR%%/USState.php
+%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%PEARDIR%%/HTML/Select/Common
 @dirrm %%PEARDIR%%/HTML/Select
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index 029716a48c21..cb6e2daafa7a 100644
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@@ -6,38 +6,22 @@
 #
 
 PORTNAME=	I18N
-PORTVERSION=	0.8
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	devel www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR internationalization package
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
-EXAMPLESDIR=	${PREFIX}/share/examples/pear
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.else
-PHP_BASE=	${LOCALBASE}
-.endif
-PEAR=		${LOCALBASE}/bin/pear
-LPHP_LIB=	lib/php
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
 MANIFEST=	Common.php Country.php Language.php Negotiator.php
-EXAMPLES=	I18N_Message.php I18N_Message_Translate.php \
-		I18N_Message_Translate.tpl I18N_Negotiator.php
+EXAMPLES=	I18N_Currency.php I18N_DateTime.php I18N_Message.php \
+		I18N_Message_Translate.php I18N_Message_Translate.tpl \
+		I18N_Negotiator.php I18N_Number.php
 
 do-install:
 	@${MKDIR} ${PEARDIR}/I18N
@@ -49,14 +33,11 @@ do-install:
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/I18N
 	@${CHMOD} a-x ${PEARDIR}/I18N/Messages/*
 .if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
 .for FILE in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/examples/${FILE} ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/docs/${FILE} ${DOCSDIR}
 .endfor
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
+	@${ECHO_MSG} "===> Examples installed in ${DOCSDIR}."
 .endif
 
-post-install:
-# Register a new package
-	@${PEAR} install -r -f ${WRKDIR}/package.xml
-
 .include <bsd.port.post.mk>
diff --git a/devel/pear-I18N/distinfo b/devel/pear-I18N/distinfo
index 9bf08f2df1f9..ca3cf0057e6f 100644
--- a/devel/pear-I18N/distinfo
+++ b/devel/pear-I18N/distinfo
@@ -1 +1 @@
-MD5 (PEAR/I18N-0.8.tgz) = 2b3b9e62f132c53f7f8f753613646863
+MD5 (PEAR/I18N-0.8.5.tgz) = f0114f9b179847c5abac4af3214376a0
diff --git a/devel/pear-I18N/pkg-deinstall b/devel/pear-I18N/pkg-deinstall
deleted file mode 100644
index c17e9d19ced0..000000000000
--- a/devel/pear-I18N/pkg-deinstall
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Remove package declaration from PEAR's registry.
-
-if [ x$2 != xDEINSTALL ]; then
-    exit
-fi
-PKG_NAME=${1%%-[0-9._]*}
-PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
-
-${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
diff --git a/devel/pear-I18N/pkg-descr b/devel/pear-I18N/pkg-descr
index 1f677204743c..a92ee6362207 100644
--- a/devel/pear-I18N/pkg-descr
+++ b/devel/pear-I18N/pkg-descr
@@ -5,4 +5,4 @@ determine the current users (browser-)language.
 
 Localizing Numbers, DateTime and currency is also possible.
 
-WWW: http://pear.php.net/package-info.php?pacid=129
+WWW: http://pear.php.net/package-info.php?package=I18N
diff --git a/devel/pear-I18N/pkg-plist b/devel/pear-I18N/pkg-plist
index 8747b0b6108d..7e706e0b0d6f 100644
--- a/devel/pear-I18N/pkg-plist
+++ b/devel/pear-I18N/pkg-plist
@@ -6,9 +6,14 @@
 %%PEARDIR%%/I18N/Messages/File.php
 %%PEARDIR%%/I18N/Messages/Translate.php
 %%PEARDIR%%/I18N/Messages/determineLanguage.inc.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/I18N_Message.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/I18N_Message_Translate.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/I18N_Message_Translate.tpl
-%%PORTDOCS%%%%EXAMPLESDIR%%/I18N_Negotiator.php
+%%PKGREGDIR%%/package.xml
+%%PORTDOCS%%%%DOCSDIR%%/I18N_Currency.php
+%%PORTDOCS%%%%DOCSDIR%%/I18N_DateTime.php
+%%PORTDOCS%%%%DOCSDIR%%/I18N_Message.php
+%%PORTDOCS%%%%DOCSDIR%%/I18N_Message_Translate.php
+%%PORTDOCS%%%%DOCSDIR%%/I18N_Message_Translate.tpl
+%%PORTDOCS%%%%DOCSDIR%%/I18N_Negotiator.php
+%%PORTDOCS%%%%DOCSDIR%%/I18N_Number.php
 @dirrm %%PEARDIR%%/I18N/Messages
 @dirrm %%PEARDIR%%/I18N
+@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-PEAR/Makefile b/devel/pear-PEAR/Makefile
index 3243fc37078f..dfe74d283ae6 100644
--- a/devel/pear-PEAR/Makefile
+++ b/devel/pear-PEAR/Makefile
@@ -6,47 +6,25 @@
 #
 
 PORTNAME=	PEAR
-PORTVERSION=	1.0.1
-PORTREVISION=	2
+PORTVERSION=	1.1
 CATEGORIES=	devel www
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR Base System
 
-BUILD_DEPENDS=	${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install
+BUILD_DEPENDS=	${PEARDIR}/Archive/Tar.php:${PORTSDIR}/archivers/pear-Archive_Tar	\
+		${PEARDIR}/Console/Getopt.php:${PORTSDIR}/devel/pear-Console_Getopt
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
-
 .include <bsd.port.pre.mk>
+.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
 
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.else
-PHP_BASE=	${LOCALBASE}
-.endif
-PEAR=		${LOCALBASE}/bin/pear
-LPHP_LIB=	lib/php
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
-PLIST_SUB=	PEARDIR=${LPHP_LIB}
 MANIFEST=	OS PEAR PEAR.php System.php package.dtd scripts template.spec
-TOBACKUP=	OS PEAR PEAR.php System.php
 
 do-install:
-.for FILE in ${TOBACKUP}
-	@${MV} ${PEARDIR}/${FILE} ${PEARDIR}/${FILE}.dist
-.endfor
 	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
 .for FILE in ${MANIFEST}
 	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${FILE}
 .endfor
 
-post-install:
-# Register an upgraded package
-	@${PEAR} upgrade -r -f ${WRKDIR}/package.xml
-
 .include <bsd.port.post.mk>
diff --git a/devel/pear-PEAR/Makefile.common b/devel/pear-PEAR/Makefile.common
new file mode 100644
index 000000000000..d229ae240323
--- /dev/null
+++ b/devel/pear-PEAR/Makefile.common
@@ -0,0 +1,43 @@
+# $FreeBSD$
+
+# Common code for pear- ports.
+
+MASTER_SITES=	http://pear.php.net/get/
+PKGNAMEPREFIX=	pear-
+EXTRACT_SUFX=	.tgz
+DIST_SUBDIR=	PEAR
+
+NO_BUILD=	yes
+
+.if exists(${LOCALBASE}/bin/php-config)
+PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
+.else
+PHP_BASE=	${LOCALBASE}
+.endif
+LPEARDIR=	share/pear
+PEARDIR=	${PHP_BASE}/${LPEARDIR}
+LPKGREGDIR=	${LPEARDIR}/packages/${PKGNAME}
+PKGREGDIR=	${PHP_BASE}/${LPKGREGDIR}
+PLIST_SUB=	PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR}
+PKGINSTALL=	${.CURDIR}/../../devel/pear-PEAR/pkg-install
+PKGDEINSTALL=	${.CURDIR}/../../devel/pear-PEAR/pkg-deinstall
+
+DOCSDIR=	${PEARDIR}/docs/${PORTNAME}
+
+pre-install:
+.if exists(${LOCALBASE}/lib/php.DIST_PHP)	\
+	|| exists(${PHP_BASE}/lib/php.DIST_PHP)	\
+	|| exists(${LOCALBASE}/.PEAR.pkg)	\
+	|| exists(${PHP_BASE}/.PEAR.pkg)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "	Sorry, the PEAR structure has been modified;"
+	@${ECHO_MSG} "	Please deinstall your installed pear- ports."
+	@${ECHO_MSG} ""
+	@${FALSE}
+.endif
+
+post-install:
+	@${MKDIR} ${PKGREGDIR}
+	@${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR}
+	@${SETENV} PKG_PREFIX=${PREFIX} \
+	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
diff --git a/devel/pear-PEAR/distinfo b/devel/pear-PEAR/distinfo
index b09b8d04d703..92e91415c6f0 100644
--- a/devel/pear-PEAR/distinfo
+++ b/devel/pear-PEAR/distinfo
@@ -1 +1 @@
-MD5 (PEAR/PEAR-1.0.1.tgz) = 4afa614e25f9df1a79a59f006f9d1ed6
+MD5 (PEAR/PEAR-1.1.tgz) = 2f0703f60361867c7ef613464d1d8f12
diff --git a/devel/pear-Date/pkg-deinstall b/devel/pear-PEAR/pkg-deinstall
index c17e9d19ced0..79df94e800f9 100644
--- a/devel/pear-Date/pkg-deinstall
+++ b/devel/pear-PEAR/pkg-deinstall
@@ -10,4 +10,4 @@ fi
 PKG_NAME=${1%%-[0-9._]*}
 PACKAGE=$(echo $PKG_NAME | sed 's/pear-//')
 
-${PKG_PREFIX}/bin/pear uninstall -r ${PACKAGE} || true
+${PKG_PREFIX}/bin/pear uninstall -r -n ${PACKAGE} || true
diff --git a/devel/pear-PEAR/pkg-install b/devel/pear-PEAR/pkg-install
new file mode 100644
index 000000000000..f622fdfce650
--- /dev/null
+++ b/devel/pear-PEAR/pkg-install
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# Register the package $1 in the port registry
+
+PREFIX=${PKG_PREFIX:-/usr/local}
+PEAR=${PREFIX}/bin/pear
+PKGREGDIR=${PREFIX}/share/pear/packages/$1
+
+[ "x$1" = "x" ] && exit 1
+if [ "x$2" = "xPOST-INSTALL" ]; then
+	${PEAR} install -r -f ${PKGREGDIR}/package.xml
+fi
diff --git a/devel/pear-PEAR/pkg-plist b/devel/pear-PEAR/pkg-plist
index c66aba50d942..6fe2df7e55b2 100644
--- a/devel/pear-PEAR/pkg-plist
+++ b/devel/pear-PEAR/pkg-plist
@@ -1,7 +1,3 @@
-@exec mv %D/lib/php/OS %D/lib/php/OS.dist
-@exec mv %D/lib/php/PEAR %D/lib/php/PEAR.dist
-@exec mv %D/lib/php/PEAR.php %D/lib/php/PEAR.php.dist
-@exec mv %D/lib/php/System.php %D/lib/php/System.php.dist
 %%PEARDIR%%/package.dtd
 %%PEARDIR%%/template.spec
 %%PEARDIR%%/PEAR.php
@@ -26,14 +22,13 @@
 %%PEARDIR%%/PEAR/Packager.php
 %%PEARDIR%%/PEAR/Registry.php
 %%PEARDIR%%/PEAR/Remote.php
-%%PEARDIR%%/scripts/pear.in
 %%PEARDIR%%/scripts/pear.bat
+%%PEARDIR%%/scripts/pear.sh
+%%PEARDIR%%/scripts/pearcmd.php
+%%PKGREGDIR%%/package.xml
 @dirrm %%PEARDIR%%/OS
 @dirrm %%PEARDIR%%/PEAR/Command
 @dirrm %%PEARDIR%%/PEAR/Frontend
 @dirrm %%PEARDIR%%/PEAR
 @dirrm %%PEARDIR%%/scripts
-@unexec mv %D/lib/php/OS.dist %D/lib/php/OS || true
-@unexec mv %D/lib/php/PEAR.dist %D/lib/php/PEAR || true
-@unexec mv %D/lib/php/PEAR.php.dist %D/lib/php/PEAR.php || true
-@unexec mv %D/lib/php/System.php.dist %D/lib/php/System.php || true
+@dirrm %%PKGREGDIR%%
diff --git a/devel/pear/Makefile b/devel/pear/Makefile
index cc45fe27aa8c..6a1fc9b288d0 100644
--- a/devel/pear/Makefile
+++ b/devel/pear/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pear
-PORTVERSION=	${PHP_VERSION}
+PORTVERSION=	${PHP_VERSION:C/RC.//}
 CATEGORIES=	devel www
 MASTER_SITES=	# empty
 DISTFILES=	# none
@@ -15,13 +15,11 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	thierry@pompo.net
 COMMENT=	A framework and distribution system for reusable PHP components
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/php-config:${PORTSDIR}/www/mod_php4
-RUN_DEPENDS=	${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR	\
-		${PEARDIR}/Console/Getopt.php.dist:${PORTSDIR}/devel/pear-Console_Getopt	\
+BUILD_DEPENDS=	${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php4
+RUN_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB		\
 		${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File	\
 		${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log	\
-		${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime	\
-		${PEARDIR}/Net/Sieve.php:${PORTSDIR}/net/pear-Net_Sieve
+		${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
 
 NO_BUILD=	yes
 
@@ -31,11 +29,10 @@ NO_BUILD=	yes
 PHP_VERSION!=	${LOCALBASE}/bin/php-config --version
 PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
 .else
-PHP_VERSION=	4.2.3
+PHP_VERSION=	4.3.2
 PHP_BASE=	${LOCALBASE}
 .endif
-LPHP_LIB=	lib/php
-PEARDIR=	${PHP_BASE}/${LPHP_LIB}
+PEARDIR=	${PHP_BASE}/share/pear
 
 do-install:	# empty
 	${DO_NADA}