2 files changed, 18 insertions, 63 deletions

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