Remove pear ports obsolated by devel/pear and switch

dependencies of all the other pear ports. Discussed with: thierry, antonio@php.net
author: ale <ale@FreeBSD.org> 2005-12-09 19:24:52 +0000
committer: ale <ale@FreeBSD.org> 2005-12-09 19:24:52 +0000
commit: 41604a0f0d82280948cab0ad263522cd6969d6f1 (patch)
tree: c92d5ad743f770a008b8555c05f3f1723eb36467
parent: c77ed4f552b975e069cc5960a2a5c8c8c76a6f54 (diff)
download: FreeBSD-ports-41604a0f0d82280948cab0ad263522cd6969d6f1.zip
FreeBSD-ports-41604a0f0d82280948cab0ad263522cd6969d6f1.tar.gz
173 files changed, 253 insertions, 796 deletions
diff --git a/MOVED b/MOVED
index e644db5..f924bf2 100644
--- a/MOVED
+++ b/MOVED
@@ -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
diff --git a/archivers/Makefile b/archivers/Makefile
index 3a331a6..b04e45a 100644
--- 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
diff --git a/archivers/pear-Archive_Tar/Makefile b/archivers/pear-Archive_Tar/Makefile
deleted file mode 100644
index 96a866e..0000000
--- a/archivers/pear-Archive_Tar/Makefile
+++ /dev/null
@@ -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>
diff --git a/archivers/pear-Archive_Tar/distinfo b/archivers/pear-Archive_Tar/distinfo
deleted file mode 100644
index 49cf152..0000000
--- a/archivers/pear-Archive_Tar/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PEAR/Archive_Tar-1.3.1.tgz) = 31e54ce401302065d43888223a0be4d9
-SIZE (PEAR/Archive_Tar-1.3.1.tgz) = 15102
diff --git a/archivers/pear-Archive_Tar/pkg-descr b/archivers/pear-Archive_Tar/pkg-descr
deleted file mode 100644
index ac2a39f..0000000
--- a/archivers/pear-Archive_Tar/pkg-descr
+++ /dev/null
@@ -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/
diff --git a/archivers/pear-File_Archive/Makefile b/archivers/pear-File_Archive/Makefile
index 5c5cfbd..e673358 100644
--- 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>
diff --git a/benchmarks/pear-Benchmark/Makefile b/benchmarks/pear-Benchmark/Makefile
index 98ceea2..f06a02b 100644
--- 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>
diff --git a/chinese/phpbb-tw/Makefile b/chinese/phpbb-tw/Makefile
index ceade54..dbe0485 100644
--- 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]*
 
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index 0653dd2..2ca5238 100644
--- 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}
diff --git a/databases/pear-DBA/Makefile b/databases/pear-DBA/Makefile
index 0d201d0..70c18ca 100644
--- 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>
diff --git a/databases/pear-DB_DataObject/Makefile b/databases/pear-DB_DataObject/Makefile
index 519420c..11a8d35 100644
--- 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>
diff --git a/databases/pear-DB_DataObject_FormBuilder/Makefile b/databases/pear-DB_DataObject_FormBuilder/Makefile
index 8d1852b..614015a 100644
--- 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>
diff --git a/databases/pear-DB_Pager/Makefile b/databases/pear-DB_Pager/Makefile
index ed573b7..7315151 100644
--- 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>
diff --git a/databases/pear-DB_QueryTool/Makefile b/databases/pear-DB_QueryTool/Makefile
index f352e59..7262dfc 100644
--- 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>
diff --git a/databases/pear-DB_Table/Makefile b/databases/pear-DB_Table/Makefile
index ef51c71..60a9ec0 100644
--- 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>
diff --git a/databases/pear-DB_ldap/Makefile b/databases/pear-DB_ldap/Makefile
index f5d97cd..7d67c5b 100644
--- 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>
diff --git a/databases/pear-DB_ldap2/Makefile b/databases/pear-DB_ldap2/Makefile
index f5d97cd..7d67c5b 100644
--- 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>
diff --git a/databases/pear-MDB/Makefile b/databases/pear-MDB/Makefile
index 204c298..407f012 100644
--- 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>
diff --git a/databases/pear-MDB2/Makefile b/databases/pear-MDB2/Makefile
index 3285329..5b79666 100644
--- 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>
diff --git a/databases/pear-MDB_QueryTool/Makefile b/databases/pear-MDB_QueryTool/Makefile
index e0e6fb6..2ee2bbe 100644
--- 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>
diff --git a/devel/Makefile b/devel/Makefile
index cdfdee2..69bfe5c 100644
--- 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
diff --git a/devel/beautifyphp/Makefile b/devel/beautifyphp/Makefile
index 31cec47..7f3fe4e 100644
--- 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
diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index 44e4aeb..30cd8e6 100644
--- 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>
diff --git a/devel/pear-Console_Getargs/Makefile b/devel/pear-Console_Getargs/Makefile
index a0f39fa..b89e3b8 100644
--- 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>
diff --git a/devel/pear-Console_Getopt/Makefile b/devel/pear-Console_Getopt/Makefile
deleted file mode 100644
index a213ba6..0000000
--- a/devel/pear-Console_Getopt/Makefile
+++ /dev/null
@@ -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>
diff --git a/devel/pear-Console_Getopt/distinfo b/devel/pear-Console_Getopt/distinfo
deleted file mode 100644
index 9d078b2..0000000
--- a/devel/pear-Console_Getopt/distinfo
+++ /dev/null
@@ -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
diff --git a/devel/pear-Console_Getopt/pkg-descr b/devel/pear-Console_Getopt/pkg-descr
deleted file mode 100644
index d198ccc..0000000
--- a/devel/pear-Console_Getopt/pkg-descr
+++ /dev/null
@@ -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
diff --git a/devel/pear-Console_Table/Makefile b/devel/pear-Console_Table/Makefile
index 43bba5f..9a9f7e1 100644
--- 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>
diff --git a/devel/pear-Date/Makefile b/devel/pear-Date/Makefile
index bb812d8..1bdea5c 100644
--- 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>
diff --git a/devel/pear-Event_Dispatcher/Makefile b/devel/pear-Event_Dispatcher/Makefile
index 9f0c1c5..d0f0205 100644
--- 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>
diff --git a/devel/pear-FSM/Makefile b/devel/pear-FSM/Makefile
index 346b824..49ad153 100644
--- 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>
diff --git a/devel/pear-HTML_BBCodeParser/Makefile b/devel/pear-HTML_BBCodeParser/Makefile
index 9794a4d..be60010 100644
--- 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>
diff --git a/devel/pear-HTML_CSS/Makefile b/devel/pear-HTML_CSS/Makefile
index 3725b31..c4485b1 100644
--- 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>
diff --git a/devel/pear-HTML_Common/Makefile b/devel/pear-HTML_Common/Makefile
index f42011b..cc3c829 100644
--- 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>
diff --git a/devel/pear-HTML_Form/Makefile b/devel/pear-HTML_Form/Makefile
index d6f76c6..52df200 100644
--- 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" \
diff --git a/devel/pear-HTML_Javascript/Makefile b/devel/pear-HTML_Javascript/Makefile
index 8009e8d..27c8325 100644
--- 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>
diff --git a/devel/pear-HTML_Page2/Makefile b/devel/pear-HTML_Page2/Makefile
index f698855..9ecf84c 100644
--- 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>
diff --git a/devel/pear-HTML_QuickForm/Makefile b/devel/pear-HTML_QuickForm/Makefile
index 8192dfe..541f0f8 100644
--- 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>
diff --git a/devel/pear-HTML_QuickForm2/Makefile b/devel/pear-HTML_QuickForm2/Makefile
index 8192dfe..541f0f8 100644
--- 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>
diff --git a/devel/pear-HTML_QuickForm_Controller/Makefile b/devel/pear-HTML_QuickForm_Controller/Makefile
index a072f8d..eae4e25 100644
--- 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>
diff --git a/devel/pear-HTML_QuickForm_SelectFilter/Makefile b/devel/pear-HTML_QuickForm_SelectFilter/Makefile
index ef4a0f2..17315b9 100644
--- 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>
diff --git a/devel/pear-HTML_QuickForm_advmultiselect/Makefile b/devel/pear-HTML_QuickForm_advmultiselect/Makefile
index 8fc13e1..cba4809 100644
--- 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>
diff --git a/devel/pear-HTML_Select/Makefile b/devel/pear-HTML_Select/Makefile
index edaf57d..6269ab5 100644
--- 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>
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 5f488cf0..5d6299d 100644
--- 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>
diff --git a/devel/pear-HTML_Table/Makefile b/devel/pear-HTML_Table/Makefile
index b369532..23074b8 100644
--- 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>
diff --git a/devel/pear-HTML_Template_Flexy/Makefile b/devel/pear-HTML_Template_Flexy/Makefile
index d506a6a..d1ab09c 100644
--- 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>
diff --git a/devel/pear-HTML_Template_IT/Makefile b/devel/pear-HTML_Template_IT/Makefile
index b1544e9..418f4c3 100644
--- 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>
diff --git a/devel/pear-HTML_Template_PHPLIB/Makefile b/devel/pear-HTML_Template_PHPLIB/Makefile
index b6c526c..6ec2f2b 100644
--- 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>
diff --git a/devel/pear-HTML_Template_Sigma/Makefile b/devel/pear-HTML_Template_Sigma/Makefile
index 1573aa0a..0145c53 100644
--- 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>
diff --git a/devel/pear-HTML_TreeMenu/Makefile b/devel/pear-HTML_TreeMenu/Makefile
index dbd6670..15c5469 100644
--- 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>
diff --git a/devel/pear-I18N/Makefile b/devel/pear-I18N/Makefile
index 35a00ae..e3b9dd2 100644
--- 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>
diff --git a/devel/pear-OLE/Makefile b/devel/pear-OLE/Makefile
index 4d5c776..c452936 100644
--- 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>
diff --git a/devel/pear-PEAR/Makefile b/devel/pear-PEAR/Makefile
deleted file mode 100644
index c6accc6..0000000
--- a/devel/pear-PEAR/Makefile
+++ /dev/null
@@ -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>
diff --git a/devel/pear-PEAR/Makefile.common b/devel/pear-PEAR/Makefile.common
deleted file mode 100644
index 9271f7a..0000000
--- a/devel/pear-PEAR/Makefile.common
+++ /dev/null
@@ -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
diff --git a/devel/pear-PEAR/distinfo b/devel/pear-PEAR/distinfo
deleted file mode 100644
index f6f6473..0000000
--- a/devel/pear-PEAR/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PEAR/PEAR-1.4.4.tgz) = 20c5d38b16b364bbf5395e6890f048e4
-SIZE (PEAR/PEAR-1.4.4.tgz) = 276978
diff --git a/devel/pear-PEAR/files/patch-scripts::pearcmd.php b/devel/pear-PEAR/files/patch-scripts::pearcmd.php
deleted file mode 100644
index 1d0c6d7..0000000
--- a/devel/pear-PEAR/files/patch-scripts::pearcmd.php
+++ /dev/null
@@ -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
diff --git a/devel/pear-PEAR/pkg-deinstall b/devel/pear-PEAR/pkg-deinstall
deleted file mode 100644
index 94de0bf..0000000
--- a/devel/pear-PEAR/pkg-deinstall
+++ /dev/null
@@ -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
diff --git a/devel/pear-PEAR/pkg-descr b/devel/pear-PEAR/pkg-descr
deleted file mode 100644
index bead70c..0000000
--- a/devel/pear-PEAR/pkg-descr
+++ /dev/null
@@ -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/
diff --git a/devel/pear-PEAR/pkg-install b/devel/pear-PEAR/pkg-install
deleted file mode 100644
index a27d7b6..0000000
--- a/devel/pear-PEAR/pkg-install
+++ /dev/null
@@ -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
diff --git a/devel/pear-PEAR_PackageFileManager/Makefile b/devel/pear-PEAR_PackageFileManager/Makefile
index 89885aa..f04c833 100644
--- 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>
diff --git a/devel/pear-PHPDoc/Makefile b/devel/pear-PHPDoc/Makefile
index 79beebe..f517abc 100644
--- 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}," \
diff --git a/devel/pear-PHPUnit/Makefile b/devel/pear-PHPUnit/Makefile
index bfd91e4..b8b78a2 100644
--- 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>
diff --git a/devel/pear-PHPUnit2/Makefile b/devel/pear-PHPUnit2/Makefile
index e659500..664b958 100644
--- 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>
diff --git a/devel/pear-PHPUnit3/Makefile b/devel/pear-PHPUnit3/Makefile
index e659500..664b958 100644
--- 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>
diff --git a/devel/pear-PHP_Beautifier/Makefile b/devel/pear-PHP_Beautifier/Makefile
index 806cde6..229bf66 100644
--- 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>
diff --git a/devel/pear-PHP_Compat/Makefile b/devel/pear-PHP_Compat/Makefile
index f6bb393..b0b4dd6 100644
--- 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>
diff --git a/devel/pear-PHP_CompatInfo/Makefile b/devel/pear-PHP_CompatInfo/Makefile
index 5c98a88..c303330 100644
--- 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>
diff --git a/devel/pear-Pager/Makefile b/devel/pear-Pager/Makefile
index 9ed8880..71dcaf1 100644
--- 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>
diff --git a/devel/pear-Structures_DataGrid/Makefile b/devel/pear-Structures_DataGrid/Makefile
index f487305..e4649fb 100644
--- 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>
diff --git a/devel/pear-System_Command/Makefile b/devel/pear-System_Command/Makefile
index e031662..dc2ca1a 100644
--- 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>
diff --git a/devel/pear-Text_Diff/Makefile b/devel/pear-Text_Diff/Makefile
index 47c5da0..9928c23 100644
--- 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>
diff --git a/devel/pear-VFS/Makefile b/devel/pear-VFS/Makefile
index 14e6998..a2a2ec7 100644
--- 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>
diff --git a/devel/pear-Validate/Makefile b/devel/pear-Validate/Makefile
index 5aad169..89f16b4 100644
--- 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}
diff --git a/devel/pear-Var_Dump/Makefile b/devel/pear-Var_Dump/Makefile
index 4384024..0d088a9 100644
--- 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>
diff --git a/devel/pear-XML_NITF/Makefile b/devel/pear-XML_NITF/Makefile
index 0f16616..37b28e1 100644
--- 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>
diff --git a/devel/pear-XML_Parser/Makefile b/devel/pear-XML_Parser/Makefile
index f972c58..6806574 100644
--- 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>
diff --git a/devel/pear-XML_RPC/Makefile b/devel/pear-XML_RPC/Makefile
deleted file mode 100644
index 8568186..0000000
--- a/devel/pear-XML_RPC/Makefile
+++ /dev/null
@@ -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>
diff --git a/devel/pear-XML_RPC/distinfo b/devel/pear-XML_RPC/distinfo
deleted file mode 100644
index 406b37c..0000000
--- a/devel/pear-XML_RPC/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (PEAR/XML_RPC-1.4.3.tgz) = 83138a445e424102db17b3b9588dbfef
-SIZE (PEAR/XML_RPC-1.4.3.tgz) = 27198
diff --git a/devel/pear-XML_RPC/pkg-descr b/devel/pear-XML_RPC/pkg-descr
deleted file mode 100644
index 2df4a18..0000000
--- a/devel/pear-XML_RPC/pkg-descr
+++ /dev/null
@@ -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/
diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile
index 590f56b..ca186fb 100644
--- 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>
diff --git a/devel/pear-XML_SVG/Makefile b/devel/pear-XML_SVG/Makefile
index 59d887b..9cb7b4b 100644
--- 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>
diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 66e3b92..770c3f6 100644
--- 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>
diff --git a/devel/pear-XML_Transformer/Makefile b/devel/pear-XML_Transformer/Makefile
index cee195d..8b27e80 100644
--- 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>
diff --git a/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile
index c6d5955..b7c2396 100644
--- 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>
diff --git a/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile
index d7e9da0..199aa21 100644
--- 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>
diff --git a/devel/pear-XML_XPath/Makefile b/devel/pear-XML_XPath/Makefile
index e6ddbe4..66d6cea 100644
--- 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>
diff --git a/devel/pear-apd/Makefile b/devel/pear-apd/Makefile
index 9795ed7..ae8fad4 100644
--- 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
diff --git a/devel/php4-pear/Makefile b/devel/php4-pear/Makefile
deleted file mode 100644
index b40f000..0000000
--- a/devel/php4-pear/Makefile
+++ /dev/null
@@ -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"
diff --git a/devel/php5-pear/Makefile b/devel/php5-pear/Makefile
deleted file mode 100644
index 7fa0140..0000000
--- a/devel/php5-pear/Makefile
+++ /dev/null
@@ -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"
diff --git a/ftp/pear-Net_FTP/Makefile b/ftp/pear-Net_FTP/Makefile
index bd892e2..03a3ffb 100644
--- 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>
diff --git a/games/pear-Games_Chess/Makefile b/games/pear-Games_Chess/Makefile
index 319ce1a..5fe6ec4 100644
--- 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>
diff --git a/graphics/pear-Image_Barcode/Makefile b/graphics/pear-Image_Barcode/Makefile
index 5ab4cb6..0383dfe 100644
--- 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>
diff --git a/graphics/pear-Image_Canvas/Makefile b/graphics/pear-Image_Canvas/Makefile
index 18f0daf..e93d8ed 100644
--- 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>
diff --git a/graphics/pear-Image_Color/Makefile b/graphics/pear-Image_Color/Makefile
index d83e4b6..c0dff74 100644
--- 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>
diff --git a/graphics/pear-Image_Graph/Makefile b/graphics/pear-Image_Graph/Makefile
index a49d6f8..e7ee40f 100644
--- 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>
diff --git a/irc/pear-Net_SmartIRC/Makefile b/irc/pear-Net_SmartIRC/Makefile
index ae9d033..b35bc29 100644
--- 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>
diff --git a/mail/pear-Contact_Vcard_Build/Makefile b/mail/pear-Contact_Vcard_Build/Makefile
index 8c87ea6..d3ecaf0 100644
--- 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>
diff --git a/mail/pear-Contact_Vcard_Parse/Makefile b/mail/pear-Contact_Vcard_Parse/Makefile
index 64db500..c0c7b18 100644
--- 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>
diff --git a/mail/pear-MIME_Type/Makefile b/mail/pear-MIME_Type/Makefile
index 87c79a6..bd2d818 100644
--- 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}
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 7b85f046..458e413 100644
--- 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>
diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
index 3b3903e..92d17ca 100644
--- a/mail/pear-Mail_Mime/Makefile
+++ b/mail/pear-Mail_Mime/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	mail www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR classes to create and decode MIME messages
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Mail
@@ -21,5 +21,5 @@ DATA=		xmail.dtd xmail.xsl
 _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>
diff --git a/mail/pear-Mail_Queue/Makefile b/mail/pear-Mail_Queue/Makefile
index 5b44971..a4b5eaf 100644
--- a/mail/pear-Mail_Queue/Makefile
+++ b/mail/pear-Mail_Queue/Makefile
@@ -23,5 +23,5 @@ DOCS=		add_example.php base.php mdb_mail_queue_schema.xml \
 		mysql.sql pgsql.sql send_example.php TODO 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>
diff --git a/mail/pear-Net_Cyrus/Makefile b/mail/pear-Net_Cyrus/Makefile
index 5b9adfa..76caaa2 100644
--- a/mail/pear-Net_Cyrus/Makefile
+++ b/mail/pear-Net_Cyrus/Makefile
@@ -20,5 +20,5 @@ CATEGORY=	Net
 FILES=		Cyrus.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>
diff --git a/mail/pear-Net_IMAP/Makefile b/mail/pear-Net_IMAP/Makefile
index 7f83d05..2acc7e9 100644
--- a/mail/pear-Net_IMAP/Makefile
+++ b/mail/pear-Net_IMAP/Makefile
@@ -19,5 +19,5 @@ CATEGORY=	Net
 FILES=		IMAP.php IMAPProtocol.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>
diff --git a/mail/pear-Net_LMTP/Makefile b/mail/pear-Net_LMTP/Makefile
index 21b3acc..698246f 100644
--- a/mail/pear-Net_LMTP/Makefile
+++ b/mail/pear-Net_LMTP/Makefile
@@ -21,5 +21,5 @@ TESTS=		test_lmtp.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>
diff --git a/math/pear-Structures_Graph/Makefile b/math/pear-Structures_Graph/Makefile
index ca84caf..fd4d864 100644
--- a/math/pear-Structures_Graph/Makefile
+++ b/math/pear-Structures_Graph/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	math devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR graph datastructure manipulation library
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Structures
@@ -25,5 +25,5 @@ post-extract:
 	@${MV} ${WRKSRC}/Structures/* ${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>
diff --git a/misc/pear-Services_Weather/Makefile b/misc/pear-Services_Weather/Makefile
index 42868d1..04d0416 100644
--- a/misc/pear-Services_Weather/Makefile
+++ b/misc/pear-Services_Weather/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR interface to various online weather-services
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 .if !defined (WITHOUT_CACHE)
@@ -40,5 +40,5 @@ EXAMPLES=	globalweather-basic.php ejse-basic.php metar-basic.php		\
 		weather.com-extensive.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>
diff --git a/misc/pear-Text_Figlet/Makefile b/misc/pear-Text_Figlet/Makefile
index 1651b4e..e433c08 100644
--- a/misc/pear-Text_Figlet/Makefile
+++ b/misc/pear-Text_Figlet/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	misc www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Render text using FIGlet fonts
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Text
@@ -23,5 +23,5 @@ EXAMPLES=	figlet.php 3-d.flf alligator2.flf bell.flf block.flf contessa.flf \
 _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>
diff --git a/net/pear-Auth_RADIUS/Makefile b/net/pear-Auth_RADIUS/Makefile
index 8f22588..c917897 100644
--- a/net/pear-Auth_RADIUS/Makefile
+++ b/net/pear-Auth_RADIUS/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net security pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR wrapper classes for the RADIUS PECL
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	radius
@@ -22,5 +22,5 @@ FILES=		RADIUS.php
 EXAMPLES=	radius-acct.php radius-auth.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>
diff --git a/net/pear-Net_CheckIP/Makefile b/net/pear-Net_CheckIP/Makefile
index 0878dd2..6b121f8 100644
--- a/net/pear-Net_CheckIP/Makefile
+++ b/net/pear-Net_CheckIP/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Check the syntax of IPv4 addresses
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		CheckIP.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>
diff --git a/net/pear-Net_DIME/Makefile b/net/pear-Net_DIME/Makefile
index c2bccc0..1bc5fd8 100644
--- a/net/pear-Net_DIME/Makefile
+++ b/net/pear-Net_DIME/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	The PEAR::Net_DIME class implements DIME encoding
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -21,5 +21,5 @@ TESTS=		dime_message_test.php dime_record_test.php
 _TESTSDIR=	test
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_DNSBL/Makefile b/net/pear-Net_DNSBL/Makefile
index 21c8e19..d643fda 100644
--- a/net/pear-Net_DNSBL/Makefile
+++ b/net/pear-Net_DNSBL/Makefile
@@ -31,5 +31,5 @@ PHP_VERS=	${PHP_VERSION:S/.//g}
 IGNORE=		"You need PHP 4.3.6 or later to install PEAR::Net_DNSBL"
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Dict/Makefile b/net/pear-Net_Dict/Makefile
index 80b778f..8f73b7f 100644
--- a/net/pear-Net_Dict/Makefile
+++ b/net/pear-Net_Dict/Makefile
@@ -22,5 +22,5 @@ FILES=		Dict.php
 DOCS=		dict.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>
diff --git a/net/pear-Net_Finger/Makefile b/net/pear-Net_Finger/Makefile
index 2e88a47..aeec13c 100644
--- a/net/pear-Net_Finger/Makefile
+++ b/net/pear-Net_Finger/Makefile
@@ -19,5 +19,5 @@ CATEGORY=	Net
 FILES=		Finger.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>
diff --git a/net/pear-Net_IPv6/Makefile b/net/pear-Net_IPv6/Makefile
index ef1106e..67503bc 100644
--- a/net/pear-Net_IPv6/Makefile
+++ b/net/pear-Net_IPv6/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Check and validate IPv6 addresses
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		IPv6.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>
diff --git a/net/pear-Net_Ident/Makefile b/net/pear-Net_Ident/Makefile
index debb4fb..4b9c1ee 100644
--- a/net/pear-Net_Ident/Makefile
+++ b/net/pear-Net_Ident/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR identification protocol implementation
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		Ident.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>
diff --git a/net/pear-Net_LDAP/Makefile b/net/pear-Net_LDAP/Makefile
index 377b067..6814d6c 100644
--- a/net/pear-Net_LDAP/Makefile
+++ b/net/pear-Net_LDAP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	OO interface for searching and manipulating LDAP-entries
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	ldap
@@ -25,5 +25,5 @@ _DOCSDIR=	./doc
 TESTS=		tests.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>
diff --git a/net/pear-Net_LDAP2/Makefile b/net/pear-Net_LDAP2/Makefile
index 377b067..6814d6c 100644
--- a/net/pear-Net_LDAP2/Makefile
+++ b/net/pear-Net_LDAP2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	OO interface for searching and manipulating LDAP-entries
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	ldap
@@ -25,5 +25,5 @@ _DOCSDIR=	./doc
 TESTS=		tests.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>
diff --git a/net/pear-Net_NNTP/Makefile b/net/pear-Net_NNTP/Makefile
index 96c3449..f9e69c3 100644
--- a/net/pear-Net_NNTP/Makefile
+++ b/net/pear-Net_NNTP/Makefile
@@ -22,5 +22,5 @@ EXAMPLES=	index.php group.php read.php
 _EXAMPLESDIR=	docs/examples/news.php.net
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_POP3/Makefile b/net/pear-Net_POP3/Makefile
index 4b3ca1cf..c2d2de6 100644
--- a/net/pear-Net_POP3/Makefile
+++ b/net/pear-Net_POP3/Makefile
@@ -21,5 +21,5 @@ TESTS=		Net_POP3_example.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>
diff --git a/net/pear-Net_Ping/Makefile b/net/pear-Net_Ping/Makefile
index 416f656..d709ce9 100644
--- a/net/pear-Net_Ping/Makefile
+++ b/net/pear-Net_Ping/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to execute ping
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -22,5 +22,5 @@ EXAMPLES=	example.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>
diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile
index 9c0f19b..027087c 100644
--- a/net/pear-Net_SMTP/Makefile
+++ b/net/pear-Net_SMTP/Makefile
@@ -32,5 +32,5 @@ OPTIONS=	PEAR_AUTH_SASL "PEAR::Auth_SASL support" off
 BUILD_DEPENDS+=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Server/Makefile b/net/pear-Net_Server/Makefile
index 2d7f88d..86c419e 100644
--- a/net/pear-Net_Server/Makefile
+++ b/net/pear-Net_Server/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net pear
 MAINTAINER=	tux@pinguru.net
 COMMENT=	Generic server class
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	sockets pcntl
@@ -24,5 +24,5 @@ DOCS=		todo.txt
 EXAMPLES=	talkback.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>
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index c14f13c..6d4b744 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -21,5 +21,5 @@ TESTS=		test_sieve.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>
diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile
index 06380a8..2ed0639 100644
--- a/net/pear-Net_Socket/Makefile
+++ b/net/pear-Net_Socket/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR Network Socket Interface
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
 FILES=		Socket.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>
diff --git a/net/pear-Net_URL/Makefile b/net/pear-Net_URL/Makefile
index 2e89531..e27a27b 100644
--- a/net/pear-Net_URL/Makefile
+++ b/net/pear-Net_URL/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy parsing of URLs
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -21,5 +21,5 @@ EXAMPLES=	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>
diff --git a/net/pear-Net_URL2/Makefile b/net/pear-Net_URL2/Makefile
index 2e89531..e27a27b 100644
--- a/net/pear-Net_URL2/Makefile
+++ b/net/pear-Net_URL2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Easy parsing of URLs
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net
@@ -21,5 +21,5 @@ EXAMPLES=	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>
diff --git a/net/pear-Net_UserAgent_Detect/Makefile b/net/pear-Net_UserAgent_Detect/Makefile
index 05d263d..f45dd9c 100644
--- a/net/pear-Net_UserAgent_Detect/Makefile
+++ b/net/pear-Net_UserAgent_Detect/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class that detects web browser, version and platform
 
-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:
 		${WRKSRC}/tests/${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>
diff --git a/net/pear-Net_UserAgent_Mobile/Makefile b/net/pear-Net_UserAgent_Mobile/Makefile
index 7359a9c7..7efb28c 100644
--- a/net/pear-Net_UserAgent_Mobile/Makefile
+++ b/net/pear-Net_UserAgent_Mobile/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	smatsui@karashi.org
 COMMENT=	PEAR class that parses HTTP mobile user agent string
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Net/UserAgent
@@ -26,5 +26,5 @@ TESTS=		00-compile.phpt 01-request.phpt 02-docomo.phpt \
 		09-fallback-on-nomatch.phpt DoCoMoMap.xml
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/net/pear-SOAP/Makefile b/net/pear-SOAP/Makefile
index 40eb5fe..59ffb45 100644
--- a/net/pear-SOAP/Makefile
+++ b/net/pear-SOAP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	net www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR SOAP Client/Server for PHP
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	SOAP
@@ -33,5 +33,5 @@ EXAMPLES=	attachment.php client.php com_client.php \
 _EXAMPLESDIR=	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>
diff --git a/security/pear-Auth/Makefile b/security/pear-Auth/Makefile
index c2cf5db..3cce29f 100644
--- a/security/pear-Auth/Makefile
+++ b/security/pear-Auth/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	security pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for creating an authentication system
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-Auth
@@ -68,5 +68,5 @@ RUN_DEPENDS+=	${PEARDIR}/Auth/RADIUS.php:${PORTSDIR}/net/pear-Auth_RADIUS
 RUN_DEPENDS+=	${PEARDIR}/File/SMBPasswd.php:${PORTSDIR}/security/pear-File_SMBPasswd
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/security/pear-Auth_HTTP/Makefile b/security/pear-Auth_HTTP/Makefile
index 9c78c38..06db6a5 100644
--- a/security/pear-Auth_HTTP/Makefile
+++ b/security/pear-Auth_HTTP/Makefile
@@ -24,5 +24,5 @@ post-extract:
 	@${MV} ${WRKSRC}/Auth_HTTP.php ${WRKSRC}/${FILES}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/security/pear-Auth_PrefManager/Makefile b/security/pear-Auth_PrefManager/Makefile
index 32166c2..7bd7dbd 100644
--- a/security/pear-Auth_PrefManager/Makefile
+++ b/security/pear-Auth_PrefManager/Makefile
@@ -20,5 +20,5 @@ FILES=		PrefManager.php
 DOCS=		PM_Example.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>
diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile
index aa0de75..3c61fcd 100644
--- a/security/pear-Auth_SASL/Makefile
+++ b/security/pear-Auth_SASL/Makefile
@@ -21,5 +21,5 @@ FILES=		SASL.php SASL/Anonymous.php SASL/Common.php SASL/CramMD5.php \
 		SASL/DigestMD5.php SASL/Login.php SASL/Plain.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>
diff --git a/security/pear-Crypt_Blowfish/Makefile b/security/pear-Crypt_Blowfish/Makefile
index 59b3edc..584f822 100644
--- a/security/pear-Crypt_Blowfish/Makefile
+++ b/security/pear-Crypt_Blowfish/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for blowfish encryption
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Crypt
@@ -25,5 +25,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>
diff --git a/security/pear-Crypt_CBC/Makefile b/security/pear-Crypt_CBC/Makefile
index ad07238..bb74a32 100644
--- a/security/pear-Crypt_CBC/Makefile
+++ b/security/pear-Crypt_CBC/Makefile
@@ -13,12 +13,12 @@ CATEGORIES=	security www pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR class to emulate Perl's Crypt::CBC module
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Crypt
 FILES=		CBC.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>
diff --git a/security/pear-Crypt_CHAP/Makefile b/security/pear-Crypt_CHAP/Makefile
index 30264d2..9147633 100644
--- a/security/pear-Crypt_CHAP/Makefile
+++ b/security/pear-Crypt_CHAP/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for generating CHAP packets
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	mcrypt mhash
@@ -22,5 +22,5 @@ FILES=		CHAP.php
 TESTS=		chaptest.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>
diff --git a/security/pear-Crypt_HMAC/Makefile b/security/pear-Crypt_HMAC/Makefile
index c4f1735..c89fcf7 100644
--- a/security/pear-Crypt_HMAC/Makefile
+++ b/security/pear-Crypt_HMAC/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to calculate RFC 2104 compliant hashes
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Crypt
@@ -20,5 +20,5 @@ FILES=		HMAC.php
 TESTS=		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>
diff --git a/security/pear-Crypt_RC4/Makefile b/security/pear-Crypt_RC4/Makefile
index 778f8cc..b02da02 100644
--- a/security/pear-Crypt_RC4/Makefile
+++ b/security/pear-Crypt_RC4/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	security www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR encryption class for RC4 encryption
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Crypt
 FILES=		Rc4.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>
diff --git a/security/pear-Crypt_RSA/Makefile b/security/pear-Crypt_RSA/Makefile
index 88f5c24..2001cc1 100644
--- a/security/pear-Crypt_RSA/Makefile
+++ b/security/pear-Crypt_RSA/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class allows you to use two-key strong cryptography
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 OPTIONS=	BCMATH "PHP BCMath extension support" off \
@@ -45,5 +45,5 @@ post-extract:
 	@${MV} ${WRKSRC}/LICENSE ${WRKSRC}/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>
diff --git a/security/pear-File_HtAccess/Makefile b/security/pear-File_HtAccess/Makefile
index 6561622..a92c231 100644
--- a/security/pear-File_HtAccess/Makefile
+++ b/security/pear-File_HtAccess/Makefile
@@ -12,12 +12,12 @@ CATEGORIES=	security www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to manipulate .htaccess files
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	File
 FILES=		HtAccess.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>
diff --git a/security/pear-File_Passwd/Makefile b/security/pear-File_Passwd/Makefile
index 68b5cf5..1364e87 100644
--- a/security/pear-File_Passwd/Makefile
+++ b/security/pear-File_Passwd/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	security pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to manipulate many kinds of password files
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 LATEST_LINK=	pear-File_Passwd
@@ -34,5 +34,5 @@ TESTS=		testsuite.php test_file_passwd.php test_common.php test_unix.php \
 RUN_DEPENDS+=	${PEARDIR}/Crypt/CHAP.php:${PORTSDIR}/security/pear-Crypt_CHAP
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/security/pear-File_SMBPasswd/Makefile b/security/pear-File_SMBPasswd/Makefile
index 399a52e..1070ee5 100644
--- a/security/pear-File_SMBPasswd/Makefile
+++ b/security/pear-File_SMBPasswd/Makefile
@@ -22,5 +22,5 @@ FILES=		SMBPasswd.php
 EXAMPLES=	smbpasswd.php smbpasswd
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/security/pear-LiveUser/Makefile b/security/pear-LiveUser/Makefile
index d5f32c3..aab2237 100644
--- a/security/pear-LiveUser/Makefile
+++ b/security/pear-LiveUser/Makefile
@@ -73,5 +73,5 @@ RUN_DEPENDS+=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
 RUN_DEPENDS+=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/security/pear-LiveUser_Admin/Makefile b/security/pear-LiveUser_Admin/Makefile
index f5a90cc..e0e5fc3 100644
--- a/security/pear-LiveUser_Admin/Makefile
+++ b/security/pear-LiveUser_Admin/Makefile
@@ -70,5 +70,5 @@ RUN_DEPENDS+=	${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
 RUN_DEPENDS+=	${PEARDIR}/Crypt/Rc4.php:${PORTSDIR}/security/pear-Crypt_RC4
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/security/pear-Text_Password/Makefile b/security/pear-Text_Password/Makefile
index 2d8c676..75e7b54 100644
--- a/security/pear-Text_Password/Makefile
+++ b/security/pear-Text_Password/Makefile
@@ -22,5 +22,5 @@ TESTS=		01-text-password.phpt
 WRKSRC=		${WRKDIR}/Text_Password-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-Cache/Makefile b/sysutils/pear-Cache/Makefile
index 94dd80b..22546f4 100644
--- a/sysutils/pear-Cache/Makefile
+++ b/sysutils/pear-Cache/Makefile
@@ -24,5 +24,5 @@ FILES=		Application.php Cache.php Container.php Container/db.php	\
 		OutputCompression.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>
diff --git a/sysutils/pear-Cache_Lite/Makefile b/sysutils/pear-Cache_Lite/Makefile
index f93435b..0577bd8 100644
--- a/sysutils/pear-Cache_Lite/Makefile
+++ b/sysutils/pear-Cache_Lite/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	sysutils www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR fast and safe little cache system
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Cache
@@ -23,5 +23,5 @@ TESTS=		test.php test2.php test3.php bench.php bench2.php bench3.php 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>
diff --git a/sysutils/pear-File/Makefile b/sysutils/pear-File/Makefile
index 90175b8..6d5836f 100644
--- a/sysutils/pear-File/Makefile
+++ b/sysutils/pear-File/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	sysutils www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR common file and directory routines
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 FILES=		File.php File/Util.php File/CSV.php
@@ -22,5 +22,5 @@ TESTS=		parser.php test.csv FileTest.php CSV/001.phpt CSV/001.csv \
 		CSV/004.csv CSV/005.phpt CSV/005.csv CSV/tests.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>
diff --git a/sysutils/pear-File_Find/Makefile b/sysutils/pear-File_Find/Makefile
index 8143b1a..3d7f742 100644
--- a/sysutils/pear-File_Find/Makefile
+++ b/sysutils/pear-File_Find/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class that facillitates the search of filesystems
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	File
@@ -21,5 +21,5 @@ TESTS=		setup.php 01glob.phpt 02maptree.phpt 03maptreemultiple.phpt \
 		04search.phpt 05search_inside.phpt bug2773.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>
diff --git a/sysutils/pear-File_Fstab/Makefile b/sysutils/pear-File_Fstab/Makefile
index 27b739e..4fcc0f3 100644
--- a/sysutils/pear-File_Fstab/Makefile
+++ b/sysutils/pear-File_Fstab/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class to read and write fstab files
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	File
@@ -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>
diff --git a/sysutils/pear-File_Gettext/Makefile b/sysutils/pear-File_Gettext/Makefile
index 6f1e24b..5c67796 100644
--- a/sysutils/pear-File_Gettext/Makefile
+++ b/sysutils/pear-File_Gettext/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR GNU Gettext file parser
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	yes
@@ -28,5 +28,5 @@ PHP_VERS=	${PHP_VERSION:S/.//g}
 IGNORE=		"You need PHP 4.1.0 or later to install PEAR::File_Gettext"
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-I18Nv2/Makefile b/sysutils/pear-I18Nv2/Makefile
index 7116fd1..2054340 100644
--- a/sysutils/pear-I18Nv2/Makefile
+++ b/sysutils/pear-I18Nv2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR Internationalization
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	iconv
@@ -150,5 +150,5 @@ PHP_VERS=	${PHP_VERSION:S/.//g}
 #IGNORE=		"You need PHP 4.0.6 or later to install PEAR::I18Nv2"
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index a5f0d9a0..8fecc3e 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	sysutils www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR logging utilities
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	yes
@@ -56,5 +56,5 @@ BUILD_DEPENDS+=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 BUILD_DEPENDS+=	${LOCALBASE}/lib/php/${PHP_EXT_DIR}/${extension}.so:${PORTSDIR}/databases/php5-sqlite
 .endif
 
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-Translation2/Makefile b/sysutils/pear-Translation2/Makefile
index 86ffb4c..9c140f5 100644
--- a/sysutils/pear-Translation2/Makefile
+++ b/sysutils/pear-Translation2/Makefile
@@ -13,7 +13,7 @@ CATEGORIES=	sysutils devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR class for multilingual applications management
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_PHP=	yes
@@ -98,5 +98,5 @@ RUN_DEPENDS+=	${PEARDIR}/XML/Serializer.php:${PORTSDIR}/devel/pear-XML_Serialize
 .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>
diff --git a/textproc/pear-Numbers_Roman/Makefile b/textproc/pear-Numbers_Roman/Makefile
index 3067889..0d3122f 100644
--- a/textproc/pear-Numbers_Roman/Makefile
+++ b/textproc/pear-Numbers_Roman/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	textproc devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR methods for converting to and from Roman Numerals
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Numbers
@@ -21,5 +21,5 @@ EXAMPLES=	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>
diff --git a/textproc/pear-Numbers_Words/Makefile b/textproc/pear-Numbers_Words/Makefile
index 1adfc01..698c8e5 100644
--- a/textproc/pear-Numbers_Words/Makefile
+++ b/textproc/pear-Numbers_Words/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	textproc pear
 MAINTAINER=	meritus@innervision.pl
 COMMENT=	PEAR package provides methods for spelling numerals in words
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 FILES=		Words.php Words/lang.bg.php Words/lang.cs.php \
@@ -26,5 +26,5 @@ FILES=		Words.php Words/lang.bg.php Words/lang.cs.php \
 TESTS=		test-numbers-words.php clitest.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>
diff --git a/textproc/pear-Spreadsheet_Excel_Writer/Makefile b/textproc/pear-Spreadsheet_Excel_Writer/Makefile
index 25bb0c4..bfd9ab8 100644
--- a/textproc/pear-Spreadsheet_Excel_Writer/Makefile
+++ b/textproc/pear-Spreadsheet_Excel_Writer/Makefile
@@ -13,7 +13,7 @@ MAINTAINER=	pav@FreeBSD.org
 COMMENT=	PEAR class for writing Microsoft Excel files
 
 BUILD_DEPENDS=	${PEARDIR}/OLE/OLE.php:${PORTSDIR}/devel/pear-OLE \
-		${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+		${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	Spreadsheet/Excel
@@ -21,5 +21,5 @@ FILES=		Writer.php Writer/BIFFwriter.php Writer/Format.php Writer/Parser.php \
 		Writer/Validator.php Writer/Workbook.php Writer/Worksheet.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>
diff --git a/textproc/pear-XML_Beautifier/Makefile b/textproc/pear-XML_Beautifier/Makefile
index d28413d..f025e7f 100644
--- a/textproc/pear-XML_Beautifier/Makefile
+++ b/textproc/pear-XML_Beautifier/Makefile
@@ -23,5 +23,5 @@ EXAMPLES=	example1.php example2.php example3.php example4.php example5.php \
 		example6.php test.xml
 
 .include <bsd.port.pre.mk>
-.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
+.include "${PORTSDIR}/devel/pear/bsd.pear.mk"
 .include <bsd.port.post.mk>
diff --git a/textproc/pear-XML_HTMLSax/Makefile b/textproc/pear-XML_HTMLSax/Makefile
index 9af9d06..e4897de 100644
--- a/textproc/pear-XML_HTMLSax/Makefile
+++ b/textproc/pear-XML_HTMLSax/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	textproc devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR SAX parser for HTML and other badly formed XML documents
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	XML
@@ -25,5 +25,5 @@ _EXAMPLESDIR=	docs/examples
 _TESTSDIR=	docs/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>
diff --git a/textproc/pear-XML_Wddx/Makefile b/textproc/pear-XML_Wddx/Makefile
index 831982c..45735853a 100644
--- a/textproc/pear-XML_Wddx/Makefile
+++ b/textproc/pear-XML_Wddx/Makefile
@@ -19,5 +19,5 @@ CATEGORY=	XML
 FILES=		Wddx.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>
diff --git a/www/pear-HTTP/Makefile b/www/pear-HTTP/Makefile
index cafcf5b..d576a2a 100644
--- a/www/pear-HTTP/Makefile
+++ b/www/pear-HTTP/Makefile
@@ -12,11 +12,11 @@ CATEGORIES=	www devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	PEAR miscellaneous HTTP utilities
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 FILES=		HTTP.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>
diff --git a/www/pear-HTTP_Client/Makefile b/www/pear-HTTP_Client/Makefile
index 5d4f019..c82663a 100644
--- a/www/pear-HTTP_Client/Makefile
+++ b/www/pear-HTTP_Client/Makefile
@@ -22,5 +22,5 @@ EXAMPLES=		link-checker.php
 _EXAMPLESDIR=	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>
diff --git a/www/pear-HTTP_Download/Makefile b/www/pear-HTTP_Download/Makefile
index 05971a5..d3d32f8 100644
--- a/www/pear-HTTP_Download/Makefile
+++ b/www/pear-HTTP_Download/Makefile
@@ -20,5 +20,5 @@ FILES=		Download.php Download/PgLOB.php Download/Archive.php
 TESTS=		send.php testcase.php data.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>
diff --git a/www/pear-HTTP_Header/Makefile b/www/pear-HTTP_Header/Makefile
index 292034a..2cd1c50 100644
--- a/www/pear-HTTP_Header/Makefile
+++ b/www/pear-HTTP_Header/Makefile
@@ -20,5 +20,5 @@ FILES=		Header.php Header/Cache.php
 TESTS=		README.txt cacheresponse.php header.php header_cache.php response.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>
diff --git a/www/pear-HTTP_Request/Makefile b/www/pear-HTTP_Request/Makefile
index 288b0ff..347c609 100644
--- a/www/pear-HTTP_Request/Makefile
+++ b/www/pear-HTTP_Request/Makefile
@@ -22,5 +22,5 @@ EXAMPLES=	download-progress.php 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>
diff --git a/www/pear-HTTP_Server/Makefile b/www/pear-HTTP_Server/Makefile
index 396ed44..69a2233 100644
--- a/www/pear-HTTP_Server/Makefile
+++ b/www/pear-HTTP_Server/Makefile
@@ -21,5 +21,5 @@ FILES=		Server.php Server/Request.php
 EXAMPLES=	HTTP_Server_File.php www/index.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>
diff --git a/www/pear-HTTP_Session/Makefile b/www/pear-HTTP_Session/Makefile
index 6145ca9..4e6f50d 100644
--- a/www/pear-HTTP_Session/Makefile
+++ b/www/pear-HTTP_Session/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www devel pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR Object-oriented interface to the session_* family functions
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 FILES=		Session.php Session/Container.php Session/Container/DB.php
@@ -20,5 +20,5 @@ EXAMPLES=	HTTP_Session_Example.php sessiondata.sql
 _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>
diff --git a/www/pear-HTTP_Session2/Makefile b/www/pear-HTTP_Session2/Makefile
index 6145ca9..4e6f50d 100644
--- a/www/pear-HTTP_Session2/Makefile
+++ b/www/pear-HTTP_Session2/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www devel pear
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PEAR Object-oriented interface to the session_* family functions
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 FILES=		Session.php Session/Container.php Session/Container/DB.php
@@ -20,5 +20,5 @@ EXAMPLES=	HTTP_Session_Example.php sessiondata.sql
 _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>
diff --git a/www/pear-HTTP_Upload/Makefile b/www/pear-HTTP_Upload/Makefile
index edb5c36..d4a4a37 100644
--- a/www/pear-HTTP_Upload/Makefile
+++ b/www/pear-HTTP_Upload/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www devel pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Easy and secure managment of files submitted via HTML Forms
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 CATEGORY=	HTTP
@@ -21,5 +21,5 @@ EXAMPLES=	upload_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>
diff --git a/www/pear-Text_Wiki/Makefile b/www/pear-Text_Wiki/Makefile
index bfe090c..f3d77812 100644
--- a/www/pear-Text_Wiki/Makefile
+++ b/www/pear-Text_Wiki/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	www pear
 MAINTAINER=	antonio@php.net
 COMMENT=	Abstracts parsing and rendering rules for Wiki markup
 
-BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
+BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_REINPLACE=	yes
@@ -96,5 +96,5 @@ post-extract:
 	@${REINPLACE_CMD} -e "s|@package_version@|${PORTVERSION}|" ${WRKSRC}/Wiki.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>
diff --git a/www/phpbb/Makefile b/www/phpbb/Makefile
index d0a3339..fbb0239 100644
--- a/www/phpbb/Makefile
+++ b/www/phpbb/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	phpBB-${PORTVERSION}
 MAINTAINER=	liukang@bjut.edu.cn
 COMMENT=	A PHP-based bulletin board / discussion forum system
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
 
 CONFLICTS=	phpbb-tw-[0-9]*
 
diff --git a/www/postnuke/Makefile b/www/postnuke/Makefile
index 9a65736..c84fbd7 100644
--- a/www/postnuke/Makefile
+++ b/www/postnuke/Makefile
@@ -14,7 +14,7 @@ DISTNAME=	PostNuke-0.761
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An automated website package to distribute and manage content
 
-RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear-PEAR
+RUN_DEPENDS=	${LOCALBASE}/share/pear/System.php:${PORTSDIR}/devel/pear
 
 USE_MYSQL=	YES
author	ale <ale@FreeBSD.org>	2005-12-09 19:24:52 +0000
committer	ale <ale@FreeBSD.org>	2005-12-09 19:24:52 +0000
commit	41604a0f0d82280948cab0ad263522cd6969d6f1 (patch)
tree	c92d5ad743f770a008b8555c05f3f1723eb36467
parent	c77ed4f552b975e069cc5960a2a5c8c8c76a6f54 (diff)
download	FreeBSD-ports-41604a0f0d82280948cab0ad263522cd6969d6f1.zip FreeBSD-ports-41604a0f0d82280948cab0ad263522cd6969d6f1.tar.gz