Remove pear ports obsolated by devel/pear and switch

dependencies of all the other pear ports. Discussed with: thierry, antonio@php.net
svn path=/head/; revision=150745
2025-01-31 10:46:16 +00:00 · 2005-12-09 19:24:52 +00:00 · 2005-12-09 19:24:52 +00:00 · 4e3717ee4f · 2021-03-31 03:12:20 +00:00
commit 4e3717ee4f
parent 4e6ebc04cb
173 changed files with 253 additions and 796 deletions
--- a/6
+++ b/6
@ -1988,3 +1988,9 @@ www/p5-HTML-Chuncks|www/p5-HTML-Chunks|2005-12-01|corrected directory
 devel/p5-Test-Builder-Tester|devel/p5-Test-Simple|2005-12-02|Included in Test::Simple package
 www/apache2|www/apache20|2005-12-03|renamed for consistency with other apache ports
 www/linux-sunbird|deskutils/linux-sunbird|2005-12-07|Moved to more suitable category
+devel/php4-pear||2005-12-09|Obsolated by devel/pear port
+devel/php5-pear||2005-12-09|Obsolated by devel/pear port
+archivers/pear-Archive_Tar||2005-12-09|Obsolated by devel/pear port
+devel/pear-Console_Getopt||2005-12-09|Obsolated by devel/pear port
+devel/pear-XML_RPC||2005-12-09|Obsolated by devel/pear port
+devel/pear-PEAR|devel/pear|2005-12-09|New pear bootstrap code
--- a/archivers/Makefile
+++ b/archivers/Makefile
@ -66,7 +66,6 @@
    SUBDIR += par2cmdline
    SUBDIR += parchive
    SUBDIR += pbzip2
-    SUBDIR += pear-Archive_Tar
    SUBDIR += pear-File_Archive
    SUBDIR += pecl-zip
    SUBDIR += php4-bz2
--- a/archivers/pear-Archive_Tar/Makefile
+++ b/archivers/pear-Archive_Tar/Makefile
@ -1,27 +0,0 @@
-# Ports collection makefile for:  pear-Archive_Tar
-# Date created:			  28 November 2002
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Archive_Tar
-PORTVERSION=	1.3.1
-CATEGORIES=	archivers pear
-
-MAINTAINER=	antonio@php.net
-COMMENT=	PEAR tar file management class
-
-USE_PHP=	yes
-WANT_PHP_PEAR=	yes
-
-CATEGORY=	Archive
-FILES=		Tar.php
-DOCS=		Archive_Tar.txt
-
-post-extract:
-	@${MV} ${WRKSRC}/Archive/* ${WRKSRC}
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
--- a/archivers/pear-Archive_Tar/distinfo
+++ b/archivers/pear-Archive_Tar/distinfo
@ -1,2 +0,0 @@
-MD5 (PEAR/Archive_Tar-1.3.1.tgz) = 31e54ce401302065d43888223a0be4d9
-SIZE (PEAR/Archive_Tar-1.3.1.tgz) = 15102
--- a/archivers/pear-Archive_Tar/pkg-descr
+++ b/archivers/pear-Archive_Tar/pkg-descr
@ -1,7 +0,0 @@
-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/package/Archive_Tar/
--- a/archivers/pear-File_Archive/Makefile
+++ b/archivers/pear-File_Archive/Makefile
@ -68,5 +68,5 @@ RUN_DEPENDS+=	${PEARDIR}/Mail/mime.php:${PORTSDIR}/mail/pear-Mail_Mime
 RUN_DEPENDS+=	${PEARDIR}/Cache/Lite.php:${PORTSDIR}/sysutils/pear-Cache_Lite
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/benchmarks/pear-Benchmark/Makefile
+++ b/benchmarks/pear-Benchmark/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	benchmarks devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR framework to benchmark PHP scripts or function calls

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_PHP=	bcmath
@ -23,5 +23,5 @@ EXAMPLES=	timer_example.php
 _EXAMPLESDIR=	doc

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/chinese/phpbb-tw/Makefile
+++ b/chinese/phpbb-tw/Makefile
@ -18,7 +18,7 @@ DISTNAME=	phpBB-${PORTVERSION}
 MAINTAINER=	chinsan.tw@gmail.com
 COMMENT=	The Traditional Chinese version of phpBB

-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear

 CONFLICTS=	phpbb-[0-9]*

--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@ -13,7 +13,7 @@ CATEGORIES=	databases www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR Database Abstraction Layer

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_REINPLACE=	yes
@ -40,7 +40,7 @@ TESTS=		db_error.phpt db_parsedsn.phpt db_factory.phpt db_ismanip.phpt \
 _DOCSDIR=	doc

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 post-patch:
 .for file in ${FILES}
--- a/databases/pear-DBA/Makefile
+++ b/databases/pear-DBA/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	databases www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Berkely-style database abstraction class

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		DBA.php DBA/Compatibility.php DBA/Driver/File.php DBA/Driver/Builtin.php
@ -20,5 +20,5 @@ TESTS=		benchmark_drivers.php test_drivers.php test_compatibility.php
 DOCS=		README.txt

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-DB_DataObject/Makefile
+++ b/databases/pear-DB_DataObject/Makefile
@ -36,5 +36,5 @@ post-patch:
 RUN_DEPENDS+=	${PEARDIR}/Validate.php:${PORTSDIR}/devel/pear-Validate
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-DB_DataObject_FormBuilder/Makefile
+++ b/databases/pear-DB_DataObject_FormBuilder/Makefile
@ -36,5 +36,5 @@ RUN_DEPENDS+=	${PEARDIR}/Date.php:${PORTSDIR}/devel/pear-Date
 RUN_DEPENDS+=	${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-DB_Pager/Makefile
+++ b/databases/pear-DB_Pager/Makefile
@ -13,7 +13,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}
 MAINTAINER=	toshiya@saitoh.nu
 COMMENT=	PEAR Database Abstraction Layer

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR \
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
 		${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 RUN_DEPENDS=	${BUILD_DEPENDS}

@ -21,5 +21,5 @@ NO_BUILD=	yes
 FILES=		Pager.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-DB_QueryTool/Makefile
+++ b/databases/pear-DB_QueryTool/Makefile
@ -39,5 +39,5 @@ TESTS=		Common.php Get.php GetAll.php GetCount.php GetQueryString.php index.php
 _EXAMPLESDIR=	docs/examples

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-DB_Table/Makefile
+++ b/databases/pear-DB_Table/Makefile
@ -40,5 +40,5 @@ post-extract:
 RUN_DEPENDS+=	${PEARDIR}/HTML/QuickForm.php:${PORTSDIR}/devel/pear-HTML_QuickForm
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-DB_ldap/Makefile
+++ b/databases/pear-DB_ldap/Makefile
@ -19,5 +19,5 @@ CATEGORY=	DB
 FILES=		ldap.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-DB_ldap2/Makefile
+++ b/databases/pear-DB_ldap2/Makefile
@ -19,5 +19,5 @@ CATEGORY=	DB
 FILES=		ldap.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-MDB/Makefile
+++ b/databases/pear-MDB/Makefile
@ -44,5 +44,5 @@ _DOCSDIR=	.
 _TESTDIR=	tests

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-MDB2/Makefile
+++ b/databases/pear-MDB2/Makefile
@ -57,5 +57,5 @@ TESTS=		clitest.php Console_TestListener.php driver_test.schema \
 _EXAMPLESDIR=	docs/examples

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/databases/pear-MDB_QueryTool/Makefile
+++ b/databases/pear-MDB_QueryTool/Makefile
@ -39,5 +39,5 @@ TESTS=		Common.php index.php Get.php GetAll.php GetCount.php GetQueryString.php
 _EXAMPLESDIR=	docs/examples

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1241,7 +1241,6 @@
    SUBDIR += pear
    SUBDIR += pear-Config
    SUBDIR += pear-Console_Getargs
-    SUBDIR += pear-Console_Getopt
    SUBDIR += pear-Console_Table
    SUBDIR += pear-Date
    SUBDIR += pear-Event_Dispatcher
@ -1266,7 +1265,6 @@
    SUBDIR += pear-HTML_TreeMenu
    SUBDIR += pear-I18N
    SUBDIR += pear-OLE
-    SUBDIR += pear-PEAR
    SUBDIR += pear-PEAR_PackageFileManager
    SUBDIR += pear-PHPDoc
    SUBDIR += pear-PHPUnit
@ -1283,7 +1281,6 @@
    SUBDIR += pear-Var_Dump
    SUBDIR += pear-XML_NITF
    SUBDIR += pear-XML_Parser
-    SUBDIR += pear-XML_RPC
    SUBDIR += pear-XML_RSS
    SUBDIR += pear-XML_SVG
    SUBDIR += pear-XML_Serializer
@ -1306,7 +1303,6 @@
    SUBDIR += php4-ncurses
    SUBDIR += php4-pcntl
    SUBDIR += php4-pcre
-    SUBDIR += php4-pear
    SUBDIR += php4-readline
    SUBDIR += php4-shmop
    SUBDIR += php4-sysvmsg
@ -1319,7 +1315,6 @@
    SUBDIR += php5-ncurses
    SUBDIR += php5-pcntl
    SUBDIR += php5-pcre
-    SUBDIR += php5-pear
    SUBDIR += php5-readline
    SUBDIR += php5-shmop
    SUBDIR += php5-sysvmsg
--- a/devel/beautifyphp/Makefile
+++ b/devel/beautifyphp/Makefile
@ -15,7 +15,7 @@ DISTNAME=	beautify_php_${PORTVERSION}
 MAINTAINER=	leeym@FreeBSD.org
 COMMENT=	PEAR beautifier for PHP4

-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear

 USE_REINPLACE=	yes
 NO_BUILD=	yes
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Your configurations swiss-army knife

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
 		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util

@ -23,5 +23,5 @@ FILES=		Config.php Config/Container.php Config/Container/Apache.php \
 DOCS=		Apache.php IniCommented.php IniFromScratch.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Console_Getargs/Makefile
+++ b/devel/pear-Console_Getargs/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR command-line arguments parser

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	Console
@ -22,5 +22,5 @@ TESTS=		Console_TestListener.php Getargs_basic_testcase.php \
 		Getargs_getValues_testcase.php test.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Console_Getopt/Makefile
+++ b/devel/pear-Console_Getopt/Makefile
@ -1,22 +0,0 @@
-# Ports collection makefile for:  pear-Console_Getopt
-# Date created:			  23 October 2002
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	Console_Getopt
-PORTVERSION=	1.2
-CATEGORIES=	devel www pear
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	PEAR command-line option parser
-
-WANT_PHP_PEAR=	yes
-USE_PHP=	yes
-
-FILES=		Console/Getopt.php
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
--- a/devel/pear-Console_Getopt/distinfo
+++ b/devel/pear-Console_Getopt/distinfo
@ -1,3 +0,0 @@
-MD5 (PEAR/Console_Getopt-1.2.tgz) = 8f9ec8253c04350bc01ee7ca941e24b6
-SHA256 (PEAR/Console_Getopt-1.2.tgz) = 90bc64b35832af79625ccd7a1cd981ae26adbe58e1296a052cc3947d9c959e0c
-SIZE (PEAR/Console_Getopt-1.2.tgz) = 3370
--- a/devel/pear-Console_Getopt/pkg-descr
+++ b/devel/pear-Console_Getopt/pkg-descr
@ -1,4 +0,0 @@
-This is a PHP implementation of "getopt" supporting both short and long
-options.
-
-WWW: http://pear.php.net/manual/en/package.console.php
--- a/devel/pear-Console_Table/Makefile
+++ b/devel/pear-Console_Table/Makefile
@ -12,12 +12,12 @@ CATEGORIES=	devel pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PHP class that makes it easy to build console style tables

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	Console
 FILES=		Table.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Date/Makefile
+++ b/devel/pear-Date/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR Date and Time Zone Classes

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		Date.php Date/Calc.php Date/Human.php Date/Span.php	\
@ -27,5 +27,5 @@ DOCS=		TODO
 _DOCSDIR=	.

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Event_Dispatcher/Makefile
+++ b/devel/pear-Event_Dispatcher/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR dispatch notifications using PHP callbacks

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_REINPLACE=	yes
@ -28,5 +28,5 @@ post-extract:
 .endfor

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-FSM/Makefile
+++ b/devel/pear-FSM/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR Finite State Machine

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		FSM.php
@ -22,5 +22,5 @@ EXAMPLES=	rpn.php
 _EXAMPLESDIR=	docs/examples

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_BBCodeParser/Makefile
+++ b/devel/pear-HTML_BBCodeParser/Makefile
@ -27,5 +27,5 @@ EXAMPLES=	BBCodeParser.ini parser.php
 _EXAMPLESDIR=	BBCodeParser/example

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_CSS/Makefile
+++ b/devel/pear-HTML_CSS/Makefile
@ -20,5 +20,5 @@ FILES=		CSS.php
 EXAMPLES=	CSS_InHeader.php CSS_Inline.php CSS_Stylesheet.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Common/Makefile
+++ b/devel/pear-HTML_Common/Makefile
@ -12,12 +12,12 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR::HTML_Common is a base class for other HTML classes

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	HTML
 FILES=		Common.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Form/Makefile
+++ b/devel/pear-HTML_Form/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR simple HTML form package

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_REINPLACE=	yes
@ -25,7 +25,7 @@ post-extract:
 	@${MV} ${WRKSRC}/HTML/* ${WRKSRC}

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 post-patch:
 	@${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" \
--- a/devel/pear-HTML_Javascript/Makefile
+++ b/devel/pear-HTML_Javascript/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Provides an interface for creating simple JS scripts

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	HTML
@ -21,5 +21,5 @@ EXAMPLES=	javascript.php js.php
 TESTS=		js.php output.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Page2/Makefile
+++ b/devel/pear-HTML_Page2/Makefile
@ -26,5 +26,5 @@ post-patch:
 	@${REINPLACE_CMD} -e "s#
##g" ${WRKSRC}/Page2.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_QuickForm/Makefile
+++ b/devel/pear-HTML_QuickForm/Makefile
@ -49,5 +49,5 @@ DOCS=		elements.php filters.php formrule.php groups.php rules-builtin.php rules-
 		renderers/templates/styles/fancygroup.html

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_QuickForm2/Makefile
+++ b/devel/pear-HTML_QuickForm2/Makefile
@ -49,5 +49,5 @@ DOCS=		elements.php filters.php formrule.php groups.php rules-builtin.php rules-
 		renderers/templates/styles/fancygroup.html

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_QuickForm_Controller/Makefile
+++ b/devel/pear-HTML_QuickForm_Controller/Makefile
@ -22,5 +22,5 @@ EXAMPLES=	simple.php tabbed.php wizard.php regWizard.php upload.php \
 		templates/upload.html statemachine.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_QuickForm_SelectFilter/Makefile
+++ b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
@ -20,5 +20,5 @@ CATEGORY=	HTML/QuickForm
 FILES=		SelectFilter.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_QuickForm_advmultiselect/Makefile
+++ b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
@ -20,5 +20,5 @@ CATEGORY=	HTML/QuickForm
 FILES=		advmultiselect.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Select/Makefile
+++ b/devel/pear-HTML_Select/Makefile
@ -19,5 +19,5 @@ CATEGORY=	HTML
 FILES=		Select.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@ -25,5 +25,5 @@ EXAMPLES=	Country.php FRDepartements.php UKCounty.php USState.php
 _EXAMPLESDIR=	Select/Common/examples

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Table/Makefile
+++ b/devel/pear-HTML_Table/Makefile
@ -21,5 +21,5 @@ EXAMPLES=	Table_example1.php Table_example2.php
 _EXAMPLESDIR=	docs

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Template_Flexy/Makefile
+++ b/devel/pear-HTML_Template_Flexy/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	An extremely powerful Tokenizer driven Template engine

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 LATEST_LINK=	pear-HTML_Template_Flexy
@ -67,5 +67,5 @@ RUN_DEPENDS+=	${PEARDIR}/Translation2.php:${PORTSDIR}/sysutils/pear-Translation2
 .endif

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Template_IT/Makefile
+++ b/devel/pear-HTML_Template_IT/Makefile
@ -13,7 +13,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR template API

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	HTML/Template
@ -30,5 +30,5 @@ do-install-tests-msg: .USE
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=PHPUnit>;;)."

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Template_PHPLIB/Makefile
+++ b/devel/pear-HTML_Template_PHPLIB/Makefile
@ -13,7 +13,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR template API ported from PHPLIB

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	HTML/Template
@ -27,5 +27,5 @@ do-install-tests-msg: .USE
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=Benchmark>;;;)."

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_Template_Sigma/Makefile
+++ b/devel/pear-HTML_Template_Sigma/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	klammer@webonaut.com
 COMMENT=	PEAR template API

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	HTML/Template
@ -34,5 +34,5 @@ do-install-tests-msg: .USE
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=PHPUnit>;;)."

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-HTML_TreeMenu/Makefile
+++ b/devel/pear-HTML_TreeMenu/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Provides an API to create a HTML tree

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	HTML
@ -36,5 +36,5 @@ DOCS=		HTML_TreeMenu.doc HTML_TreeMenu.pdf example.php map_fs.php
 _DATADIR=	.

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-I18N/Makefile
+++ b/devel/pear-I18N/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR internationalization package

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	I18N
@ -34,5 +34,5 @@ EXAMPLES=	I18N_Currency.php I18N_DateTime.php I18N_Message.php		\
 _EXAMPLESDIR=	docs

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-OLE/Makefile
+++ b/devel/pear-OLE/Makefile
@ -12,12 +12,12 @@ CATEGORIES=	devel www pear
 MAINTAINER=	pav@FreeBSD.org
 COMMENT=	PEAR class for reading and writing OLE containers

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	OLE
 FILES=		OLE.php PPS.php PPS/File.php PPS/Root.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-PEAR/Makefile
+++ b/devel/pear-PEAR/Makefile
@ -1,79 +0,0 @@
-# Ports collection makefile for:  pear-PEAR
-# Date created:			  22 October 2002
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	PEAR
-PORTVERSION=	1.4.4
-CATEGORIES=	devel www pear
-
-MAINTAINER=	antonio@php.net
-COMMENT=	PEAR Base System
-
-BUILD_DEPENDS=	${PEARDIR}/Archive/Tar.php:${PORTSDIR}/archivers/pear-Archive_Tar	\
-		${PEARDIR}/Console/Getopt.php:${PORTSDIR}/devel/pear-Console_Getopt	\
-		${PEARDIR}/XML/RPC.php:${PORTSDIR}/devel/pear-XML_RPC
-RUN_DEPENDS=	${BUILD_DEPENDS}
-
-USE_REINPLACE=	yes
-
-FILES=		OS/Guess.php PEAR/ChannelFile/Parser.php PEAR/Command/Auth.xml		\
-		PEAR/Command/Auth.php PEAR/Command/Build.xml PEAR/Command/Build.php	\
-		PEAR/Command/Channels.xml PEAR/Command/Channels.php			\
-		PEAR/Command/Common.php PEAR/Command/Config.xml PEAR/Command/Config.php	\
-		PEAR/Command/Install.xml PEAR/Command/Install.php			\
-		PEAR/Command/Package.xml PEAR/Command/Package.php			\
-		PEAR/Command/Pickle.xml PEAR/Command/Pickle.php				\
-		PEAR/Command/Registry.xml PEAR/Command/Registry.php			\
-		PEAR/Command/Remote.xml PEAR/Command/Remote.php				\
-		PEAR/Command/Mirror.xml PEAR/Command/Mirror.php				\
-		PEAR/Command/Test.xml PEAR/Command/Test.php PEAR/Downloader/Package.php	\
-		PEAR/Frontend/CLI.php PEAR/Installer/Role/Common.php			\
-		PEAR/Installer/Role/Data.xml PEAR/Installer/Role/Data.php		\
-		PEAR/Installer/Role/Doc.xml PEAR/Installer/Role/Doc.php			\
-		PEAR/Installer/Role/Ext.xml PEAR/Installer/Role/Ext.php			\
-		PEAR/Installer/Role/Php.xml PEAR/Installer/Role/Php.php			\
-		PEAR/Installer/Role/Script.xml PEAR/Installer/Role/Script.php		\
-		PEAR/Installer/Role/Src.xml PEAR/Installer/Role/Src.php			\
-		PEAR/Installer/Role/Test.xml PEAR/Installer/Role/Test.php		\
-		PEAR/Installer/Role.php PEAR/PackageFile/Generator/v1.php		\
-		PEAR/PackageFile/Generator/v2.php PEAR/PackageFile/Parser/v1.php	\
-		PEAR/PackageFile/Parser/v2.php PEAR/PackageFile/v2/rw.php		\
-		PEAR/PackageFile/v2/Validator.php PEAR/PackageFile/v1.php		\
-		PEAR/PackageFile/v2.php PEAR/REST/10.php PEAR/REST/11.php		\
-		PEAR/Task/Postinstallscript/rw.php PEAR/Task/Replace/rw.php		\
-		PEAR/Task/Unixeol/rw.php PEAR/Task/Windowseol/rw.php			\
-		PEAR/Task/Common.php PEAR/Task/Postinstallscript.php			\
-		PEAR/Task/Replace.php PEAR/Task/Unixeol.php PEAR/Task/Windowseol.php	\
-		PEAR/Validator/PECL.php PEAR/Autoloader.php PEAR/Builder.php		\
-		PEAR/ChannelFile.php PEAR/Command.php PEAR/Common.php PEAR/Config.php	\
-		PEAR/Dependency.php PEAR/DependencyDB.php PEAR/Dependency2.php		\
-		PEAR/Downloader.php PEAR/ErrorStack.php PEAR/Exception.php		\
-		PEAR/Frontend.php PEAR/Installer.php PEAR/Packager.php			\
-		PEAR/PackageFile.php PEAR/Registry.php PEAR/Remote.php PEAR/REST.php	\
-		PEAR/RunTest.php PEAR/Validate.php PEAR/XMLParser.php package.dtd	\
-		template.spec PEAR.php System.php
-SCRIPTFILES=	pear2
-
-.include <bsd.port.pre.mk>
-
-pre-patch:
-.for dosfile in ${FILES} scripts/pearcmd.php
-	@${MV} ${WRKSRC}/${dosfile} ${WRKSRC}/${dosfile}.dos
-	@${TR} -d '\r' < ${WRKSRC}/${dosfile}.dos > ${WRKSRC}/${dosfile}
-.endfor
-
-post-patch:
-.for origfile in ${FILES}
-	@${REINPLACE_CMD} -e 's|@pear_version@|${PORTVERSION}|g'	\
-			-e 's|@PEAR-VER@|${PORTVERSION}|g'		\
-			-e 's|@DATA-DIR@|${PEARDIR}|g'		\
-		${WRKSRC}/${origfile}
-.endfor
-	@${SED} "s|@pear_version@|${PORTVERSION}|g" \
-		${WRKSRC}/scripts/pearcmd.php > ${WRKSRC}/pear-${SCRIPTFILES}
-
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
--- a/devel/pear-PEAR/Makefile.common
+++ b/devel/pear-PEAR/Makefile.common
@ -1,239 +0,0 @@
-# $FreeBSD$
-
-# Common code for pear- ports.
-
-MASTER_SITES=	http://pear.php.net/get/
-PKGNAMEPREFIX=	pear-
-EXTRACT_SUFX=	.tgz
-DIST_SUBDIR=	PEAR
-
-USE_REINPLACE=	yes
-
-.if !defined(USE_PHPIZE)
-NO_BUILD=	yes
-.endif
-
-.if exists(${LOCALBASE}/bin/php-config)
-PHP_BASE!=	${LOCALBASE}/bin/php-config --prefix
-.else
-PHP_BASE=	${LOCALBASE}
-.endif
-LPEARDIR=	share/pear
-LPKGREGDIR=	${LPEARDIR}/packages/${PKGNAME}
-LDATADIR=	${LPEARDIR}/data/${PORTNAME}
-LDOCSDIR=	share/doc/pear/${PORTNAME}
-LEXAMPLESDIR=	share/examples/pear/${PORTNAME}
-LSQLSDIR=	${LPEARDIR}/sql/${PORTNAME}
-LSCRIPTSDIR=	bin
-LTESTSDIR=	${LPEARDIR}/tests/${PORTNAME}
-PEARDIR=	${PHP_BASE}/${LPEARDIR}
-PKGREGDIR=	${PHP_BASE}/${LPKGREGDIR}
-DATADIR=	${PHP_BASE}/${LDATADIR}
-DOCSDIR=	${PHP_BASE}/${LDOCSDIR}
-EXAMPLESDIR=	${PHP_BASE}/${LEXAMPLESDIR}
-SQLSDIR=	${PHP_BASE}/${LSQLSDIR}
-SCRIPTFILESDIR=	${LOCALBASE}/bin
-TESTSDIR=	${PHP_BASE}/${LTESTSDIR}
-.if defined(CATEGORY) && !empty(CATEGORY)
-LINSTDIR=	${LPEARDIR}/${CATEGORY}
-.else
-LINSTDIR=	${LPEARDIR}
-.endif
-INSTDIR=	${PHP_BASE}/${LINSTDIR}
-
-.if !defined(USE_PHPIZE) && !exists(${.CURDIR}/pkg-plist)
-PLIST=		${WRKDIR}/PLIST
-.endif
-PLIST_SUB=	PEARDIR=${LPEARDIR} PKGREGDIR=${LPKGREGDIR} \
-		TESTSDIR=${LTESTSDIR} INSTDIR=${LINSTDIR} SQLSDIR=${LSQLSDIR} \
-		SCRIPTFILESDIR=${LCRIPTSDIR}
-
-PKGINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-install
-PKGDEINSTALL=	${PORTSDIR}/devel/pear-PEAR/pkg-deinstall
-
-FILES?=
-DATA?=
-DOCS?=
-EXAMPLES?=
-SQLS?=
-SCRIPTFILES?=
-TESTS?=
-_DATADIR?=	data
-_DOCSDIR?=	docs
-_EXAMPLESDIR?=	examples
-_SQLSDIR?=	sql
-_TESTSDIR?=	tests
-
-# this is an easy way to eliminate duplicate entries in a variable :)
-# if someone knows how to achieve the result without this terrible
-# hack, please tell me!
-.for v in FILES DOCS TESTS EXAMPLES SQLS SCRIPTFILES DATA
-X${v}DIRS=	${${v}:M*/*:C;/[^/]+$;;}
-. for XD in ${X${v}DIRS}
-ALREADYTHERE=	0
-.  for D in ${${v}DIRS}
-DD=	${D}
-.   if ${DD} == ${XD}
-ALREADYTHERE=	1
-.   endif
-.  endfor
-.  if ${ALREADYTHERE} == 0
-${v}DIRS+=		${XD}
-.  endif
-. endfor
-.endfor
-
-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
-
-DIRFILTER=	${SED} -En '\:^.*/[^/]*$$:s:^(.+)/[^/]*$$:\1:p' | ${SORT} -ru
-
-.if !defined(USE_PHPIZE)
-do-generate-plist:
-. if !exists(${.CURDIR}/pkg-plist)
-	@${ECHO_MSG} "===>   Generating packing list"; \
-	(for file in ${FILES}; do echo "${LINSTDIR}/$${file}"; done; \
-	for file in ${TESTS}; do echo "${LTESTSDIR}/$${file}"; done; \
-	for file in ${DATA}; do echo "${LDATADIR}/$${file}"; done; \
-	for file in ${SQLS}; do echo "${LSQLSDIR}/$${file}"; done; \
-	for file in ${SCRIPTFILES}; do echo "${LSCRIPTSDIR}/$${file}"; done; \
-	for file in ${DOCS}; do echo "%%PORTDOCS%%${LDOCSDIR}/$${file}"; done; \
-	for file in ${EXAMPLES}; do echo "%%PORTDOCS%%${LEXAMPLESDIR}/$${file}"; done; \
-	echo "${LPKGREGDIR}/package.xml"; \
-	for d in ${FILES} ${FILES:H}; do echo $${d}; done | ${DIRFILTER} | \
-	    while read dir; do echo "@dirrm ${LINSTDIR}/$${dir}"; done; \
-	for d in ${TESTS}; do echo $${d}; done | ${DIRFILTER} | \
-	    while read dir; do echo "@dirrm ${LTESTSDIR}/$${dir}"; done; \
-	for d in ${DATA}; do echo $${d}; done | ${DIRFILTER} | \
-	    while read dir; do echo "@dirrm ${LDATADIR}/$${dir}"; done; \
-	for d in ${SQLS}; do echo $${d}; done | ${DIRFILTER} | \
-	    while read dir; do echo "@dirrm ${LSQLSDIR}/$${dir}"; done; \
-	for d in ${DOCS}; do echo $${d}; done | ${DIRFILTER} | \
-	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}/$${dir}"; done; \
-	for d in ${EXAMPLES}; do echo $${d}; done | ${DIRFILTER} | \
-	    while read dir; do echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}/$${dir}"; done; \
-	if [ -n "${TESTS}" ]; then echo "@dirrm ${LTESTSDIR}"; fi; \
-	if [ -n "${DATA}" ]; then echo "@dirrm ${LDATADIR}"; fi; \
-	if [ -n "${SQLS}" ]; then echo "@dirrm ${LSQLSDIR}"; fi; \
-	if [ -n "${DOCS}" ]; then echo "%%PORTDOCS%%@dirrm ${LDOCSDIR}"; fi; \
-	if [ -n "${EXAMPLES}" ]; then echo "%%PORTDOCS%%@dirrm ${LEXAMPLESDIR}"; fi; \
-	echo "@dirrm ${LPKGREGDIR}"; \
-	echo "@unexec rmdir %D/${LINSTDIR} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LINSTDIR:H} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LPEARDIR}/.registry 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LPEARDIR}/packages 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LPEARDIR} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LDOCSDIR:H} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LEXAMPLESDIR:H} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LTESTSDIR:H} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LDATADIR:H} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LSCRIPTSDIR:H} 2> /dev/null || true"; \
-	echo "@unexec rmdir %D/${LSQLSDIR:H} 2> /dev/null || true") > ${PLIST}
-. endif
-
-. for t in files docs tests sqls scriptfiles examples data
-.  if !target(do-install-${t}-msg)
-do-install-${t}-msg: .USE
-.  endif
-. endfor
-
-pre-install: 	do-generate-plist
-do-install: 	do-install-files do-install-docs do-install-tests do-install-sqls \
-		do-install-scriptfiles do-install-examples do-install-data
-
-do-install-files: do-install-files-msg
-	@${MKDIR} ${INSTDIR}
-. for dir in ${FILESDIRS}
-	@${MKDIR} ${INSTDIR}/${dir}
-. endfor
-. for file in ${FILES}
-	@${INSTALL_DATA} ${WRKSRC}/${file} ${INSTDIR}/${file}
-. endfor
-
-do-install-docs: do-install-docs-msg
-. if !defined(NOPORTDOCS) && !empty(DOCS)
-	@${ECHO_MSG} "===> Installing documentation in ${DOCSDIR}."
-	@${MKDIR} ${DOCSDIR}
-.  for dir in ${DOCSDIRS}
-	@${MKDIR} ${DOCSDIR}/${dir}
-.  endfor
-.  for file in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${_DOCSDIR}/${file} ${DOCSDIR}/${file}
-.  endfor
-. endif
-
-do-install-tests: do-install-tests-msg
-. if !empty(TESTS)
-	@${ECHO_MSG} "===> Installing tests in ${TESTSDIR}."
-	@${MKDIR} ${TESTSDIR}
-.  for dir in ${TESTSDIRS}
-	@${MKDIR} ${TESTSDIR}/${dir}
-.  endfor
-.  for file in ${TESTS}
-	@${INSTALL_DATA} ${WRKSRC}/${_TESTSDIR}/${file} ${TESTSDIR}/${file}
-.  endfor
-. endif
-
-do-install-data: do-install-data-msg
-. if !empty(DATA)
-	@${ECHO_MSG} "===> Installing data in ${DATADIR}."
-	@${MKDIR} ${DATADIR}
-.  for dir in ${DATADIRS}
-	@${MKDIR} ${DATADIR}/${dir}
-.  endfor
-.  for file in ${DATA}
-	@${INSTALL_DATA} ${WRKSRC}/${_DATADIR}/${file} ${DATADIR}/${file}
-.  endfor
-. endif
-
-do-install-sqls: do-install-sqls-msg
-. if !empty(SQLS)
-	@${ECHO_MSG} "===> Installing sqls in ${SQLSDIR}."
-	@${MKDIR} ${SQLSDIR}
-.  for dir in ${SQLSDIRS}
-	@${MKDIR} ${SQLSDIR}/${dir}
-.  endfor
-.  for file in ${SQLS}
-	@${INSTALL_DATA} ${WRKSRC}/${_SQLSDIR}/${file} ${SQLSDIR}/${file}
-.  endfor
-. endif
-
-do-install-scriptfiles: do-install-scriptfiles-msg
-. if !empty(SCRIPTFILES)
-	@${ECHO_MSG} "===> Installing scripts in ${SCRIPTFILESDIR}."
-.  for file in ${SCRIPTFILES}
-	@${CP} ${WRKSRC}/pear-${file} ${WRKSRC}/${file}
-	@${REINPLACE_CMD} -e "s|@php_bin@|${SCRIPTFILESDIR}/php|g" ${WRKSRC}/${file}
-	@${REINPLACE_CMD} -e "s|@php_dir@|${PREFIX}/lib/php|g" ${WRKSRC}/${file}
-	@${REINPLACE_CMD} -e "s|@include_path@|${PREFIX}/${LPEARDIR}|g" ${WRKSRC}/${file}
-	@${INSTALL_SCRIPT} ${WRKSRC}/${file} ${SCRIPTFILESDIR}/${file}
-.  endfor
-. endif
-
-do-install-examples: do-install-examples-msg
-. if !defined(NOPORTDOCS) && !empty(EXAMPLES)
-	@${ECHO_MSG} "===> Installing examples in ${EXAMPLESDIR}."
-	@${MKDIR} ${EXAMPLESDIR}
-.  for dir in ${EXAMPLESDIRS}
-	@${MKDIR} ${EXAMPLESDIR}/${dir}
-.  endfor
-.  for file in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/${_EXAMPLESDIR}/${file} ${EXAMPLESDIR}/${file}
-.  endfor
-. endif
-.endif
-
-post-install:
-	@${MKDIR} ${PKGREGDIR}
-	@${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR}
-	@${SETENV} PKG_PREFIX=${PREFIX} \
-	${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
--- a/devel/pear-PEAR/distinfo
+++ b/devel/pear-PEAR/distinfo
@ -1,2 +0,0 @@
-MD5 (PEAR/PEAR-1.4.4.tgz) = 20c5d38b16b364bbf5395e6890f048e4
-SIZE (PEAR/PEAR-1.4.4.tgz) = 276978
--- a/devel/pear-PEAR/files/patch-scripts::pearcmd.php
+++ b/devel/pear-PEAR/files/patch-scripts::pearcmd.php
@ -1,19 +0,0 @@
--- scripts/pearcmd.php.orig	Sun Nov  6 21:17:11 2005
-+++ scripts/pearcmd.php	Sun Nov  6 21:19:20 2005
-@@ -1,3 +1,4 @@
-+#!@php_bin@ -nq
- <?php
- //
- // +----------------------------------------------------------------------+
-@@ -29,8 +30,10 @@
- /**
-  * @nodep Gtk
-  */
-+dl('pcre.so');
-+dl('xml.so');
- if ('@include_path@' != '@'.'include_path'.'@') {
-    ini_set('include_path', '@include_path@');
-+    ini_set('include_path', '@include_path@:@include_path@/bootstrap');
-     $raw = false;
- } else {
-     // this is a raw, uninstalled pear, either a cvs checkout, or php distro
--- a/devel/pear-PEAR/pkg-deinstall
+++ b/devel/pear-PEAR/pkg-deinstall
@ -1,25 +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-//')
-
-PEAR=${PKG_PREFIX}/bin/pear
-PEAR2=${PKG_PREFIX}/bin/pear2
-
-if [ ${PACKAGE} = "PEAR" ]		\
-|| [ ${PACKAGE} = "Archive_Tar" ]	\
-|| [ ${PACKAGE} = "Console_Getopt" ]	\
-|| [ ${PACKAGE} = "XML_RPC" ]; then
-	PEAR_INSTALLER=${PEAR}
-else
-	PEAR_INSTALLER=${PEAR2}
-fi
-
-${PEAR_INSTALLER} uninstall -r -n ${PACKAGE} || true
--- a/devel/pear-PEAR/pkg-descr
+++ b/devel/pear-PEAR/pkg-descr
@ -1,12 +0,0 @@
-The PEAR package contains:
-* the PEAR installer, for creating, distributing and installing packages
-* the alpha-quality PEAR_Exception php5-only exception class
-* the beta-quality PEAR_ErrorStack advanced error handling mechanism
-* the PEAR_Error error handling mechanism
-* the OS_Guess class for retrieving info about the OS where PHP is
-  running on
-* the System class for quick handling common operations with files and 
-  directories
-* the PEAR base class
-
-WWW: http://pear.php.net/package/PEAR/
--- a/devel/pear-PEAR/pkg-install
+++ b/devel/pear-PEAR/pkg-install
@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-# Register the package $1 in the port registry
-
-PREFIX=${PKG_PREFIX:=%%PREFIX%%}
-PEAR=${PREFIX}/bin/pear
-PEAR2=${PREFIX}/bin/pear2
-PKGREGDIR=${PREFIX}/share/pear/packages/$1
-
-if [ -f "${PEAR2}" ]; then
-	PEAR_INSTALLER=${PEAR2}
-else
-	PEAR_INSTALLER=${PEAR}
-fi
-
-[ "x$1" = "x" ] && exit 1
-if [ "x$2" = "xPOST-INSTALL" ]; then
-	${PEAR_INSTALLER} install -r -n -f ${PKGREGDIR}/package.xml
-fi
--- a/devel/pear-PEAR_PackageFileManager/Makefile
+++ b/devel/pear-PEAR_PackageFileManager/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to maintain PEAR packages

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 LATEST_LINK=	pear-${PORTNAME}
@ -140,5 +140,5 @@ RUN_DEPENDS+=	${PEARDIR}/PHP/CompatInfo.php:${PORTSDIR}/devel/pear-PHP_CompatInf
 RUN_DEPENDS+=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-PHPDoc/Makefile
+++ b/devel/pear-PHPDoc/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	Tool to generate documentation from the source

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	PHPDoc
@ -100,7 +100,7 @@ DATA=		renderer/html/default/class.html \
 SCRIPTFILES=	phpdoc

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 post-patch:
 	@${REINPLACE_CMD} -e "s,@php_dir@,${PEARDIR}," \
--- a/devel/pear-PHPUnit/Makefile
+++ b/devel/pear-PHPUnit/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	PEAR regression testing framework for unit tests

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \
@ -23,5 +23,5 @@ FILES=		PHPUnit.php PHPUnit/GUI/Gtk.php PHPUnit/GUI/HTML.php \
 		PHPUnit/TestResult.php PHPUnit/TestSuite.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-PHPUnit2/Makefile
+++ b/devel/pear-PHPUnit2/Makefile
@ -90,5 +90,5 @@ post-patch:
 RUN_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-PHPUnit3/Makefile
+++ b/devel/pear-PHPUnit3/Makefile
@ -90,5 +90,5 @@ post-patch:
 RUN_DEPENDS+=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-PHP_Beautifier/Makefile
+++ b/devel/pear-PHP_Beautifier/Makefile
@ -63,5 +63,5 @@ post-patch:
 . endfor

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-PHP_Compat/Makefile
+++ b/devel/pear-PHP_Compat/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Provides missing functionality for older versions of PHP

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	PHP
@ -132,5 +132,5 @@ TESTS=		loadconstant.phpt loadfunction.phpt loadversion.phpt \
 		function/vprintf.phpt function/vsprintf.phpt

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-PHP_CompatInfo/Makefile
+++ b/devel/pear-PHP_CompatInfo/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to find out the minimum version and extensions required

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_PHP=	tokenizer
@ -73,5 +73,5 @@ post-extract:
 RUN_DEPENDS+=	${PEARDIR}/Console/Table.php:${PORTSDIR}/devel/pear-Console_Table
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Pager/Makefile
+++ b/devel/pear-Pager/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR data paging class

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	Pager
@ -27,5 +27,5 @@ TESTS=		all_tests.php pager_include.php pager_jumping_noData_test.php \
 		pager_wrapper_test.php simple_include.php README

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Structures_DataGrid/Makefile
+++ b/devel/pear-Structures_DataGrid/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	nick@foobar.org
 COMMENT=	Simple HTML data structure package

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${PEARDIR}/HTML/Table.php:${PORTSDIR}/devel/pear-HTML_Table \
 		${PEARDIR}/Pager/Pager.php:${PORTSDIR}/devel/pear-Pager \
 		${PEARDIR}/Spreadsheet/Excel/Writer.php:${PORTSDIR}/textproc/pear-Spreadsheet_Excel_Writer \
@ -35,5 +35,5 @@ FILES=		DataGrid.php DataGrid/Core.php DataGrid/Column.php \
 		DataGrid/Record/DataObject.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-System_Command/Makefile
+++ b/devel/pear-System_Command/Makefile
@ -12,12 +12,12 @@ CATEGORIES=	devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR command line execution interface

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	System
 FILES=		Command.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Text_Diff/Makefile
+++ b/devel/pear-Text_Diff/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel pear
 MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	Engine for performing and rendering text diffs

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	Text
@ -32,5 +32,5 @@ EXAMPLES=	1.txt \
 _EXAMPLESDIR=	docs/examples

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-VFS/Makefile
+++ b/devel/pear-VFS/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR Virtual File System API

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR \
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear \
 		${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log
 RUN_DEPENDS=	${BUILD_DEPENDS}

@ -28,5 +28,5 @@ post-patch:
 	@${MV} ${WRKSRC}/scripts/vfs.php ${WRKSRC}/pear-vfs.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-Validate/Makefile
+++ b/devel/pear-Validate/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Validation class

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		Validate.php Validate/Finance.php \
@ -34,7 +34,7 @@ USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 post-patch:
 .for f in ${DATAFILES}
--- a/devel/pear-Var_Dump/Makefile
+++ b/devel/pear-Var_Dump/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Provides methods for dumping structured information about a variable

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		Var_Dump.php Var_Dump/Renderer.php Var_Dump/Renderer/Common.php \
@ -36,5 +36,5 @@ post-extract:
 	${MV} ${WRKSRC}/php/* ${WRKSRC}

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_NITF/Makefile
+++ b/devel/pear-XML_NITF/Makefile
@ -19,5 +19,5 @@ CATEGORY=	XML
 FILES=		NITF.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_Parser/Makefile
+++ b/devel/pear-XML_Parser/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR XML parsing class based on PHP's bundled expat

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	XML
@ -23,5 +23,5 @@ EXAMPLES=	xml_parser_file.php xml_parser_file.xml xml_parser_handler.php \
 		xml_parser_simple2.xml xml_parser_simple_handler.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_RPC/Makefile
+++ b/devel/pear-XML_RPC/Makefile
@ -1,36 +0,0 @@
-# Ports collection makefile for:  pear-XML_RPC
-# Date created:			  4 October 2003
-# Whom:				  Thierry Thomas (<thierry@pompo.net>)
-#
-# $FreeBSD$
-#
-
-PORTNAME=	XML_RPC
-PORTVERSION=	1.4.3
-CATEGORIES=	devel www pear
-
-MAINTAINER=	antonio@php.net
-COMMENT=	PHP implementation of the XML-RPC protocol
-
-USE_PHP=	yes
-WANT_PHP_PEAR=	yes
-
-CATEGORY=	XML
-FILES=		RPC.php RPC/Server.php RPC/Dump.php
-TESTS=		protoport.php test_Dump.php
-
-post-extract:
-	@${MKDIR} ${WRKSRC}/RPC
-	@${MV} ${WRKSRC}/Server.php ${WRKSRC}/Dump.php ${WRKSRC}/RPC
-
-post-patch:
-.for file in ${FILES}
-	@${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/${file}
-.endfor
-.for file in ${TESTS}
-	@${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/tests/${file}
-.endfor
-
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-.include <bsd.port.post.mk>
--- a/devel/pear-XML_RPC/distinfo
+++ b/devel/pear-XML_RPC/distinfo
@ -1,2 +0,0 @@
-MD5 (PEAR/XML_RPC-1.4.3.tgz) = 83138a445e424102db17b3b9588dbfef
-SIZE (PEAR/XML_RPC-1.4.3.tgz) = 27198
--- a/devel/pear-XML_RPC/pkg-descr
+++ b/devel/pear-XML_RPC/pkg-descr
@ -1,5 +0,0 @@
-A PEAR-ified version of Useful Inc's XML-RPC for PHP.
-
-It has support for HTTP/HTTPS transport, proxies and authentication.
-
-WWW: http://pear.php.net/package/XML_RPC/
--- a/devel/pear-XML_RSS/Makefile
+++ b/devel/pear-XML_RSS/Makefile
@ -13,7 +13,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR RSS parser

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree

@ -22,5 +22,5 @@ FILES=		RSS.php
 TESTS=		test.rss 01-parse.phpt

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_SVG/Makefile
+++ b/devel/pear-XML_SVG/Makefile
@ -12,12 +12,12 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR object-oriented API for building SVG documents

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	XML
 FILES=		SVG.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@ -43,5 +43,5 @@ post-extract:
 .endfor

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_Transformer/Makefile
+++ b/devel/pear-XML_Transformer/Makefile
@ -27,5 +27,5 @@ DOCS=		README
 _DOCSDIR=	.

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_Tree/Makefile
+++ b/devel/pear-XML_Tree/Makefile
@ -13,12 +13,12 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class for representing XML data in a tree structure

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	XML
 FILES=		Tree.php Tree/Node.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_Util/Makefile
+++ b/devel/pear-XML_Util/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR XML utility class

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	XML
@ -20,5 +20,5 @@ FILES=		Util.php
 EXAMPLES=	example.php example2.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-XML_XPath/Makefile
+++ b/devel/pear-XML_XPath/Makefile
@ -13,7 +13,7 @@ CATEGORIES=	devel www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class provided an XPath/DOM XML manipulation

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 .if defined(PACKAGE_BUILDING)
@ -26,5 +26,5 @@ EXAMPLES=	XML_XPath_example.php
 _EXAMPLESDIR=	docs

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/devel/pear-apd/Makefile
+++ b/devel/pear-apd/Makefile
@ -13,7 +13,7 @@ CATEGORIES=	devel pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A full-featured engine-level PHP profiler/debugger

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_PHP=	yes
@ -26,7 +26,7 @@ DUMP_DIR?=	/var/tmp/apd
 PORTDOCS=	README

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 .if ${PHP_VER} == 4
 APD_VER=	0.9.2
--- a/devel/php4-pear/Makefile
+++ b/devel/php4-pear/Makefile
@ -1,19 +0,0 @@
-# New ports collection makefile for:	php4-pear
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	devel
-PKGNAMESUFFIX=	-pear
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT=	PEAR framework for PHP
-
-MASTERDIR=	${.CURDIR}/../../lang/php4
-
-PLIST=		${PKGDIR}/pkg-plist.pear
-PKGMESSAGE=	${PKGDIR}/pkg-message.pear
-
-.include "${MASTERDIR}/Makefile"
--- a/devel/php5-pear/Makefile
+++ b/devel/php5-pear/Makefile
@ -1,19 +0,0 @@
-# New ports collection makefile for:	php5-pear
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre <ale@FreeBSD.org>
-#
-# $FreeBSD$
-#
-
-CATEGORIES=	devel
-PKGNAMESUFFIX=	-pear
-
-MAINTAINER=	ale@FreeBSD.org
-COMMENT=	PEAR framework for PHP
-
-MASTERDIR=	${.CURDIR}/../../lang/php5
-
-PLIST=		${PKGDIR}/pkg-plist.pear
-PKGMESSAGE=	${PKGDIR}/pkg-message.pear
-
-.include "${MASTERDIR}/Makefile"
--- a/ftp/pear-Net_FTP/Makefile
+++ b/ftp/pear-Net_FTP/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	ftp www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR OO interface to the PHP FTP functions plus some additions

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_PHP=	ftp
@ -26,5 +26,5 @@ post-extract:
 	@${MV} ${WRKSRC}/Net/* ${WRKSRC}

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/games/pear-Games_Chess/Makefile
+++ b/games/pear-Games_Chess/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	games devel pear
 MAINTAINER=	xaa+ports@timewasters.nl
 COMMENT=	PEAR methods for constructing and validating chess games in PGN

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	Games
@ -27,5 +27,5 @@ EXAMPLES=	HTMLChess.php images/B.gif images/N.gif images/Q.gif \
 		images/dark/q.gif

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/graphics/pear-Image_Barcode/Makefile
+++ b/graphics/pear-Image_Barcode/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	graphics www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for barcode generation

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_PHP=	gd
@ -33,5 +33,5 @@ _EXAMPLESDIR=	docs/examples
 RUN_DEPENDS+=	${PEARDIR}/PHP/Compat.php:${PORTSDIR}/devel/pear-PHP_Compat
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/graphics/pear-Image_Canvas/Makefile
+++ b/graphics/pear-Image_Canvas/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	graphics www pear
 MAINTAINER=	numisemis@yahoo.com
 COMMENT=	An OO PEAR common interface to image drawing

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${PEARDIR}/Image/Color.php:${PORTSDIR}/graphics/pear-Image_Color

 USE_PHP=	gd
@ -38,6 +38,6 @@ post-patch:
 .endfor

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 .include <bsd.port.post.mk>
--- a/graphics/pear-Image_Color/Makefile
+++ b/graphics/pear-Image_Color/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	graphics www pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	PEAR::Image_Color manages and handles color data and conversions

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 USE_PHP=	gd
@ -21,5 +21,5 @@ CATEGORY=	Image
 FILES=		Color.php

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/graphics/pear-Image_Graph/Makefile
+++ b/graphics/pear-Image_Graph/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	graphics www pear
 MAINTAINER=	nick@foobar.org
 COMMENT=	An OO PEAR graph rendering package

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${PEARDIR}/Log.php:${PORTSDIR}/sysutils/pear-Log \
 		${PEARDIR}/Image/Canvas.php:${PORTSDIR}/graphics/pear-Image_Canvas

@ -170,6 +170,6 @@ post-patch:
 .endfor

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 .include <bsd.port.post.mk>
--- a/irc/pear-Net_SmartIRC/Makefile
+++ b/irc/pear-Net_SmartIRC/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	irc www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for communication with IRC networks

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 CATEGORY=	Net
@ -97,5 +97,5 @@ DOCS=		DOCUMENTATION HOWTO HTML/classtrees_Net_SmartIRC.html \
 		HTML/Net_SmartIRC/_SmartIRC-0.5.5_SmartIRC_php.html

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/mail/pear-Contact_Vcard_Build/Makefile
+++ b/mail/pear-Contact_Vcard_Build/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	mail www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to build (create) and fetch vCard 2.1 and 3.0 text blocks

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		Contact_Vcard_Build.php
@ -20,5 +20,5 @@ TESTS=		test.php
 _TESTSDIR=	.

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/mail/pear-Contact_Vcard_Parse/Makefile
+++ b/mail/pear-Contact_Vcard_Parse/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	mail www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to parse vCard 2.1 and 3.0 files

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		Contact_Vcard_Parse.php
@ -20,5 +20,5 @@ TESTS=		test.php test.vcf
 _TESTSDIR=	.

 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/mail/pear-MIME_Type/Makefile
+++ b/mail/pear-MIME_Type/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	mail www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for dealing with MIME types

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 LATEST_LINK=	pear-${PORTNAME}
@ -35,7 +35,7 @@ post-extract:
 RUN_DEPENDS+=	${PEARDIR}/System/Command.php:${PORTSDIR}/devel/pear-System_Command
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"

 post-patch:
 .for file in ${FILES}
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@ -12,7 +12,7 @@ CATEGORIES=	mail www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class that provides multiple interfaces for sending emails

-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}

 FILES=		Mail.php Mail/mail.php Mail/null.php Mail/sendmail.php	\
@ -28,5 +28,5 @@ OPTIONS=	PEAR_NET_SMTP "PEAR::Net_SMTP support" off
 RUN_DEPENDS+=	${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
 .endif

-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
--- a/Show More
+++ b/Show More