56 files changed, 202 insertions, 665 deletions

diff --git a/archivers/pear-Archive_Tar/Makefile b/archivers/pear-Archive_Tar/Makefile
index a909e533a051..45f1c88b1e48 100644
--- a/archivers/pear-Archive_Tar/Makefile
+++ b/archivers/pear-Archive_Tar/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Archive_Tar
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	archivers www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,17 +16,10 @@ COMMENT=	PEAR tar file management class
 BUILD_DEPENDS=	pear:${PORTSDIR}/lang/php4
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${MKDIR} ${PEARDIR}/Archive
-	@${CP} -Rp ${WRKSRC}/Archive ${PEARDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Archive
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/Archive_Tar.txt ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
+FILES=		Archive/Tar.php
+DOCS=		Archive_Tar.txt
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/lang/php4/bsd.php.mk"
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/archivers/pear-Archive_Tar/pkg-plist b/archivers/pear-Archive_Tar/pkg-plist
deleted file mode 100644
index d9d9709b467d..000000000000
--- a/archivers/pear-Archive_Tar/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%PEARDIR%%/Archive/Tar.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/Archive_Tar/Archive_Tar.txt
-@dirrm %%PEARDIR%%/Archive
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/Archive_Tar
-@unexec rmdir %D/share/pear/docs 2> /dev/null || true
-@unexec rmdir %D/share/pear/.registry 2> /dev/null || true
-@unexec rmdir %D/share/pear/packages 2> /dev/null || true
diff --git a/databases/pear-DB/Makefile b/databases/pear-DB/Makefile
index 315d18bbe302..2356b81f5992 100644
--- a/databases/pear-DB/Makefile
+++ b/databases/pear-DB/Makefile
@@ -8,6 +8,7 @@
 PORTNAME=	DB
 PORTVERSION=	1.5.0.r2
 PORTEPOCH=	1
+PORTREVISION=	1
 CATEGORIES=	databases www pear
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r2/RC2/}
 
@@ -17,23 +18,23 @@ COMMENT=	PEAR Database Abstraction Layer
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	DB DB.php tests
+FILES=		DB.php DB/common.php DB/dbase.php DB/fbsql.php \
+		DB/ibase.php DB/ifx.php DB/msql.php DB/mssql.php \
+		DB/mysql.php DB/oci8.php DB/odbc.php DB/pgsql.php \
+		DB/sqlite.php DB/storage.php DB/sybase.php
 DOCS=		IDEAS MAINTAINERS STATUS TESTERS
+TESTS=		db_error.phpt db_error2.phpt db_factory.phpt \
+		db_ismanip.phpt db_parsedsn.phpt driver/01connect.phpt \
+		driver/02fetch.phpt driver/03simplequery.phpt \
+		driver/04numcols.phpt driver/05sequences.phpt \
+		driver/06prepexec.phpt driver/08affectedrows.phpt \
+		driver/09numrows.phpt driver/10errormap.phpt \
+		driver/13limit.phpt driver/14fetchmode_object.phpt \
+		driver/15quote.phpt driver/bug22328.phpt \
+		driver/connect.inc driver/mktable.inc driver/setup.inc \
+		driver/skipif.inc
+_DOCSDIR=	doc
 
-do-install:
-.for FILE in ${MANIFEST}
-	@${CP} -Rp ${WRKSRC}/${FILE} ${PEARDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${FILE}
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-.for FILE in ${DOCS}
-	@${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR}
-.endfor
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
-
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/databases/pear-DB/pkg-plist b/databases/pear-DB/pkg-plist
deleted file mode 100644
index e61fd83cc337..000000000000
--- a/databases/pear-DB/pkg-plist
+++ /dev/null
@@ -1,46 +0,0 @@
-%%PEARDIR%%/DB.php
-%%PEARDIR%%/DB/common.php
-%%PEARDIR%%/DB/dbase.php
-%%PEARDIR%%/DB/fbsql.php
-%%PEARDIR%%/DB/ibase.php
-%%PEARDIR%%/DB/ifx.php
-%%PEARDIR%%/DB/msql.php
-%%PEARDIR%%/DB/mssql.php
-%%PEARDIR%%/DB/mysql.php
-%%PEARDIR%%/DB/oci8.php
-%%PEARDIR%%/DB/odbc.php
-%%PEARDIR%%/DB/pgsql.php
-%%PEARDIR%%/DB/sqlite.php
-%%PEARDIR%%/DB/storage.php
-%%PEARDIR%%/DB/sybase.php
-%%PEARDIR%%/tests/db_error.phpt
-%%PEARDIR%%/tests/db_error2.phpt
-%%PEARDIR%%/tests/db_factory.phpt
-%%PEARDIR%%/tests/db_ismanip.phpt
-%%PEARDIR%%/tests/db_parsedsn.phpt
-%%PEARDIR%%/tests/driver/01connect.phpt
-%%PEARDIR%%/tests/driver/02fetch.phpt
-%%PEARDIR%%/tests/driver/03simplequery.phpt
-%%PEARDIR%%/tests/driver/04numcols.phpt
-%%PEARDIR%%/tests/driver/05sequences.phpt
-%%PEARDIR%%/tests/driver/06prepexec.phpt
-%%PEARDIR%%/tests/driver/08affectedrows.phpt
-%%PEARDIR%%/tests/driver/09numrows.phpt
-%%PEARDIR%%/tests/driver/10errormap.phpt
-%%PEARDIR%%/tests/driver/13limit.phpt
-%%PEARDIR%%/tests/driver/14fetchmode_object.phpt
-%%PEARDIR%%/tests/driver/15quote.phpt
-%%PEARDIR%%/tests/driver/bug22328.phpt
-%%PEARDIR%%/tests/driver/connect.inc
-%%PEARDIR%%/tests/driver/mktable.inc
-%%PEARDIR%%/tests/driver/setup.inc
-%%PEARDIR%%/tests/driver/skipif.inc
-%%PORTDOCS%%%%DOCSDIR%%/IDEAS
-%%PORTDOCS%%%%DOCSDIR%%/MAINTAINERS
-%%PORTDOCS%%%%DOCSDIR%%/STATUS
-%%PORTDOCS%%%%DOCSDIR%%/TESTERS
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/DB
-@dirrm %%PEARDIR%%/tests/driver
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@unexec rmdir %D/share/pear/tests 2> /dev/null || true
diff --git a/devel/pear-Config/Makefile b/devel/pear-Config/Makefile
index 95b9f08f9289..446552cdd4ac 100644
--- a/devel/pear-Config/Makefile
+++ b/devel/pear-Config/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Config
 PORTVERSION=	1.8
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,26 +18,13 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
 		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	Apache.php IniCommented.php PHPArray.php GenericConf.php IniFile.php XML.php
-
-do-install:
-	@${CP} -p ${WRKSRC}/Config.php ${PEARDIR}
-	@${MKDIR} ${PEARDIR}/Config/Container
-	@${CP} -p ${WRKSRC}/Config/Container.php ${PEARDIR}/Config
-.for FILE in ${MANIFEST}
-	@${CP} -p ${WRKSRC}/Config/Container/${FILE} ${PEARDIR}/Config/Container
-.endfor
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Config.php
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Config
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/Apache.php ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/IniCommented.php ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/docs/IniFromScratch.php ${DOCSDIR}
-	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
-.endif
+FILES=		Config.php Config/Container.php Config/Container/Apache.php \
+		Config/Container/IniCommented.php Config/Container/PHPArray.php \
+		Config/Container/GenericConf.php Config/Container/IniFile.php \
+		Config/Container/XML.php
+EXAMPLES=	Apache.php IniCommented.php IniFromScratch.php
+_EXAMPLESDIR=	docs
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-Config/pkg-plist b/devel/pear-Config/pkg-plist
deleted file mode 100644
index a8cefb4d4da1..000000000000
--- a/devel/pear-Config/pkg-plist
+++ /dev/null
@@ -1,16 +0,0 @@
-%%PEARDIR%%/Config.php
-%%PEARDIR%%/Config/Container.php
-%%PEARDIR%%/Config/Container/Apache.php
-%%PEARDIR%%/Config/Container/GenericConf.php
-%%PEARDIR%%/Config/Container/IniCommented.php
-%%PEARDIR%%/Config/Container/IniFile.php
-%%PEARDIR%%/Config/Container/PHPArray.php
-%%PEARDIR%%/Config/Container/XML.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/Config/Apache.php
-%%PORTDOCS%%%%PEARDIR%%/docs/Config/IniCommented.php
-%%PORTDOCS%%%%PEARDIR%%/docs/Config/IniFromScratch.php
-@dirrm %%PEARDIR%%/Config/Container
-@dirrm %%PEARDIR%%/Config
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/Config
diff --git a/devel/pear-Console_Getopt/Makefile b/devel/pear-Console_Getopt/Makefile
index c7c9ead4c530..0e61e45e1f83 100644
--- a/devel/pear-Console_Getopt/Makefile
+++ b/devel/pear-Console_Getopt/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Console_Getopt
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,12 +16,8 @@ COMMENT=	PEAR command-line option parser
 BUILD_DEPENDS=	pear:${PORTSDIR}/lang/php4
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${MKDIR} ${PEARDIR}/Console
-	@${CP} -Rp ${WRKSRC}/Console/Getopt.php ${PEARDIR}/Console
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Console
+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/pkg-plist b/devel/pear-Console_Getopt/pkg-plist
deleted file mode 100644
index c6259b2b2c8b..000000000000
--- a/devel/pear-Console_Getopt/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%PEARDIR%%/Console/Getopt.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/Console
-@dirrm %%PKGREGDIR%%
-@unexec rmdir %D/share/pear/.registry 2> /dev/null || true
-@unexec rmdir %D/share/pear/packages 2> /dev/null || true
diff --git a/devel/pear-Console_Table/Makefile b/devel/pear-Console_Table/Makefile
index 6a31ecc6272c..ef66c0e4bfdd 100644
--- a/devel/pear-Console_Table/Makefile
+++ b/devel/pear-Console_Table/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Console_Table
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,15 +16,9 @@ COMMENT=	PHP class that makes it easy to build console style tables
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	Table.php
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Console
-.for FILE in ${MANIFEST}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Console/${FILE}
-.endfor
+CATEGORY=	Console
+FILES=		Table.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-Console_Table/pkg-plist b/devel/pear-Console_Table/pkg-plist
deleted file mode 100644
index 55d26e80c688..000000000000
--- a/devel/pear-Console_Table/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Console/Table.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-Date/Makefile b/devel/pear-Date/Makefile
index 5f9d836246aa..967d81654667 100644
--- a/devel/pear-Date/Makefile
+++ b/devel/pear-Date/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Date
 PORTVERSION=	1.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,17 +16,8 @@ COMMENT=	PEAR Date and Time Zone Classes
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-NO_BUILD=	yes
+FILES=		Date.php Date/Calc.php Date/Human.php Date/TimeZone.php
 
 .include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	Date Date.php
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
-.for FILE in ${MANIFEST}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${FILE}
-.endfor
-
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-Date/pkg-plist b/devel/pear-Date/pkg-plist
deleted file mode 100644
index 604bc8430393..000000000000
--- a/devel/pear-Date/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PEARDIR%%/Date/Calc.php
-%%PEARDIR%%/Date/Human.php
-%%PEARDIR%%/Date/TimeZone.php
-%%PEARDIR%%/Date.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/Date
-@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-HTML_Select_Common/Makefile b/devel/pear-HTML_Select_Common/Makefile
index 413c49164607..246c0e786eaf 100644
--- a/devel/pear-HTML_Select_Common/Makefile
+++ b/devel/pear-HTML_Select_Common/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	HTML_Select_Common
 PORTVERSION=	1.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,27 +17,13 @@ BUILD_DEPENDS=	${PEARDIR}/HTML/Common.php:${PORTSDIR}/devel/pear-HTML_Common	\
 		${PEARDIR}/I18N/Common.php:${PORTSDIR}/devel/pear-I18N
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-EXAMPLESDIR=	${PEARDIR}/HTML/Select/Common/examples
+CATEGORY=	HTML
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	Country.php FRDepartements.php UKCounty.php USState.php
+FILES=		Select/Common/Country.php Select/Common/FRDepartements.php \
+		Select/Common/UKCounty.php Select/Common/USState.php
 EXAMPLES=	Country.php FRDepartements.php UKCounty.php USState.php
+_EXAMPLESDIR=	Select/Common/examples
 
-do-install:
-	@${MKDIR} ${PEARDIR}/HTML/Select/Common
-.for FILE in ${MANIFEST}
-	@${CP} -p ${WRKSRC}/Select/Common/${FILE} ${PEARDIR}/HTML/Select/Common
-.endfor
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Select/Common
-	@${CHMOD} a-x ${PEARDIR}/HTML/Select/Common/*
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${EXAMPLESDIR}
-.for FILE in ${EXAMPLES}
-	@${INSTALL_DATA} ${WRKSRC}/Select/Common/examples/${FILE} ${EXAMPLESDIR}
-.endfor
-	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
-.endif
-
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-HTML_Select_Common/pkg-plist b/devel/pear-HTML_Select_Common/pkg-plist
deleted file mode 100644
index af2e48853208..000000000000
--- a/devel/pear-HTML_Select_Common/pkg-plist
+++ /dev/null
@@ -1,13 +0,0 @@
-%%PEARDIR%%/HTML/Select/Common/Country.php
-%%PEARDIR%%/HTML/Select/Common/FRDepartements.php
-%%PEARDIR%%/HTML/Select/Common/UKCounty.php
-%%PEARDIR%%/HTML/Select/Common/USState.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%EXAMPLESDIR%%/Country.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/FRDepartements.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/UKCounty.php
-%%PORTDOCS%%%%EXAMPLESDIR%%/USState.php
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
-@dirrm %%PEARDIR%%/HTML/Select/Common
-@dirrm %%PEARDIR%%/HTML/Select
-@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-HTML_Template_IT/Makefile b/devel/pear-HTML_Template_IT/Makefile
index 00dc00bc2bdb..b1544e9919a1 100644
--- a/devel/pear-HTML_Template_IT/Makefile
+++ b/devel/pear-HTML_Template_IT/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HTML_Template_IT
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,25 +16,19 @@ COMMENT=	PEAR template API
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	IT.php ITX.php IT_Error.php
-TESTDIR=	${PEARDIR}/tests/${PORTNAME}
+CATEGORY=	HTML/Template
+FILES=		IT.php ITX.php IT_Error.php
+EXAMPLES=	sample_it.php templates/main.tpl.htm
+TESTS=		templates/addblock.html templates/blockiteration.html \
+		templates/blocks.html templates/globals.html templates/__include.html \
+		templates/include.html templates/loadtemplatefile.html \
+		templates/replaceblock.html Console_TestListener.php IT_api_testcase.php \
+		IT_usage_testcase.php ITX_api_testcase.php ITX_usage_testcase.php test.php
 
-do-install:
-	@${MKDIR} -p ${PEARDIR}/HTML/Template
-.for FILE in ${MANIFEST}
-	@${CP} -p ${WRKSRC}/${FILE} ${PEARDIR}/HTML/Template
-.endfor
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Template
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${TESTDIR}
-	@${CP} -Rp ${WRKSRC}/tests/* ${TESTDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR}
-	@${ECHO_MSG} "===> Examples installed in ${TESTDIR}."
+do-install-tests-msg: .USE
 	@${ECHO_MSG} "     (These tests require PHPUnit - see"
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
-.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-HTML_Template_IT/pkg-plist b/devel/pear-HTML_Template_IT/pkg-plist
deleted file mode 100644
index 14a9c23b2876..000000000000
--- a/devel/pear-HTML_Template_IT/pkg-plist
+++ /dev/null
@@ -1,23 +0,0 @@
-%%PEARDIR%%/HTML/Template/IT.php
-%%PEARDIR%%/HTML/Template/ITX.php
-%%PEARDIR%%/HTML/Template/IT_Error.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/Console_TestListener.php
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/ITX_api_testcase.php
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/ITX_usage_testcase.php
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/IT_api_testcase.php
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/IT_usage_testcase.php
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/test.php
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/__include.html
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/addblock.html
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/blockiteration.html
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/blocks.html
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/globals.html
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/include.html
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/loadtemplatefile.html
-%%PORTDOCS%%%%PEARDIR%%/tests/HTML_Template_IT/templates/replaceblock.html
-@dirrm %%PEARDIR%%/HTML/Template
-@unexec rmdir %%PEARDIR%%/HTML 2>/dev/null || true
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/HTML_Template_IT/templates
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/HTML_Template_IT
diff --git a/devel/pear-HTML_Template_PHPLIB/Makefile b/devel/pear-HTML_Template_PHPLIB/Makefile
index 98f146ac421e..b6c526c8a2be 100644
--- a/devel/pear-HTML_Template_PHPLIB/Makefile
+++ b/devel/pear-HTML_Template_PHPLIB/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	HTML_Template_PHPLIB
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,22 +16,16 @@ COMMENT=	PEAR template API ported from PHPLIB
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-TESTDIR=	${PEARDIR}/tests/${PORTNAME}
+CATEGORY=	HTML/Template
+FILES=		PHPLIB.php
+DOCS=		README
+EXAMPLES=	block.ihtml block.php ittest.php tpl1.ihtml tpl1.php
+_DOCSDIR=	examples
 
-do-install:
-	@${MKDIR} ${PEARDIR}/HTML/Template
-	@${CP} -p ${WRKSRC}/PHPLIB.php ${PEARDIR}/HTML/Template
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/HTML/Template/PHPLIB.php
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -Rp ${WRKSRC}/examples/* ${DOCSDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@${ECHO_MSG} "===> Examples installed in ${DOCSDIR}."
+do-install-tests-msg: .USE
 	@${ECHO_MSG} "     (These tests require PEAR::Benchmark - see"
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=Benchmark>;;;)."
-.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-HTML_Template_PHPLIB/pkg-plist b/devel/pear-HTML_Template_PHPLIB/pkg-plist
deleted file mode 100644
index 906000c5d2b6..000000000000
--- a/devel/pear-HTML_Template_PHPLIB/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%PEARDIR%%/HTML/Template/PHPLIB.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/README
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/block.ihtml
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/block.php
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/ittest.php
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/tpl1.ihtml
-%%PORTDOCS%%%%PEARDIR%%/docs/HTML_Template_PHPLIB/tpl1.php
-@dirrm %%PEARDIR%%/HTML/Template
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/HTML_Template_PHPLIB
diff --git a/devel/pear-PEAR/Makefile b/devel/pear-PEAR/Makefile
index 163090cea51b..05d12b8000b6 100644
--- a/devel/pear-PEAR/Makefile
+++ b/devel/pear-PEAR/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	PEAR
 PORTVERSION=	1.2.1
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,15 +17,16 @@ BUILD_DEPENDS=	${PEARDIR}/Archive/Tar.php:${PORTSDIR}/archivers/pear-Archive_Tar
 		${PEARDIR}/Console/Getopt.php:${PORTSDIR}/devel/pear-Console_Getopt
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+FILES=		PEAR.php System.php PEAR/Autoloader.php \
+		PEAR/Command.php PEAR/Command/Auth.php PEAR/Command/Build.php \
+		PEAR/Command/Common.php PEAR/Command/Config.php \
+		PEAR/Command/Install.php PEAR/Command/Package.php \
+		PEAR/Command/Registry.php PEAR/Command/Remote.php \
+		PEAR/Command/Mirror.php PEAR/Common.php PEAR/Config.php \
+		PEAR/Dependency.php PEAR/Frontend/CLI.php PEAR/Builder.php \
+		PEAR/Installer.php PEAR/Packager.php PEAR/Registry.php \
+		PEAR/Remote.php OS/Guess.php package.dtd template.spec
+ 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	OS PEAR PEAR.php System.php package.dtd scripts template.spec
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
-.for FILE in ${MANIFEST}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${FILE}
-.endfor
-
 .include <bsd.port.post.mk>
diff --git a/devel/pear-PEAR/pkg-plist b/devel/pear-PEAR/pkg-plist
deleted file mode 100644
index d88c4028f3ed..000000000000
--- a/devel/pear-PEAR/pkg-plist
+++ /dev/null
@@ -1,35 +0,0 @@
-%%PEARDIR%%/package.dtd
-%%PEARDIR%%/template.spec
-%%PEARDIR%%/PEAR.php
-%%PEARDIR%%/System.php
-%%PEARDIR%%/OS/Guess.php
-%%PEARDIR%%/PEAR/Autoloader.php
-%%PEARDIR%%/PEAR/Builder.php
-%%PEARDIR%%/PEAR/Command.php
-%%PEARDIR%%/PEAR/Command/Auth.php
-%%PEARDIR%%/PEAR/Command/Build.php
-%%PEARDIR%%/PEAR/Command/Common.php
-%%PEARDIR%%/PEAR/Command/Config.php
-%%PEARDIR%%/PEAR/Command/Install.php
-%%PEARDIR%%/PEAR/Command/Mirror.php
-%%PEARDIR%%/PEAR/Command/Package.php
-%%PEARDIR%%/PEAR/Command/Registry.php
-%%PEARDIR%%/PEAR/Command/Remote.php
-%%PEARDIR%%/PEAR/Common.php
-%%PEARDIR%%/PEAR/Config.php
-%%PEARDIR%%/PEAR/Dependency.php
-%%PEARDIR%%/PEAR/Frontend/CLI.php
-%%PEARDIR%%/PEAR/Installer.php
-%%PEARDIR%%/PEAR/Packager.php
-%%PEARDIR%%/PEAR/Registry.php
-%%PEARDIR%%/PEAR/Remote.php
-%%PEARDIR%%/scripts/pear.bat
-%%PEARDIR%%/scripts/pear.sh
-%%PEARDIR%%/scripts/pearcmd.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/OS
-@dirrm %%PEARDIR%%/PEAR/Command
-@dirrm %%PEARDIR%%/PEAR/Frontend
-@dirrm %%PEARDIR%%/PEAR
-@dirrm %%PEARDIR%%/scripts
-@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-XML_Parser/Makefile b/devel/pear-XML_Parser/Makefile
index 7323ea74696e..9771b84f23a6 100644
--- a/devel/pear-XML_Parser/Makefile
+++ b/devel/pear-XML_Parser/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML_Parser
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,22 +16,14 @@ COMMENT=	PEAR XML parsing class based on PHP's bundled expat
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-TESTDIR=	${PEARDIR}/tests/${PORTNAME}
+CATEGORY=	XML
+FILES=		Parser.php
+TESTS=		001.phpt 002.phpt 003.phpt 004.phpt 005.phpt test2.xml test3.xml
 
-do-install:
-	@${MKDIR} ${PEARDIR}/XML
-	@${CP} -p ${WRKSRC}/Parser.php ${PEARDIR}/XML
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XML/Parser.php
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${TESTDIR}
-	@${CP} -Rp ${WRKSRC}/tests/* ${TESTDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR}
-	@${ECHO_MSG} "===> Examples installed in ${TESTDIR}."
+do-install-tests-msg: .USE
 	@${ECHO_MSG} "     (These tests require PHPUnit - see"
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
-.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-XML_Parser/pkg-plist b/devel/pear-XML_Parser/pkg-plist
deleted file mode 100644
index 05bf7bd8e3a7..000000000000
--- a/devel/pear-XML_Parser/pkg-plist
+++ /dev/null
@@ -1,12 +0,0 @@
-%%PEARDIR%%/XML/Parser.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Parser/001.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Parser/002.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Parser/003.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Parser/004.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Parser/005.phpt
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Parser/test2.xml
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Parser/test3.xml
-@dirrm %%PEARDIR%%/XML
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/XML_Parser
diff --git a/devel/pear-XML_RSS/Makefile b/devel/pear-XML_RSS/Makefile
index 27183c75c554..590f56bd2655 100644
--- a/devel/pear-XML_RSS/Makefile
+++ b/devel/pear-XML_RSS/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML_RSS
 PORTVERSION=	0.9.2
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,21 +17,10 @@ BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${PEARDIR}/XML/Tree.php:${PORTSDIR}/devel/pear-XML_Tree
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-TESTDIR=	${PEARDIR}/tests/${PORTNAME}
-
-do-install:
-	@${MKDIR} ${PEARDIR}/XML
-	@${CP} -fp ${WRKSRC}/RSS.php ${PEARDIR}/XML
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XML/RSS.php
-	@${CHMOD} ${SHAREMODE} ${PEARDIR}/XML/RSS.php
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${TESTDIR}
-	@${CP} -p ${WRKSRC}/tests/* ${TESTDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR}
-	@${CHMOD} -R ${SHAREMODE} ${TESTDIR}/*
-.endif
+CATEGORY=	XML
+FILES=		RSS.php
+TESTS=		test.rss 01-parse.phpt
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-XML_RSS/pkg-plist b/devel/pear-XML_RSS/pkg-plist
deleted file mode 100644
index 46c1c84a0cb2..000000000000
--- a/devel/pear-XML_RSS/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PEARDIR%%/XML/RSS.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_RSS/test.rss
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_RSS/01-parse.phpt
-@unexec rmdir %D/%%PEARDIR%%/XML 2>/dev/null || true
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/XML_RSS
diff --git a/devel/pear-XML_Serializer/Makefile b/devel/pear-XML_Serializer/Makefile
index 599d70d56800..80fdb504d069 100644
--- a/devel/pear-XML_Serializer/Makefile
+++ b/devel/pear-XML_Serializer/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML_Serializer
 PORTVERSION=	0.6
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,21 +18,11 @@ RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${PEARDIR}/XML/Parser.php:${PORTSDIR}/devel/pear-XML_Parser \
 		${PEARDIR}/XML/Util.php:${PORTSDIR}/devel/pear-XML_Util
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	Serializer.php Unserializer.php
-
-do-install:
-	@${MKDIR} ${PEARDIR}/XML
-.for FILE in ${MANIFEST}
-	@${CP} -p ${WRKSRC}/${FILE} ${PEARDIR}/XML
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XML/${FILE}
-.endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -Rp ${WRKSRC}/examples/* ${DOCSDIR}
-	@${ECHO_MSG} "===> Examples installed in ${DOCSDIR}."
-.endif
+CATEGORY=	XML
+FILES=		Serializer.php Unserializer.php
+EXAMPLES=	serializeObject.php serializeRDF.php unserializeAnyXML.php \
+		unserializeObject.php unserializeRDF.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-XML_Serializer/pkg-plist b/devel/pear-XML_Serializer/pkg-plist
deleted file mode 100644
index 316932ce23ab..000000000000
--- a/devel/pear-XML_Serializer/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-%%PEARDIR%%/XML/Serializer.php
-%%PEARDIR%%/XML/Unserializer.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/serializeObject.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/serializeRDF.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/unserializeAnyXML.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/unserializeObject.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Serializer/unserializeRDF.php
-@unexec rmdir %D/%%PEARDIR%%/XML 2>/dev/null || true
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Serializer
diff --git a/devel/pear-XML_Tree/Makefile b/devel/pear-XML_Tree/Makefile
index 096931c6be84..c6d5955f8182 100644
--- a/devel/pear-XML_Tree/Makefile
+++ b/devel/pear-XML_Tree/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML_Tree
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,14 +16,9 @@ COMMENT=	PEAR class for representing XML data in a tree structure
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${MKDIR} ${PEARDIR}/XML/Tree
-	@${CP} -p ${WRKSRC}/Tree.php ${PEARDIR}/XML
-	@${CP} -p ${WRKSRC}/Tree/Node.php ${PEARDIR}/XML/Tree
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XML/Tree.php
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XML/Tree
+CATEGORY=	XML
+FILES=		Tree.php Tree/Node.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-XML_Tree/pkg-plist b/devel/pear-XML_Tree/pkg-plist
deleted file mode 100644
index 551d8ecf0c13..000000000000
--- a/devel/pear-XML_Tree/pkg-plist
+++ /dev/null
@@ -1,6 +0,0 @@
-%%PEARDIR%%/XML/Tree.php
-%%PEARDIR%%/XML/Tree/Node.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/XML/Tree
-@unexec rmdir %D/%%PEARDIR%%/XML 2>/dev/null || true
-@dirrm %%PKGREGDIR%%
diff --git a/devel/pear-XML_Util/Makefile b/devel/pear-XML_Util/Makefile
index 0c6d4b63308f..d801d2bcf903 100644
--- a/devel/pear-XML_Util/Makefile
+++ b/devel/pear-XML_Util/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML_Util
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,24 +16,34 @@ COMMENT=	PEAR XML utility class
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-TESTDIR=	${PEARDIR}/tests/${PORTNAME}
+CATEGORY=	XML
+FILES=		Util.php
+EXAMPLES=	example.php
+DOCS=		blank.html classtrees_XML_Util.html elementindex.html \
+		elementindex_XML_Util.html errors.html index.html li_XML_Util.html \
+		packages.html todolist.html media/banner.css media/stylesheet.css \
+		media/images/blank.png media/images/Class.png \
+		media/images/class_folder.png media/images/Constant.png \
+		media/images/Constructor.png media/images/Destructor.png \
+		media/images/file.png media/images/folder.png media/images/Function.png \
+		media/images/function_folder.png media/images/Global.png \
+		media/images/I.png media/images/Index.png media/images/L.png \
+		media/images/Lminus.png media/images/Lplus.png media/images/Method.png \
+		media/images/next_button.png media/images/next_button_disabled.png \
+		media/images/package.png media/images/package_folder.png \
+		media/images/T.png media/images/Page.png media/images/previous_button.png \
+		media/images/previous_button_disabled.png media/images/PrivateClass.png \
+		media/images/PrivateMethod.png media/images/PrivateVariable.png \
+		media/images/Tminus.png media/images/Tplus.png media/images/tutorial.png \
+		media/images/tutorial_folder.png media/images/up_button.png \
+		media/images/Variable.png XML_Util/XML_Util.html \
+		XML_Util/_Util_XML_XML_Util_php.html
+_DOCSDIR=	apidoc
 
-do-install:
-	@${MKDIR} ${PEARDIR}/XML
-	@${CP} -p ${WRKSRC}/Util.php ${PEARDIR}/XML
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XML/Util.php
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -Rp ${WRKSRC}/apidoc/* ${DOCSDIR}
-	@${MKDIR} ${TESTDIR}
-	@${CP} -Rp ${WRKSRC}/examples/* ${TESTDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${TESTDIR}
-	@${ECHO_MSG} "===> Examples installed in ${TESTDIR}."
+do-install-tests-msg: .USE
 	@${ECHO_MSG} "     (These tests require PHPUnit - see"
 	@${ECHO_MSG} "     <http://pear.php.net/package-info.php?package=PHPUnit>;;)."
-.endif
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-XML_Util/pkg-plist b/devel/pear-XML_Util/pkg-plist
deleted file mode 100644
index f11f026f8805..000000000000
--- a/devel/pear-XML_Util/pkg-plist
+++ /dev/null
@@ -1,57 +0,0 @@
-%%PEARDIR%%/XML/Util.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/tests/XML_Util/example.php
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/elementindex_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/blank.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/errors.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/packages.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/classtrees_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/index.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/todolist.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/elementindex.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/li_XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/XML_Util/XML_Util.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/XML_Util/_Util_XML_XML_Util_php.html
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/banner.css
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/stylesheet.css
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Class.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Constant.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Constructor.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Destructor.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Function.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Global.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/I.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Index.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/L.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Lminus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Lplus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Method.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Page.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateClass.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateMethod.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/PrivateVariable.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/T.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Tminus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Tplus.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/Variable.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/blank.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/class_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/file.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/function_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/next_button.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/next_button_disabled.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/package.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/package_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/previous_button.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/previous_button_disabled.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/tutorial.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/tutorial_folder.png
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_Util/media/images/up_button.png
-@dirrm %%PEARDIR%%/XML
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/media/images
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/media
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util/XML_Util
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_Util
-%%PORTDOCS%%@dirrm %%PEARDIR%%/tests/XML_Util
diff --git a/devel/pear-XML_XPath/Makefile b/devel/pear-XML_XPath/Makefile
index 2d8242423820..e6ddbe425b49 100644
--- a/devel/pear-XML_XPath/Makefile
+++ b/devel/pear-XML_XPath/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	XML_XPath
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	devel www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,27 +16,15 @@ COMMENT=	PEAR class provided an XPath/DOM XML manipulation
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
 .if defined(PACKAGE_BUILDING)
 IGNORE=		No package building: The default libraries in the PHP package do not support domxml by default.
 .endif
 
-MANIFEST=	common.php error.php result.php
-
-do-install:
-	@${MKDIR} ${PEARDIR}/XPath
-	@${CP} -p ${WRKSRC}/XPath.php ${PEARDIR}
-.for FILE in ${MANIFEST}
-	@${CP} -p ${WRKSRC}/XPath/${FILE} ${PEARDIR}/XPath
-.endfor
-		@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XPath.php
-		@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/XPath
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CP} -p ${WRKSRC}/docs/XML_XPath_example.php ${DOCSDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-.endif
+CATEGORY=	XML
+FILES=		XPath.php XPath/common.php XPath/error.php XPath/result.php
+EXAMPLES=	XML_XPath_example.php
+_EXAMPLESDIR=	docs
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/devel/pear-XML_XPath/pkg-plist b/devel/pear-XML_XPath/pkg-plist
deleted file mode 100644
index 1cfe7c12589b..000000000000
--- a/devel/pear-XML_XPath/pkg-plist
+++ /dev/null
@@ -1,9 +0,0 @@
-%%PEARDIR%%/XPath.php
-%%PEARDIR%%/XPath/common.php
-%%PEARDIR%%/XPath/error.php
-%%PEARDIR%%/XPath/result.php
-%%PKGREGDIR%%/package.xml
-%%PORTDOCS%%%%PEARDIR%%/docs/XML_XPath/XML_XPath_example.php
-@dirrm %%PEARDIR%%/XPath
-@dirrm %%PKGREGDIR%%
-%%PORTDOCS%%@dirrm %%PEARDIR%%/docs/XML_XPath
diff --git a/mail/pear-Mail/Makefile b/mail/pear-Mail/Makefile
index 4454eacc4e72..eaeae4526a9c 100644
--- a/mail/pear-Mail/Makefile
+++ b/mail/pear-Mail/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Mail
 PORTVERSION=	1.1.2
+PORTREVISION=	1
 CATEGORIES=	mail www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,12 +16,8 @@ COMMENT=	PEAR class that provides multiple interfaces for sending emails
 BUILD_DEPENDS=	${PEARDIR}/Net/SMTP.php:${PORTSDIR}/net/pear-Net_SMTP
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Mail*
-	@${CHMOD} a-x ${PEARDIR}/Mail.php
+FILES=		Mail.php Mail/mail.php Mail/sendmail.php Mail/smtp.php Mail/RFC822.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/mail/pear-Mail/pkg-plist b/mail/pear-Mail/pkg-plist
deleted file mode 100644
index fc5be30bd8e1..000000000000
--- a/mail/pear-Mail/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%PEARDIR%%/Mail/RFC822.php
-%%PEARDIR%%/Mail/mail.php
-%%PEARDIR%%/Mail/sendmail.php
-%%PEARDIR%%/Mail/smtp.php
-%%PEARDIR%%/Mail.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
-@unexec rmdir %D/share/pear/Mail 2> /dev/null || true
diff --git a/mail/pear-Mail_Mime/Makefile b/mail/pear-Mail_Mime/Makefile
index 4fb86e06c565..250db5d0355c 100644
--- a/mail/pear-Mail_Mime/Makefile
+++ b/mail/pear-Mail_Mime/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Mail_Mime
 PORTVERSION=	1.2.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,14 +16,9 @@ COMMENT=	PEAR classes to create and decode MIME messages
 BUILD_DEPENDS=	${PEARDIR}/Mail/mail.php:${PORTSDIR}/mail/pear-Mail
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Mail
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Mail/*
-.for BUGMODE in mimeDecode.php mimePart.php xmail.dtd xmail.xsl
-	@${CHMOD} a-x ${PEARDIR}/Mail/${BUGMODE}
-.endfor
+CATEGORY=	Mail
+FILES=		mime.php mimeDecode.php mimePart.php xmail.dtd xmail.xsl
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/mail/pear-Mail_Mime/pkg-plist b/mail/pear-Mail_Mime/pkg-plist
deleted file mode 100644
index 0b083cb8f847..000000000000
--- a/mail/pear-Mail_Mime/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-%%PEARDIR%%/Mail/mime.php
-%%PEARDIR%%/Mail/mimeDecode.php
-%%PEARDIR%%/Mail/mimePart.php
-%%PEARDIR%%/Mail/xmail.dtd
-%%PEARDIR%%/Mail/xmail.xsl
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
diff --git a/net/pear-Net_SMTP/Makefile b/net/pear-Net_SMTP/Makefile
index 91346ac0f360..06e17422ae2f 100644
--- a/net/pear-Net_SMTP/Makefile
+++ b/net/pear-Net_SMTP/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net_SMTP
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	net mail www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,13 +18,9 @@ BUILD_DEPENDS=	${PEARDIR}/Auth/SASL.php:${PORTSDIR}/security/pear-Auth_SASL \
 # The Auth_SASL package is no longer absolutely required, but it will be used if it is available.
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	Net/SMTP.php
-
-do-install:
-	@${CP} -p ${WRKSRC}/SMTP.php ${PEARDIR}/Net
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${MANIFEST}
+CATEGORY=	Net
+FILES=		SMTP.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_SMTP/pkg-plist b/net/pear-Net_SMTP/pkg-plist
deleted file mode 100644
index 4d01f94a59c7..000000000000
--- a/net/pear-Net_SMTP/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/SMTP.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
diff --git a/net/pear-Net_Sieve/Makefile b/net/pear-Net_Sieve/Makefile
index ce0ba59ccbbd..cb390d9cf3bb 100644
--- a/net/pear-Net_Sieve/Makefile
+++ b/net/pear-Net_Sieve/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Net_Sieve
 PORTVERSION=	0.8.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,12 +16,9 @@ COMMENT=	PEAR class to handle talking to timsieved
 BUILD_DEPENDS=	${PEARDIR}/Net/Socket.php:${PORTSDIR}/net/pear-Net_Socket
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Net
-	@${CHOWN} ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Net/Sieve.php
-	@${CHMOD} a-x ${PEARDIR}/Net/Sieve.php
+CATEGORY=	Net
+FILES=		Sieve.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Sieve/pkg-plist b/net/pear-Net_Sieve/pkg-plist
deleted file mode 100644
index 769b8a5fea1c..000000000000
--- a/net/pear-Net_Sieve/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/Sieve.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
diff --git a/net/pear-Net_Socket/Makefile b/net/pear-Net_Socket/Makefile
index dda8685b7387..1b00ff5baade 100644
--- a/net/pear-Net_Socket/Makefile
+++ b/net/pear-Net_Socket/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Net_Socket
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,12 +16,9 @@ COMMENT=	PEAR Network Socket Interface
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${MKDIR} ${PEARDIR}/Net
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}/Net
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Net
+CATEGORY=	Net
+FILES=		Socket.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_Socket/pkg-plist b/net/pear-Net_Socket/pkg-plist
deleted file mode 100644
index da686f64a0e6..000000000000
--- a/net/pear-Net_Socket/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PEARDIR%%/Net/Socket.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
-@unexec rmdir %D/share/pear/Net 2> /dev/null || true
diff --git a/net/pear-Net_URL/Makefile b/net/pear-Net_URL/Makefile
index 69f0b6fd4aa7..285d1b5d8505 100644
--- a/net/pear-Net_URL/Makefile
+++ b/net/pear-Net_URL/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net_URL
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	net www pear
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -19,13 +20,9 @@ COMMENT=	Easy parsing of Urls
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CATEGORY=	Net
+FILES=		URL.php
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${INSTALL} -d -m 755 ${PKGREGDIR}
-	@${INSTALL} -d -m 755 ${PEARDIR}/Net
-	@${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR}
-	@${INSTALL_DATA} ${WRKSRC}/URL.php ${PEARDIR}/Net
-
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_URL/pkg-plist b/net/pear-Net_URL/pkg-plist
deleted file mode 100644
index 72900be63c12..000000000000
--- a/net/pear-Net_URL/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/URL.php
-%%PKGREGDIR%%/package.xml
-@unexec rmdir %%PKGREGDIR%% 2>/dev/null || true
diff --git a/net/pear-Net_URL2/Makefile b/net/pear-Net_URL2/Makefile
index 69f0b6fd4aa7..285d1b5d8505 100644
--- a/net/pear-Net_URL2/Makefile
+++ b/net/pear-Net_URL2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Net_URL
 PORTVERSION=	1.0.10
+PORTREVISION=	1
 CATEGORIES=	net www pear
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -19,13 +20,9 @@ COMMENT=	Easy parsing of Urls
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+CATEGORY=	Net
+FILES=		URL.php
+
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${INSTALL} -d -m 755 ${PKGREGDIR}
-	@${INSTALL} -d -m 755 ${PEARDIR}/Net
-	@${INSTALL_DATA} ${WRKDIR}/package.xml ${PKGREGDIR}
-	@${INSTALL_DATA} ${WRKSRC}/URL.php ${PEARDIR}/Net
-
 .include <bsd.port.post.mk>
diff --git a/net/pear-Net_URL2/pkg-plist b/net/pear-Net_URL2/pkg-plist
deleted file mode 100644
index 72900be63c12..000000000000
--- a/net/pear-Net_URL2/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/Net/URL.php
-%%PKGREGDIR%%/package.xml
-@unexec rmdir %%PKGREGDIR%% 2>/dev/null || true
diff --git a/security/pear-Auth_SASL/Makefile b/security/pear-Auth_SASL/Makefile
index d0a421dc0138..aa0de7523595 100644
--- a/security/pear-Auth_SASL/Makefile
+++ b/security/pear-Auth_SASL/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Auth_SASL
 PORTVERSION=	1.0.1
+PORTREVISION=	1
 CATEGORIES=	security www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,17 +16,10 @@ COMMENT=	PEAR abstraction of various SASL mechanism responses
 BUILD_DEPENDS=	${PEARDIR}/Auth/Auth.php:${PORTSDIR}/security/pear-Auth
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-MANIFEST=	SASL.php SASL
-
-do-install:
-.for FILE in ${MANIFEST}
-	@${CP} -Rp ${WRKSRC}/${FILE} ${PEARDIR}/Auth
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Auth/${FILE}
-.endfor
-	@${CHMOD} a-x ${PEARDIR}/Auth/SASL/*
-	@${CHMOD} a-x ${PEARDIR}/Auth/SASL.php
+CATEGORY=	Auth
+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 <bsd.port.post.mk>
diff --git a/security/pear-Auth_SASL/pkg-plist b/security/pear-Auth_SASL/pkg-plist
deleted file mode 100644
index 5b786210180e..000000000000
--- a/security/pear-Auth_SASL/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-%%PEARDIR%%/Auth/SASL.php
-%%PEARDIR%%/Auth/SASL/Anonymous.php
-%%PEARDIR%%/Auth/SASL/Common.php
-%%PEARDIR%%/Auth/SASL/CramMD5.php
-%%PEARDIR%%/Auth/SASL/DigestMD5.php
-%%PEARDIR%%/Auth/SASL/Login.php
-%%PEARDIR%%/Auth/SASL/Plain.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/Auth/SASL
-@dirrm %%PKGREGDIR%%
diff --git a/security/pear-Crypt_CBC/Makefile b/security/pear-Crypt_CBC/Makefile
index ad3f5edd83c2..ad072385b797 100644
--- a/security/pear-Crypt_CBC/Makefile
+++ b/security/pear-Crypt_CBC/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	Crypt_CBC
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	security www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,12 +16,9 @@ COMMENT=	PEAR class to emulate Perl's Crypt::CBC module
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${MKDIR} ${PEARDIR}/Crypt
-	@${CP} -Rp ${WRKSRC}/CBC.php ${PEARDIR}/Crypt
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/Crypt
+CATEGORY=	Crypt
+FILES=		CBC.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/security/pear-Crypt_CBC/pkg-plist b/security/pear-Crypt_CBC/pkg-plist
deleted file mode 100644
index 82ab5e846889..000000000000
--- a/security/pear-Crypt_CBC/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-%%PEARDIR%%/Crypt/CBC.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/Crypt
-@dirrm %%PKGREGDIR%%
diff --git a/sysutils/pear-File/Makefile b/sysutils/pear-File/Makefile
index 5dfbf6370f82..71bc0e578f29 100644
--- a/sysutils/pear-File/Makefile
+++ b/sysutils/pear-File/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	File
 PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -16,12 +16,9 @@ COMMENT=	PEAR common file and directory routines
 BUILD_DEPENDS=	${PEARDIR}/PEAR.php:${PORTSDIR}/devel/pear-PEAR
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${PORTNAME}*
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/tests
+FILES=		File.php File/CSV.php
+TESTS=		parser.php test.csv
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-File/pkg-plist b/sysutils/pear-File/pkg-plist
deleted file mode 100644
index 9d55bdae8898..000000000000
--- a/sysutils/pear-File/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-%%PEARDIR%%/File/CSV.php
-%%PEARDIR%%/File.php
-%%PKGREGDIR%%/package.xml
-%%PEARDIR%%/tests/parser.php
-%%PEARDIR%%/tests/test.csv
-@dirrm %%PKGREGDIR%%
-@unexec rmdir %D/share/pear/tests 2> /dev/null || true
-@unexec rmdir %D/share/pear/File 2> /dev/null || true
diff --git a/sysutils/pear-File_Find/Makefile b/sysutils/pear-File_Find/Makefile
index eff775237b72..b4204f959ae4 100644
--- a/sysutils/pear-File_Find/Makefile
+++ b/sysutils/pear-File_Find/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	File_Find
 PORTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	sysutils www pear
 MASTER_SITES=	http://pear.php.net/get/
 PKGNAMEPREFIX=	pear-
@@ -19,10 +20,9 @@ COMMENT=	A PEAR Class to facilitate the search of filesystems
 BUILD_DEPENDS=	${PEARDIR}/File.php:${PORTSDIR}/sysutils/pear-File
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${INSTALL_DATA} ${WRKSRC}/Find.php ${PEARDIR}/File/Find.php
+CATEGORY=	File
+FILES=		Find.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-File_Find/pkg-plist b/sysutils/pear-File_Find/pkg-plist
deleted file mode 100644
index e785fa8126c1..000000000000
--- a/sysutils/pear-File_Find/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-%%PEARDIR%%/File/Find.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PKGREGDIR%%
diff --git a/sysutils/pear-Log/Makefile b/sysutils/pear-Log/Makefile
index 4b377a581986..f4d5b330040c 100644
--- a/sysutils/pear-Log/Makefile
+++ b/sysutils/pear-Log/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	Log
 PORTVERSION=	1.7.1
+PORTREVISION=	1
 CATEGORIES=	sysutils www pear
 
 MAINTAINER=	ports@FreeBSD.org
@@ -15,11 +16,10 @@ COMMENT=	PEAR logging utilities
 BUILD_DEPENDS=	${PEARDIR}/DB.php:${PORTSDIR}/databases/pear-DB
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-.include <bsd.port.pre.mk>
-.include "${.CURDIR}/../../devel/pear-PEAR/Makefile.common"
-
-do-install:
-	@${CP} -Rp ${WRKSRC}/* ${PEARDIR}
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${PEARDIR}/${PORTNAME}*
+FILES=		Log.php Log/composite.php Log/console.php Log/error_log.php \
+		Log/file.php Log/mail.php Log/mcal.php Log/observer.php \
+		Log/sql.php Log/syslog.php Log/win.php
 
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/devel/pear-PEAR/Makefile.common"
 .include <bsd.port.post.mk>
diff --git a/sysutils/pear-Log/pkg-plist b/sysutils/pear-Log/pkg-plist
deleted file mode 100644
index 731f8fafdc0c..000000000000
--- a/sysutils/pear-Log/pkg-plist
+++ /dev/null
@@ -1,14 +0,0 @@
-%%PEARDIR%%/Log/composite.php
-%%PEARDIR%%/Log/console.php
-%%PEARDIR%%/Log/error_log.php
-%%PEARDIR%%/Log/file.php
-%%PEARDIR%%/Log/mail.php
-%%PEARDIR%%/Log/mcal.php
-%%PEARDIR%%/Log/observer.php
-%%PEARDIR%%/Log/sql.php
-%%PEARDIR%%/Log/syslog.php
-%%PEARDIR%%/Log/win.php
-%%PEARDIR%%/Log.php
-%%PKGREGDIR%%/package.xml
-@dirrm %%PEARDIR%%/Log
-@dirrm %%PKGREGDIR%%