diff options
70 files changed, 238 insertions, 932 deletions
diff --git a/archivers/pear-Archive_Tar/Makefile b/archivers/pear-Archive_Tar/Makefile index 7f0335e9a5d3..8b8c98131983 100644 --- a/archivers/pear-Archive_Tar/Makefile +++ b/archivers/pear-Archive_Tar/Makefile @@ -6,50 +6,26 @@ # PORTNAME= Archive_Tar -PORTVERSION= 1.0 -PORTREVISION= 1 +PORTVERSION= 1.1 CATEGORIES= archivers www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR tar file management class -COMMENT= PEAR tar file management class -BUILD_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= pear:${PORTSDIR}/lang/php4 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} - -DOCSDIR= ${PEARDIR}/docs/Archive_Tar +.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common" do-install: - @${MV} ${PEARDIR}/Archive ${PEARDIR}/Archive.dist + @${MKDIR} ${PEARDIR}/Archive @${CP} -Rp ${WRKSRC}/Archive ${PEARDIR} @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Archive .if !defined(NOPORTDOCS) - @${MV} ${DOCSDIR} ${DOCSDIR}.dist @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/docs/Archive_Tar.txt ${DOCSDIR} @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif -post-install: -# Register a new package - @${PEAR} upgrade -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/archivers/pear-Archive_Tar/distinfo b/archivers/pear-Archive_Tar/distinfo index 7258ae5fedbc..eb18f7d42456 100644 --- a/archivers/pear-Archive_Tar/distinfo +++ b/archivers/pear-Archive_Tar/distinfo @@ -1 +1 @@ -MD5 (PEAR/Archive_Tar-1.0.tgz) = 15e5dd6e46b339136e7d2b68f438249a +MD5 (PEAR/Archive_Tar-1.1.tgz) = 474e37d367f1b96b92809baab00c0464 diff --git a/archivers/pear-Archive_Tar/pkg-descr b/archivers/pear-Archive_Tar/pkg-descr index 29f95397944d..5baa215e6948 100644 --- a/archivers/pear-Archive_Tar/pkg-descr +++ b/archivers/pear-Archive_Tar/pkg-descr @@ -2,5 +2,6 @@ This class provides handling of tar files in PHP. It supports creating, listing, extracting and adding to tar files. Gzip support is available if PHP has the zlib extension built-in or loaded. + Bz2 compression is also supported with the bz2 extension loaded. -WWW: http://pear.php.net/manual/en/packages.file.archive-tar.php +WWW: http://pear.php.net/package-info.php?package=Archive_Tar diff --git a/archivers/pear-Archive_Tar/pkg-plist b/archivers/pear-Archive_Tar/pkg-plist index 273ae53d976e..d9d9709b467d 100644 --- a/archivers/pear-Archive_Tar/pkg-plist +++ b/archivers/pear-Archive_Tar/pkg-plist @@ -1,8 +1,9 @@ -@exec mv %D/lib/php/Archive %D/lib/php/Archive.dist -%%PORTDOCS%%@exec mv %D/lib/php/docs/Archive_Tar %D/lib/php/docs/Archive_Tar.dist %%PEARDIR%%/Archive/Tar.php +%%PKGREGDIR%%/package.xml %%PORTDOCS%%%%PEARDIR%%/docs/Archive_Tar/Archive_Tar.txt @dirrm %%PEARDIR%%/Archive +@dirrm %%PKGREGDIR%% %%PORTDOCS%%@dirrm %%PEARDIR%%/docs/Archive_Tar -@unexec mv %D/lib/php/Archive.dist %D/lib/php/Archive || true -%%PORTDOCS%%@unexec mv %D/lib/php/docs/Archive_Tar.dist %D/lib/php/docs/Archive_Tar || true +@unexec rmdir %D/share/pear/docs 2> /dev/null || true +@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-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} diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile index 676e1b46b488..713fa196c8cf 100644 --- a/mail/pear-Mail_Mime/Makefile +++ b/mail/pear-Mail_Mime/Makefile @@ -7,32 +7,17 @@ PORTNAME= Mail_Mime PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR classes to create and decode MIME messages -BUILD_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR -RUN_DEPENDS= ${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install - -NO_BUILD= yes +BUILD_DEPENDS= ${PEARDIR}/Mail/mail.php:${PORTSDIR}/mail/pear-Mail +RUN_DEPENDS= ${BUILD_DEPENDS} .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: @${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Mail @@ -41,8 +26,4 @@ do-install: @${CHMOD} a-x ${PEARDIR}/Mail/${BUGMODE} .endfor -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/mail/pear-Mail_Mime/pkg-install b/mail/pear-Mail_Mime/pkg-install new file mode 100644 index 000000000000..ed2f91c6f145 --- /dev/null +++ b/mail/pear-Mail_Mime/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}/.PEAR.pkg/$1 + +[ "x$1" = "x" ] && exit 1 +if [ "x$2" = "xPOST-INSTALL" ]; then + ${PEAR} install -r -f ${PKGREGDIR}/package.xml +fi diff --git a/mail/pear-Mail_Mime/pkg-plist b/mail/pear-Mail_Mime/pkg-plist index 9ece498454c6..0b083cb8f847 100644 --- a/mail/pear-Mail_Mime/pkg-plist +++ b/mail/pear-Mail_Mime/pkg-plist @@ -3,3 +3,5 @@ %%PEARDIR%%/Mail/mimePart.php %%PEARDIR%%/Mail/xmail.dtd %%PEARDIR%%/Mail/xmail.xsl +%%PKGREGDIR%%/package.xml +@dirrm %%PKGREGDIR%% diff --git a/mail/pear-mailparse/Makefile b/mail/pear-mailparse/Makefile index d401f211d2f1..21a45939745c 100644 --- a/mail/pear-mailparse/Makefile +++ b/mail/pear-mailparse/Makefile @@ -7,53 +7,35 @@ PORTNAME= mailparse PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= mail www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR classes to create and decode MIME messages -BUILD_DEPENDS= ${LOCALBASE}/bin/phpize:${PORTSDIR}/www/mod_php4 \ - ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR -RUN_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR -USE_AUTOMAKE= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Don't call autoconf directly, ./buildconf does this -GNU_CONFIGURE= yes -USE_AUTOCONF= no -USE_LIBTOOL= no +USE_PHPIZE= yes USE_REINPLACE= yes - REINPLACE_ARGS= -i.before_mailparse +.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../lang/php4/bsd.php.mk" +.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common" + .if exists(${LOCALBASE}/bin/php-config) -PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix EXT_DIR!= ${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e \ "s:${PHP_BASE}/::" -.else -PHP_BASE= ${LOCALBASE} .endif -PEAR= ${LOCALBASE}/bin/pear -LPHP_LIB= lib/php PHP_DIR?= ${LOCALBASE}/etc PHP_INI= ${PHP_DIR}/php.ini -PEARDIR= ${PHP_BASE}/${LPHP_LIB} -PLIST_SUB= EXTDIR=${EXT_DIR} PEARDIR=${LPHP_LIB} +PLIST_SUB+= EXTDIR=${EXT_DIR} DOCSDIR= ${PEARDIR}/docs/${PORTNAME} DOCS= CREDITS README try.php TESTDIR= ${PEARDIR}/tests/${PORTNAME} -post-patch: - (cd ${WRKSRC} && ${LOCALBASE}/bin/phpize) - pre-configure: @if ! ${LOCALBASE}/bin/php -i | ${GREP} -q -e "--enable-mbstring"; then \ ${ECHO_MSG} "" ; \ @@ -62,7 +44,7 @@ pre-configure: ${FALSE} ; \ fi -post-install: +post-install-script: @${STRIP_CMD} ${PHP_BASE}/${EXT_DIR}/mailparse.so # Configure extension_dir @if [ ! -f ${PHP_INI} ]; then \ @@ -85,7 +67,5 @@ post-install: @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR} @${ECHO_MSG} "===> Examples installed in ${TESTDIR}." .endif -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml .include <bsd.port.post.mk> diff --git a/mail/pear-mailparse/pkg-deinstall b/mail/pear-mailparse/pkg-deinstall deleted file mode 100644 index c17e9d19ced0..000000000000 --- a/mail/pear-mailparse/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/mail/pear-mailparse/pkg-plist b/mail/pear-mailparse/pkg-plist index a22d5cbce5da..0ec98dc03925 100644 --- a/mail/pear-mailparse/pkg-plist +++ b/mail/pear-mailparse/pkg-plist @@ -1,4 +1,5 @@ %%EXTDIR%%/mailparse.so +%%PKGREGDIR%%/package.xml %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/CREDITS %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/README %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/try.php @@ -22,3 +23,4 @@ %%PORTDOCS%%@dirrm %%PEARDIR%%/docs/mailparse %%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/testdata %%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/ +@dirrm %%PKGREGDIR%% diff --git a/mail/pecl-mailparse/Makefile b/mail/pecl-mailparse/Makefile index d401f211d2f1..21a45939745c 100644 --- a/mail/pecl-mailparse/Makefile +++ b/mail/pecl-mailparse/Makefile @@ -7,53 +7,35 @@ PORTNAME= mailparse PORTVERSION= 0.9.1 +PORTREVISION= 1 CATEGORIES= mail www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR classes to create and decode MIME messages -BUILD_DEPENDS= ${LOCALBASE}/bin/phpize:${PORTSDIR}/www/mod_php4 \ - ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR -RUN_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +RUN_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR -USE_AUTOMAKE= yes -USE_AUTOCONF= yes - -.include <bsd.port.pre.mk> - -# Don't call autoconf directly, ./buildconf does this -GNU_CONFIGURE= yes -USE_AUTOCONF= no -USE_LIBTOOL= no +USE_PHPIZE= yes USE_REINPLACE= yes - REINPLACE_ARGS= -i.before_mailparse +.include <bsd.port.pre.mk> +.include "${.CURDIR}/../../lang/php4/bsd.php.mk" +.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common" + .if exists(${LOCALBASE}/bin/php-config) -PHP_BASE!= ${LOCALBASE}/bin/php-config --prefix EXT_DIR!= ${LOCALBASE}/bin/php-config --extension-dir | ${SED} -e \ "s:${PHP_BASE}/::" -.else -PHP_BASE= ${LOCALBASE} .endif -PEAR= ${LOCALBASE}/bin/pear -LPHP_LIB= lib/php PHP_DIR?= ${LOCALBASE}/etc PHP_INI= ${PHP_DIR}/php.ini -PEARDIR= ${PHP_BASE}/${LPHP_LIB} -PLIST_SUB= EXTDIR=${EXT_DIR} PEARDIR=${LPHP_LIB} +PLIST_SUB+= EXTDIR=${EXT_DIR} DOCSDIR= ${PEARDIR}/docs/${PORTNAME} DOCS= CREDITS README try.php TESTDIR= ${PEARDIR}/tests/${PORTNAME} -post-patch: - (cd ${WRKSRC} && ${LOCALBASE}/bin/phpize) - pre-configure: @if ! ${LOCALBASE}/bin/php -i | ${GREP} -q -e "--enable-mbstring"; then \ ${ECHO_MSG} "" ; \ @@ -62,7 +44,7 @@ pre-configure: ${FALSE} ; \ fi -post-install: +post-install-script: @${STRIP_CMD} ${PHP_BASE}/${EXT_DIR}/mailparse.so # Configure extension_dir @if [ ! -f ${PHP_INI} ]; then \ @@ -85,7 +67,5 @@ post-install: @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR} @${ECHO_MSG} "===> Examples installed in ${TESTDIR}." .endif -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml .include <bsd.port.post.mk> diff --git a/mail/pecl-mailparse/pkg-deinstall b/mail/pecl-mailparse/pkg-deinstall deleted file mode 100644 index c17e9d19ced0..000000000000 --- a/mail/pecl-mailparse/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/mail/pecl-mailparse/pkg-plist b/mail/pecl-mailparse/pkg-plist index a22d5cbce5da..0ec98dc03925 100644 --- a/mail/pecl-mailparse/pkg-plist +++ b/mail/pecl-mailparse/pkg-plist @@ -1,4 +1,5 @@ %%EXTDIR%%/mailparse.so +%%PKGREGDIR%%/package.xml %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/CREDITS %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/README %%PORTDOCS%%%%PEARDIR%%/docs/mailparse/try.php @@ -22,3 +23,4 @@ %%PORTDOCS%%@dirrm %%PEARDIR%%/docs/mailparse %%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/testdata %%PORTDOCS%%@dirrm %%PEARDIR%%/tests/mailparse/tests/ +@dirrm %%PKGREGDIR%% diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile index 027541d9e1e5..c6aa7ddcac94 100644 --- a/net/pear-Net_SMTP/Makefile +++ b/net/pear-Net_SMTP/Makefile @@ -6,42 +6,24 @@ # PORTNAME= Net_SMTP -PORTVERSION= 1.1.2 +PORTVERSION= 1.2.3 CATEGORIES= net mail www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR class that provides an implementation of the SMTP protocol -BUILD_DEPENDS= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL -# ${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket +BUILD_DEPENDS= ${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL \ + ${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket +# The Auth_SASL package is no longer absolutely required, but it will be used if it is available. 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= ${LOCALBASE}/${LPHP_LIB} -PLIST_SUB= PEARDIR=${LPHP_LIB} MANIFEST= Net/SMTP.php do-install: - @${MV} ${PEARDIR}/${MANIFEST} ${PEARDIR}/${MANIFEST}.dist @${CP} -p ${WRKSRC}/SMTP.php ${PEARDIR}/Net @${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${MANIFEST} -post-install: -# Register an upgraded package - @${PEAR} upgrade -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/net/pear-Net_SMTP/distinfo b/net/pear-Net_SMTP/distinfo index 9b2b061eafc9..d75df09b3dc7 100644 --- a/net/pear-Net_SMTP/distinfo +++ b/net/pear-Net_SMTP/distinfo @@ -1 +1 @@ -MD5 (PEAR/Net_SMTP-1.1.2.tgz) = af7f864596ed36cc17023991aeb96c69 +MD5 (PEAR/Net_SMTP-1.2.3.tgz) = 3c1ee9556bec8184f26bf7b64ce0b80e diff --git a/net/pear-Net_SMTP/pkg-descr b/net/pear-Net_SMTP/pkg-descr index ace9ff315210..b3748a3dfb4e 100644 --- a/net/pear-Net_SMTP/pkg-descr +++ b/net/pear-Net_SMTP/pkg-descr @@ -1,4 +1,4 @@ This PEAR class provides an implementation of the SMTP protocol using PEAR's Net_Socket:: class. -WWW: http://pear.php.net/package-info.php?pacid=90 +WWW: http://pear.php.net/package-info.php?package=Net_SMTP diff --git a/net/pear-Net_SMTP/pkg-plist b/net/pear-Net_SMTP/pkg-plist index 87398a599255..4d01f94a59c7 100644 --- a/net/pear-Net_SMTP/pkg-plist +++ b/net/pear-Net_SMTP/pkg-plist @@ -1,3 +1,3 @@ -@exec mv %D/lib/php/Net/SMTP.php %D/lib/php/Net/SMTP.php.dist %%PEARDIR%%/Net/SMTP.php -@unexec mv %D/lib/php/Net/SMTP.php.dist %D/lib/php/Net/SMTP.php || true +%%PKGREGDIR%%/package.xml +@dirrm %%PKGREGDIR%% diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile index 656096187ecb..887d9b19faef 100644 --- a/net/pear-Net_Sieve/Makefile +++ b/net/pear-Net_Sieve/Makefile @@ -7,40 +7,21 @@ PORTNAME= Net_Sieve PORTVERSION= 0.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR class to handle talking to timsieved -BUILD_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR +BUILD_DEPENDS= ${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket 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: @${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Net @${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Net/Sieve.php @${CHMOD} a-x ${PEARDIR}/Net/Sieve.php -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/net/pear-Net_Sieve/pkg-deinstall b/net/pear-Net_Sieve/pkg-deinstall deleted file mode 100644 index c17e9d19ced0..000000000000 --- a/net/pear-Net_Sieve/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/net/pear-Net_Sieve/pkg-descr b/net/pear-Net_Sieve/pkg-descr index e994efc7f20b..4932c5c33881 100644 --- a/net/pear-Net_Sieve/pkg-descr +++ b/net/pear-Net_Sieve/pkg-descr @@ -3,4 +3,4 @@ Net_Sieve is a PEAR class which handles talking to timsieved. Provides an API to talk to the timsieved server that comes with Cyrus IMAPd. Can be used to install, remove, mark active, etc. SIEVE scripts. -WWW: http://pear.php.net/package-info.php?pacid=71 +WWW: http://pear.php.net/package-info.php?package=Net_Sieve diff --git a/net/pear-Net_Sieve/pkg-plist b/net/pear-Net_Sieve/pkg-plist index a1753da6c08f..769b8a5fea1c 100644 --- a/net/pear-Net_Sieve/pkg-plist +++ b/net/pear-Net_Sieve/pkg-plist @@ -1 +1,3 @@ %%PEARDIR%%/Net/Sieve.php +%%PKGREGDIR%%/package.xml +@dirrm %%PKGREGDIR%% diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile index f9456bbc492a..b9ee878428e4 100644 --- a/net/pear-Net_Socket/Makefile +++ b/net/pear-Net_Socket/Makefile @@ -7,31 +7,21 @@ PORTNAME= Net_Socket PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= net www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR Network Socket Interface -BUILD_DEPENDS= ${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install -RUN_DEPENDS= ${PEARDIR}.DIST_PHP:${PORTSDIR}/devel/pear-install - -NO_BUILD= yes +BUILD_DEPENDS= ${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR +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: + @${MKDIR} ${PEARDIR}/Net @${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Net - @${CHOWN} -R root:wheel ${PEARDIR}/Net/Socket.php + @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Net .include <bsd.port.post.mk> diff --git a/net/pear-Net_Socket/pkg-descr b/net/pear-Net_Socket/pkg-descr index 9bca37de98af..d00622aa5be2 100644 --- a/net/pear-Net_Socket/pkg-descr +++ b/net/pear-Net_Socket/pkg-descr @@ -4,4 +4,4 @@ It provides blocking and non-blocking operation, with different reading and writing modes (byte-wise, block-wise, line-wise and special formats like network byte-order ip addresses). -WWW: http://pear.php.net/manual/en/core.networking.net_socket.php +WWW: http://pear.php.net/package-info.php?package=Net_Socket diff --git a/net/pear-Net_Socket/pkg-plist b/net/pear-Net_Socket/pkg-plist index 2426b9ad72eb..da686f64a0e6 100644 --- a/net/pear-Net_Socket/pkg-plist +++ b/net/pear-Net_Socket/pkg-plist @@ -1 +1,4 @@ %%PEARDIR%%/Net/Socket.php +%%PKGREGDIR%%/package.xml +@dirrm %%PKGREGDIR%% +@unexec rmdir %D/share/pear/Net 2> /dev/null || true diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile index b27185860141..d14676343a87 100644 --- a/security/pear-Auth/Makefile +++ b/security/pear-Auth/Makefile @@ -7,31 +7,17 @@ PORTNAME= Auth PORTVERSION= 1.2.0 +PORTREVISION= 1 CATEGORIES= security www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR authentication methods -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" MANIFEST= Auth.php Container Container.php @@ -43,8 +29,4 @@ do-install: @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Auth @${CHMOD} -R a-x ${PEARDIR}/Auth/Container/*.php -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/security/pear-Auth/pkg-deinstall b/security/pear-Auth/pkg-deinstall deleted file mode 100644 index c17e9d19ced0..000000000000 --- a/security/pear-Auth/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/security/pear-Auth/pkg-plist b/security/pear-Auth/pkg-plist index ef71d90ca45c..eaf0cdd3898c 100644 --- a/security/pear-Auth/pkg-plist +++ b/security/pear-Auth/pkg-plist @@ -8,5 +8,7 @@ %%PEARDIR%%/Auth/Container/RADIUS.php %%PEARDIR%%/Auth/Container/SOAP.php %%PEARDIR%%/Auth/Container/vpopmail.php +%%PKGREGDIR%%/package.xml @dirrm %%PEARDIR%%/Auth/Container @dirrm %%PEARDIR%%/Auth +@dirrm %%PKGREGDIR%% diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile index f422354793cc..5fc46edc5913 100644 --- a/security/pear-Auth_SASL/Makefile +++ b/security/pear-Auth_SASL/Makefile @@ -7,12 +7,8 @@ PORTNAME= Auth_SASL PORTVERSION= 1.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= security www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR abstraction of various SASL mechanism responses @@ -20,19 +16,8 @@ COMMENT= PEAR abstraction of various SASL mechanism responses BUILD_DEPENDS= ${PEARDIR}/Auth/Auth.php:${PORTSDIR}/security/pear-Auth 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= SASL.php SASL @@ -44,8 +29,4 @@ do-install: @${CHMOD} a-x ${PEARDIR}/Auth/SASL/* @${CHMOD} a-x ${PEARDIR}/Auth/SASL.php -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/security/pear-Auth_SASL/pkg-deinstall b/security/pear-Auth_SASL/pkg-deinstall deleted file mode 100644 index c17e9d19ced0..000000000000 --- a/security/pear-Auth_SASL/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/security/pear-Auth_SASL/pkg-descr b/security/pear-Auth_SASL/pkg-descr index afaefb265022..7750e6715e3d 100644 --- a/security/pear-Auth_SASL/pkg-descr +++ b/security/pear-Auth_SASL/pkg-descr @@ -6,4 +6,4 @@ o Plain o Anonymous o Login (Pseudo mechanism). -WWW: http://pear.php.net/package-info.php?pacid=123 +WWW: http://pear.php.net/package-info.php?package=Auth_SASL diff --git a/security/pear-Auth_SASL/pkg-plist b/security/pear-Auth_SASL/pkg-plist index 5621d945fdc2..5b786210180e 100644 --- a/security/pear-Auth_SASL/pkg-plist +++ b/security/pear-Auth_SASL/pkg-plist @@ -5,4 +5,6 @@ %%PEARDIR%%/Auth/SASL/DigestMD5.php %%PEARDIR%%/Auth/SASL/Login.php %%PEARDIR%%/Auth/SASL/Plain.php +%%PKGREGDIR%%/package.xml @dirrm %%PEARDIR%%/Auth/SASL +@dirrm %%PKGREGDIR%% diff --git a/security/pear-Crypt_CBC/Makefile b/security/pear-Crypt_CBC/Makefile index 89a452ca4b94..3e301a771c35 100644 --- a/security/pear-Crypt_CBC/Makefile +++ b/security/pear-Crypt_CBC/Makefile @@ -7,39 +7,21 @@ PORTNAME= Crypt_CBC PORTVERSION= 0.4 +PORTREVISION= 1 CATEGORIES= security www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR class to emulate Perl's Crypt::CBC module -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}/Crypt @${CP} -Rp ${WRKSRC}/CBC.php ${PEARDIR}/Crypt @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Crypt -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/security/pear-Crypt_CBC/pkg-descr b/security/pear-Crypt_CBC/pkg-descr index af138b21b04f..dd4723d43949 100644 --- a/security/pear-Crypt_CBC/pkg-descr +++ b/security/pear-Crypt_CBC/pkg-descr @@ -1,3 +1,3 @@ A PEAR class to emulate Perl's Crypt::CBC module. -WWW: http://pear.php.net/package-info.php?pacid=48 +WWW: http://pear.php.net/package-info.php?package=Crypt_CBC diff --git a/security/pear-Crypt_CBC/pkg-plist b/security/pear-Crypt_CBC/pkg-plist index e873b488ba5f..82ab5e846889 100644 --- a/security/pear-Crypt_CBC/pkg-plist +++ b/security/pear-Crypt_CBC/pkg-plist @@ -1,2 +1,4 @@ %%PEARDIR%%/Crypt/CBC.php +%%PKGREGDIR%%/package.xml @dirrm %%PEARDIR%%/Crypt +@dirrm %%PKGREGDIR%% diff --git a/sysutils/pear-File/Makefile b/sysutils/pear-File/Makefile index 7f0e07660c73..21bf85234c0e 100644 --- a/sysutils/pear-File/Makefile +++ b/sysutils/pear-File/Makefile @@ -7,39 +7,21 @@ PORTNAME= File PORTVERSION= 1.0.3 +PORTREVISION= 1 CATEGORIES= sysutils www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR common file and directory routines -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: @${CP} -Rp ${WRKSRC}/* ${PEARDIR} @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${PORTNAME}* @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/tests -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/sysutils/pear-File/pkg-deinstall b/sysutils/pear-File/pkg-deinstall deleted file mode 100644 index c17e9d19ced0..000000000000 --- a/sysutils/pear-File/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/sysutils/pear-File/pkg-descr b/sysutils/pear-File/pkg-descr index 7dbaaff3f463..d3826c5d81e8 100644 --- a/sysutils/pear-File/pkg-descr +++ b/sysutils/pear-File/pkg-descr @@ -2,4 +2,4 @@ PEAR classes providing easy access to read/write to files along with some common routines to deal with paths. Also provides interface for handling CSV files. -WWW: http://pear.php.net/manual/en/packages.file.php +WWW: http://pear.php.net/package-info.php?package=File diff --git a/sysutils/pear-File/pkg-plist b/sysutils/pear-File/pkg-plist index 82e769dda347..9d55bdae8898 100644 --- a/sysutils/pear-File/pkg-plist +++ b/sysutils/pear-File/pkg-plist @@ -1,5 +1,8 @@ %%PEARDIR%%/File/CSV.php %%PEARDIR%%/File.php +%%PKGREGDIR%%/package.xml %%PEARDIR%%/tests/parser.php %%PEARDIR%%/tests/test.csv -@dirrm %%PEARDIR%%/File +@dirrm %%PKGREGDIR%% +@unexec rmdir %D/share/pear/tests 2> /dev/null || true +@unexec rmdir %D/share/pear/File 2> /dev/null || true diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile index 00a71d279362..fc1ae83ab98c 100644 --- a/sysutils/pear-Log/Makefile +++ b/sysutils/pear-Log/Makefile @@ -6,40 +6,20 @@ # PORTNAME= Log -PORTVERSION= 1.6.1 +PORTVERSION= 1.6.5 CATEGORIES= sysutils www -MASTER_SITES= http://pear.php.net/get/ -PKGNAMEPREFIX= pear- -EXTRACT_SUFX= .tgz -DIST_SUBDIR= PEAR MAINTAINER= ports@FreeBSD.org COMMENT= PEAR logging utilities -BUILD_DEPENDS= ${PEARDIR}/PEAR.php.dist:${PORTSDIR}/devel/pear-PEAR -# ${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB +BUILD_DEPENDS= ${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB 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: @${CP} -Rp ${WRKSRC}/* ${PEARDIR} @${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${PORTNAME}* -post-install: -# Register a new package - @${PEAR} install -r -f ${WRKDIR}/package.xml - .include <bsd.port.post.mk> diff --git a/sysutils/pear-Log/distinfo b/sysutils/pear-Log/distinfo index 4724ce743a73..011d3476e321 100644 --- a/sysutils/pear-Log/distinfo +++ b/sysutils/pear-Log/distinfo @@ -1 +1 @@ -MD5 (PEAR/Log-1.6.1.tgz) = bf033aebb99ed060e73cd1c89280e2b6 +MD5 (PEAR/Log-1.6.5.tgz) = db17ef03564929c77838d17993be33b9 diff --git a/sysutils/pear-Log/pkg-deinstall b/sysutils/pear-Log/pkg-deinstall deleted file mode 100644 index c17e9d19ced0..000000000000 --- a/sysutils/pear-Log/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/sysutils/pear-Log/pkg-descr b/sysutils/pear-Log/pkg-descr index d15b0ddefb82..41e2b0d6f90d 100644 --- a/sysutils/pear-Log/pkg-descr +++ b/sysutils/pear-Log/pkg-descr @@ -3,4 +3,4 @@ PEAR Log framework providing an abstracted logging system. It supports logging to console, file, syslog, SQL, mail, and mcal targets. It also provides a subject - observer mechanism. -WWW: http://pear.php.net/manual/en/packages.log.php +WWW: http://pear.php.net/package-info.php?package=Log diff --git a/sysutils/pear-Log/pkg-plist b/sysutils/pear-Log/pkg-plist index 51c492c0b71a..da695bc9ace1 100644 --- a/sysutils/pear-Log/pkg-plist +++ b/sysutils/pear-Log/pkg-plist @@ -7,4 +7,6 @@ %%PEARDIR%%/Log/sql.php %%PEARDIR%%/Log/syslog.php %%PEARDIR%%/Log.php +%%PKGREGDIR%%/package.xml @dirrm %%PEARDIR%%/Log +@dirrm %%PKGREGDIR%% |